Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework broadwell-de conversion #111

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Rework broadwell-de conversion #111

merged 1 commit into from
Sep 26, 2023

Conversation

captain5050
Copy link
Contributor

Broadwell-de follows broadwell for core events but broadwellx for uncore. Prior to this patch the uncore_arb PMU was tried to be used, however, it isn't present and uncore_cbox should be used. Rework how this is done in the code, in find_form for Page_Walks_Utilization force the BDX lookup. For lookups that result in UNC_ARB retry the lookup using BDX as lookup order.

Note, this only changes the metric tma_info_system_dram_bw_use as:

  •    "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",

  •    "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",

@captain5050
Rework broadwell-de conversion
cddf6eb 
Broadwell-de follows broadwell for core events but broadwellx for
uncore. Prior to this patch the uncore_arb PMU was tried to be used,
however, it isn't present and uncore_cbox should be used. Rework how
this is done in the code, in find_form for Page_Walks_Utilization
force the BDX lookup. For lookups that result in UNC_ARB retry the
lookup using BDX as lookup order.
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Sep 26, 2023
@captain5050 @intel-lab-lkp
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
c76e595 
… metric

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
kliang2
kliang2 approved these changes Sep 26, 2023
View reviewed changes
Copy link
Contributor

@kliang2 kliang2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks!

@kliang2 kliang2 merged commit d28979d into intel:main Sep 26, 2023
1 check passed
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Sep 26, 2023
@captain5050 @intel-lab-lkp
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
0f070e0 
… metric

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Oct 27, 2023
@captain5050 @namhyung
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
3779416 
… metric

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Kaz205 pushed a commit to Kaz205/linux that referenced this pull request Nov 15, 2023
@captain5050 @gregkh
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
f2ad081 
… metric

[ Upstream commit 3779416 ]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
ReillyBrogan pushed a commit to getsolus/linux that referenced this pull request Nov 18, 2023
@captain5050 @gregkh
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
ba329e5 
… metric

[ Upstream commit 3779416 ]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Whissi pushed a commit to Whissi/linux-stable that referenced this pull request Nov 20, 2023
@captain5050 @gregkh
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
e5270cb 
… metric

[ Upstream commit 3779416 ]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
github-actions bot pushed a commit to sirdarckcat/linux-1 that referenced this pull request Nov 20, 2023
@captain5050 @gregkh
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
8a1be9d 
… metric

[ Upstream commit 3779416 ]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
wanghao75 pushed a commit to openeuler-mirror/kernel that referenced this pull request Nov 24, 2023
@captain5050
perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use…
9197bfe 
… metric

stable inclusion
from stable-v6.6.2
commit 8a1be9decb3ad15d221c4cabee590624d0d6040d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8a1be9decb3ad15d221c4cabee590624d0d6040d

--------------------------------

[ Upstream commit 3779416eed25a843364b940decee452620a1de4b ]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
intel/perfmon#111

Fixes: 7d12430 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Link: https://lore.kernel.org/r/20230926031034.1201145-1-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kliang2 kliang2 kliang2 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@captain5050 @kliang2