From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224ezXzk8V8A2IraUpmSSNEaSjJWk+M9JWlcaxtY6/B2e1BAp6gBqmp/EQHW9ljjXwG596Mn ARC-Seal: i=1; a=rsa-sha256; t=1517257342; cv=none; d=google.com; s=arc-20160816; b=pIcyguYmbNcG/iZVq8KoDCSXxIOoR+zhbB5h0IzV+7PHe1UlV2RKNEwcT7TLwSGvS2 o5+wzGj0XenviudelixP0ZwVAMWPq4KWsl71s4f1AtXKV7smTHJRMM2lJDGC7MSuQyXH u5Sl5H00fsE9V+Az0g4x++3fnyg3dGREPQUI/g8N7pTvtoaxoNrY1NhXUEZX9fQg5GxJ JIpU7NRWWIRm68/mog985FaJRzM1mzuU4HbR55+QbGFIqhbpkjiXYnItQnqLWSZXQpEi mdstDpzD7R5hEvFT31Nb4tWeH+MIRPpMBUfpnC93B+oi/s5Q5bFXIllxoW76sjAMhpct LPLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=JlWTVi1D8QQPfSkVRPP2Dtip05HFn1flRHmoI9dUo70=; b=eghoUpveK0tr0LbioQoUfyfHDNBp4o/VHulnI1BO3sSpBLQRF3pXQfilbHTy4/P++H UDwc4iSR0NE2APO0+HwHnTXj7CFAUmw8iGwK7sTdCiVpTWki3RBbP36GTUFYo4SyQ9iR 4P3Eo80wbmQ5Aoehm1CbH92Bh9H9VLvhpX2vZ1moEm1iCjTiRJtxKoZy4oTADkKglnh4 MsQYPKiNzwTYa/0yblnXbBVSTU5ulcEcGZEHJTTU4B9Uv00wo4zf/5vHyPBA7TIZT2Za yTEWLRrp5A0icFnmXg4SgA0dJ8TzzfTvsI3VVW0jqf4oi6rZHVGF6cXd2Y2g94ZtiCxI heeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of mathieu.desnoyers@efficios.com designates 167.114.142.141 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mathieu.desnoyers@efficios.com designates 167.114.142.141 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com From: Mathieu Desnoyers To: Ingo Molnar , Peter Zijlstra , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Andy Lutomirski , "Paul E . McKenney" , Boqun Feng , Andrew Hunter , Maged Michael , Avi Kivity , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Dave Watson , "H . Peter Anvin" , Andrea Parri , Russell King , Greg Hackmann , Will Deacon , David Sehr , Linus Torvalds , x86@kernel.org, Mathieu Desnoyers , Greg Kroah-Hartman , Alan Stern , Alice Ferrazzi , Paul Elder , linux-kselftest@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH for 4.16 v2 05/11] membarrier: selftest: Test global expedited cmd Date: Mon, 29 Jan 2018 15:20:14 -0500 Message-Id: <20180129202020.8515-6-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129202020.8515-1-mathieu.desnoyers@efficios.com> References: <20180129202020.8515-1-mathieu.desnoyers@efficios.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590959635162398552?= X-GMAIL-MSGID: =?utf-8?q?1590959635162398552?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Test the new MEMBARRIER_CMD_GLOBAL_EXPEDITED and MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED commands. Adapt to the MEMBARRIER_CMD_SHARED -> MEMBARRIER_CMD_GLOBAL rename. Signed-off-by: Mathieu Desnoyers Acked-by: Shuah Khan Acked-by: Peter Zijlstra (Intel) CC: Greg Kroah-Hartman CC: Paul E. McKenney CC: Boqun Feng CC: Andrew Hunter CC: Maged Michael CC: Avi Kivity CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Michael Ellerman CC: Dave Watson CC: Alan Stern CC: Will Deacon CC: Andy Lutomirski CC: Alice Ferrazzi CC: Paul Elder CC: linux-kselftest@vger.kernel.org CC: linux-arch@vger.kernel.org --- Changes since v1: - Rename SHARED to GLOBAL. --- .../testing/selftests/membarrier/membarrier_test.c | 59 ++++++++++++++++++++-- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index e6ee73d01fa1..eec39a0e1f77 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -59,10 +59,10 @@ static int test_membarrier_flags_fail(void) return 0; } -static int test_membarrier_shared_success(void) +static int test_membarrier_global_success(void) { - int cmd = MEMBARRIER_CMD_SHARED, flags = 0; - const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED"; + 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( @@ -132,6 +132,40 @@ static int test_membarrier_private_expedited_success(void) 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; @@ -142,7 +176,7 @@ static int test_membarrier(void) status = test_membarrier_flags_fail(); if (status) return status; - status = test_membarrier_shared_success(); + status = test_membarrier_global_success(); if (status) return status; status = test_membarrier_private_expedited_fail(); @@ -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 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; } @@ -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_GLOBAL)) { + ksft_test_result_fail("sys_membarrier() CMD_GLOBAL 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