lkml.org 
[lkml]   [2023]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/13] selftests/nolibc: syscall_args: use __NR_statx for rv32
    Date
    When compile nolibc-test.c for rv32, we got such error:

    tools/testing/selftests/nolibc/nolibc-test.c:599:57: error: ‘__NR_fstat’ undeclared (first use in this function)
    599 | CASE_TEST(syscall_args); EXPECT_SYSER(1, syscall(__NR_fstat, 0, NULL), -1, EFAULT); break;

    The generic include/uapi/asm-generic/unistd.h used by rv32 doesn't
    support __NR_fstat, use __NR_statx instead:

    Running test 'syscall'
    69 syscall_noargs = 1 [OK]
    70 syscall_args = -1 EFAULT [OK]

    As tools/include/nolibc/sys.h shows, __NR_statx is either not supported
    by all platforms, so, both __NR_fstat and __NR_statx are required.

    Btw, the latest riscv libc6-dev package is required, otherwise, we would
    also get such error:

    In file included from /usr/riscv64-linux-gnu/include/sys/cdefs.h:452,
    from /usr/riscv64-linux-gnu/include/features.h:461,
    from /usr/riscv64-linux-gnu/include/bits/libc-header-start.h:33,
    from /usr/riscv64-linux-gnu/include/limits.h:26,
    from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:194,
    from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/syslimits.h:7,
    from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:34,
    from /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/nolibc-test.c:6:
    /usr/riscv64-linux-gnu/include/bits/wordsize.h:28:3: error: #error "rv32i-based targets are not supported"
    28 | # error "rv32i-based targets are not supported"

    The glibc commit 5b6113d62efa ("RISC-V: Support the 32-bit ABI
    implementation") fixed up above error, so, glibc >= 2.33 (who includes
    this commit) is required.

    Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
    ---
    tools/testing/selftests/nolibc/nolibc-test.c | 13 ++++++++++++-
    1 file changed, 12 insertions(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
    index 227ef2a3ebba..c86ff6018c7f 100644
    --- a/tools/testing/selftests/nolibc/nolibc-test.c
    +++ b/tools/testing/selftests/nolibc/nolibc-test.c
    @@ -501,6 +501,17 @@ static int test_fork(void)
    }
    }

    +static int test_syscall_args(void)
    +{
    +#ifdef __NR_fstat
    + return syscall(__NR_fstat, 0, NULL);
    +#elif defined(__NR_statx)
    + return syscall(__NR_statx, 0, NULL, 0, 0, NULL);
    +#else
    +#error Neither __NR_fstat nor __NR_statx defined, cannot implement syscall_args test
    +#endif
    +}
    +
    /* Run syscall tests between IDs <min> and <max>.
    * Return 0 on success, non-zero on failure.
    */
    @@ -597,7 +608,7 @@ int run_syscall(int min, int max)
    CASE_TEST(write_badf); EXPECT_SYSER(1, write(-1, &tmp, 1), -1, EBADF); break;
    CASE_TEST(write_zero); EXPECT_SYSZR(1, write(1, &tmp, 0)); break;
    CASE_TEST(syscall_noargs); EXPECT_SYSEQ(1, syscall(__NR_getpid), getpid()); break;
    - CASE_TEST(syscall_args); EXPECT_SYSER(1, syscall(__NR_fstat, 0, NULL), -1, EFAULT); break;
    + CASE_TEST(syscall_args); EXPECT_SYSER(1, test_syscall_args(), -1, EFAULT); break;
    case __LINE__:
    return ret; /* must be last */
    /* note: do not set any defaults so as to permit holes above */
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-05-24 19:50    [W:4.103 / U:25.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site