Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032041AbdIZUOh (ORCPT ); Tue, 26 Sep 2017 16:14:37 -0400 Received: from mail.efficios.com ([167.114.142.141]:48384 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966877AbdIZUOa (ORCPT ); Tue, 26 Sep 2017 16:14:30 -0400 Date: Tue, 26 Sep 2017 20:15:25 +0000 (UTC) From: Mathieu Desnoyers To: Shuah Khan , Greg Kroah-Hartman , Alice Ferrazzi , Paul Elder , "Paul E. McKenney" Cc: linux-kselftest , shuah , Peter Zijlstra , linux-kernel , Boqun Feng , Andrew Hunter , maged michael , gromer , Avi Kivity , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Dave Watson , Alan Stern , Will Deacon , Andy Lutomirski , linux-arch , Shuah Khan Message-ID: <998801080.19251.1506456925340.JavaMail.zimbra@efficios.com> In-Reply-To: References: <20170926175151.14264-1-mathieu.desnoyers@efficios.com> <20170926175151.14264-2-mathieu.desnoyers@efficios.com> <1861482846.19234.1506455717905.JavaMail.zimbra@efficios.com> Subject: Re: [PATCH for 4.14 2/3] membarrier: selftest: Test private expedited cmd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [167.114.142.141] X-Mailer: Zimbra 8.7.11_GA_1854 (ZimbraWebClient - FF52 (Linux)/8.7.11_GA_1854) Thread-Topic: membarrier: selftest: Test private expedited cmd Thread-Index: Eyrtol5jmUf63LujQWqSQDjWnlWJ/g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9650 Lines: 257 ----- On Sep 26, 2017, at 4:08 PM, Shuah Khan shuahkhan@gmail.com wrote: > On Tue, Sep 26, 2017 at 1:55 PM, Mathieu Desnoyers > wrote: >> ----- On Sep 26, 2017, at 3:41 PM, Shuah Khan shuahkhan@gmail.com wrote: >> >>> Hi Mathew, >>> >>> On Tue, Sep 26, 2017 at 11:51 AM, Mathieu Desnoyers >>> wrote: >>>> Test the new MEMBARRIER_CMD_PRIVATE_EXPEDITED and >>>> MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED commands. >>>> >>>> Add checks expecting specific error values on system calls expected to >>>> fail. >>>> >>>> Signed-off-by: Mathieu Desnoyers >>>> CC: Peter Zijlstra >>>> CC: Paul E. McKenney >>>> CC: Boqun Feng >>>> CC: Andrew Hunter >>>> CC: Maged Michael >>>> CC: gromer@google.com >>>> 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: linux-arch@vger.kernel.org >>>> --- >>>> .../testing/selftests/membarrier/membarrier_test.c | 109 >>> >>> Did you run get_maintainers script on this patch? I am curious why >>> get_maintainers didn't include linux-kselftest@vger.kernel.org and >>> shuah@kernel.org >> >> My mistake. I'll add this script to my checklist before I send out >> patches. >> >> If OK with you, I can just add the ML in CC here. >> > > Please add everybody get_maintainers suggest for this patch as well. > If this patch is going through linux-kselftest, you will have to resend the > patch to me at some point, so I can pull it in. > > I am guessing this has dependency on the other patches in the series > and will go through the primary tree. In that case CC is just fine and I will > review it and Ack it. Indeed, it has a dependency on another patch part of this series, which is aimed to go through Paul E. McKenney's tree. Adding Greg, Alice, and Paul Elder in CC as suggested by get_maintainers. Do you need me to re-send the series, or is this thread ok ? Thanks, Mathieu > > thanks, > -- Shuah >>> >>> Please make sure you send the patches to >>> ++++++++++++++++++--- >>>> 1 file changed, 94 insertions(+), 15 deletions(-) >>>> >>>> diff --git a/tools/testing/selftests/membarrier/membarrier_test.c >>>> b/tools/testing/selftests/membarrier/membarrier_test.c >>>> index 21399fcf1a59..f85657374b59 100644 >>>> --- a/tools/testing/selftests/membarrier/membarrier_test.c >>>> +++ b/tools/testing/selftests/membarrier/membarrier_test.c >>>> @@ -15,49 +15,119 @@ static int sys_membarrier(int cmd, int 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( >>>> - "sys membarrier invalid command test: command = %d, >>>> flags = %d. Should fail, but passed\n", >>>> - cmd, flags); >>>> + "%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( >>>> - "sys membarrier invalid command test: command = %d, flags = %d. >>>> Failed as expected\n", >>>> - cmd, flags); >>>> + "%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( >>>> - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: >>>> flags = %d. Should fail, but passed\n", >>>> - flags); >>>> + "%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( >>>> - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: flags = >>>> %d. Failed as expected\n", >>>> - flags); >>>> + "%s test: flags = %d, errno = %d. Failed as expected\n", >>>> + test_name, flags, errno); >>>> return 0; >>>> } >>>> >>>> -static int test_membarrier_success(void) >>>> +static int test_membarrier_shared_success(void) >>>> { >>>> int cmd = MEMBARRIER_CMD_SHARED, flags = 0; >>>> - const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED\n"; >>>> + const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED"; >>>> + >>>> + 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( >>>> - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = >>>> %d\n", >>>> - flags); >>>> + "%s test: flags = %d, errno = %d\n", >>>> + test_name, flags, errno); >>>> } >>>> >>>> ksft_test_result_pass( >>>> - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = %d\n", >>>> - flags); >>>> + "%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; >>>> } >>>> >>>> @@ -71,7 +141,16 @@ static int test_membarrier(void) >>>> status = test_membarrier_flags_fail(); >>>> if (status) >>>> return status; >>>> - status = test_membarrier_success(); >>>> + status = test_membarrier_shared_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; >>>> return 0; >>>> -- >>>> 2.11.0 >> >> -- >> Mathieu Desnoyers >> EfficiOS Inc. > > http://www.efficios.com -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com