From f5fc3368c618b9566439c4eae71b4d84027ae720 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Oct 2019 17:34:59 +0200 Subject: [PATCH] drop perf patch from trees as it broke the build --- ...-use-cap_sys_admin-instead-of-euid-0.patch | 61 ------------------- ...-use-cap_sys_admin-instead-of-euid-0.patch | 61 ------------------- ...-use-cap_sys_admin-instead-of-euid-0.patch | 61 ------------------- ...-use-cap_sys_admin-instead-of-euid-0.patch | 61 ------------------- 4 files changed, 244 deletions(-) delete mode 100644 queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch delete mode 100644 queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch delete mode 100644 queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch delete mode 100644 queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch diff --git a/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch deleted file mode 100644 index 59ee8898138..00000000000 --- a/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e909c01c55e02867711e6489e3c4faac852e795 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Aug 2019 10:44:17 -0400 -Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0 - -From: Igor Lubashev - -[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ] - -The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs -for ftrace. Make perf do the same. - -Signed-off-by: Igor Lubashev -Acked-by: Jiri Olsa -Cc: Alexander Shishkin -Cc: Alexey Budankov -Cc: James Morris -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Suzuki Poulouse -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-ftrace.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c -index 13a33fb71a6da..6f07c5541fdea 100644 ---- a/tools/perf/builtin-ftrace.c -+++ b/tools/perf/builtin-ftrace.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -22,6 +23,7 @@ - #include "target.h" - #include "cpumap.h" - #include "thread_map.h" -+#include "util/cap.h" - #include "util/config.h" - - -@@ -270,7 +272,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) - .events = POLLIN, - }; - -- if (geteuid() != 0) { -+ if (!perf_cap__capable(CAP_SYS_ADMIN)) { - pr_err("ftrace only works for root!\n"); - return -1; - } --- -2.20.1 - diff --git a/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch deleted file mode 100644 index 4f371c49193..00000000000 --- a/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ef375daf32294fbfdf25702b3e090eb63967edc0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Aug 2019 10:44:17 -0400 -Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0 - -From: Igor Lubashev - -[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ] - -The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs -for ftrace. Make perf do the same. - -Signed-off-by: Igor Lubashev -Acked-by: Jiri Olsa -Cc: Alexander Shishkin -Cc: Alexey Budankov -Cc: James Morris -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Suzuki Poulouse -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-ftrace.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c -index 137955197ba8d..e0c61c572db06 100644 ---- a/tools/perf/builtin-ftrace.c -+++ b/tools/perf/builtin-ftrace.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -22,6 +23,7 @@ - #include "target.h" - #include "cpumap.h" - #include "thread_map.h" -+#include "util/cap.h" - #include "util/config.h" - - -@@ -282,7 +284,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) - .events = POLLIN, - }; - -- if (geteuid() != 0) { -+ if (!perf_cap__capable(CAP_SYS_ADMIN)) { - pr_err("ftrace only works for root!\n"); - return -1; - } --- -2.20.1 - diff --git a/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch deleted file mode 100644 index 17ba3548a7c..00000000000 --- a/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c2c87517b2dbedb5c9fd5a9c4ac33fab00e10193 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Aug 2019 10:44:17 -0400 -Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0 - -From: Igor Lubashev - -[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ] - -The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs -for ftrace. Make perf do the same. - -Signed-off-by: Igor Lubashev -Acked-by: Jiri Olsa -Cc: Alexander Shishkin -Cc: Alexey Budankov -Cc: James Morris -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Suzuki Poulouse -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-ftrace.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c -index 22386ab350504..2026364a61dc2 100644 ---- a/tools/perf/builtin-ftrace.c -+++ b/tools/perf/builtin-ftrace.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -21,6 +22,7 @@ - #include "target.h" - #include "cpumap.h" - #include "thread_map.h" -+#include "util/cap.h" - #include "util/config.h" - - -@@ -281,7 +283,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) - .events = POLLIN, - }; - -- if (geteuid() != 0) { -+ if (!perf_cap__capable(CAP_SYS_ADMIN)) { - pr_err("ftrace only works for root!\n"); - return -1; - } --- -2.20.1 - diff --git a/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch deleted file mode 100644 index de8aca4def4..00000000000 --- a/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 54a277c389061fc501624f51a13426d7b797f5f7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Aug 2019 10:44:17 -0400 -Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0 - -From: Igor Lubashev - -[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ] - -The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs -for ftrace. Make perf do the same. - -Signed-off-by: Igor Lubashev -Acked-by: Jiri Olsa -Cc: Alexander Shishkin -Cc: Alexey Budankov -Cc: James Morris -Cc: Mathieu Poirier -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Suzuki Poulouse -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-ftrace.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c -index 0193128104056..10971255fd2dc 100644 ---- a/tools/perf/builtin-ftrace.c -+++ b/tools/perf/builtin-ftrace.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -21,6 +22,7 @@ - #include "target.h" - #include "cpumap.h" - #include "thread_map.h" -+#include "util/cap.h" - #include "util/config.h" - - -@@ -281,7 +283,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) - .events = POLLIN, - }; - -- if (geteuid() != 0) { -+ if (!perf_cap__capable(CAP_SYS_ADMIN)) { - pr_err("ftrace only works for root!\n"); - return -1; - } --- -2.20.1 - -- 2.47.2