selftests, sched/membarrier: Add multi-threaded test
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 19 Sep 2019 17:37:03 +0000 (13:37 -0400)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Sep 2019 15:42:31 +0000 (17:42 +0200)
membarrier commands cover very different code paths if they are in
a single-threaded vs multi-threaded process. Therefore, exercise both
scenarios in the kernel selftests to increase coverage of this selftest.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Kirill Tkhai <tkhai@yandex.ru>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190919173705.2181-6-mathieu.desnoyers@efficios.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/testing/selftests/membarrier/.gitignore
tools/testing/selftests/membarrier/Makefile
tools/testing/selftests/membarrier/membarrier_test.c [deleted file]
tools/testing/selftests/membarrier/membarrier_test_impl.h [new file with mode: 0644]
tools/testing/selftests/membarrier/membarrier_test_multi_thread.c [new file with mode: 0644]
tools/testing/selftests/membarrier/membarrier_test_single_thread.c [new file with mode: 0644]

index 020c44f49a9e675e2419b9d50dc689206887de14..f2f7ec0a99b4d2aa6761112ee1a31489197aaa3c 100644 (file)
@@ -1 +1,2 @@
-membarrier_test
+membarrier_test_multi_thread
+membarrier_test_single_thread
index 97e3bdf3d1e96f27f10bcef4e10a4dd373b6f602..34d1c81a2324a692193e5b16f9ec09f86a1a0c46 100644 (file)
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 CFLAGS += -g -I../../../../usr/include/
+LDLIBS += -lpthread
 
-TEST_GEN_PROGS := membarrier_test
+TEST_GEN_PROGS := membarrier_test_single_thread \
+               membarrier_test_multi_thread
 
 include ../lib.mk
-
diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
deleted file mode 100644 (file)
index 70b4ddb..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#define _GNU_SOURCE
-#include <linux/membarrier.h>
-#include <syscall.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include "../kselftest.h"
-
-static int sys_membarrier(int cmd, int flags)
-{
-       return syscall(__NR_membarrier, cmd, flags);
-}
-
-static int test_membarrier_cmd_fail(void)
-{
-       int cmd = -1, flags = 0;
-       const char *test_name = "sys membarrier invalid command";
-
-       if (sys_membarrier(cmd, flags) != -1) {
-               ksft_exit_fail_msg(
-                       "%s test: command = %d, flags = %d. Should fail, but passed\n",
-                       test_name, cmd, flags);
-       }
-       if (errno != EINVAL) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
-                       test_name, flags, EINVAL, strerror(EINVAL),
-                       errno, strerror(errno));
-       }
-
-       ksft_test_result_pass(
-               "%s test: command = %d, flags = %d, errno = %d. Failed as expected\n",
-               test_name, cmd, flags, errno);
-       return 0;
-}
-
-static int test_membarrier_flags_fail(void)
-{
-       int cmd = MEMBARRIER_CMD_QUERY, flags = 1;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_QUERY invalid flags";
-
-       if (sys_membarrier(cmd, flags) != -1) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should fail, but passed\n",
-                       test_name, flags);
-       }
-       if (errno != EINVAL) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
-                       test_name, flags, EINVAL, strerror(EINVAL),
-                       errno, strerror(errno));
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d, errno = %d. Failed as expected\n",
-               test_name, flags, errno);
-       return 0;
-}
-
-static int test_membarrier_global_success(void)
-{
-       int cmd = MEMBARRIER_CMD_GLOBAL, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n", test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_private_expedited_fail(void)
-{
-       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED not registered failure";
-
-       if (sys_membarrier(cmd, flags) != -1) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should fail, but passed\n",
-                       test_name, flags);
-       }
-       if (errno != EPERM) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
-                       test_name, flags, EPERM, strerror(EPERM),
-                       errno, strerror(errno));
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d, errno = %d\n",
-               test_name, flags, errno);
-       return 0;
-}
-
-static int test_membarrier_register_private_expedited_success(void)
-{
-       int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_private_expedited_success(void)
-{
-       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_private_expedited_sync_core_fail(void)
-{
-       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE not registered failure";
-
-       if (sys_membarrier(cmd, flags) != -1) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should fail, but passed\n",
-                       test_name, flags);
-       }
-       if (errno != EPERM) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
-                       test_name, flags, EPERM, strerror(EPERM),
-                       errno, strerror(errno));
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d, errno = %d\n",
-               test_name, flags, errno);
-       return 0;
-}
-
-static int test_membarrier_register_private_expedited_sync_core_success(void)
-{
-       int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_private_expedited_sync_core_success(void)
-{
-       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_register_global_expedited_success(void)
-{
-       int cmd = MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier_global_expedited_success(void)
-{
-       int cmd = MEMBARRIER_CMD_GLOBAL_EXPEDITED, flags = 0;
-       const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL_EXPEDITED";
-
-       if (sys_membarrier(cmd, flags) != 0) {
-               ksft_exit_fail_msg(
-                       "%s test: flags = %d, errno = %d\n",
-                       test_name, flags, errno);
-       }
-
-       ksft_test_result_pass(
-               "%s test: flags = %d\n",
-               test_name, flags);
-       return 0;
-}
-
-static int test_membarrier(void)
-{
-       int status;
-
-       status = test_membarrier_cmd_fail();
-       if (status)
-               return status;
-       status = test_membarrier_flags_fail();
-       if (status)
-               return status;
-       status = test_membarrier_global_success();
-       if (status)
-               return status;
-       status = test_membarrier_private_expedited_fail();
-       if (status)
-               return status;
-       status = test_membarrier_register_private_expedited_success();
-       if (status)
-               return status;
-       status = test_membarrier_private_expedited_success();
-       if (status)
-               return status;
-       status = sys_membarrier(MEMBARRIER_CMD_QUERY, 0);
-       if (status < 0) {
-               ksft_test_result_fail("sys_membarrier() failed\n");
-               return status;
-       }
-       if (status & MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) {
-               status = test_membarrier_private_expedited_sync_core_fail();
-               if (status)
-                       return status;
-               status = test_membarrier_register_private_expedited_sync_core_success();
-               if (status)
-                       return status;
-               status = test_membarrier_private_expedited_sync_core_success();
-               if (status)
-                       return status;
-       }
-       /*
-        * It is valid to send a global membarrier from a non-registered
-        * process.
-        */
-       status = test_membarrier_global_expedited_success();
-       if (status)
-               return status;
-       status = test_membarrier_register_global_expedited_success();
-       if (status)
-               return status;
-       status = test_membarrier_global_expedited_success();
-       if (status)
-               return status;
-       return 0;
-}
-
-static int test_membarrier_query(void)
-{
-       int flags = 0, ret;
-
-       ret = sys_membarrier(MEMBARRIER_CMD_QUERY, flags);
-       if (ret < 0) {
-               if (errno == ENOSYS) {
-                       /*
-                        * It is valid to build a kernel with
-                        * CONFIG_MEMBARRIER=n. However, this skips the tests.
-                        */
-                       ksft_exit_skip(
-                               "sys membarrier (CONFIG_MEMBARRIER) is disabled.\n");
-               }
-               ksft_exit_fail_msg("sys_membarrier() failed\n");
-       }
-       if (!(ret & MEMBARRIER_CMD_GLOBAL))
-               ksft_exit_skip(
-                       "sys_membarrier unsupported: CMD_GLOBAL not found.\n");
-
-       ksft_test_result_pass("sys_membarrier available\n");
-       return 0;
-}
-
-int main(int argc, char **argv)
-{
-       ksft_print_header();
-       ksft_set_plan(13);
-
-       test_membarrier_query();
-       test_membarrier();
-
-       return ksft_exit_pass();
-}
diff --git a/tools/testing/selftests/membarrier/membarrier_test_impl.h b/tools/testing/selftests/membarrier/membarrier_test_impl.h
new file mode 100644 (file)
index 0000000..186be69
--- /dev/null
@@ -0,0 +1,317 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#define _GNU_SOURCE
+#include <linux/membarrier.h>
+#include <syscall.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "../kselftest.h"
+
+static int sys_membarrier(int cmd, int flags)
+{
+       return syscall(__NR_membarrier, cmd, flags);
+}
+
+static int test_membarrier_cmd_fail(void)
+{
+       int cmd = -1, flags = 0;
+       const char *test_name = "sys membarrier invalid command";
+
+       if (sys_membarrier(cmd, flags) != -1) {
+               ksft_exit_fail_msg(
+                       "%s test: command = %d, flags = %d. Should fail, but passed\n",
+                       test_name, cmd, flags);
+       }
+       if (errno != EINVAL) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
+                       test_name, flags, EINVAL, strerror(EINVAL),
+                       errno, strerror(errno));
+       }
+
+       ksft_test_result_pass(
+               "%s test: command = %d, flags = %d, errno = %d. Failed as expected\n",
+               test_name, cmd, flags, errno);
+       return 0;
+}
+
+static int test_membarrier_flags_fail(void)
+{
+       int cmd = MEMBARRIER_CMD_QUERY, flags = 1;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_QUERY invalid flags";
+
+       if (sys_membarrier(cmd, flags) != -1) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should fail, but passed\n",
+                       test_name, flags);
+       }
+       if (errno != EINVAL) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
+                       test_name, flags, EINVAL, strerror(EINVAL),
+                       errno, strerror(errno));
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d, errno = %d. Failed as expected\n",
+               test_name, flags, errno);
+       return 0;
+}
+
+static int test_membarrier_global_success(void)
+{
+       int cmd = MEMBARRIER_CMD_GLOBAL, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n", test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_private_expedited_fail(void)
+{
+       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED not registered failure";
+
+       if (sys_membarrier(cmd, flags) != -1) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should fail, but passed\n",
+                       test_name, flags);
+       }
+       if (errno != EPERM) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
+                       test_name, flags, EPERM, strerror(EPERM),
+                       errno, strerror(errno));
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d, errno = %d\n",
+               test_name, flags, errno);
+       return 0;
+}
+
+static int test_membarrier_register_private_expedited_success(void)
+{
+       int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_private_expedited_success(void)
+{
+       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_private_expedited_sync_core_fail(void)
+{
+       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE not registered failure";
+
+       if (sys_membarrier(cmd, flags) != -1) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should fail, but passed\n",
+                       test_name, flags);
+       }
+       if (errno != EPERM) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n",
+                       test_name, flags, EPERM, strerror(EPERM),
+                       errno, strerror(errno));
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d, errno = %d\n",
+               test_name, flags, errno);
+       return 0;
+}
+
+static int test_membarrier_register_private_expedited_sync_core_success(void)
+{
+       int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_private_expedited_sync_core_success(void)
+{
+       int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_register_global_expedited_success(void)
+{
+       int cmd = MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_global_expedited_success(void)
+{
+       int cmd = MEMBARRIER_CMD_GLOBAL_EXPEDITED, flags = 0;
+       const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL_EXPEDITED";
+
+       if (sys_membarrier(cmd, flags) != 0) {
+               ksft_exit_fail_msg(
+                       "%s test: flags = %d, errno = %d\n",
+                       test_name, flags, errno);
+       }
+
+       ksft_test_result_pass(
+               "%s test: flags = %d\n",
+               test_name, flags);
+       return 0;
+}
+
+static int test_membarrier_fail(void)
+{
+       int status;
+
+       status = test_membarrier_cmd_fail();
+       if (status)
+               return status;
+       status = test_membarrier_flags_fail();
+       if (status)
+               return status;
+       status = test_membarrier_private_expedited_fail();
+       if (status)
+               return status;
+       status = sys_membarrier(MEMBARRIER_CMD_QUERY, 0);
+       if (status < 0) {
+               ksft_test_result_fail("sys_membarrier() failed\n");
+               return status;
+       }
+       if (status & MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) {
+               status = test_membarrier_private_expedited_sync_core_fail();
+               if (status)
+                       return status;
+       }
+       return 0;
+}
+
+static int test_membarrier_success(void)
+{
+       int status;
+
+       status = test_membarrier_global_success();
+       if (status)
+               return status;
+       status = test_membarrier_register_private_expedited_success();
+       if (status)
+               return status;
+       status = test_membarrier_private_expedited_success();
+       if (status)
+               return status;
+       status = sys_membarrier(MEMBARRIER_CMD_QUERY, 0);
+       if (status < 0) {
+               ksft_test_result_fail("sys_membarrier() failed\n");
+               return status;
+       }
+       if (status & MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) {
+               status = test_membarrier_register_private_expedited_sync_core_success();
+               if (status)
+                       return status;
+               status = test_membarrier_private_expedited_sync_core_success();
+               if (status)
+                       return status;
+       }
+       /*
+        * It is valid to send a global membarrier from a non-registered
+        * process.
+        */
+       status = test_membarrier_global_expedited_success();
+       if (status)
+               return status;
+       status = test_membarrier_register_global_expedited_success();
+       if (status)
+               return status;
+       status = test_membarrier_global_expedited_success();
+       if (status)
+               return status;
+       return 0;
+}
+
+static int test_membarrier_query(void)
+{
+       int flags = 0, ret;
+
+       ret = sys_membarrier(MEMBARRIER_CMD_QUERY, flags);
+       if (ret < 0) {
+               if (errno == ENOSYS) {
+                       /*
+                        * It is valid to build a kernel with
+                        * CONFIG_MEMBARRIER=n. However, this skips the tests.
+                        */
+                       ksft_exit_skip(
+                               "sys membarrier (CONFIG_MEMBARRIER) is disabled.\n");
+               }
+               ksft_exit_fail_msg("sys_membarrier() failed\n");
+       }
+       if (!(ret & MEMBARRIER_CMD_GLOBAL))
+               ksft_exit_skip(
+                       "sys_membarrier unsupported: CMD_GLOBAL not found.\n");
+
+       ksft_test_result_pass("sys_membarrier available\n");
+       return 0;
+}
diff --git a/tools/testing/selftests/membarrier/membarrier_test_multi_thread.c b/tools/testing/selftests/membarrier/membarrier_test_multi_thread.c
new file mode 100644 (file)
index 0000000..ac5613e
--- /dev/null
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0
+#define _GNU_SOURCE
+#include <linux/membarrier.h>
+#include <syscall.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "membarrier_test_impl.h"
+
+static int thread_ready, thread_quit;
+static pthread_mutex_t test_membarrier_thread_mutex =
+       PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t test_membarrier_thread_cond =
+       PTHREAD_COND_INITIALIZER;
+
+void *test_membarrier_thread(void *arg)
+{
+       pthread_mutex_lock(&test_membarrier_thread_mutex);
+       thread_ready = 1;
+       pthread_cond_broadcast(&test_membarrier_thread_cond);
+       pthread_mutex_unlock(&test_membarrier_thread_mutex);
+
+       pthread_mutex_lock(&test_membarrier_thread_mutex);
+       while (!thread_quit)
+               pthread_cond_wait(&test_membarrier_thread_cond,
+                                 &test_membarrier_thread_mutex);
+       pthread_mutex_unlock(&test_membarrier_thread_mutex);
+
+       return NULL;
+}
+
+static int test_mt_membarrier(void)
+{
+       int i;
+       pthread_t test_thread;
+
+       pthread_create(&test_thread, NULL,
+                      test_membarrier_thread, NULL);
+
+       pthread_mutex_lock(&test_membarrier_thread_mutex);
+       while (!thread_ready)
+               pthread_cond_wait(&test_membarrier_thread_cond,
+                                 &test_membarrier_thread_mutex);
+       pthread_mutex_unlock(&test_membarrier_thread_mutex);
+
+       test_membarrier_fail();
+
+       test_membarrier_success();
+
+       pthread_mutex_lock(&test_membarrier_thread_mutex);
+       thread_quit = 1;
+       pthread_cond_broadcast(&test_membarrier_thread_cond);
+       pthread_mutex_unlock(&test_membarrier_thread_mutex);
+
+       pthread_join(test_thread, NULL);
+
+       return 0;
+}
+
+int main(int argc, char **argv)
+{
+       ksft_print_header();
+       ksft_set_plan(13);
+
+       test_membarrier_query();
+
+       /* Multi-threaded */
+       test_mt_membarrier();
+
+       return ksft_exit_pass();
+}
diff --git a/tools/testing/selftests/membarrier/membarrier_test_single_thread.c b/tools/testing/selftests/membarrier/membarrier_test_single_thread.c
new file mode 100644 (file)
index 0000000..c1c9639
--- /dev/null
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+#define _GNU_SOURCE
+#include <linux/membarrier.h>
+#include <syscall.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "membarrier_test_impl.h"
+
+int main(int argc, char **argv)
+{
+       ksft_print_header();
+       ksft_set_plan(13);
+
+       test_membarrier_query();
+
+       test_membarrier_fail();
+
+       test_membarrier_success();
+
+       return ksft_exit_pass();
+}