| 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
| ||
|
Date: Sat, 22 Jun 2024 00:43:22 +0800
From: Howard Chu <howardchu95@...il.com>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Arnaldo Carvalho de Melo <acme@...nel.org>, Jiri Olsa <jolsa@...nel.org>, Ian Rogers <irogers@...gle.com>,
Adrian Hunter <adrian.hunter@...el.com>, Kan Liang <kan.liang@...ux.intel.com>,
linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH v2 5/5] perf trace: Add test for enum augmentation
Hello Namhyung,
On Sat, Jun 22, 2024 at 12:07 AM Namhyung Kim <namhyung@...nel.org> wrote:
>
> Hi Howard,
>
> On Wed, Jun 19, 2024 at 04:20:42PM +0800, Howard Chu wrote:
> > Check for vmlinux's existence in sysfs as prerequisite.
> >
> > Add landlock_add_rule.c workload. Trace landlock_add_rule syscall to see
> > if the output is desirable.
>
> Do you expect to add more things to the landlock workload? I think we
> could simply call it landlock.c and probably do other things according
> to the argument, if needed (e.g. landlock add).
Shortening the name is good, I'll change it, thanks. I think
landlock_add_rule is the only syscall that we need currently, for it
contains the only enum argument of all the syscalls. I'll look into
how we can use these arguments, thank you.
Thanks,
Howard
>
> Thanks,
> Namhyung
>
> >
> > Trace the non-syscall tracepoint 'timer:hrtimer_init' and
> > 'timer:hrtimer_start', see if the 'mode' argument is augmented,
> > the 'mode' enum argument has the prefix of 'HRTIMER_MODE_'
> > in its name.
> >
> > Suggested-by: Arnaldo Carvalho de Melo <acme@...nel.org>
> > Signed-off-by: Howard Chu <howardchu95@...il.com>
> > ---
> > tools/perf/tests/builtin-test.c | 1 +
> > tools/perf/tests/shell/trace_btf_enum.sh | 57 +++++++++++++++++++
> > tools/perf/tests/tests.h | 1 +
> > tools/perf/tests/workloads/Build | 1 +
> > .../perf/tests/workloads/landlock_add_rule.c | 32 +++++++++++
> > 5 files changed, 92 insertions(+)
> > create mode 100755 tools/perf/tests/shell/trace_btf_enum.sh
> > create mode 100644 tools/perf/tests/workloads/landlock_add_rule.c
> >
> > diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> > index c3d84b67ca8e..e83200415ad1 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_add_rule,
> > };
> >
> > static int num_subtests(const struct test_suite *t)
> > diff --git a/tools/perf/tests/shell/trace_btf_enum.sh b/tools/perf/tests/shell/trace_btf_enum.sh
> > new file mode 100755
> > index 000000000000..4861983553ab
> > --- /dev/null
> > +++ b/tools/perf/tests/shell/trace_btf_enum.sh
> > @@ -0,0 +1,57 @@
> > +#!/bin/sh
> > +# perf trace enum augmentation tests
> > +# SPDX-License-Identifier: GPL-2.0
> > +
> > +err=0
> > +set -e
> > +
> > +syscall="landlock_add_rule"
> > +non_syscall="timer:hrtimer_init,timer:hrtimer_start"
> > +
> > +TESTPROG="perf test -w landlock_add_rule"
> > +
> > +. "$(dirname $0)"/lib/probe.sh
> > +skip_if_no_perf_trace || exit 2
> > +
> > +check_vmlinux() {
> > + echo "Checking if vmlinux exists"
> > + if ! ls /sys/kernel/btf/vmlinux 1>/dev/null 2>&1
> > + then
> > + echo "trace+enum test [Skipped missing vmlinux BTF support]"
> > + err=2
> > + fi
> > +}
> > +
> > +trace_landlock() {
> > + echo "Tracing syscall ${syscall}"
> > + if perf trace -e $syscall $TESTPROG 2>&1 | \
> > + grep -q -E ".*landlock_add_rule\(ruleset_fd: 11, rule_type: (LANDLOCK_RULE_PATH_BENEATH|LANDLOCK_RULE_NET_PORT), rule_attr: 0x[a-f0-9]+, flags: 45\) = -1.*"
> > + then
> > + err=0
> > + else
> > + err=1
> > + fi
> > +}
> > +
> > +trace_non_syscall() {
> > + echo "Tracing non-syscall tracepoint ${non-syscall}"
> > + if perf trace -e $non_syscall --max-events=1 2>&1 | \
> > + grep -q -E '.*timer:hrtimer_.*\(.*mode: HRTIMER_MODE_.*\)$'
> > + then
> > + err=0
> > + else
> > + err=1
> > + fi
> > +}
> > +
> > +check_vmlinux
> > +
> > +if [ $err = 0 ]; then
> > + trace_landlock
> > +fi
> > +
> > +if [ $err = 0 ]; then
> > + trace_non_syscall
> > +fi
> > +
> > +exit $err
> > diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> > index 3aa7701ee0e9..69126299bb08 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_add_rule);
> >
> > 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 a1f34d5861e3..5b12b93ecffa 100644
> > --- a/tools/perf/tests/workloads/Build
> > +++ b/tools/perf/tests/workloads/Build
> > @@ -6,6 +6,7 @@ perf-y += leafloop.o
> > perf-y += sqrtloop.o
> > perf-y += brstack.o
> > perf-y += datasym.o
> > +perf-y += landlock_add_rule.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
> > diff --git a/tools/perf/tests/workloads/landlock_add_rule.c b/tools/perf/tests/workloads/landlock_add_rule.c
> > new file mode 100644
> > index 000000000000..529b5f1ea5a7
> > --- /dev/null
> > +++ b/tools/perf/tests/workloads/landlock_add_rule.c
> > @@ -0,0 +1,32 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +#include <linux/compiler.h>
> > +#include <uapi/asm-generic/unistd.h> // for __NR_landlock_add_rule
> > +#include <unistd.h>
> > +#include <linux/landlock.h>
> > +#include "../tests.h"
> > +
> > +static int landlock_add_rule(int argc __maybe_unused, const char **argv __maybe_unused)
> > +{
> > + int fd = 11;
> > + int 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;
> > +}
> > +
> > +DEFINE_WORKLOAD(landlock_add_rule);
> > --
> > 2.45.2
> >
Powered by blists - more mailing lists