From: Greg Kroah-Hartman Date: Wed, 13 Feb 2019 17:58:08 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.9.157~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1b1924b2c566badf89572e88c766155059b588d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: perf-tests-attr-fix-group-stat-tests.patch perf-tests-attr-fix-task-term-values.patch perf-tests-attr-make-hw-events-optional.patch --- diff --git a/queue-4.14/perf-tests-attr-fix-group-stat-tests.patch b/queue-4.14/perf-tests-attr-fix-group-stat-tests.patch new file mode 100644 index 00000000000..50612acaad3 --- /dev/null +++ b/queue-4.14/perf-tests-attr-fix-group-stat-tests.patch @@ -0,0 +1,63 @@ +From f6a9820d572bd8384d982357cbad214b3a6c04bb Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Thu, 28 Sep 2017 18:06:33 +0200 +Subject: perf tests attr: Fix group stat tests + +From: Jiri Olsa + +commit f6a9820d572bd8384d982357cbad214b3a6c04bb upstream. + +We started to use group read whenever it's possible: + + 82bf311e15d2 perf stat: Use group read for event groups + +That breaks some of attr tests, this change adds the new possible +read_format value. + +Signed-off-by: Jiri Olsa +Tested-by: Arnaldo Carvalho de Melo +Cc: Heiko Carstens +Cc: Hendrik Brueckner +Cc: Martin Schwidefsky +Cc: Thomas-Mich Richter +LPU-Reference: 20170928160633.GA26973@krava +Link: http://lkml.kernel.org/n/tip-1ko2zc4nph93d8lfwjyk9ivz@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: "Rantala, Tommi T. (Nokia - FI/Espoo)" +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/tests/attr/test-stat-group | 2 ++ + tools/perf/tests/attr/test-stat-group1 | 2 ++ + 2 files changed, 4 insertions(+) + +--- a/tools/perf/tests/attr/test-stat-group ++++ b/tools/perf/tests/attr/test-stat-group +@@ -6,6 +6,7 @@ ret = 1 + [event-1:base-stat] + fd=1 + group_fd=-1 ++read_format=3|15 + + [event-2:base-stat] + fd=2 +@@ -13,3 +14,4 @@ group_fd=1 + config=1 + disabled=0 + enable_on_exec=0 ++read_format=3|15 +--- a/tools/perf/tests/attr/test-stat-group1 ++++ b/tools/perf/tests/attr/test-stat-group1 +@@ -6,6 +6,7 @@ ret = 1 + [event-1:base-stat] + fd=1 + group_fd=-1 ++read_format=3|15 + + [event-2:base-stat] + fd=2 +@@ -13,3 +14,4 @@ group_fd=1 + config=1 + disabled=0 + enable_on_exec=0 ++read_format=3|15 diff --git a/queue-4.14/perf-tests-attr-fix-task-term-values.patch b/queue-4.14/perf-tests-attr-fix-task-term-values.patch new file mode 100644 index 00000000000..5499a6a01c4 --- /dev/null +++ b/queue-4.14/perf-tests-attr-fix-task-term-values.patch @@ -0,0 +1,70 @@ +From 10836d9f9ac63d40ccfa756f871ce4ed51ae3b52 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Mon, 3 Jul 2017 16:50:30 +0200 +Subject: perf tests attr: Fix task term values + +From: Jiri Olsa + +commit 10836d9f9ac63d40ccfa756f871ce4ed51ae3b52 upstream. + +The perf_event_attr::task is 1 by default for first (tracking) event in +the session. Setting task=1 as default and adding task=0 for cases that +need it. + +Signed-off-by: Jiri Olsa +Cc: David Ahern +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Thomas-Mich Richter +Link: http://lkml.kernel.org/r/20170703145030.12903-16-jolsa@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: "Rantala, Tommi T. (Nokia - FI/Espoo)" +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/tests/attr/base-record | 2 +- + tools/perf/tests/attr/test-record-group | 1 + + tools/perf/tests/attr/test-record-group-sampling | 2 +- + tools/perf/tests/attr/test-record-group1 | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +--- a/tools/perf/tests/attr/base-record ++++ b/tools/perf/tests/attr/base-record +@@ -23,7 +23,7 @@ comm=1 + freq=1 + inherit_stat=0 + enable_on_exec=1 +-task=0 ++task=1 + watermark=0 + precise_ip=0|1|2|3 + mmap_data=0 +--- a/tools/perf/tests/attr/test-record-group ++++ b/tools/perf/tests/attr/test-record-group +@@ -17,5 +17,6 @@ sample_type=327 + read_format=4 + mmap=0 + comm=0 ++task=0 + enable_on_exec=0 + disabled=0 +--- a/tools/perf/tests/attr/test-record-group-sampling ++++ b/tools/perf/tests/attr/test-record-group-sampling +@@ -23,7 +23,7 @@ sample_type=343 + + # PERF_FORMAT_ID | PERF_FORMAT_GROUP + read_format=12 +- ++task=0 + mmap=0 + comm=0 + enable_on_exec=0 +--- a/tools/perf/tests/attr/test-record-group1 ++++ b/tools/perf/tests/attr/test-record-group1 +@@ -18,5 +18,6 @@ sample_type=327 + read_format=4 + mmap=0 + comm=0 ++task=0 + enable_on_exec=0 + disabled=0 diff --git a/queue-4.14/perf-tests-attr-make-hw-events-optional.patch b/queue-4.14/perf-tests-attr-make-hw-events-optional.patch new file mode 100644 index 00000000000..05469f6ff85 --- /dev/null +++ b/queue-4.14/perf-tests-attr-make-hw-events-optional.patch @@ -0,0 +1,347 @@ +From 692f5a22cd284bb8233a38e3ed86881d2d9c89d4 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Mon, 9 Oct 2017 15:07:12 +0200 +Subject: perf tests attr: Make hw events optional + +From: Jiri Olsa + +commit 692f5a22cd284bb8233a38e3ed86881d2d9c89d4 upstream. + +Otherwise we fail on virtual machines with no support for specific HW +events. + +Signed-off-by: Jiri Olsa +Cc: David Ahern +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20171009130712.14747-1-jolsa@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: "Rantala, Tommi T. (Nokia - FI/Espoo)" +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/tests/attr/test-stat-C0 | 1 + + tools/perf/tests/attr/test-stat-basic | 1 + + tools/perf/tests/attr/test-stat-default | 4 ++++ + tools/perf/tests/attr/test-stat-detailed-1 | 8 ++++++++ + tools/perf/tests/attr/test-stat-detailed-2 | 13 +++++++++++++ + tools/perf/tests/attr/test-stat-detailed-3 | 13 +++++++++++++ + tools/perf/tests/attr/test-stat-no-inherit | 1 + + 7 files changed, 41 insertions(+) + +--- a/tools/perf/tests/attr/test-stat-C0 ++++ b/tools/perf/tests/attr/test-stat-C0 +@@ -7,3 +7,4 @@ ret = 1 + # events are disabled by default when attached to cpu + disabled=1 + enable_on_exec=0 ++optional=1 +--- a/tools/perf/tests/attr/test-stat-basic ++++ b/tools/perf/tests/attr/test-stat-basic +@@ -4,3 +4,4 @@ args = -e cycles kill >/dev/null 2>&1 + ret = 1 + + [event:base-stat] ++optional=1 +--- a/tools/perf/tests/attr/test-stat-default ++++ b/tools/perf/tests/attr/test-stat-default +@@ -32,6 +32,7 @@ config=2 + fd=5 + type=0 + config=0 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_STALLED_CYCLES_FRONTEND + [event6:base-stat] +@@ -52,15 +53,18 @@ optional=1 + fd=8 + type=0 + config=1 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_INSTRUCTIONS + [event9:base-stat] + fd=9 + type=0 + config=4 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_MISSES + [event10:base-stat] + fd=10 + type=0 + config=5 ++optional=1 +--- a/tools/perf/tests/attr/test-stat-detailed-1 ++++ b/tools/perf/tests/attr/test-stat-detailed-1 +@@ -33,6 +33,7 @@ config=2 + fd=5 + type=0 + config=0 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_STALLED_CYCLES_FRONTEND + [event6:base-stat] +@@ -53,18 +54,21 @@ optional=1 + fd=8 + type=0 + config=1 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_INSTRUCTIONS + [event9:base-stat] + fd=9 + type=0 + config=4 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_MISSES + [event10:base-stat] + fd=10 + type=0 + config=5 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -74,6 +78,7 @@ config=5 + fd=11 + type=3 + config=0 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -83,6 +88,7 @@ config=0 + fd=12 + type=3 + config=65536 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -92,6 +98,7 @@ config=65536 + fd=13 + type=3 + config=2 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -101,3 +108,4 @@ config=2 + fd=14 + type=3 + config=65538 ++optional=1 +--- a/tools/perf/tests/attr/test-stat-detailed-2 ++++ b/tools/perf/tests/attr/test-stat-detailed-2 +@@ -33,6 +33,7 @@ config=2 + fd=5 + type=0 + config=0 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_STALLED_CYCLES_FRONTEND + [event6:base-stat] +@@ -53,18 +54,21 @@ optional=1 + fd=8 + type=0 + config=1 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_INSTRUCTIONS + [event9:base-stat] + fd=9 + type=0 + config=4 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_MISSES + [event10:base-stat] + fd=10 + type=0 + config=5 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -74,6 +78,7 @@ config=5 + fd=11 + type=3 + config=0 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -83,6 +88,7 @@ config=0 + fd=12 + type=3 + config=65536 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -92,6 +98,7 @@ config=65536 + fd=13 + type=3 + config=2 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -101,6 +108,7 @@ config=2 + fd=14 + type=3 + config=65538 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_L1I << 0 | +@@ -120,6 +128,7 @@ optional=1 + fd=16 + type=3 + config=65537 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_DTLB << 0 | +@@ -129,6 +138,7 @@ config=65537 + fd=17 + type=3 + config=3 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_DTLB << 0 | +@@ -138,6 +148,7 @@ config=3 + fd=18 + type=3 + config=65539 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_ITLB << 0 | +@@ -147,6 +158,7 @@ config=65539 + fd=19 + type=3 + config=4 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_ITLB << 0 | +@@ -156,3 +168,4 @@ config=4 + fd=20 + type=3 + config=65540 ++optional=1 +--- a/tools/perf/tests/attr/test-stat-detailed-3 ++++ b/tools/perf/tests/attr/test-stat-detailed-3 +@@ -33,6 +33,7 @@ config=2 + fd=5 + type=0 + config=0 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_STALLED_CYCLES_FRONTEND + [event6:base-stat] +@@ -53,18 +54,21 @@ optional=1 + fd=8 + type=0 + config=1 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_INSTRUCTIONS + [event9:base-stat] + fd=9 + type=0 + config=4 ++optional=1 + + # PERF_TYPE_HARDWARE / PERF_COUNT_HW_BRANCH_MISSES + [event10:base-stat] + fd=10 + type=0 + config=5 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -74,6 +78,7 @@ config=5 + fd=11 + type=3 + config=0 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_L1D << 0 | +@@ -83,6 +88,7 @@ config=0 + fd=12 + type=3 + config=65536 ++optional=1 + + # PERF_TYPE_HW_CACHE / + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -92,6 +98,7 @@ config=65536 + fd=13 + type=3 + config=2 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_LL << 0 | +@@ -101,6 +108,7 @@ config=2 + fd=14 + type=3 + config=65538 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_L1I << 0 | +@@ -120,6 +128,7 @@ optional=1 + fd=16 + type=3 + config=65537 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_DTLB << 0 | +@@ -129,6 +138,7 @@ config=65537 + fd=17 + type=3 + config=3 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_DTLB << 0 | +@@ -138,6 +148,7 @@ config=3 + fd=18 + type=3 + config=65539 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_ITLB << 0 | +@@ -147,6 +158,7 @@ config=65539 + fd=19 + type=3 + config=4 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_ITLB << 0 | +@@ -156,6 +168,7 @@ config=4 + fd=20 + type=3 + config=65540 ++optional=1 + + # PERF_TYPE_HW_CACHE, + # PERF_COUNT_HW_CACHE_L1D << 0 | +--- a/tools/perf/tests/attr/test-stat-no-inherit ++++ b/tools/perf/tests/attr/test-stat-no-inherit +@@ -5,3 +5,4 @@ ret = 1 + + [event:base-stat] + inherit=0 ++optional=1 diff --git a/queue-4.14/series b/queue-4.14/series index c6cfb44ed3d..140b2f16e0b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -22,3 +22,6 @@ libceph-avoid-keepalive_pending-races-in-ceph_con_keepalive.patch xfrm-refine-validation-of-template-and-selector-families.patch batman-adv-avoid-warn-on-net_device-without-parent-in-netns.patch batman-adv-force-mac-header-to-start-of-data-on-xmit.patch +perf-tests-attr-fix-task-term-values.patch +perf-tests-attr-fix-group-stat-tests.patch +perf-tests-attr-make-hw-events-optional.patch