lkml.org 
[lkml]   [2017]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH for 4.16 02/11] membarrier: selftest: Test private expedited cmd (v2)
    Date
    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 <mathieu.desnoyers@efficios.com>
    Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    CC: Peter Zijlstra <peterz@infradead.org>
    CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    CC: Boqun Feng <boqun.feng@gmail.com>
    CC: Andrew Hunter <ahh@google.com>
    CC: Maged Michael <maged.michael@gmail.com>
    CC: Avi Kivity <avi@scylladb.com>
    CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    CC: Paul Mackerras <paulus@samba.org>
    CC: Michael Ellerman <mpe@ellerman.id.au>
    CC: Dave Watson <davejwatson@fb.com>
    CC: Alan Stern <stern@rowland.harvard.edu>
    CC: Will Deacon <will.deacon@arm.com>
    CC: Andy Lutomirski <luto@kernel.org>
    CC: Alice Ferrazzi <alice.ferrazzi@gmail.com>
    CC: Paul Elder <paul.elder@pitt.edu>
    CC: linux-kselftest@vger.kernel.org
    CC: linux-arch@vger.kernel.org
    ---
    Changes since v1:
    - return result of ksft_exit_pass from main(), silencing compiler
    warning about missing return value.
    ---
    .../testing/selftests/membarrier/membarrier_test.c | 111 ++++++++++++++++++---
    1 file changed, 95 insertions(+), 16 deletions(-)

    diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
    index 9e674d9514d1..e6ee73d01fa1 100644
    --- a/tools/testing/selftests/membarrier/membarrier_test.c
    +++ b/tools/testing/selftests/membarrier/membarrier_test.c
    @@ -16,49 +16,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;
    }

    @@ -72,7 +142,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;
    @@ -108,5 +187,5 @@ int main(int argc, char **argv)
    test_membarrier_query();
    test_membarrier();

    - ksft_exit_pass();
    + return ksft_exit_pass();
    }
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-22 21:20    [W:2.297 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site