| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240704124354.904540-6-howardchu95@gmail.com>
Date: Thu, 4 Jul 2024 20:43:51 +0800
From: Howard Chu <howardchu95@...il.com>
To: acme@...nel.org
Cc: adrian.hunter@...el.com,
irogers@...gle.com,
jolsa@...nel.org,
kan.liang@...ux.intel.com,
namhyung@...nel.org,
linux-perf-users@...r.kernel.org,
linux-kernel@...r.kernel.org,
kernel test robot <lkp@...el.com>,
Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: [PATCH v4 5/8] perf test: Add landlock workload
We'll use it to add a regression test for the BTF augmentation of enum
arguments for tracepoints in 'perf trace':
root@x1:~# perf trace -e landlock_add_rule perf test -w landlock
0.000 ( 0.009 ms): perf/747160 landlock_add_rule(ruleset_fd: 11, rule_type: LANDLOCK_RULE_PATH_BENEATH, rule_attr: 0x7ffd8e258594, flags: 45) = -1 EINVAL (Invalid argument)
0.011 ( 0.002 ms): perf/747160 landlock_add_rule(ruleset_fd: 11, rule_type: LANDLOCK_RULE_NET_PORT, rule_attr: 0x7ffd8e2585a0, flags: 45) = -1 EINVAL (Invalid argument)
root@x1:~#
Committer notes:
It was agreed on the discussion (see Link1 below) to shorten then name of
the workload from 'landlock_add_rule' to 'landlock', and I moved it to a
separate patch.
Howard fixed the build error found by Namhyung (see Link2 below),
changing the landlock.h header to the one in source tree, and including
syscall.h for the '__NR_landlock_add_rule' syscall number.
However, there is another problem. Because of this line in Makefile.config:
INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi ,
we'll include 'tools/arch/x86/include/uapi/asm/unistd_64.h' in the source
tree. But what we want is '/usr/include/asm/unistd_64.h'.
This hardcoded unistd_64.h in the source tree is not cool for the landlock
workload because it is a simplified list of syscall numbers for particular
use cases, we need to discard this search path if we want the
__NR_landlock_add_rule macro. To solve this problem, Howard added a
CFLAGS_REMOVE_landlock.o to remove the flag of
-I$(srctree)/tools/arch/$(SRCARCH)/include/uapi.
The problem above will not occur in some arch, say arm64
and riscv because they include asm-generic/unistd.h instead. The arch
that it really affects is the ones that include asm/unistd_32.h and
asm/unistd_64.h.
linux $ find . -regex './arch/.*/include/uapi/asm/unistd.h' | xargs grep -H --color=auto 'include <asm'
./arch/x86/include/uapi/asm/unistd.h:# include <asm/unistd_32.h>
./arch/x86/include/uapi/asm/unistd.h:# include <asm/unistd_x32.h>
./arch/x86/include/uapi/asm/unistd.h:# include <asm/unistd_64.h>
./arch/parisc/include/uapi/asm/unistd.h:#include <asm/unistd_64.h>
./arch/parisc/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/nios2/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/mips/include/uapi/asm/unistd.h:#include <asm/sgidefs.h>
./arch/mips/include/uapi/asm/unistd.h:#include <asm/unistd_o32.h>
./arch/mips/include/uapi/asm/unistd.h:#include <asm/unistd_n64.h>
./arch/mips/include/uapi/asm/unistd.h:#include <asm/unistd_n32.h>
./arch/s390/include/uapi/asm/unistd.h:#include <asm/unistd_64.h>
./arch/s390/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/arm64/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/riscv/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/sparc/include/uapi/asm/unistd.h:#include <asm/unistd_64.h>
./arch/sparc/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/xtensa/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/hexagon/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/openrisc/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/arm/include/uapi/asm/unistd.h:#include <asm/unistd-eabi.h>
./arch/arm/include/uapi/asm/unistd.h:#include <asm/unistd-oabi.h>
./arch/alpha/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/sh/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/m68k/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/microblaze/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/arc/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/powerpc/include/uapi/asm/unistd.h:#include <asm/unistd_32.h>
./arch/powerpc/include/uapi/asm/unistd.h:#include <asm/unistd_64.h>
./arch/csky/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
./arch/loongarch/include/uapi/asm/unistd.h:#include <asm-generic/unistd.h>
Reported-by: Namhyung Kim <namhyung@...nel.org>
Reported-by: kernel test robot <lkp@...el.com>
Closes: https://lore.kernel.org/r/202406250302.E4WaX9Ud-lkp@intel.com/
Closes: https://lore.kernel.org/linux-perf-users/Zn8TfuQi0iq7bMVD@google.com/
Suggested-by: Arnaldo Carvalho de Melo <acme@...nel.org>
Signed-off-by: Howard Chu <howardchu95@...il.com>
Tested-by: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Ian Rogers <irogers@...gle.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Kan Liang <kan.liang@...ux.intel.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Link1: https://lore.kernel.org/lkml/CAH0uvohaypdTV6Z7O5QSK+va_qnhZ6BP6oSJ89s1c1E0CjgxDA@mail.gmail.com
Link2: https://lore.kernel.org/linux-perf-users/Zn8TfuQi0iq7bMVD@google.com/
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/tests/builtin-test.c | 1 +
tools/perf/tests/tests.h | 1 +
tools/perf/tests/workloads/Build | 2 ++
tools/perf/tests/workloads/landlock.c | 38 +++++++++++++++++++++++++++
4 files changed, 42 insertions(+)
create mode 100644 tools/perf/tests/workloads/landlock.c
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index c3d84b67ca8e..470a9709427d 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -152,6 +152,7 @@ static struct test_workload *workloads[] = {
&workload__sqrtloop,
&workload__brstack,
&workload__datasym,
+ &workload__landlock,
};
static int num_subtests(const struct test_suite *t)
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 3aa7701ee0e9..6ea2be86b7bf 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -205,6 +205,7 @@ DECLARE_WORKLOAD(leafloop);
DECLARE_WORKLOAD(sqrtloop);
DECLARE_WORKLOAD(brstack);
DECLARE_WORKLOAD(datasym);
+DECLARE_WORKLOAD(landlock);
extern const char *dso_to_test;
extern const char *test_objdump_path;
diff --git a/tools/perf/tests/workloads/Build b/tools/perf/tests/workloads/Build
index 48bf0d3b0f3d..e132d5d95983 100644
--- a/tools/perf/tests/workloads/Build
+++ b/tools/perf/tests/workloads/Build
@@ -6,8 +6,10 @@ perf-test-y += leafloop.o
perf-test-y += sqrtloop.o
perf-test-y += brstack.o
perf-test-y += datasym.o
+perf-test-y += landlock.o
CFLAGS_sqrtloop.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE
CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer -U_FORTIFY_SOURCE
CFLAGS_brstack.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE
CFLAGS_datasym.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE
+CFLAGS_REMOVE_landlock.o = -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi
diff --git a/tools/perf/tests/workloads/landlock.c b/tools/perf/tests/workloads/landlock.c
new file mode 100644
index 000000000000..c4f29b17f2a7
--- /dev/null
+++ b/tools/perf/tests/workloads/landlock.c
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <sys/syscall.h> // for __NR_landlock_add_rule
+#include <linux/compiler.h>
+#include <unistd.h>
+#include "../tests.h"
+#ifdef __NR_landlock_add_rule
+#include "../../../../include/uapi/linux/landlock.h"
+#endif
+
+/* This workload is used only to test enum augmentation with BTF in perf trace */
+static int landlock(int argc __maybe_unused, const char **argv __maybe_unused)
+{
+#if defined(__NR_landlock_add_rule) && defined(HAVE_LIBBPF_SUPPORT)
+ int fd = 11, flags = 45;
+
+ struct landlock_path_beneath_attr path_beneath_attr = {
+ .allowed_access = LANDLOCK_ACCESS_FS_READ_FILE,
+ .parent_fd = 14,
+ };
+
+ struct landlock_net_port_attr net_port_attr = {
+ .port = 19,
+ .allowed_access = LANDLOCK_ACCESS_NET_CONNECT_TCP,
+ };
+
+ syscall(__NR_landlock_add_rule, fd, LANDLOCK_RULE_PATH_BENEATH,
+ &path_beneath_attr, flags);
+
+ syscall(__NR_landlock_add_rule, fd, LANDLOCK_RULE_NET_PORT,
+ &net_port_attr, flags);
+
+ return 0;
+#else
+ return 2;
+#endif
+}
+
+DEFINE_WORKLOAD(landlock);
--
2.45.2
Powered by blists - more mailing lists