Message ID | 20240507043235.1692-2-lufei@uniontech.com |
---|---|
State | Changes Requested |
Headers | show |
Series | Add case about arch_prctl syscall. | expand |
Hi! > +static void run(unsigned int index) > +{ > + struct tcase tc = tcases[index]; > + > + TEST(arch_prctl_set(ARCH_SET_CPUID, tc.input)); > + > + if (TST_RET == tc.set_exp) > + if (tc.set_exp == -1) > + tst_res((TST_ERR == tc.tst_errno ? TPASS : TFAIL), > + "set cpuid, expect: %s, get: %s", > + tst_strerrno(tc.tst_errno), > + tst_strerrno(TST_ERR)); > + else > + tst_res(TPASS, "set cpuid succeed."); > + else > + tst_res(TFAIL, "set cpuid failed."); This is kind of ugly, why can't we just do: if (tag) TST_EXP_PASS(arch_prctl_set(ARCH_SET_CPUID, index)); else TST_EXP_FAIL(arch_prctl_set(ARCH_SET_CPUID, index), ENODEV); > + TEST(arch_prctl_get(ARCH_GET_CPUID)); > + > + if (TST_RET == tc.get_exp) > + tst_res(TPASS, "get cpuid succeed."); > + else > + tst_res(TFAIL, "get cpuid failed."); We have to check the errno here as well, just branch on the tag as well: if (tag) { TEST(arch_prctl_get(ARCH_GET_CPUID)); if (TST_RET == index) tst_res(TPASS, "..."); else tst_res(FAIL, "..."); } else { TST_EXP_FAIL(arch_prctl_get(ARCH_GET_CPUID), ENODEV); } Generally the use of TST_EXP_FAIL() is prefered whenever possible. > +} > + > +static struct tst_test test = { > + .test = run, > + .setup = setup, > + .tcnt = ARRAY_SIZE(tcases), > + .min_kver = "4.12", > + .supported_archs = (const char *const []){"x86_64", "x86", NULL} > +}; > + > +#else /* HAVE_ASM_PRCTL_H */ > +TST_TEST_TCONF("missing <asm/prctl.h>"); > +#endif > -- > 2.39.3 >
Hi, Cyril.
Thanks again very much.
As written in man page, ENODEV seems only for ARCH_SET_CPUID, so I didn't use TST_EXP_FAIL in ARCH_GET_CPUID check. ARCH_GET_CPUID always success with returning cpuid status, I've tested this on a Intel J1900 machine witch has no cpuid_fault flag. I've resent the patch.
Lu Fei
site:www.uniontech.com
tel:(+86)18501012352
addr: Xi'an, China
------------------ Original ------------------
From: "Cyril Hrubis"<chrubis@suse.cz>;
Date: Tue, May 7, 2024 12:51 PM
To: "lufei"<lufei@uniontech.com>;
Cc: "ltp"<ltp@lists.linux.it>; "jstancek"<jstancek@redhat.com>;
Subject: Re: [PATCH] Add case about arch_prctl syscall.
Hi!
> +static void run(unsigned int index)
> +{
> + struct tcase tc = tcases[index];
> +
> + TEST(arch_prctl_set(ARCH_SET_CPUID, tc.input));
> +
> + if (TST_RET == tc.set_exp)
> + if (tc.set_exp == -1)
> + tst_res((TST_ERR == tc.tst_errno ? TPASS : TFAIL),
> + "set cpuid, expect: %s, get: %s",
> + tst_strerrno(tc.tst_errno),
> + tst_strerrno(TST_ERR));
> + else
> + tst_res(TPASS, "set cpuid succeed.");
> + else
> + tst_res(TFAIL, "set cpuid failed.");
This is kind of ugly, why can't we just do:
if (tag)
TST_EXP_PASS(arch_prctl_set(ARCH_SET_CPUID, index));
else
TST_EXP_FAIL(arch_prctl_set(ARCH_SET_CPUID, index), ENODEV);
> + TEST(arch_prctl_get(ARCH_GET_CPUID));
> +
> + if (TST_RET == tc.get_exp)
> + tst_res(TPASS, "get cpuid succeed.");
> + else
> + tst_res(TFAIL, "get cpuid failed.");
We have to check the errno here as well, just branch on the tag as well:
if (tag) {
TEST(arch_prctl_get(ARCH_GET_CPUID));
if (TST_RET == index)
tst_res(TPASS, "...");
else
tst_res(FAIL, "...");
} else {
TST_EXP_FAIL(arch_prctl_get(ARCH_GET_CPUID), ENODEV);
}
Generally the use of TST_EXP_FAIL() is prefered whenever possible.
> +}
> +
> +static struct tst_test test = {
> + .test = run,
> + .setup = setup,
> + .tcnt = ARRAY_SIZE(tcases),
> + .min_kver = "4.12",
> + .supported_archs = (const char *const []){"x86_64", "x86", NULL}
> +};
> +
> +#else /* HAVE_ASM_PRCTL_H */
> +TST_TEST_TCONF("missing <asm/prctl.h>");
> +#endif
> --
> 2.39.3
>
diff --git a/configure.ac b/configure.ac index 1d7e862d8..0dcaddc0f 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ AC_CHECK_DECLS([SEM_STAT_ANY],,,[#include <sys/sem.h>]) AC_CHECK_HEADERS_ONCE([ \ asm/ldt.h \ + asm/prctl.h \ cpuid.h \ emmintrin.h \ ifaddrs.h \ diff --git a/runtest/syscalls b/runtest/syscalls index 7794f1465..505b4243d 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -31,6 +31,8 @@ alarm05 alarm05 alarm06 alarm06 alarm07 alarm07 +arch_prctl01 arch_prctl01 + bind01 bind01 bind02 bind02 bind03 bind03 diff --git a/testcases/kernel/syscalls/arch_prctl/.gitignore b/testcases/kernel/syscalls/arch_prctl/.gitignore new file mode 100644 index 000000000..24871e249 --- /dev/null +++ b/testcases/kernel/syscalls/arch_prctl/.gitignore @@ -0,0 +1 @@ +/arch_prctl01 diff --git a/testcases/kernel/syscalls/arch_prctl/Makefile b/testcases/kernel/syscalls/arch_prctl/Makefile new file mode 100644 index 000000000..272949d57 --- /dev/null +++ b/testcases/kernel/syscalls/arch_prctl/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) UnionTech Software Technology Co.,Ltd. 2024 + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/arch_prctl/arch_prctl01.c b/testcases/kernel/syscalls/arch_prctl/arch_prctl01.c new file mode 100644 index 000000000..cce204f2d --- /dev/null +++ b/testcases/kernel/syscalls/arch_prctl/arch_prctl01.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) UnionTech Software Technology Co.,Ltd., 2024 + * Author: Lu Fei <lufei@uniontech.com> + */ + +/*\ + * [Description] + * + * Simple test on arch_prctl to set and get cpuid instruction of test thread. + */ + +#include "tst_test.h" +#include "tst_safe_stdio.h" +#include "lapi/syscalls.h" +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#ifdef HAVE_ASM_PRCTL_H +#include <asm/prctl.h> + +static int arch_prctl_get(int code) +{ + return tst_syscall(__NR_arch_prctl, code, NULL); +} + +static int arch_prctl_set(int code, unsigned long addr) +{ + return tst_syscall(__NR_arch_prctl, code, addr); +} + +static struct tcase { + const int input; + int set_exp; + int get_exp; + const int tst_errno; +} tcases[] = { + {0, 0, 0, ENODEV}, + {1, 0, 1, ENODEV}, +}; + +static void setup(void) +{ + FILE *f; + char flag_mid[] = " cpuid_fault "; + char flag_end[] = " cpuid_fault\n"; + char *line = NULL; + size_t len = 0; + bool tag = 0; + + f = SAFE_FOPEN("/proc/cpuinfo", "r"); + + while (getline(&line, &len, f) != -1) + if (strncmp(line, "flags", strlen("flags")) == 0 && + (strstr(line, flag_mid) != NULL || + strstr(line, flag_end) != NULL)) { + tag = 1; + break; + } + if (!tag) + for (unsigned long i = 0; i < ARRAY_SIZE(tcases); i++) { + tcases[i].set_exp = -1; + // get default value + tcases[i].get_exp = 1; + } +} + +static void run(unsigned int index) +{ + struct tcase tc = tcases[index]; + + TEST(arch_prctl_set(ARCH_SET_CPUID, tc.input)); + + if (TST_RET == tc.set_exp) + if (tc.set_exp == -1) + tst_res((TST_ERR == tc.tst_errno ? TPASS : TFAIL), + "set cpuid, expect: %s, get: %s", + tst_strerrno(tc.tst_errno), + tst_strerrno(TST_ERR)); + else + tst_res(TPASS, "set cpuid succeed."); + else + tst_res(TFAIL, "set cpuid failed."); + + TEST(arch_prctl_get(ARCH_GET_CPUID)); + + if (TST_RET == tc.get_exp) + tst_res(TPASS, "get cpuid succeed."); + else + tst_res(TFAIL, "get cpuid failed."); +} + +static struct tst_test test = { + .test = run, + .setup = setup, + .tcnt = ARRAY_SIZE(tcases), + .min_kver = "4.12", + .supported_archs = (const char *const []){"x86_64", "x86", NULL} +}; + +#else /* HAVE_ASM_PRCTL_H */ +TST_TEST_TCONF("missing <asm/prctl.h>"); +#endif
Add testcase about arch_prctl syscall. Signed-off-by: Lu Fei <lufei@uniontech.com> --- configure.ac | 1 + runtest/syscalls | 2 + .../kernel/syscalls/arch_prctl/.gitignore | 1 + testcases/kernel/syscalls/arch_prctl/Makefile | 8 ++ .../kernel/syscalls/arch_prctl/arch_prctl01.c | 103 ++++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 testcases/kernel/syscalls/arch_prctl/.gitignore create mode 100644 testcases/kernel/syscalls/arch_prctl/Makefile create mode 100644 testcases/kernel/syscalls/arch_prctl/arch_prctl01.c