Test the new MEMBARRIER_CMD_SHARED_EXPEDITED and MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED commands.
Signed-off-by: Mathieu Desnoyers <[email protected]> CC: Shuah Khan <[email protected]> CC: Greg Kroah-Hartman <[email protected]> CC: Peter Zijlstra <[email protected]> CC: Paul E. McKenney <[email protected]> CC: Boqun Feng <[email protected]> CC: Andrew Hunter <[email protected]> CC: Maged Michael <[email protected]> CC: Avi Kivity <[email protected]> CC: Benjamin Herrenschmidt <[email protected]> CC: Paul Mackerras <[email protected]> CC: Michael Ellerman <[email protected]> CC: Dave Watson <[email protected]> CC: Alan Stern <[email protected]> CC: Will Deacon <[email protected]> CC: Andy Lutomirski <[email protected]> CC: Alice Ferrazzi <[email protected]> CC: Paul Elder <[email protected]> CC: [email protected] CC: [email protected] --- .../testing/selftests/membarrier/membarrier_test.c | 51 +++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index e6ee73d01fa1..bb9c58072c5c 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -132,6 +132,40 @@ static int test_membarrier_private_expedited_success(void) return 0; } +static int test_membarrier_register_shared_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_SHARED_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_shared_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_SHARED_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED_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; @@ -154,6 +188,19 @@ static int test_membarrier(void) status = test_membarrier_private_expedited_success(); if (status) return status; + /* + * It is valid to send a shared membarrier from a non-registered + * process. + */ + status = test_membarrier_shared_expedited_success(); + if (status) + return status; + status = test_membarrier_register_shared_expedited_success(); + if (status) + return status; + status = test_membarrier_shared_expedited_success(); + if (status) + return status; return 0; } @@ -173,8 +220,10 @@ static int test_membarrier_query(void) } ksft_exit_fail_msg("sys_membarrier() failed\n"); } - if (!(ret & MEMBARRIER_CMD_SHARED)) + if (!(ret & MEMBARRIER_CMD_SHARED)) { + ksft_test_result_fail("sys_membarrier() CMD_SHARED query failed\n"); ksft_exit_fail_msg("sys_membarrier is not supported.\n"); + } ksft_test_result_pass("sys_membarrier available\n"); return 0; -- 2.11.0
