| 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: <20230605233900.2838-5-beaub@linux.microsoft.com>
Date: Mon, 5 Jun 2023 16:38:59 -0700
From: Beau Belgrave <beaub@...ux.microsoft.com>
To: rostedt@...dmis.org, mhiramat@...nel.org
Cc: linux-kernel@...r.kernel.org, linux-trace-kernel@...r.kernel.org,
ast@...nel.org, dcook@...ux.microsoft.com
Subject: [PATCH v2 4/5] tracing/user_events: Add self-test for persist flag
A new flag for persisting user_events upon the last reference exists
now. We must ensure this flag works correctly in the common cases.
Update abi self test to ensure when this flag is used the user_event
goes away at the appropriate time. Ensure last fd, enabler, and
trace_event_call refs paths correctly delete the event for non-persist
events.
Signed-off-by: Beau Belgrave <beaub@...ux.microsoft.com>
---
.../testing/selftests/user_events/abi_test.c | 144 +++++++++++++++++-
.../selftests/user_events/ftrace_test.c | 1 +
2 files changed, 137 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/user_events/abi_test.c b/tools/testing/selftests/user_events/abi_test.c
index 5125c42efe65..55aaec21fd8e 100644
--- a/tools/testing/selftests/user_events/abi_test.c
+++ b/tools/testing/selftests/user_events/abi_test.c
@@ -22,10 +22,61 @@
const char *data_file = "/sys/kernel/tracing/user_events_data";
const char *enable_file = "/sys/kernel/tracing/events/user_events/__abi_event/enable";
+const char *temp_enable_file = "/sys/kernel/tracing/events/user_events/__abi_temp_event/enable";
-static int change_event(bool enable)
+static bool __exists(int grace_ms, const char *path)
{
- int fd = open(enable_file, O_RDWR);
+ int fd;
+
+ usleep(grace_ms * 1000);
+
+ fd = open(path, O_RDONLY);
+
+ if (fd == -1)
+ return false;
+
+ close(fd);
+
+ return true;
+}
+
+static bool temp_exists(int grace_ms)
+{
+ return __exists(grace_ms, temp_enable_file);
+}
+
+static bool exists(int grace_ms)
+{
+ return __exists(grace_ms, enable_file);
+}
+
+static int __clear(const char *name)
+{
+ int fd = open(data_file, O_RDWR);
+ int ret = 0;
+
+ if (ioctl(fd, DIAG_IOCSDEL, name) == -1)
+ if (errno != ENOENT)
+ ret = -1;
+
+ close(fd);
+
+ return ret;
+}
+
+static int clear_temp(void)
+{
+ return __clear("__abi_temp_event");
+}
+
+static int clear(void)
+{
+ return __clear("__abi_event");
+}
+
+static int __change_event(const char *path, bool enable)
+{
+ int fd = open(path, O_RDWR);
int ret;
if (fd < 0)
@@ -46,22 +97,48 @@ static int change_event(bool enable)
return ret;
}
-static int reg_enable(long *enable, int size, int bit)
+static int change_temp_event(bool enable)
+{
+ return __change_event(temp_enable_file, enable);
+}
+
+static int change_event(bool enable)
+{
+ return __change_event(enable_file, enable);
+}
+
+static int __reg_enable(int *fd, const char *name, long *enable, int size,
+ int bit, int flags)
{
struct user_reg reg = {0};
- int fd = open(data_file, O_RDWR);
- int ret;
- if (fd < 0)
+ *fd = open(data_file, O_RDWR);
+
+ if (*fd < 0)
return -1;
reg.size = sizeof(reg);
- reg.name_args = (__u64)"__abi_event";
+ reg.name_args = (__u64)name;
reg.enable_bit = bit;
reg.enable_addr = (__u64)enable;
reg.enable_size = size;
+ reg.flags = flags;
+
+ return ioctl(*fd, DIAG_IOCSREG, ®);
+}
- ret = ioctl(fd, DIAG_IOCSREG, ®);
+static int reg_enable_temp(int *fd, long *enable, int size, int bit)
+{
+ return __reg_enable(fd, "__abi_temp_event", enable, size, bit, 0);
+}
+
+static int reg_enable(long *enable, int size, int bit)
+{
+ int ret;
+ int fd;
+
+ ret = __reg_enable(&fd, "__abi_event", enable, size, bit,
+ USER_EVENT_REG_PERSIST);
close(fd);
@@ -98,6 +175,8 @@ FIXTURE_SETUP(user) {
}
FIXTURE_TEARDOWN(user) {
+ clear();
+ clear_temp();
}
TEST_F(user, enablement) {
@@ -223,6 +302,55 @@ TEST_F(user, clones) {
ASSERT_EQ(0, change_event(false));
}
+TEST_F(user, flags) {
+ int grace = 100;
+ int fd;
+
+ /* FLAG: None */
+ /* Removal path 1, close on last fd ref */
+ ASSERT_EQ(0, clear_temp());
+ ASSERT_EQ(0, reg_enable_temp(&fd, &self->check, sizeof(int), 0));
+ ASSERT_EQ(0, reg_disable(&self->check, 0));
+ close(fd);
+ ASSERT_EQ(false, temp_exists(grace));
+
+ /* Removal path 2, close on last enabler */
+ ASSERT_EQ(0, clear_temp());
+ ASSERT_EQ(0, reg_enable_temp(&fd, &self->check, sizeof(int), 0));
+ close(fd);
+ ASSERT_EQ(true, temp_exists(grace));
+ ASSERT_EQ(0, reg_disable(&self->check, 0));
+ ASSERT_EQ(false, temp_exists(grace));
+
+ /* Removal path 3, close on last trace_event ref */
+ ASSERT_EQ(0, clear_temp());
+ ASSERT_EQ(0, reg_enable_temp(&fd, &self->check, sizeof(int), 0));
+ ASSERT_EQ(0, reg_disable(&self->check, 0));
+ ASSERT_EQ(0, change_temp_event(true));
+ close(fd);
+ ASSERT_EQ(true, temp_exists(grace));
+ ASSERT_EQ(0, change_temp_event(false));
+ ASSERT_EQ(false, temp_exists(grace));
+
+ /* FLAG: USER_EVENT_REG_PERSIST */
+ ASSERT_EQ(0, clear());
+ ASSERT_EQ(0, reg_enable(&self->check, sizeof(int), 0));
+ ASSERT_EQ(0, reg_disable(&self->check, 0));
+ ASSERT_EQ(true, exists(grace));
+ ASSERT_EQ(0, clear());
+ ASSERT_EQ(false, exists(grace));
+
+ /* FLAG: Non-ABI */
+ /* Unknown flags should fail with EINVAL */
+ ASSERT_EQ(-1, __reg_enable(&fd, "__abi_invalid_event", &self->check,
+ sizeof(int), 0, USER_EVENT_REG_MAX));
+ ASSERT_EQ(EINVAL, errno);
+
+ ASSERT_EQ(-1, __reg_enable(&fd, "__abi_invalid_event", &self->check,
+ sizeof(int), 0, USER_EVENT_REG_MAX + 1));
+ ASSERT_EQ(EINVAL, errno);
+}
+
int main(int argc, char **argv)
{
return test_harness_run(argc, argv);
diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c
index 7c99cef94a65..e5e966d77918 100644
--- a/tools/testing/selftests/user_events/ftrace_test.c
+++ b/tools/testing/selftests/user_events/ftrace_test.c
@@ -210,6 +210,7 @@ TEST_F(user, register_events) {
reg.enable_bit = 31;
reg.enable_addr = (__u64)&self->check;
reg.enable_size = sizeof(self->check);
+ reg.flags = USER_EVENT_REG_PERSIST;
unreg.size = sizeof(unreg);
unreg.disable_bit = 31;
--
2.25.1
Powered by blists - more mailing lists