um: Fix filtering '-mno-global-merge'
PATCH 1/1 um: Fix filtering '-mno-global-merge'
When booting a clang compiled UML kernel, the kernel panics when trying to run init:
wait_stub_done : failed to wait for SIGTRAP, pid = 651294, n = 651294, errno = 0, status = 0xb7f
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
After the commit in Fixes, many flags from KBUILD_CFLAGS do not appear in USER_CFLAGS, likely due to USER_CFLAGS initially being a recursive variable ("VAR =") then being switched to a simple ("VAR :=") variable. For example, diffing arch/x86/um/.ptrace_user.o.cmd shows flags such as '-Os' and '-fno-delete-null-pointer-checks' getting dropped, which both impact code generation.
Rework the filtering to use filter-out instead of patsubst, which allows all the patterns that USER_CFLAGS cares about to be excluded in one command and ensures all flags from KBUILD_CFLAGS are transferred over to USER_CFLAGS properly, which resolves the boot issue noted above.
--- arch/um/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/um/Makefile +1 -5
@@ -70,15 +70,11 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ KBUILD_AFLAGS += $(ARCH_INCLUDE) -USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ +USER_CFLAGS = $(filter-out $(KERNEL_DEFINES) -I% -mno-global-merge,$(KBUILD_CFLAGS)) \ $(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \ -D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \ -idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__ -ifdef CONFIG_CC_IS_CLANG -USER_CFLAGS := $(patsubst -mno-global-merge,,$(USER_CFLAGS)) -endif - #This will adjust *FLAGS accordingly to the platform. include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
base-commit: 82017457957a550d7d00dde419435dd74a890887
Signature · 1 line
2.35.1
Quoted 14 lines · Nathan Chancellor
When booting a clang compiled UML kernel, the kernel panics when trying to run init:
wait_stub_done: failed to wait for SIGTRAP, pid = 651294, n = 651294, errno = 0, status =0xb7fKernel panic - not syncing: Attempted to kill init! exitcode=0x0000000bAfter the commit in Fixes, many flags from
KBUILD_CFLAGSdo not appear inUSER_CFLAGS, likely due toUSER_CFLAGSinitially being a recursive variable ("VAR =") then being switched to a simple ("VAR :=") variable. For example, diffingarch/x86/um/.ptrace_user.o.cmdshows flags such as '-Os' and '-fno-delete-null-pointer-checks' getting dropped, which both impact code generation.
Quoted 8 lines
Rework the filtering to use filter-out instead of patsubst, which allows all the patterns that
USER_CFLAGScares about to be excluded in one command and ensures all flags fromKBUILD_CFLAGSare transferred over toUSER_CFLAGSproperly, which resolves the boot issue noted above.Fixes 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS")Signed-off-by Nathan Chancellor <[email protected]>---
Thanks. I was able to reproduce the panic here, and this indeed fixes it.
Cheers,
-- David
Quoted 29 lines
arch/um/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)arch/um/Makefile +1
-5@@ -70,15 +70,11 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ KBUILD_AFLAGS += $(ARCH_INCLUDE) -USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ +USER_CFLAGS = $(filter-out $(KERNEL_DEFINES) -I% -mno-global-merge,$(KBUILD_CFLAGS)) \ $(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \ -D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \ -idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__ -ifdef CONFIG_CC_IS_CLANG -USER_CFLAGS := $(patsubst -mno-global-merge,,$(USER_CFLAGS)) -endif - #This will adjust *FLAGS accordingly to the platform. include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)base-commit:
82017457957a550d7d00dde419435dd74a890887--
2.35.1
Quoted 14 lines · Nathan Chancellor
When booting a clang compiled UML kernel, the kernel panics when trying to run init:
wait_stub_done: failed to wait for SIGTRAP, pid = 651294, n = 651294, errno = 0, status =0xb7fKernel panic - not syncing: Attempted to kill init! exitcode=0x0000000bAfter the commit in Fixes, many flags from
KBUILD_CFLAGSdo not appear inUSER_CFLAGS, likely due toUSER_CFLAGSinitially being a recursive variable ("VAR =") then being switched to a simple ("VAR :=") variable. For example, diffingarch/x86/um/.ptrace_user.o.cmdshows flags such as '-Os' and '-fno-delete-null-pointer-checks' getting dropped, which both impact code generation.
Quoted 7 lines
Rework the filtering to use filter-out instead of patsubst, which allows all the patterns that
USER_CFLAGScares about to be excluded in one command and ensures all flags fromKBUILD_CFLAGSare transferred over toUSER_CFLAGSproperly, which resolves the boot issue noted above.Fixes 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS")Signed-off-by Nathan Chancellor <[email protected]>
Can we remove -mno-global-merge entirely?
61163efae02040f66a95 was a very old commit,
without enough explanation.
Shall we remove -mno-global-merge, and do compile-tests. If we are hit by problems for arm/arm64, we can re-add it.
Quoted 30 lines
--- arch/um/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)arch/um/Makefile +1
-5@@ -70,15 +70,11 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ KBUILD_AFLAGS += $(ARCH_INCLUDE) -USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ +USER_CFLAGS = $(filter-out $(KERNEL_DEFINES) -I% -mno-global-merge,$(KBUILD_CFLAGS)) \ $(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \ -D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \ -idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__ -ifdef CONFIG_CC_IS_CLANG -USER_CFLAGS := $(patsubst -mno-global-merge,,$(USER_CFLAGS)) -endif - #This will adjust *FLAGS accordingly to the platform. include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)base-commit:
82017457957a550d7d00dde419435dd74a890887--
2.35.1
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 25 lines · Masahiro Yamada
Quoted 14 lines · Nathan Chancellor
When booting a clang compiled UML kernel, the kernel panics when trying to run init:
wait_stub_done: failed to wait for SIGTRAP, pid = 651294, n = 651294, errno = 0, status =0xb7fKernel panic - not syncing: Attempted to kill init! exitcode=0x0000000bAfter the commit in Fixes, many flags from
KBUILD_CFLAGSdo not appear inUSER_CFLAGS, likely due toUSER_CFLAGSinitially being a recursive variable ("VAR =") then being switched to a simple ("VAR :=") variable. For example, diffingarch/x86/um/.ptrace_user.o.cmdshows flags such as '-Os' and '-fno-delete-null-pointer-checks' getting dropped, which both impact code generation.Quoted 7 lines
Rework the filtering to use filter-out instead of patsubst, which allows all the patterns that
USER_CFLAGScares about to be excluded in one command and ensures all flags fromKBUILD_CFLAGSare transferred over toUSER_CFLAGSproperly, which resolves the boot issue noted above.Fixes 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS")Signed-off-by Nathan Chancellor <[email protected]>
Quoted 8 lines
Can we remove -mno-global-merge entirely?
61163efae02040f66a95was a very old commit,
without enough explanation.Shall we remove -mno-global-merge, and do compile-tests. If we are hit by problems for arm/arm64, we can re-add it.
Yes, I think that was the conversation that we had on the commit that this fixes:
https://lore.kernel.org/r/[email protected]/
I can test that on my Raspberry Pi 3 and 4 on Monday, although I would like for this patch to be picked up in the meantime so that it is possible to test UML on -next with clang. We can remove -mno-global-merge in a follow up change, if you do not have any objections?
Cheers,
Nathano
Quoted 41 lines · Nathan Chancellor
Quoted 25 lines · Masahiro Yamada
Quoted 14 lines · Nathan Chancellor
When booting a clang compiled UML kernel, the kernel panics when trying to run init:
wait_stub_done: failed to wait for SIGTRAP, pid = 651294, n = 651294, errno = 0, status =0xb7fKernel panic - not syncing: Attempted to kill init! exitcode=0x0000000bAfter the commit in Fixes, many flags from
KBUILD_CFLAGSdo not appear inUSER_CFLAGS, likely due toUSER_CFLAGSinitially being a recursive variable ("VAR =") then being switched to a simple ("VAR :=") variable. For example, diffingarch/x86/um/.ptrace_user.o.cmdshows flags such as '-Os' and '-fno-delete-null-pointer-checks' getting dropped, which both impact code generation.Quoted 7 lines
Rework the filtering to use filter-out instead of patsubst, which allows all the patterns that
USER_CFLAGScares about to be excluded in one command and ensures all flags fromKBUILD_CFLAGSare transferred over toUSER_CFLAGSproperly, which resolves the boot issue noted above.Fixes 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS")Signed-off-by Nathan Chancellor <[email protected]>Quoted 8 lines
Can we remove -mno-global-merge entirely?
61163efae02040f66a95was a very old commit,
without enough explanation.Shall we remove -mno-global-merge, and do compile-tests. If we are hit by problems for arm/arm64, we can re-add it.
Yes, I think that was the conversation that we had on the commit that this fixes:
Quoted 8 lines
I can test that on my Raspberry Pi 3 and 4 on Monday, although I would like for this patch to be picked up in the meantime so that it is possible to test UML on -next with clang. We can remove -mno-global-merge in a follow up change, if you do not have any objections?
Cheers,
Nathano
This patch is unneeded now
because I picked up the alternative:
https://lore.kernel.org/all/CAK7LNAS6C6Uj9cCQ0o=bYF1F-EVD=VgdR8YYx-1PJc9toX_HZA@mail.gmail.com/
Signature · 2 lines
Best Regards Masahiro Yamada