From: Greg Kroah-Hartman Date: Sat, 23 Sep 2023 08:22:59 +0000 (+0200) Subject: drop some perf patches from 5.15, 5.10, and 5.4 X-Git-Tag: v4.14.326~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c00f57ff8131c4613cc47b62416656ce850534f;p=thirdparty%2Fkernel%2Fstable-queue.git drop some perf patches from 5.15, 5.10, and 5.4 --- diff --git a/queue-5.10/perf-build-update-build-rule-for-generated-files.patch b/queue-5.10/perf-build-update-build-rule-for-generated-files.patch deleted file mode 100644 index e954e695b95..00000000000 --- a/queue-5.10/perf-build-update-build-rule-for-generated-files.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 9a4c5c0bd91c0c480ac89fc0800ec6057b4ba509 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Jul 2023 19:24:46 -0700 -Subject: perf build: Update build rule for generated files - -From: Namhyung Kim - -[ Upstream commit 7822a8913f4c51c7d1aff793b525d60c3384fb5b ] - -The bison and flex generate C files from the source (.y and .l) -files. When O= option is used, they are saved in a separate directory -but the default build rule assumes the .C files are in the source -directory. So it might read invalid file if there are generated files -from an old version. The same is true for the pmu-events files. - -For example, the following command would cause a build failure: - - $ git checkout v6.3 - $ make -C tools/perf # build in the same directory - - $ git checkout v6.5-rc2 - $ mkdir build # create a build directory - $ make -C tools/perf O=build # build in a different directory but it - # refers files in the source directory - -Let's update the build rule to specify those cases explicitly to depend -on the files in the output directory. - -Note that it's not a complete fix and it needs the next patch for the -include path too. - -Fixes: 80eeb67fe577aa76 ("perf jevents: Program to convert JSON file") -Signed-off-by: Namhyung Kim -Cc: Adrian Hunter -Cc: Andi Kleen -Cc: Anup Sharma -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Peter Zijlstra -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230728022447.1323563-1-namhyung@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/build/Makefile.build | 10 ++++++++++ - tools/perf/pmu-events/Build | 6 ++++++ - 2 files changed, 16 insertions(+) - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index cd72016c3cfa7..5a727094ae832 100644 ---- a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -116,6 +116,16 @@ $(OUTPUT)%.s: %.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_s_c) - -+# bison and flex files are generated in the OUTPUT directory -+# so it needs a separate rule to depend on them properly -+$(OUTPUT)%-bison.o: $(OUTPUT)%-bison.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ -+$(OUTPUT)%-flex.o: $(OUTPUT)%-flex.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ - # Gather build data: - # obj-y - list of build objects - # subdir-y - list of directories to nest -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index 5ec5ce8c31bab..ea8c41f9c7398 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -25,3 +25,9 @@ $(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) - $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ - endif -+ -+# pmu-events.c file is generated in the OUTPUT directory so it needs a -+# separate rule to depend on it properly -+$(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) -+ $(call rule_mkdir) -+ $(call if_changed_dep,cc_o_c) --- -2.40.1 - diff --git a/queue-5.10/perf-jevents-switch-build-to-use-jevents.py.patch b/queue-5.10/perf-jevents-switch-build-to-use-jevents.py.patch deleted file mode 100644 index a44c6025dee..00000000000 --- a/queue-5.10/perf-jevents-switch-build-to-use-jevents.py.patch +++ /dev/null @@ -1,295 +0,0 @@ -From e51e13831d91b7107d7df3bb89a2dc87f3c7d930 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 29 Jun 2022 11:25:04 -0700 -Subject: perf jevents: Switch build to use jevents.py - -From: Ian Rogers - -[ Upstream commit 00facc760903be6675870c2749e2cd72140e396e ] - -Generate pmu-events.c using jevents.py rather than the binary built from -jevents.c. - -Add a new config variable NO_JEVENTS that is set when there is no -architecture json or an appropriate python interpreter isn't present. - -When NO_JEVENTS is defined the file pmu-events/empty-pmu-events.c is -copied and used as the pmu-events.c file. - -Signed-off-by: Ian Rogers -Tested-by: John Garry -Cc: Alexander Shishkin -Cc: Ananth Narayan -Cc: Andi Kleen -Cc: Andrew Kilroy -Cc: Caleb Biggers -Cc: Felix Fietkau -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: James Clark -Cc: Jiri Olsa -Cc: Kajol Jain -Cc: Kan Liang -Cc: Kshipra Bopardikar -Cc: Like Xu -Cc: Mark Rutland -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Nick Forrington -Cc: Paul Clarke -Cc: Perry Taylor -Cc: Peter Zijlstra -Cc: Qi Liu -Cc: Ravi Bangoria -Cc: Sandipan Das -Cc: Santosh Shukla -Cc: Stephane Eranian -Cc: Will Deacon -Cc: Xing Zhengjun -Link: https://lore.kernel.org/r/20220629182505.406269-4-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Stable-dep-of: 7822a8913f4c ("perf build: Update build rule for generated files") -Signed-off-by: Sasha Levin ---- - tools/perf/Makefile.config | 19 +++ - tools/perf/Makefile.perf | 1 + - tools/perf/pmu-events/Build | 13 +- - tools/perf/pmu-events/empty-pmu-events.c | 158 +++++++++++++++++++++++ - 4 files changed, 189 insertions(+), 2 deletions(-) - create mode 100644 tools/perf/pmu-events/empty-pmu-events.c - -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index 89905b4e93091..a92d5422041ee 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -824,6 +824,25 @@ else - endif - endif - -+ifneq ($(NO_JEVENTS),1) -+ ifeq ($(wildcard pmu-events/arch/$(SRCARCH)/mapfile.csv),) -+ NO_JEVENTS := 1 -+ endif -+endif -+ifneq ($(NO_JEVENTS),1) -+ NO_JEVENTS := 0 -+ ifndef PYTHON -+ $(warning No python interpreter disabling jevent generation) -+ NO_JEVENTS := 1 -+ else -+ # jevents.py uses f-strings present in Python 3.6 released in Dec. 2016. -+ JEVENTS_PYTHON_GOOD := $(shell $(PYTHON) -c 'import sys;print("1" if(sys.version_info.major >= 3 and sys.version_info.minor >= 6) else "0")' 2> /dev/null) -+ ifneq ($(JEVENTS_PYTHON_GOOD), 1) -+ $(warning Python interpreter too old (older than 3.6) disabling jevent generation) -+ NO_JEVENTS := 1 -+ endif -+ endif -+endif - - ifndef NO_LIBBFD - ifeq ($(feature-libbfd), 1) -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index e41a8f9b99d2d..ef25028b2e2fa 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -634,6 +634,7 @@ JEVENTS := $(OUTPUT)pmu-events/jevents - JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o - - PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o -+export NO_JEVENTS - - export JEVENTS - -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index a055dee6a46af..5ec5ce8c31bab 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -9,10 +9,19 @@ JSON = $(shell [ -d $(JDIR) ] && \ - JDIR_TEST = pmu-events/arch/test - JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \ - find $(JDIR_TEST) -name '*.json') -+JEVENTS_PY = pmu-events/jevents.py - - # - # Locate/process JSON files in pmu-events/arch/ - # directory and create tables in pmu-events.c. - # --$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS) -- $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V) -+ -+ifeq ($(NO_JEVENTS),1) -+$(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-events.c -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)cp $< $@ -+else -+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ -+endif -diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c -new file mode 100644 -index 0000000000000..77e655c6f1162 ---- /dev/null -+++ b/tools/perf/pmu-events/empty-pmu-events.c -@@ -0,0 +1,158 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * An empty pmu-events.c file used when there is no architecture json files in -+ * arch or when the jevents.py script cannot be run. -+ * -+ * The test cpu/soc is provided for testing. -+ */ -+#include "pmu-events/pmu-events.h" -+ -+static const struct pmu_event pme_test_soc_cpu[] = { -+ { -+ .name = "l3_cache_rd", -+ .event = "event=0x40", -+ .desc = "L3 cache access, read", -+ .topic = "cache", -+ .long_desc = "Attributable Level 3 cache access, read", -+ }, -+ { -+ .name = "segment_reg_loads.any", -+ .event = "event=0x6,period=200000,umask=0x80", -+ .desc = "Number of segment register loads", -+ .topic = "other", -+ }, -+ { -+ .name = "dispatch_blocked.any", -+ .event = "event=0x9,period=200000,umask=0x20", -+ .desc = "Memory cluster signals to block micro-op dispatch for any reason", -+ .topic = "other", -+ }, -+ { -+ .name = "eist_trans", -+ .event = "event=0x3a,period=200000,umask=0x0", -+ .desc = "Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions", -+ .topic = "other", -+ }, -+ { -+ .name = "uncore_hisi_ddrc.flux_wcmd", -+ .event = "event=0x2", -+ .desc = "DDRC write commands. Unit: hisi_sccl,ddrc ", -+ .topic = "uncore", -+ .long_desc = "DDRC write commands", -+ .pmu = "hisi_sccl,ddrc", -+ }, -+ { -+ .name = "unc_cbo_xsnp_response.miss_eviction", -+ .event = "event=0x22,umask=0x81", -+ .desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-hyphen", -+ .event = "event=0xe0,umask=0x00", -+ .desc = "UNC_CBO_HYPHEN. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_HYPHEN", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-two-hyph", -+ .event = "event=0xc0,umask=0x00", -+ .desc = "UNC_CBO_TWO_HYPH. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_TWO_HYPH", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "uncore_hisi_l3c.rd_hit_cpipe", -+ .event = "event=0x7", -+ .desc = "Total read hits. Unit: hisi_sccl,l3c ", -+ .topic = "uncore", -+ .long_desc = "Total read hits", -+ .pmu = "hisi_sccl,l3c", -+ }, -+ { -+ .name = "uncore_imc_free_running.cache_miss", -+ .event = "event=0x12", -+ .desc = "Total cache misses. Unit: uncore_imc_free_running ", -+ .topic = "uncore", -+ .long_desc = "Total cache misses", -+ .pmu = "uncore_imc_free_running", -+ }, -+ { -+ .name = "uncore_imc.cache_hits", -+ .event = "event=0x34", -+ .desc = "Total cache hits. Unit: uncore_imc ", -+ .topic = "uncore", -+ .long_desc = "Total cache hits", -+ .pmu = "uncore_imc", -+ }, -+ { -+ .name = "bp_l1_btb_correct", -+ .event = "event=0x8a", -+ .desc = "L1 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = "bp_l2_btb_correct", -+ .event = "event=0x8b", -+ .desc = "L2 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_events_map pmu_events_map[] = { -+ { -+ .cpuid = "testcpu", -+ .version = "v1", -+ .type = "core", -+ .table = pme_test_soc_cpu, -+ }, -+ { -+ .cpuid = 0, -+ .version = 0, -+ .type = 0, -+ .table = 0, -+ }, -+}; -+ -+static const struct pmu_event pme_test_soc_sys[] = { -+ { -+ .name = "sys_ddr_pmu.write_cycles", -+ .event = "event=0x2b", -+ .desc = "ddr write-cycles event. Unit: uncore_sys_ddr_pmu ", -+ .compat = "v8", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ddr_pmu", -+ }, -+ { -+ .name = "sys_ccn_pmu.read_cycles", -+ .event = "config=0x2c", -+ .desc = "ccn read-cycles event. Unit: uncore_sys_ccn_pmu ", -+ .compat = "0x01", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ccn_pmu", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_sys_events pmu_sys_event_tables[] = { -+ { -+ .table = pme_test_soc_sys, -+ .name = "pme_test_soc_sys", -+ }, -+ { -+ .table = 0 -+ }, -+}; --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index f6d75123197..4a2a4d906d5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -50,8 +50,6 @@ mtd-rawnand-brcmnand-allow-soc-to-provide-i-o-operat.patch mtd-rawnand-brcmnand-fix-ecc-level-field-setting-for.patch perf-jevents-make-build-dependency-on-test-jsons.patch perf-tools-add-an-option-to-build-without-libbfd.patch -perf-jevents-switch-build-to-use-jevents.py.patch -perf-build-update-build-rule-for-generated-files.patch btrfs-move-btrfs_pinned_by_swapfile-prototype-into-v.patch btrfs-add-a-helper-to-read-the-superblock-metadata_u.patch btrfs-compare-the-correct-fsid-metadata_uuid-in-btrf.patch diff --git a/queue-5.15/perf-build-update-build-rule-for-generated-files.patch b/queue-5.15/perf-build-update-build-rule-for-generated-files.patch deleted file mode 100644 index 86d9d65e8b1..00000000000 --- a/queue-5.15/perf-build-update-build-rule-for-generated-files.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 5ffff079925fe9e90d7fa9826c20c4d7838a6f8a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Jul 2023 19:24:46 -0700 -Subject: perf build: Update build rule for generated files - -From: Namhyung Kim - -[ Upstream commit 7822a8913f4c51c7d1aff793b525d60c3384fb5b ] - -The bison and flex generate C files from the source (.y and .l) -files. When O= option is used, they are saved in a separate directory -but the default build rule assumes the .C files are in the source -directory. So it might read invalid file if there are generated files -from an old version. The same is true for the pmu-events files. - -For example, the following command would cause a build failure: - - $ git checkout v6.3 - $ make -C tools/perf # build in the same directory - - $ git checkout v6.5-rc2 - $ mkdir build # create a build directory - $ make -C tools/perf O=build # build in a different directory but it - # refers files in the source directory - -Let's update the build rule to specify those cases explicitly to depend -on the files in the output directory. - -Note that it's not a complete fix and it needs the next patch for the -include path too. - -Fixes: 80eeb67fe577aa76 ("perf jevents: Program to convert JSON file") -Signed-off-by: Namhyung Kim -Cc: Adrian Hunter -Cc: Andi Kleen -Cc: Anup Sharma -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Peter Zijlstra -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230728022447.1323563-1-namhyung@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/build/Makefile.build | 10 ++++++++++ - tools/perf/pmu-events/Build | 6 ++++++ - 2 files changed, 16 insertions(+) - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index 715092fc6a239..0f0aba16bdee7 100644 ---- a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -116,6 +116,16 @@ $(OUTPUT)%.s: %.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_s_c) - -+# bison and flex files are generated in the OUTPUT directory -+# so it needs a separate rule to depend on them properly -+$(OUTPUT)%-bison.o: $(OUTPUT)%-bison.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ -+$(OUTPUT)%-flex.o: $(OUTPUT)%-flex.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ - # Gather build data: - # obj-y - list of build objects - # subdir-y - list of directories to nest -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index 5ec5ce8c31bab..ea8c41f9c7398 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -25,3 +25,9 @@ $(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) - $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ - endif -+ -+# pmu-events.c file is generated in the OUTPUT directory so it needs a -+# separate rule to depend on it properly -+$(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) -+ $(call rule_mkdir) -+ $(call if_changed_dep,cc_o_c) --- -2.40.1 - diff --git a/queue-5.15/perf-jevents-switch-build-to-use-jevents.py.patch b/queue-5.15/perf-jevents-switch-build-to-use-jevents.py.patch deleted file mode 100644 index 614eb89db42..00000000000 --- a/queue-5.15/perf-jevents-switch-build-to-use-jevents.py.patch +++ /dev/null @@ -1,295 +0,0 @@ -From f7508f92cf16375b4050a2c74c7be05e7ed58f1e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 29 Jun 2022 11:25:04 -0700 -Subject: perf jevents: Switch build to use jevents.py - -From: Ian Rogers - -[ Upstream commit 00facc760903be6675870c2749e2cd72140e396e ] - -Generate pmu-events.c using jevents.py rather than the binary built from -jevents.c. - -Add a new config variable NO_JEVENTS that is set when there is no -architecture json or an appropriate python interpreter isn't present. - -When NO_JEVENTS is defined the file pmu-events/empty-pmu-events.c is -copied and used as the pmu-events.c file. - -Signed-off-by: Ian Rogers -Tested-by: John Garry -Cc: Alexander Shishkin -Cc: Ananth Narayan -Cc: Andi Kleen -Cc: Andrew Kilroy -Cc: Caleb Biggers -Cc: Felix Fietkau -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: James Clark -Cc: Jiri Olsa -Cc: Kajol Jain -Cc: Kan Liang -Cc: Kshipra Bopardikar -Cc: Like Xu -Cc: Mark Rutland -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Nick Forrington -Cc: Paul Clarke -Cc: Perry Taylor -Cc: Peter Zijlstra -Cc: Qi Liu -Cc: Ravi Bangoria -Cc: Sandipan Das -Cc: Santosh Shukla -Cc: Stephane Eranian -Cc: Will Deacon -Cc: Xing Zhengjun -Link: https://lore.kernel.org/r/20220629182505.406269-4-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Stable-dep-of: 7822a8913f4c ("perf build: Update build rule for generated files") -Signed-off-by: Sasha Levin ---- - tools/perf/Makefile.config | 19 +++ - tools/perf/Makefile.perf | 1 + - tools/perf/pmu-events/Build | 13 +- - tools/perf/pmu-events/empty-pmu-events.c | 158 +++++++++++++++++++++++ - 4 files changed, 189 insertions(+), 2 deletions(-) - create mode 100644 tools/perf/pmu-events/empty-pmu-events.c - -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index 973c0d5ed8d8b..e1077c4d30fff 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -857,6 +857,25 @@ else - endif - endif - -+ifneq ($(NO_JEVENTS),1) -+ ifeq ($(wildcard pmu-events/arch/$(SRCARCH)/mapfile.csv),) -+ NO_JEVENTS := 1 -+ endif -+endif -+ifneq ($(NO_JEVENTS),1) -+ NO_JEVENTS := 0 -+ ifndef PYTHON -+ $(warning No python interpreter disabling jevent generation) -+ NO_JEVENTS := 1 -+ else -+ # jevents.py uses f-strings present in Python 3.6 released in Dec. 2016. -+ JEVENTS_PYTHON_GOOD := $(shell $(PYTHON) -c 'import sys;print("1" if(sys.version_info.major >= 3 and sys.version_info.minor >= 6) else "0")' 2> /dev/null) -+ ifneq ($(JEVENTS_PYTHON_GOOD), 1) -+ $(warning Python interpreter too old (older than 3.6) disabling jevent generation) -+ NO_JEVENTS := 1 -+ endif -+ endif -+endif - - ifndef NO_LIBBFD - ifeq ($(feature-libbfd), 1) -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index b856afa6eb52e..b82f2d89d74c4 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -649,6 +649,7 @@ JEVENTS := $(OUTPUT)pmu-events/jevents - JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o - - PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o -+export NO_JEVENTS - - export JEVENTS - -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index a055dee6a46af..5ec5ce8c31bab 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -9,10 +9,19 @@ JSON = $(shell [ -d $(JDIR) ] && \ - JDIR_TEST = pmu-events/arch/test - JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \ - find $(JDIR_TEST) -name '*.json') -+JEVENTS_PY = pmu-events/jevents.py - - # - # Locate/process JSON files in pmu-events/arch/ - # directory and create tables in pmu-events.c. - # --$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS) -- $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V) -+ -+ifeq ($(NO_JEVENTS),1) -+$(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-events.c -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)cp $< $@ -+else -+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ -+endif -diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c -new file mode 100644 -index 0000000000000..77e655c6f1162 ---- /dev/null -+++ b/tools/perf/pmu-events/empty-pmu-events.c -@@ -0,0 +1,158 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * An empty pmu-events.c file used when there is no architecture json files in -+ * arch or when the jevents.py script cannot be run. -+ * -+ * The test cpu/soc is provided for testing. -+ */ -+#include "pmu-events/pmu-events.h" -+ -+static const struct pmu_event pme_test_soc_cpu[] = { -+ { -+ .name = "l3_cache_rd", -+ .event = "event=0x40", -+ .desc = "L3 cache access, read", -+ .topic = "cache", -+ .long_desc = "Attributable Level 3 cache access, read", -+ }, -+ { -+ .name = "segment_reg_loads.any", -+ .event = "event=0x6,period=200000,umask=0x80", -+ .desc = "Number of segment register loads", -+ .topic = "other", -+ }, -+ { -+ .name = "dispatch_blocked.any", -+ .event = "event=0x9,period=200000,umask=0x20", -+ .desc = "Memory cluster signals to block micro-op dispatch for any reason", -+ .topic = "other", -+ }, -+ { -+ .name = "eist_trans", -+ .event = "event=0x3a,period=200000,umask=0x0", -+ .desc = "Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions", -+ .topic = "other", -+ }, -+ { -+ .name = "uncore_hisi_ddrc.flux_wcmd", -+ .event = "event=0x2", -+ .desc = "DDRC write commands. Unit: hisi_sccl,ddrc ", -+ .topic = "uncore", -+ .long_desc = "DDRC write commands", -+ .pmu = "hisi_sccl,ddrc", -+ }, -+ { -+ .name = "unc_cbo_xsnp_response.miss_eviction", -+ .event = "event=0x22,umask=0x81", -+ .desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-hyphen", -+ .event = "event=0xe0,umask=0x00", -+ .desc = "UNC_CBO_HYPHEN. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_HYPHEN", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-two-hyph", -+ .event = "event=0xc0,umask=0x00", -+ .desc = "UNC_CBO_TWO_HYPH. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_TWO_HYPH", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "uncore_hisi_l3c.rd_hit_cpipe", -+ .event = "event=0x7", -+ .desc = "Total read hits. Unit: hisi_sccl,l3c ", -+ .topic = "uncore", -+ .long_desc = "Total read hits", -+ .pmu = "hisi_sccl,l3c", -+ }, -+ { -+ .name = "uncore_imc_free_running.cache_miss", -+ .event = "event=0x12", -+ .desc = "Total cache misses. Unit: uncore_imc_free_running ", -+ .topic = "uncore", -+ .long_desc = "Total cache misses", -+ .pmu = "uncore_imc_free_running", -+ }, -+ { -+ .name = "uncore_imc.cache_hits", -+ .event = "event=0x34", -+ .desc = "Total cache hits. Unit: uncore_imc ", -+ .topic = "uncore", -+ .long_desc = "Total cache hits", -+ .pmu = "uncore_imc", -+ }, -+ { -+ .name = "bp_l1_btb_correct", -+ .event = "event=0x8a", -+ .desc = "L1 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = "bp_l2_btb_correct", -+ .event = "event=0x8b", -+ .desc = "L2 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_events_map pmu_events_map[] = { -+ { -+ .cpuid = "testcpu", -+ .version = "v1", -+ .type = "core", -+ .table = pme_test_soc_cpu, -+ }, -+ { -+ .cpuid = 0, -+ .version = 0, -+ .type = 0, -+ .table = 0, -+ }, -+}; -+ -+static const struct pmu_event pme_test_soc_sys[] = { -+ { -+ .name = "sys_ddr_pmu.write_cycles", -+ .event = "event=0x2b", -+ .desc = "ddr write-cycles event. Unit: uncore_sys_ddr_pmu ", -+ .compat = "v8", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ddr_pmu", -+ }, -+ { -+ .name = "sys_ccn_pmu.read_cycles", -+ .event = "config=0x2c", -+ .desc = "ccn read-cycles event. Unit: uncore_sys_ccn_pmu ", -+ .compat = "0x01", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ccn_pmu", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_sys_events pmu_sys_event_tables[] = { -+ { -+ .table = pme_test_soc_sys, -+ .name = "pme_test_soc_sys", -+ }, -+ { -+ .table = 0 -+ }, -+}; --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 01143e7b2a1..02716c9e8c9 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -66,8 +66,6 @@ jbd2-correct-the-end-of-the-journal-recovery-scan-ra.patch mtd-rawnand-brcmnand-allow-soc-to-provide-i-o-operat.patch mtd-rawnand-brcmnand-fix-ecc-level-field-setting-for.patch mips-use-grep-e-instead-of-egrep.patch -perf-jevents-switch-build-to-use-jevents.py.patch -perf-build-update-build-rule-for-generated-files.patch perf-test-remove-bash-construct-from-stat_bpf_counte.patch perf-test-shell-stat_bpf_counters-fix-test-on-intel.patch btrfs-move-btrfs_pinned_by_swapfile-prototype-into-v.patch diff --git a/queue-5.4/perf-build-update-build-rule-for-generated-files.patch b/queue-5.4/perf-build-update-build-rule-for-generated-files.patch deleted file mode 100644 index ced6351c517..00000000000 --- a/queue-5.4/perf-build-update-build-rule-for-generated-files.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ae2b85b8560a82bcf7902fed7ef733b31385515f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Jul 2023 19:24:46 -0700 -Subject: perf build: Update build rule for generated files - -From: Namhyung Kim - -[ Upstream commit 7822a8913f4c51c7d1aff793b525d60c3384fb5b ] - -The bison and flex generate C files from the source (.y and .l) -files. When O= option is used, they are saved in a separate directory -but the default build rule assumes the .C files are in the source -directory. So it might read invalid file if there are generated files -from an old version. The same is true for the pmu-events files. - -For example, the following command would cause a build failure: - - $ git checkout v6.3 - $ make -C tools/perf # build in the same directory - - $ git checkout v6.5-rc2 - $ mkdir build # create a build directory - $ make -C tools/perf O=build # build in a different directory but it - # refers files in the source directory - -Let's update the build rule to specify those cases explicitly to depend -on the files in the output directory. - -Note that it's not a complete fix and it needs the next patch for the -include path too. - -Fixes: 80eeb67fe577aa76 ("perf jevents: Program to convert JSON file") -Signed-off-by: Namhyung Kim -Cc: Adrian Hunter -Cc: Andi Kleen -Cc: Anup Sharma -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Peter Zijlstra -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230728022447.1323563-1-namhyung@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/build/Makefile.build | 10 ++++++++++ - tools/perf/pmu-events/Build | 6 ++++++ - 2 files changed, 16 insertions(+) - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index cd72016c3cfa7..5a727094ae832 100644 ---- a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -116,6 +116,16 @@ $(OUTPUT)%.s: %.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_s_c) - -+# bison and flex files are generated in the OUTPUT directory -+# so it needs a separate rule to depend on them properly -+$(OUTPUT)%-bison.o: $(OUTPUT)%-bison.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ -+$(OUTPUT)%-flex.o: $(OUTPUT)%-flex.c FORCE -+ $(call rule_mkdir) -+ $(call if_changed_dep,$(host)cc_o_c) -+ - # Gather build data: - # obj-y - list of build objects - # subdir-y - list of directories to nest -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index 5ec5ce8c31bab..ea8c41f9c7398 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -25,3 +25,9 @@ $(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) - $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ - endif -+ -+# pmu-events.c file is generated in the OUTPUT directory so it needs a -+# separate rule to depend on it properly -+$(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) -+ $(call rule_mkdir) -+ $(call if_changed_dep,cc_o_c) --- -2.40.1 - diff --git a/queue-5.4/perf-jevents-switch-build-to-use-jevents.py.patch b/queue-5.4/perf-jevents-switch-build-to-use-jevents.py.patch deleted file mode 100644 index 2e21fefce13..00000000000 --- a/queue-5.4/perf-jevents-switch-build-to-use-jevents.py.patch +++ /dev/null @@ -1,295 +0,0 @@ -From 4aefcff9723fa5a6225e6b053d02609e385ea04d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 29 Jun 2022 11:25:04 -0700 -Subject: perf jevents: Switch build to use jevents.py - -From: Ian Rogers - -[ Upstream commit 00facc760903be6675870c2749e2cd72140e396e ] - -Generate pmu-events.c using jevents.py rather than the binary built from -jevents.c. - -Add a new config variable NO_JEVENTS that is set when there is no -architecture json or an appropriate python interpreter isn't present. - -When NO_JEVENTS is defined the file pmu-events/empty-pmu-events.c is -copied and used as the pmu-events.c file. - -Signed-off-by: Ian Rogers -Tested-by: John Garry -Cc: Alexander Shishkin -Cc: Ananth Narayan -Cc: Andi Kleen -Cc: Andrew Kilroy -Cc: Caleb Biggers -Cc: Felix Fietkau -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: James Clark -Cc: Jiri Olsa -Cc: Kajol Jain -Cc: Kan Liang -Cc: Kshipra Bopardikar -Cc: Like Xu -Cc: Mark Rutland -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Nick Forrington -Cc: Paul Clarke -Cc: Perry Taylor -Cc: Peter Zijlstra -Cc: Qi Liu -Cc: Ravi Bangoria -Cc: Sandipan Das -Cc: Santosh Shukla -Cc: Stephane Eranian -Cc: Will Deacon -Cc: Xing Zhengjun -Link: https://lore.kernel.org/r/20220629182505.406269-4-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Stable-dep-of: 7822a8913f4c ("perf build: Update build rule for generated files") -Signed-off-by: Sasha Levin ---- - tools/perf/Makefile.config | 19 +++ - tools/perf/Makefile.perf | 1 + - tools/perf/pmu-events/Build | 13 +- - tools/perf/pmu-events/empty-pmu-events.c | 158 +++++++++++++++++++++++ - 4 files changed, 189 insertions(+), 2 deletions(-) - create mode 100644 tools/perf/pmu-events/empty-pmu-events.c - -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index e95281586f65e..b76800bbc632a 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -752,6 +752,25 @@ else - endif - endif - -+ifneq ($(NO_JEVENTS),1) -+ ifeq ($(wildcard pmu-events/arch/$(SRCARCH)/mapfile.csv),) -+ NO_JEVENTS := 1 -+ endif -+endif -+ifneq ($(NO_JEVENTS),1) -+ NO_JEVENTS := 0 -+ ifndef PYTHON -+ $(warning No python interpreter disabling jevent generation) -+ NO_JEVENTS := 1 -+ else -+ # jevents.py uses f-strings present in Python 3.6 released in Dec. 2016. -+ JEVENTS_PYTHON_GOOD := $(shell $(PYTHON) -c 'import sys;print("1" if(sys.version_info.major >= 3 and sys.version_info.minor >= 6) else "0")' 2> /dev/null) -+ ifneq ($(JEVENTS_PYTHON_GOOD), 1) -+ $(warning Python interpreter too old (older than 3.6) disabling jevent generation) -+ NO_JEVENTS := 1 -+ endif -+ endif -+endif - - ifndef NO_LIBBFD - ifeq ($(feature-libbfd), 1) -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index 961f5e4fd6566..b0314f31e5a37 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -584,6 +584,7 @@ JEVENTS := $(OUTPUT)pmu-events/jevents - JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o - - PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o -+export NO_JEVENTS - - export JEVENTS - -diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build -index a055dee6a46af..5ec5ce8c31bab 100644 ---- a/tools/perf/pmu-events/Build -+++ b/tools/perf/pmu-events/Build -@@ -9,10 +9,19 @@ JSON = $(shell [ -d $(JDIR) ] && \ - JDIR_TEST = pmu-events/arch/test - JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \ - find $(JDIR_TEST) -name '*.json') -+JEVENTS_PY = pmu-events/jevents.py - - # - # Locate/process JSON files in pmu-events/arch/ - # directory and create tables in pmu-events.c. - # --$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS) -- $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V) -+ -+ifeq ($(NO_JEVENTS),1) -+$(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-events.c -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)cp $< $@ -+else -+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) -+ $(call rule_mkdir) -+ $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ -+endif -diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c -new file mode 100644 -index 0000000000000..77e655c6f1162 ---- /dev/null -+++ b/tools/perf/pmu-events/empty-pmu-events.c -@@ -0,0 +1,158 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * An empty pmu-events.c file used when there is no architecture json files in -+ * arch or when the jevents.py script cannot be run. -+ * -+ * The test cpu/soc is provided for testing. -+ */ -+#include "pmu-events/pmu-events.h" -+ -+static const struct pmu_event pme_test_soc_cpu[] = { -+ { -+ .name = "l3_cache_rd", -+ .event = "event=0x40", -+ .desc = "L3 cache access, read", -+ .topic = "cache", -+ .long_desc = "Attributable Level 3 cache access, read", -+ }, -+ { -+ .name = "segment_reg_loads.any", -+ .event = "event=0x6,period=200000,umask=0x80", -+ .desc = "Number of segment register loads", -+ .topic = "other", -+ }, -+ { -+ .name = "dispatch_blocked.any", -+ .event = "event=0x9,period=200000,umask=0x20", -+ .desc = "Memory cluster signals to block micro-op dispatch for any reason", -+ .topic = "other", -+ }, -+ { -+ .name = "eist_trans", -+ .event = "event=0x3a,period=200000,umask=0x0", -+ .desc = "Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions", -+ .topic = "other", -+ }, -+ { -+ .name = "uncore_hisi_ddrc.flux_wcmd", -+ .event = "event=0x2", -+ .desc = "DDRC write commands. Unit: hisi_sccl,ddrc ", -+ .topic = "uncore", -+ .long_desc = "DDRC write commands", -+ .pmu = "hisi_sccl,ddrc", -+ }, -+ { -+ .name = "unc_cbo_xsnp_response.miss_eviction", -+ .event = "event=0x22,umask=0x81", -+ .desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-hyphen", -+ .event = "event=0xe0,umask=0x00", -+ .desc = "UNC_CBO_HYPHEN. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_HYPHEN", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "event-two-hyph", -+ .event = "event=0xc0,umask=0x00", -+ .desc = "UNC_CBO_TWO_HYPH. Unit: uncore_cbox ", -+ .topic = "uncore", -+ .long_desc = "UNC_CBO_TWO_HYPH", -+ .pmu = "uncore_cbox", -+ }, -+ { -+ .name = "uncore_hisi_l3c.rd_hit_cpipe", -+ .event = "event=0x7", -+ .desc = "Total read hits. Unit: hisi_sccl,l3c ", -+ .topic = "uncore", -+ .long_desc = "Total read hits", -+ .pmu = "hisi_sccl,l3c", -+ }, -+ { -+ .name = "uncore_imc_free_running.cache_miss", -+ .event = "event=0x12", -+ .desc = "Total cache misses. Unit: uncore_imc_free_running ", -+ .topic = "uncore", -+ .long_desc = "Total cache misses", -+ .pmu = "uncore_imc_free_running", -+ }, -+ { -+ .name = "uncore_imc.cache_hits", -+ .event = "event=0x34", -+ .desc = "Total cache hits. Unit: uncore_imc ", -+ .topic = "uncore", -+ .long_desc = "Total cache hits", -+ .pmu = "uncore_imc", -+ }, -+ { -+ .name = "bp_l1_btb_correct", -+ .event = "event=0x8a", -+ .desc = "L1 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = "bp_l2_btb_correct", -+ .event = "event=0x8b", -+ .desc = "L2 BTB Correction", -+ .topic = "branch", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_events_map pmu_events_map[] = { -+ { -+ .cpuid = "testcpu", -+ .version = "v1", -+ .type = "core", -+ .table = pme_test_soc_cpu, -+ }, -+ { -+ .cpuid = 0, -+ .version = 0, -+ .type = 0, -+ .table = 0, -+ }, -+}; -+ -+static const struct pmu_event pme_test_soc_sys[] = { -+ { -+ .name = "sys_ddr_pmu.write_cycles", -+ .event = "event=0x2b", -+ .desc = "ddr write-cycles event. Unit: uncore_sys_ddr_pmu ", -+ .compat = "v8", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ddr_pmu", -+ }, -+ { -+ .name = "sys_ccn_pmu.read_cycles", -+ .event = "config=0x2c", -+ .desc = "ccn read-cycles event. Unit: uncore_sys_ccn_pmu ", -+ .compat = "0x01", -+ .topic = "uncore", -+ .pmu = "uncore_sys_ccn_pmu", -+ }, -+ { -+ .name = 0, -+ .event = 0, -+ .desc = 0, -+ }, -+}; -+ -+const struct pmu_sys_events pmu_sys_event_tables[] = { -+ { -+ .table = pme_test_soc_sys, -+ .name = "pme_test_soc_sys", -+ }, -+ { -+ .table = 0 -+ }, -+}; --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 91b37ecfb31..a1e8d4ac889 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -346,8 +346,6 @@ kobject-add-sanity-check-for-kset-kobj.ktype-in-kset.patch tools-features-add-feature-test-to-check-if-libbfd-h.patch perf-jevents-make-build-dependency-on-test-jsons.patch perf-tools-add-an-option-to-build-without-libbfd.patch -perf-jevents-switch-build-to-use-jevents.py.patch -perf-build-update-build-rule-for-generated-files.patch btrfs-move-btrfs_pinned_by_swapfile-prototype-into-v.patch btrfs-add-a-helper-to-read-the-superblock-metadata_u.patch btrfs-compare-the-correct-fsid-metadata_uuid-in-btrf.patch