From 3830f247f05a1ed18eddf86a2d80c2797f4aadaf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Dec 2025 12:32:09 +0100 Subject: [PATCH] drop queue-6.18/perf-vendor-metrics-s390-avoid-has_event-instruction.patch --- ...ics-s390-avoid-has_event-instruction.patch | 97 ------------------- queue-6.18/series | 1 - 2 files changed, 98 deletions(-) delete mode 100644 queue-6.18/perf-vendor-metrics-s390-avoid-has_event-instruction.patch diff --git a/queue-6.18/perf-vendor-metrics-s390-avoid-has_event-instruction.patch b/queue-6.18/perf-vendor-metrics-s390-avoid-has_event-instruction.patch deleted file mode 100644 index aaef139c95..0000000000 --- a/queue-6.18/perf-vendor-metrics-s390-avoid-has_event-instruction.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0d2b5b04a34842190bcb58ecc4f88da859520473 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 12 Nov 2025 08:24:39 -0800 -Subject: perf vendor metrics s390: Avoid has_event(INSTRUCTIONS) - -From: Ian Rogers - -[ Upstream commit c1932fb85af8e51ac9f6bd9947145b06c716106e ] - -The instructions event is now provided in json meaning the has_event -test always succeeds. Switch to using non-legacy event names in the -affected metrics. - -Reported-by: Thomas Richter -Closes: https://lore.kernel.org/linux-perf-users/3e80f453-f015-4f4f-93d3-8df6bb6b3c95@linux.ibm.com/ -Fixes: 0012e0fa221b ("perf jevents: Add legacy-hardware and legacy-cache json") -Signed-off-by: Ian Rogers -Reviewed-by: Thomas Richter -Tested-by: Thomas Richter -Signed-off-by: Namhyung Kim -Signed-off-by: Sasha Levin ---- - tools/perf/pmu-events/arch/s390/cf_z16/transaction.json | 8 ++++---- - tools/perf/pmu-events/arch/s390/cf_z17/transaction.json | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tools/perf/pmu-events/arch/s390/cf_z16/transaction.json b/tools/perf/pmu-events/arch/s390/cf_z16/transaction.json -index 3ab1d3a6638c4..57b785307a85f 100644 ---- a/tools/perf/pmu-events/arch/s390/cf_z16/transaction.json -+++ b/tools/perf/pmu-events/arch/s390/cf_z16/transaction.json -@@ -7,17 +7,17 @@ - { - "BriefDescription": "Cycles per Instruction", - "MetricName": "cpi", -- "MetricExpr": "CPU_CYCLES / INSTRUCTIONS if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "CPU_CYCLES / INSTRUCTIONS if has_event(CPU_CYCLES) else 0" - }, - { - "BriefDescription": "Problem State Instruction Ratio", - "MetricName": "prbstate", -- "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100 if has_event(PROBLEM_STATE_INSTRUCTIONS) else 0" - }, - { - "BriefDescription": "Level One Miss per 100 Instructions", - "MetricName": "l1mp", -- "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100 if has_event(L1I_DIR_WRITES) else 0" - }, - { - "BriefDescription": "Percentage sourced from Level 2 cache", -@@ -52,7 +52,7 @@ - { - "BriefDescription": "Estimated Instruction Complexity CPI infinite Level 1", - "MetricName": "est_cpi", -- "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS) if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS) if has_event(CPU_CYCLES) else 0" - }, - { - "BriefDescription": "Estimated Sourcing Cycles per Level 1 Miss", -diff --git a/tools/perf/pmu-events/arch/s390/cf_z17/transaction.json b/tools/perf/pmu-events/arch/s390/cf_z17/transaction.json -index 74df533c8b6fa..7ded6a5a76c0f 100644 ---- a/tools/perf/pmu-events/arch/s390/cf_z17/transaction.json -+++ b/tools/perf/pmu-events/arch/s390/cf_z17/transaction.json -@@ -7,17 +7,17 @@ - { - "BriefDescription": "Cycles per Instruction", - "MetricName": "cpi", -- "MetricExpr": "CPU_CYCLES / INSTRUCTIONS if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "CPU_CYCLES / INSTRUCTIONS if has_event(CPU_CYCLES) else 0" - }, - { - "BriefDescription": "Problem State Instruction Ratio", - "MetricName": "prbstate", -- "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100 if has_event(PROBLEM_STATE_INSTRUCTIONS) else 0" - }, - { - "BriefDescription": "Level One Miss per 100 Instructions", - "MetricName": "l1mp", -- "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100 if has_event(L1I_DIR_WRITES) else 0" - }, - { - "BriefDescription": "Percentage sourced from Level 2 cache", -@@ -52,7 +52,7 @@ - { - "BriefDescription": "Estimated Instruction Complexity CPI infinite Level 1", - "MetricName": "est_cpi", -- "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS) if has_event(INSTRUCTIONS) else 0" -+ "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS) if has_event(L1C_TLB2_MISSES) else 0" - }, - { - "BriefDescription": "Estimated Sourcing Cycles per Level 1 Miss", --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index b4d45bc9ff..77b5d60143 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -273,7 +273,6 @@ soc-renesas-rz-sysc-populate-readable_reg-writeable_.patch arm64-dts-rockchip-move-the-eeprom-to-correct-i2c-bu.patch arm64-dts-rockchip-add-eeprom-vcc-supply-for-radxa-r.patch arm64-dts-rockchip-add-eeprom-vcc-supply-for-radxa-r.patch-12419 -perf-vendor-metrics-s390-avoid-has_event-instruction.patch crypto-iaa-fix-incorrect-return-value-in-save_iaa_wq.patch s390-fpu-fix-false-positive-kmsan-report-in-fpu_vstl.patch pwm-simplify-printf-to-emit-chip-npwm-in-debugfs-pwm.patch -- 2.47.3