This series fixes build errors found by clang to allow the x86 suite to get built with the clang.
Unfortunately, there is one bug [1] in the clang becuase of which extended asm isn't handled correctly by it and build fails for sysret_rip.c. Hence even after this series the build of this test would fail with clang. Should we disable this test for now when clang is used until the bug is fixed in clang? Not sure. Any opinions?
[1] https://github.com/llvm/llvm-project/issues/53728
Muhammad Usama Anjum (8): selftests: x86: Remove dependence of headers file selftests: x86: check_initial_reg_state: remove -no-pie while using -static selftests: x86: test_vsyscall: remove unused function selftests: x86: fsgsbase_restore: fix asm directive from =rm to =r selftests: x86: syscall_arg_fault_32: remove unused variable selftests: x86: test_FISTTP: use fisttps instead of ambigous fisttp selftests: x86: fsgsbase: Remove unused function and variable selftests: x86: amx: Remove unused functions
tools/testing/selftests/x86/Makefile | 9 +++++---- tools/testing/selftests/x86/amx.c | 16 ---------------- tools/testing/selftests/x86/fsgsbase.c | 6 ------ tools/testing/selftests/x86/fsgsbase_restore.c | 2 +- tools/testing/selftests/x86/syscall_arg_fault.c | 1 - tools/testing/selftests/x86/test_FISTTP.c | 8 ++++---- tools/testing/selftests/x86/test_vsyscall.c | 5 ----- 7 files changed, 10 insertions(+), 37 deletions(-)
Remove header file dependence to remove the following error caught by clang.
clang: error: cannot specify -o when generating multiple output files
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index 0b872c0a42d20..671b1819694ff 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -72,10 +72,10 @@ all_64: $(BINARIES_64)
EXTRA_CLEAN := $(BINARIES_32) $(BINARIES_64)
-$(BINARIES_32): $(OUTPUT)/%_32: %.c helpers.h +$(BINARIES_32): $(OUTPUT)/%_32: %.c $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl -lm
-$(BINARIES_64): $(OUTPUT)/%_64: %.c helpers.h +$(BINARIES_64): $(OUTPUT)/%_64: %.c $(CC) -m64 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
# x86_64 users should be encouraged to install 32-bit libraries
The -static clang flag ignores -no-pie flag. Hence following warning is generated. Fix the warning by removing the -no-pie flag before specifying -static flag.
clang: warning: argument unused during compilation: '-no-pie' [-Wunused-command-line-argument]
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index 671b1819694ff..b0f5b5ff79b8d 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -108,8 +108,9 @@ $(OUTPUT)/test_syscall_vdso_32: thunks_32.S # check_initial_reg_state is special: it needs a custom entry, and it # needs to be static so that its interpreter doesn't destroy its initial # state. -$(OUTPUT)/check_initial_reg_state_32: CFLAGS += -Wl,-ereal_start -static -$(OUTPUT)/check_initial_reg_state_64: CFLAGS += -Wl,-ereal_start -static +CFLAGS2:=$(filter-out -no-pie,$(CFLAGS)) +$(OUTPUT)/check_initial_reg_state_32: CFLAGS2 += -Wl,-ereal_start -static +$(OUTPUT)/check_initial_reg_state_64: CFLAGS2 += -Wl,-ereal_start -static
$(OUTPUT)/nx_stack_32: CFLAGS += -Wl,-z,noexecstack $(OUTPUT)/nx_stack_64: CFLAGS += -Wl,-z,noexecstack
Remove unused function to fix the following warning:
test_vsyscall.c:100:19: warning: unused function 'sys_clock_gettime' [-Wunused-function] 100 | static inline int sys_clock_gettime(clockid_t id, struct timespec *ts)
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/test_vsyscall.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/tools/testing/selftests/x86/test_vsyscall.c b/tools/testing/selftests/x86/test_vsyscall.c index d4c8e8d79d389..1c9895cfc660b 100644 --- a/tools/testing/selftests/x86/test_vsyscall.c +++ b/tools/testing/selftests/x86/test_vsyscall.c @@ -97,11 +97,6 @@ static inline long sys_gtod(struct timeval *tv, struct timezone *tz) return syscall(SYS_gettimeofday, tv, tz); }
-static inline int sys_clock_gettime(clockid_t id, struct timespec *ts) -{ - return syscall(SYS_clock_gettime, id, ts); -} - static inline long sys_time(time_t *t) { return syscall(SYS_time, t);
The clang gives unknown use of instruction mnemonic error. Fix it by specifying =r only. The operand would be placed in register only.
fsgsbase_restore.c:45:16: error: unknown use of instruction mnemonic without a size suffix 45 | asm volatile ("mov %" SEG ":(0), %0" : "=rm" (ret)); | ^ <inline asm>:1:2: note: instantiated into assembly here 1 | mov %fs:(0), 20(%esp) | ^ fsgsbase_restore.c:45:16: error: unknown use of instruction mnemonic without a size suffix 45 | asm volatile ("mov %" SEG ":(0), %0" : "=rm" (ret)); | ^ <inline asm>:1:2: note: instantiated into assembly here 1 | mov %fs:(0), 20(%esp) | ^
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/fsgsbase_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/x86/fsgsbase_restore.c b/tools/testing/selftests/x86/fsgsbase_restore.c index 6fffadc515791..12871b482185b 100644 --- a/tools/testing/selftests/x86/fsgsbase_restore.c +++ b/tools/testing/selftests/x86/fsgsbase_restore.c @@ -42,7 +42,7 @@ static unsigned int dereference_seg_base(void) { int ret; - asm volatile ("mov %" SEG ":(0), %0" : "=rm" (ret)); + asm volatile ("mov %" SEG ":(0), %0" : "=r" (ret)); return ret; }
Remove unused global variable.
syscall_arg_fault.c:32:30: warning: unused variable 'sig_traps' [-Wunused-variable] 32 | static volatile sig_atomic_t sig_traps;
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/syscall_arg_fault.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/tools/testing/selftests/x86/syscall_arg_fault.c b/tools/testing/selftests/x86/syscall_arg_fault.c index 461fa41a4d02a..48ab065a76f9b 100644 --- a/tools/testing/selftests/x86/syscall_arg_fault.c +++ b/tools/testing/selftests/x86/syscall_arg_fault.c @@ -29,7 +29,6 @@ static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), err(1, "sigaction"); }
-static volatile sig_atomic_t sig_traps; static sigjmp_buf jmpbuf;
static volatile sig_atomic_t n_errs;
Use fisttps instead of fisttp to specify correctly that the output variable is of size short.
test_FISTTP.c:28:3: error: ambiguous instructions require an explicit suffix (could be 'fisttps', or 'fisttpl') 28 | " fisttp res16""\n" | ^ <inline asm>:3:2: note: instantiated into assembly here 3 | fisttp res16 | ^ test_FISTTP.c:48:3: error: ambiguous instructions require an explicit suffix (could be 'fisttps', or 'fisttpl') 48 | " fisttp res16""\n" | ^ <inline asm>:3:2: note: instantiated into assembly here 3 | fisttp res16 | ^ test_FISTTP.c:69:3: error: ambiguous instructions require an explicit suffix (could be 'fisttps', or 'fisttpl') 69 | " fisttp res16""\n" | ^ <inline asm>:4:2: note: instantiated into assembly here 4 | fisttp res16 | ^ test_FISTTP.c:91:3: error: ambiguous instructions require an explicit suffix (could be 'fisttps', or 'fisttpl') 91 | " fisttp res16""\n" | ^ <inline asm>:3:2: note: instantiated into assembly here 3 | fisttp res16 | ^
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/test_FISTTP.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/x86/test_FISTTP.c b/tools/testing/selftests/x86/test_FISTTP.c index 09789c0ce3e9c..b9ae9d8cebcb3 100644 --- a/tools/testing/selftests/x86/test_FISTTP.c +++ b/tools/testing/selftests/x86/test_FISTTP.c @@ -25,7 +25,7 @@ int test(void) feclearexcept(FE_DIVBYZERO|FE_INEXACT|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW); asm volatile ("\n" " fld1""\n" - " fisttp res16""\n" + " fisttps res16""\n" " fld1""\n" " fisttpl res32""\n" " fld1""\n" @@ -45,7 +45,7 @@ int test(void) feclearexcept(FE_DIVBYZERO|FE_INEXACT|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW); asm volatile ("\n" " fldpi""\n" - " fisttp res16""\n" + " fisttps res16""\n" " fldpi""\n" " fisttpl res32""\n" " fldpi""\n" @@ -66,7 +66,7 @@ int test(void) asm volatile ("\n" " fldpi""\n" " fchs""\n" - " fisttp res16""\n" + " fisttps res16""\n" " fldpi""\n" " fchs""\n" " fisttpl res32""\n" @@ -88,7 +88,7 @@ int test(void) feclearexcept(FE_DIVBYZERO|FE_INEXACT|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW); asm volatile ("\n" " fldln2""\n" - " fisttp res16""\n" + " fisttps res16""\n" " fldln2""\n" " fisttpl res32""\n" " fldln2""\n"
Remove unused code.
fsgsbase.c:112:20: warning: unused function 'wrfsbase' [-Wunused-function] 112 | static inline void wrfsbase(unsigned long fsbase) | ^~~~~~~~ fsgsbase.c:215:22: warning: unused variable 'remote_hard_zero' [-Wunused-variable] 215 | static volatile bool remote_hard_zero; | ^~~~~~~~~~~~~~~~
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/fsgsbase.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/tools/testing/selftests/x86/fsgsbase.c b/tools/testing/selftests/x86/fsgsbase.c index 8c780cce941da..50cf32de63139 100644 --- a/tools/testing/selftests/x86/fsgsbase.c +++ b/tools/testing/selftests/x86/fsgsbase.c @@ -109,11 +109,6 @@ static inline void wrgsbase(unsigned long gsbase) asm volatile("wrgsbase %0" :: "r" (gsbase) : "memory"); }
-static inline void wrfsbase(unsigned long fsbase) -{ - asm volatile("wrfsbase %0" :: "r" (fsbase) : "memory"); -} - enum which_base { FS, GS };
static unsigned long read_base(enum which_base which) @@ -212,7 +207,6 @@ static void mov_0_gs(unsigned long initial_base, bool schedule) }
static volatile unsigned long remote_base; -static volatile bool remote_hard_zero; static volatile unsigned int ftx;
/*
Remove unused code.
amx.c:42:24: warning: unused function 'xgetbv' [-Wunused-function] 42 | static inline uint64_t xgetbv(uint32_t index) | ^~~~~~ amx.c:167:24: warning: unused function 'get_xstatebv' [-Wunused-function] 167 | static inline uint64_t get_xstatebv(struct xsave_buffer *buffer) | ^~~~~~~~~~~~
Signed-off-by: Muhammad Usama Anjum usama.anjum@collabora.com --- tools/testing/selftests/x86/amx.c | 16 ---------------- 1 file changed, 16 deletions(-)
diff --git a/tools/testing/selftests/x86/amx.c b/tools/testing/selftests/x86/amx.c index 95aad6d8849be..1fdf35a4d7f63 100644 --- a/tools/testing/selftests/x86/amx.c +++ b/tools/testing/selftests/x86/amx.c @@ -39,16 +39,6 @@ struct xsave_buffer { }; };
-static inline uint64_t xgetbv(uint32_t index) -{ - uint32_t eax, edx; - - asm volatile("xgetbv;" - : "=a" (eax), "=d" (edx) - : "c" (index)); - return eax + ((uint64_t)edx << 32); -} - static inline void xsave(struct xsave_buffer *xbuf, uint64_t rfbm) { uint32_t rfbm_lo = rfbm; @@ -164,12 +154,6 @@ static inline void clear_xstate_header(struct xsave_buffer *buffer) memset(&buffer->header, 0, sizeof(buffer->header)); }
-static inline uint64_t get_xstatebv(struct xsave_buffer *buffer) -{ - /* XSTATE_BV is at the beginning of the header: */ - return *(uint64_t *)&buffer->header; -} - static inline void set_xstatebv(struct xsave_buffer *buffer, uint64_t bv) { /* XSTATE_BV is at the beginning of the header: */
On Wed, May 1, 2024 at 5:29 AM Muhammad Usama Anjum usama.anjum@collabora.com wrote:
This series fixes build errors found by clang to allow the x86 suite to get built with the clang.
Unfortunately, there is one bug [1] in the clang becuase of which extended asm isn't handled correctly by it and build fails for sysret_rip.c. Hence even after this series the build of this test would fail with clang. Should we disable this test for now when clang is used until the bug is fixed in clang? Not sure. Any opinions?
I've closed https://github.com/llvm/llvm-project/issues/53728 (constant expression folding for relocatable file output (MCObjectStreamer)).
I've sent a patch to address https://github.com/llvm/llvm-project/issues/62520 (constant expression folding for relocatable file output when inline assembly is used).
(I am subscribed to llvm@lists.linux.dev but rarely read it. I noticed this message accidentally :) )
Muhammad Usama Anjum (8): selftests: x86: Remove dependence of headers file selftests: x86: check_initial_reg_state: remove -no-pie while using -static selftests: x86: test_vsyscall: remove unused function selftests: x86: fsgsbase_restore: fix asm directive from =rm to =r selftests: x86: syscall_arg_fault_32: remove unused variable selftests: x86: test_FISTTP: use fisttps instead of ambigous fisttp selftests: x86: fsgsbase: Remove unused function and variable selftests: x86: amx: Remove unused functions
tools/testing/selftests/x86/Makefile | 9 +++++---- tools/testing/selftests/x86/amx.c | 16 ---------------- tools/testing/selftests/x86/fsgsbase.c | 6 ------ tools/testing/selftests/x86/fsgsbase_restore.c | 2 +- tools/testing/selftests/x86/syscall_arg_fault.c | 1 - tools/testing/selftests/x86/test_FISTTP.c | 8 ++++---- tools/testing/selftests/x86/test_vsyscall.c | 5 ----- 7 files changed, 10 insertions(+), 37 deletions(-)
-- 2.39.2
On Mon, May 6, 2024 at 4:26 PM Fangrui Song maskray@google.com wrote:
On Wed, May 1, 2024 at 5:29 AM Muhammad Usama Anjum usama.anjum@collabora.com wrote:
This series fixes build errors found by clang to allow the x86 suite to get built with the clang.
Unfortunately, there is one bug [1] in the clang becuase of which extended asm isn't handled correctly by it and build fails for sysret_rip.c. Hence even after this series the build of this test would fail with clang. Should we disable this test for now when clang is used until the bug is fixed in clang? Not sure. Any opinions?
I've closed https://github.com/llvm/llvm-project/issues/53728 (constant expression folding for relocatable file output (MCObjectStreamer)).
I've sent a patch to address https://github.com/llvm/llvm-project/issues/62520 (constant expression folding for relocatable file output when inline assembly is used).
(I am subscribed to llvm@lists.linux.dev but rarely read it. I noticed this message accidentally :) )
On the LLVM/Clang side, I've landed https://github.com/llvm/llvm-project/pull/91082 to make the following .if directive work for clang -c. clang -S still doesn't work (https://discourse.llvm.org/t/rfc-clang-assembly-object-equivalence-for-files...) but people can probably live with that
``` % cat b.cc asm(R"( .pushsection .text,"ax" .globl _start; _start: ret .if . -_start == 1 ret .endif .popsection )");
% clang -c b.cc # succeeded with this patch % clang -S b.cc # still failed <inline asm>:4:5: error: expected absolute expression 4 | .if . -_start == 1 | ^ 1 error generated. ```
Muhammad Usama Anjum (8): selftests: x86: Remove dependence of headers file selftests: x86: check_initial_reg_state: remove -no-pie while using -static selftests: x86: test_vsyscall: remove unused function selftests: x86: fsgsbase_restore: fix asm directive from =rm to =r selftests: x86: syscall_arg_fault_32: remove unused variable selftests: x86: test_FISTTP: use fisttps instead of ambigous fisttp selftests: x86: fsgsbase: Remove unused function and variable selftests: x86: amx: Remove unused functions
tools/testing/selftests/x86/Makefile | 9 +++++---- tools/testing/selftests/x86/amx.c | 16 ---------------- tools/testing/selftests/x86/fsgsbase.c | 6 ------ tools/testing/selftests/x86/fsgsbase_restore.c | 2 +- tools/testing/selftests/x86/syscall_arg_fault.c | 1 - tools/testing/selftests/x86/test_FISTTP.c | 8 ++++---- tools/testing/selftests/x86/test_vsyscall.c | 5 ----- 7 files changed, 10 insertions(+), 37 deletions(-)
-- 2.39.2
On 5/1/24 6:29 AM, Muhammad Usama Anjum wrote:
This series fixes build errors found by clang to allow the x86 suite to get built with the clang.
Unfortunately, there is one bug [1] in the clang becuase of which extended asm isn't handled correctly by it and build fails for sysret_rip.c. Hence even after this series the build of this test would fail with clang. Should we disable this test for now when clang is used until the bug is fixed in clang? Not sure. Any opinions?
Its seems like the bug has been fixed in clang. I'll verify it in next release and draft a patch separately to fix that error.
I think this series is good to accept then.
[1] https://github.com/llvm/llvm-project/issues/53728
Muhammad Usama Anjum (8): selftests: x86: Remove dependence of headers file selftests: x86: check_initial_reg_state: remove -no-pie while using -static selftests: x86: test_vsyscall: remove unused function selftests: x86: fsgsbase_restore: fix asm directive from =rm to =r selftests: x86: syscall_arg_fault_32: remove unused variable selftests: x86: test_FISTTP: use fisttps instead of ambigous fisttp selftests: x86: fsgsbase: Remove unused function and variable selftests: x86: amx: Remove unused functions
tools/testing/selftests/x86/Makefile | 9 +++++---- tools/testing/selftests/x86/amx.c | 16 ---------------- tools/testing/selftests/x86/fsgsbase.c | 6 ------ tools/testing/selftests/x86/fsgsbase_restore.c | 2 +- tools/testing/selftests/x86/syscall_arg_fault.c | 1 - tools/testing/selftests/x86/test_FISTTP.c | 8 ++++---- tools/testing/selftests/x86/test_vsyscall.c | 5 ----- 7 files changed, 10 insertions(+), 37 deletions(-)
linux-kselftest-mirror@lists.linaro.org
-
Fangrui Song -
Muhammad Usama Anjum