From f43bdb791d3f154f7b2be37340075f0e32f398d50f73a3f2d8f5d8f55f6caaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 20 Dec 2024 16:07:54 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main numatop revision 38b4765e3e06b163a0f33af9a9aea2bd --- numatop-fix-missing-fields.patch | 36 -------------------------- numatop-power11.patch | 43 -------------------------------- numatop.changes | 9 +++++++ numatop.spec | 6 +---- v2.4.tar.gz | 3 --- v2.5.tar.gz | 3 +++ 6 files changed, 13 insertions(+), 87 deletions(-) delete mode 100644 numatop-fix-missing-fields.patch delete mode 100644 numatop-power11.patch delete mode 100644 v2.4.tar.gz create mode 100644 v2.5.tar.gz diff --git a/numatop-fix-missing-fields.patch b/numatop-fix-missing-fields.patch deleted file mode 100644 index 58134f0..0000000 --- a/numatop-fix-missing-fields.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8badd8cfed744c254520808890d7351b88e1b9c4 Mon Sep 17 00:00:00 2001 -From: Colin Ian King -Date: Wed, 31 Jul 2024 12:02:06 +0100 -Subject: [PATCH] x86: Fix missing fields for EMR support -Upstream: merged, not released - -There are two missing fields in the s_emr_config array causing -build issues with modern versions of gcc. Fix this. - -Fixes: d3fcffc6a9cc ("x86: Add initial support for EMR") -Signed-off-by: Colin Ian King ---- - x86/skl.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/x86/skl.c b/x86/skl.c -index 17cfbcc..a80a868 100644 ---- a/x86/skl.c -+++ b/x86/skl.c -@@ -64,11 +64,11 @@ static plat_event_config_t s_spr_config[PERF_COUNT_NUM] = { - }; - - static plat_event_config_t s_emr_config[PERF_COUNT_NUM] = { -- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, -- { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, "off_core_response_0" }, -- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, -- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, -- { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, "off_core_response_1" } -+ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.core" }, -+ { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, 0, 0, "off_core_response_0" }, -+ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.ref" }, -+ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, 0, 0, "instr_retired.any" }, -+ { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, 0, 0, "off_core_response_1" } - }; - - static plat_event_config_t s_skl_ll = { diff --git a/numatop-power11.patch b/numatop-power11.patch deleted file mode 100644 index 3003272..0000000 --- a/numatop-power11.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 50617b9a0e197a5261b3824d6e6309c034e99134 Mon Sep 17 00:00:00 2001 -From: Kajol Jain -Date: Fri, 12 Apr 2024 04:46:59 -0400 -Subject: [PATCH] numatop/powerpc: Add Power11 support -References: jsc#PED-9887, jsc#PED-10899 -Upstream: merged, not released - -Power11 is PowerISA v3.1 compliant processor and support Power10 events. -So using Power10 events to enable numatop in Power11 platform and to -count the per-process/per-thread memory accesses and CPU usage. - -Signed-off-by: Kajol Jain ---- - numatop.8 | 2 +- - powerpc/plat.c | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/numatop.8 b/numatop.8 -index 7237093..b09862e 100644 ---- a/numatop.8 -+++ b/numatop.8 -@@ -500,4 +500,4 @@ in 3.9. The following steps show how to get and apply the patch set. - \fBnumatop\fP supports the Intel Xeon processors: 5500-series, 6500/7500-series, - 5600 series, E7-x8xx-series, and E5-16xx/24xx/26xx/46xx-series. - \fBNote\fP: CPU microcode version 0x618 or 0x70c or later is required on --E5-16xx/24xx/26xx/46xx-series. It also supports IBM Power8, Power9 and Power10 processors. -+E5-16xx/24xx/26xx/46xx-series. It also supports IBM Power8, Power9, Power10 and Power11 processors. -diff --git a/powerpc/plat.c b/powerpc/plat.c -index bed27d5..0ea262b 100644 ---- a/powerpc/plat.c -+++ b/powerpc/plat.c -@@ -93,6 +93,11 @@ plat_detect(void) - s_cpu_type = CPU_POWER10; - ret = 0; - break; -+ -+ case 0x82: -+ s_cpu_type = CPU_POWER10; -+ ret = 0; -+ break; - } - - return ret; diff --git a/numatop.changes b/numatop.changes index d4b3065..70aaa17 100644 --- a/numatop.changes +++ b/numatop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 11 15:47:00 UTC 2024 - Vlastimil Babka + +- update to version 2.5 + * Support GNR processors (jsc#PED-10182, jsc#PED-10575) + * Support SRF processors (jsc#PED-10588) +- remove numatop-fix-missing-fields.patch: upstream +- remove numatop-power11.patch: upstream + ------------------------------------------------------------------- Tue Oct 15 13:34:50 UTC 2024 - Vlastimil Babka diff --git a/numatop.spec b/numatop.spec index ec1399a..c250d4b 100644 --- a/numatop.spec +++ b/numatop.spec @@ -17,7 +17,7 @@ Name: numatop -Version: 2.4 +Version: 2.5 Release: 0 Summary: A top-like tool for runtime memory locality monitoring on NUMA systems License: BSD-3-Clause @@ -32,10 +32,6 @@ BuildRequires: libtool BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 ppc64le -# PATCH-FIX-UPSTREAM numatop-fix-missing-fields.patch -Patch0: numatop-fix-missing-fields.patch -# PATCH-FEATURE-SLE numatop-power11.patch jsc#PED-9887 jsc#PED-10899 -Patch1: numatop-power11.patch %description NumaTOP is an observation tool for runtime memory locality characterization diff --git a/v2.4.tar.gz b/v2.4.tar.gz deleted file mode 100644 index 0769e49..0000000 --- a/v2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0a4fbce717f82658be0c44168bf6d9ae3ee63465b23b580eab11d2532bdc142 -size 107466 diff --git a/v2.5.tar.gz b/v2.5.tar.gz new file mode 100644 index 0000000..cb40f11 --- /dev/null +++ b/v2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9da222b98ee602af828fc3193e759a9652c5373904581ecc7d6bfdc21354c492 +size 107960