* [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
[not found] <20240430111354.637356-1-vdonnefort@google.com>
@ 2024-04-30 11:13 ` Vincent Donnefort
2024-05-03 19:12 ` Shuah Khan
0 siblings, 1 reply; 6+ messages in thread
From: Vincent Donnefort @ 2024-04-30 11:13 UTC (permalink / raw)
To: rostedt, mhiramat, linux-kernel, linux-trace-kernel
Cc: mathieu.desnoyers, kernel-team, rdunlap, rppt, david,
Vincent Donnefort, Shuah Khan, Shuah Khan, linux-kselftest,
Muhammad Usama Anjum
This test maps a ring-buffer and validate the meta-page after reset and
after emitting few events.
Cc: Shuah Khan <shuah@kernel.org>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kselftest@vger.kernel.org
Acked-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
diff --git a/tools/testing/selftests/ring-buffer/.gitignore b/tools/testing/selftests/ring-buffer/.gitignore
new file mode 100644
index 000000000000..3aed1a2a6c67
--- /dev/null
+++ b/tools/testing/selftests/ring-buffer/.gitignore
@@ -0,0 +1 @@
+map_test
diff --git a/tools/testing/selftests/ring-buffer/Makefile b/tools/testing/selftests/ring-buffer/Makefile
new file mode 100644
index 000000000000..627c5fa6d1ab
--- /dev/null
+++ b/tools/testing/selftests/ring-buffer/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+CFLAGS += -Wl,-no-as-needed -Wall
+CFLAGS += $(KHDR_INCLUDES)
+CFLAGS += -D_GNU_SOURCE
+
+TEST_GEN_PROGS = map_test
+
+include ../lib.mk
diff --git a/tools/testing/selftests/ring-buffer/config b/tools/testing/selftests/ring-buffer/config
new file mode 100644
index 000000000000..d936f8f00e78
--- /dev/null
+++ b/tools/testing/selftests/ring-buffer/config
@@ -0,0 +1,2 @@
+CONFIG_FTRACE=y
+CONFIG_TRACER_SNAPSHOT=y
diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
new file mode 100644
index 000000000000..b95eedddbb8c
--- /dev/null
+++ b/tools/testing/selftests/ring-buffer/map_test.c
@@ -0,0 +1,288 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Ring-buffer memory mapping tests
+ *
+ * Copyright (c) 2024 Vincent Donnefort <vdonnefort@google.com>
+ */
+#include <fcntl.h>
+#include <sched.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <linux/trace_mmap.h>
+
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+
+#include "../user_events/user_events_selftests.h" /* share tracefs setup */
+#include "../kselftest_harness.h"
+
+#define TRACEFS_ROOT "/sys/kernel/tracing"
+
+static int __tracefs_write(const char *path, const char *value)
+{
+ int fd, ret;
+
+ fd = open(path, O_WRONLY | O_TRUNC);
+ if (fd < 0)
+ return fd;
+
+ ret = write(fd, value, strlen(value));
+
+ close(fd);
+
+ return ret == -1 ? -errno : 0;
+}
+
+static int __tracefs_write_int(const char *path, int value)
+{
+ char *str;
+ int ret;
+
+ if (asprintf(&str, "%d", value) < 0)
+ return -1;
+
+ ret = __tracefs_write(path, str);
+
+ free(str);
+
+ return ret;
+}
+
+#define tracefs_write_int(path, value) \
+ ASSERT_EQ(__tracefs_write_int((path), (value)), 0)
+
+#define tracefs_write(path, value) \
+ ASSERT_EQ(__tracefs_write((path), (value)), 0)
+
+static int tracefs_reset(void)
+{
+ if (__tracefs_write_int(TRACEFS_ROOT"/tracing_on", 0))
+ return -1;
+ if (__tracefs_write(TRACEFS_ROOT"/trace", ""))
+ return -1;
+ if (__tracefs_write(TRACEFS_ROOT"/set_event", ""))
+ return -1;
+ if (__tracefs_write(TRACEFS_ROOT"/current_tracer", "nop"))
+ return -1;
+
+ return 0;
+}
+
+struct tracefs_cpu_map_desc {
+ struct trace_buffer_meta *meta;
+ int cpu_fd;
+};
+
+int tracefs_cpu_map(struct tracefs_cpu_map_desc *desc, int cpu)
+{
+ int page_size = getpagesize();
+ char *cpu_path;
+ void *map;
+
+ if (asprintf(&cpu_path,
+ TRACEFS_ROOT"/per_cpu/cpu%d/trace_pipe_raw",
+ cpu) < 0)
+ return -ENOMEM;
+
+ desc->cpu_fd = open(cpu_path, O_RDONLY | O_NONBLOCK);
+ free(cpu_path);
+ if (desc->cpu_fd < 0)
+ return -ENODEV;
+
+ map = mmap(NULL, page_size, PROT_READ, MAP_SHARED, desc->cpu_fd, 0);
+ if (map == MAP_FAILED)
+ return -errno;
+
+ desc->meta = (struct trace_buffer_meta *)map;
+
+ return 0;
+}
+
+void tracefs_cpu_unmap(struct tracefs_cpu_map_desc *desc)
+{
+ munmap(desc->meta, desc->meta->meta_page_size);
+ close(desc->cpu_fd);
+}
+
+FIXTURE(map) {
+ struct tracefs_cpu_map_desc map_desc;
+ bool umount;
+};
+
+FIXTURE_VARIANT(map) {
+ int subbuf_size;
+};
+
+FIXTURE_VARIANT_ADD(map, subbuf_size_4k) {
+ .subbuf_size = 4,
+};
+
+FIXTURE_VARIANT_ADD(map, subbuf_size_8k) {
+ .subbuf_size = 8,
+};
+
+FIXTURE_SETUP(map)
+{
+ int cpu = sched_getcpu();
+ cpu_set_t cpu_mask;
+ bool fail, umount;
+ char *message;
+
+ if (!tracefs_enabled(&message, &fail, &umount)) {
+ if (fail) {
+ TH_LOG("Tracefs setup failed: %s", message);
+ ASSERT_FALSE(fail);
+ }
+ SKIP(return, "Skipping: %s", message);
+ }
+
+ self->umount = umount;
+
+ ASSERT_GE(cpu, 0);
+
+ ASSERT_EQ(tracefs_reset(), 0);
+
+ tracefs_write_int(TRACEFS_ROOT"/buffer_subbuf_size_kb", variant->subbuf_size);
+
+ ASSERT_EQ(tracefs_cpu_map(&self->map_desc, cpu), 0);
+
+ /*
+ * Ensure generated events will be found on this very same ring-buffer.
+ */
+ CPU_ZERO(&cpu_mask);
+ CPU_SET(cpu, &cpu_mask);
+ ASSERT_EQ(sched_setaffinity(0, sizeof(cpu_mask), &cpu_mask), 0);
+}
+
+FIXTURE_TEARDOWN(map)
+{
+ tracefs_reset();
+
+ if (self->umount)
+ tracefs_unmount();
+
+ tracefs_cpu_unmap(&self->map_desc);
+}
+
+TEST_F(map, meta_page_check)
+{
+ struct tracefs_cpu_map_desc *desc = &self->map_desc;
+ int cnt = 0;
+
+ ASSERT_EQ(desc->meta->entries, 0);
+ ASSERT_EQ(desc->meta->overrun, 0);
+ ASSERT_EQ(desc->meta->read, 0);
+
+ ASSERT_EQ(desc->meta->reader.id, 0);
+ ASSERT_EQ(desc->meta->reader.read, 0);
+
+ ASSERT_EQ(ioctl(desc->cpu_fd, TRACE_MMAP_IOCTL_GET_READER), 0);
+ ASSERT_EQ(desc->meta->reader.id, 0);
+
+ tracefs_write_int(TRACEFS_ROOT"/tracing_on", 1);
+ for (int i = 0; i < 16; i++)
+ tracefs_write_int(TRACEFS_ROOT"/trace_marker", i);
+again:
+ ASSERT_EQ(ioctl(desc->cpu_fd, TRACE_MMAP_IOCTL_GET_READER), 0);
+
+ ASSERT_EQ(desc->meta->entries, 16);
+ ASSERT_EQ(desc->meta->overrun, 0);
+ ASSERT_EQ(desc->meta->read, 16);
+
+ ASSERT_EQ(desc->meta->reader.id, 1);
+
+ if (!(cnt++))
+ goto again;
+}
+
+TEST_F(map, data_mmap)
+{
+ struct tracefs_cpu_map_desc *desc = &self->map_desc;
+ unsigned long meta_len, data_len;
+ void *data;
+
+ meta_len = desc->meta->meta_page_size;
+ data_len = desc->meta->subbuf_size * desc->meta->nr_subbufs;
+
+ /* Map all the available subbufs */
+ data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
+ desc->cpu_fd, meta_len);
+ ASSERT_NE(data, MAP_FAILED);
+ munmap(data, data_len);
+
+ /* Map all the available subbufs - 1 */
+ data_len -= desc->meta->subbuf_size;
+ data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
+ desc->cpu_fd, meta_len);
+ ASSERT_NE(data, MAP_FAILED);
+ munmap(data, data_len);
+
+ /* Overflow the available subbufs by 1 */
+ meta_len += desc->meta->subbuf_size * 2;
+ data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
+ desc->cpu_fd, meta_len);
+ ASSERT_EQ(data, MAP_FAILED);
+}
+
+FIXTURE(snapshot) {
+ bool umount;
+};
+
+FIXTURE_SETUP(snapshot)
+{
+ bool fail, umount;
+ struct stat sb;
+ char *message;
+
+ if (stat(TRACEFS_ROOT"/snapshot", &sb))
+ SKIP(return, "Skipping: %s", "snapshot not available");
+
+ if (!tracefs_enabled(&message, &fail, &umount)) {
+ if (fail) {
+ TH_LOG("Tracefs setup failed: %s", message);
+ ASSERT_FALSE(fail);
+ }
+ SKIP(return, "Skipping: %s", message);
+ }
+
+ self->umount = umount;
+}
+
+FIXTURE_TEARDOWN(snapshot)
+{
+ __tracefs_write(TRACEFS_ROOT"/events/sched/sched_switch/trigger",
+ "!snapshot");
+ tracefs_reset();
+
+ if (self->umount)
+ tracefs_unmount();
+}
+
+TEST_F(snapshot, excludes_map)
+{
+ struct tracefs_cpu_map_desc map_desc;
+ int cpu = sched_getcpu();
+
+ ASSERT_GE(cpu, 0);
+ tracefs_write(TRACEFS_ROOT"/events/sched/sched_switch/trigger",
+ "snapshot");
+ ASSERT_EQ(tracefs_cpu_map(&map_desc, cpu), -EBUSY);
+}
+
+TEST_F(snapshot, excluded_by_map)
+{
+ struct tracefs_cpu_map_desc map_desc;
+ int cpu = sched_getcpu();
+
+ ASSERT_EQ(tracefs_cpu_map(&map_desc, cpu), 0);
+
+ ASSERT_EQ(__tracefs_write(TRACEFS_ROOT"/events/sched/sched_switch/trigger",
+ "snapshot"), -EBUSY);
+ ASSERT_EQ(__tracefs_write(TRACEFS_ROOT"/snapshot",
+ "1"), -EBUSY);
+}
+
+TEST_HARNESS_MAIN
--
2.44.0.769.g3c40516874-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
2024-04-30 11:13 ` [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test Vincent Donnefort
@ 2024-05-03 19:12 ` Shuah Khan
2024-05-07 23:35 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Shuah Khan @ 2024-05-03 19:12 UTC (permalink / raw)
To: Vincent Donnefort, rostedt, mhiramat, linux-kernel,
linux-trace-kernel
Cc: mathieu.desnoyers, kernel-team, rdunlap, rppt, david, Shuah Khan,
linux-kselftest, Muhammad Usama Anjum, Shuah Khan
On 4/30/24 05:13, Vincent Donnefort wrote:
> This test maps a ring-buffer and validate the meta-page after reset and
> after emitting few events.
>
Changelog needs to be imperative - refer to the following:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html
Update the change log and describe what the test does and include
test output.
If the test requires root privileges - make sure add a check to skip
when a normal use runs the test.
The rest looks good.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
2024-05-03 19:12 ` Shuah Khan
@ 2024-05-07 23:35 ` Steven Rostedt
2024-05-10 11:04 ` Vincent Donnefort
0 siblings, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2024-05-07 23:35 UTC (permalink / raw)
To: Vincent Donnefort
Cc: Shuah Khan, mhiramat, linux-kernel, linux-trace-kernel,
mathieu.desnoyers, kernel-team, rdunlap, rppt, david, Shuah Khan,
linux-kselftest, Muhammad Usama Anjum
On Fri, 3 May 2024 13:12:56 -0600
Shuah Khan <skhan@linuxfoundation.org> wrote:
> On 4/30/24 05:13, Vincent Donnefort wrote:
> > This test maps a ring-buffer and validate the meta-page after reset and
> > after emitting few events.
> >
>
> Changelog needs to be imperative - refer to the following:
>
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html
>
> Update the change log and describe what the test does and include
> test output.
>
> If the test requires root privileges - make sure add a check to skip
> when a normal use runs the test.
>
> The rest looks good.
>
Vincent,
Can you address Shuah's concerns. I'm starting to test patches 1-4 so
you only need to send an update to this one, unless of course I find an
issue with one of the others.
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
2024-05-07 23:35 ` Steven Rostedt
@ 2024-05-10 11:04 ` Vincent Donnefort
2024-05-10 18:44 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Vincent Donnefort @ 2024-05-10 11:04 UTC (permalink / raw)
To: Steven Rostedt
Cc: Shuah Khan, mhiramat, linux-kernel, linux-trace-kernel,
mathieu.desnoyers, kernel-team, rdunlap, rppt, david, Shuah Khan,
linux-kselftest, Muhammad Usama Anjum
On Tue, May 07, 2024 at 07:35:55PM -0400, Steven Rostedt wrote:
> On Fri, 3 May 2024 13:12:56 -0600
> Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> > On 4/30/24 05:13, Vincent Donnefort wrote:
> > > This test maps a ring-buffer and validate the meta-page after reset and
> > > after emitting few events.
> > >
> >
> > Changelog needs to be imperative - refer to the following:
> >
> > https://www.kernel.org/doc/html/latest/process/submitting-patches.html
> >
> > Update the change log and describe what the test does and include
> > test output.
> >
> > If the test requires root privileges - make sure add a check to skip
> > when a normal use runs the test.
> >
> > The rest looks good.
> >
>
> Vincent,
>
> Can you address Shuah's concerns. I'm starting to test patches 1-4 so
> you only need to send an update to this one, unless of course I find an
> issue with one of the others.
I will do, as well as with the VM_ flags change.
Thanks for having a look Shuah.
>
> Thanks,
>
> -- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
2024-05-10 11:04 ` Vincent Donnefort
@ 2024-05-10 18:44 ` Steven Rostedt
2024-05-10 18:50 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2024-05-10 18:44 UTC (permalink / raw)
To: Vincent Donnefort
Cc: Shuah Khan, mhiramat, linux-kernel, linux-trace-kernel,
mathieu.desnoyers, kernel-team, rdunlap, rppt, david, Shuah Khan,
linux-kselftest, Muhammad Usama Anjum
On Fri, 10 May 2024 12:04:31 +0100
Vincent Donnefort <vdonnefort@google.com> wrote:
> > Can you address Shuah's concerns. I'm starting to test patches 1-4 so
> > you only need to send an update to this one, unless of course I find an
> > issue with one of the others.
>
> I will do, as well as with the VM_ flags change.
Just so I'm not confusing you. Pleases send a full patch series again.
I only wanted the one patch if there wasn't another issue found. But we
found another issue, so it requires sending a full series.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test
2024-05-10 18:44 ` Steven Rostedt
@ 2024-05-10 18:50 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2024-05-10 18:50 UTC (permalink / raw)
To: Vincent Donnefort
Cc: Shuah Khan, mhiramat, linux-kernel, linux-trace-kernel,
mathieu.desnoyers, kernel-team, rdunlap, rppt, david, Shuah Khan,
linux-kselftest, Muhammad Usama Anjum
On Fri, 10 May 2024 14:44:36 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 10 May 2024 12:04:31 +0100
> Vincent Donnefort <vdonnefort@google.com> wrote:
>
> > > Can you address Shuah's concerns. I'm starting to test patches 1-4 so
> > > you only need to send an update to this one, unless of course I find an
> > > issue with one of the others.
> >
> > I will do, as well as with the VM_ flags change.
>
> Just so I'm not confusing you. Pleases send a full patch series again.
> I only wanted the one patch if there wasn't another issue found. But we
> found another issue, so it requires sending a full series.
>
I just noticed that you posted the full series so never mind.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-10 18:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240430111354.637356-1-vdonnefort@google.com>
2024-04-30 11:13 ` [PATCH v22 5/5] ring-buffer/selftest: Add ring-buffer mapping test Vincent Donnefort
2024-05-03 19:12 ` Shuah Khan
2024-05-07 23:35 ` Steven Rostedt
2024-05-10 11:04 ` Vincent Donnefort
2024-05-10 18:44 ` Steven Rostedt
2024-05-10 18:50 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox