Skip to contentSkip to conversation

Remove '-mno-global-merge' from KBUILD_CFLAGS

PATCH In review Nathan Chancellor 5 participants 11 messages Mar 30, 2022 – Apr 1, 2022

Subsystems (2)
lore
Share & tools
lore

Nathan Chancellor

author maintainer
#0 lore raw

cover Remove '-mno-global-merge' from KBUILD_CFLAGS

As discussed at [1] and [2], this series removes '-mno-global-merge' from KBUILD_CFLAGS for clang, as it causes warnings for UML, and it no longer appears to be necessary, as I do not see any modpost warnings with LLVM 11 through 15 with several different ARCH=arm and ARCH=arm64 configurations.

[1] is currently in the UML tree, destined for 5.18, but it is buggy, as I note in [2]. This series is an alternative to [2], which has not been picked up yet, so it is based on the current UML tree. If [2] is picked up, I can rework the first patch to remove the '-mno-global-merge' filtering from arch/um/Makefile; otherwise, this should be picked up in place of [2].

I intentionally kept the first patch vague around what fixed the modpost warnings, as I am not too sure. [3] seems somewhat likely, but I don't think that will revert cleanly on main to test. I think the testing is enough to show that the original issue is resolved but I do note that we can add this flag back in the architecture specific Makefiles if needed.

Please review and ack as necessary.

[1]: https://lore.kernel.org/r/[email protected]/
[2]: https://lore.kernel.org/r/[email protected]/
[3]: https://github.com/llvm/llvm-project/commit/863bfdbfb446adaef767ff514d1f2ffb5d489562

Nathan Chancellor (2):
kbuild: Remove '-mno-global-merge'
Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"

 Makefile         | 4 ----
 arch/um/Makefile | 4 ----
 2 files changed, 8 deletions(-)

base-commit: 82017457957a550d7d00dde419435dd74a890887

Signature · 1 line
2.35.1
author maintainer
#1 lore raw

PATCH 1/2 kbuild: Remove '-mno-global-merge'

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)
Makefile +0 -4
index daeb5c88b50b..f2723d9bfca4 100644
@@ -784,10 +784,6 @@ ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 # The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable.
 KBUILD_CFLAGS += -Wno-gnu
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += -mno-global-merge
 else
 
 # gcc inanely warns about local variables called 'main'
Signature · 1 line
2.35.1
Tested-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] kbuild: Remove '-mno-global-merge'

Quoted 15 lines · Nathan Chancellor

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

Quoted 6 lines

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

---

This seems to work fine here under the KUnit tooling, with both x86_64 and arm64. That admittedly doesn't do anything with modules, so wouldn't reveal any of those issues, but at least the warnings about --mno-global-merge existing remain gone.

Cheers,
-- David

Reviewed-by on v1 1/2
#3 lore raw

Re: [PATCH 1/2] kbuild: Remove '-mno-global-merge'

In reply to Nathan Chancellor
Quoted 14 lines · Nathan Chancellor

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

Quoted 5 lines

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

Yeah, this looks right -- the history of this option seems to show it is no longer needed.

Signature · 1 line
Kees Cook
Tested-by Reviewed-by on v1 1/2
#4 lore raw

Re: [PATCH 1/2] kbuild: Remove '-mno-global-merge'

In reply to Nathan Chancellor
Quoted 40 lines · Nathan Chancellor

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)
Makefile +0 -5
index daeb5c88b50b..f2723d9bfca4 100644
@@ -784,10 +784,6 @@ ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 # The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable.
 KBUILD_CFLAGS += -Wno-gnu
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += -mno-global-merge
 else
 
 # gcc inanely warns about local variables called 'main'
--
Quoted 2 lines

2.35.1

I have tested this several times and was able to boot into bar metal - no problems with building and/or booting my kernel-modules.

Just as a side-note:
As with Linux v5.18-rc1 and -std=gnu11 we change the above comment ...?

# The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable. KBUILD_CFLAGS += -Wno-gnu

- Sedat -

author maintainer
#5 lore raw

Re: [PATCH 1/2] kbuild: Remove '-mno-global-merge'

Quoted 47 lines · Sedat Dilek
Quoted 40 lines · Nathan Chancellor

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)
Makefile +0 -5
index daeb5c88b50b..f2723d9bfca4 100644
@@ -784,10 +784,6 @@ ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 # The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable.
 KBUILD_CFLAGS += -Wno-gnu
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += -mno-global-merge
 else
 
 # gcc inanely warns about local variables called 'main'
--
Quoted 2 lines

2.35.1

I have tested this several times and was able to boot into bar metal - no problems with building and/or booting my kernel-modules.

Quoted 2 lines

I would be very concerned if you did see any impact, given this flag is ARM specific :) thanks as always for verifying!

Quoted 5 lines

Just as a side-note:
As with Linux v5.18-rc1 and -std=gnu11 we change the above comment ...?

# The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable. KBUILD_CFLAGS += -Wno-gnu

It was updated as part of the shift to '-std=gnu11':

https://git.kernel.org/linus/e8c07082a810fbb9db303a2b66b66b8d7e588b53

The UML tree is based on 5.17-rc6, which does not have that change. There should not be a merge conflict though.

Cheers,
Nathan

#6 lore raw

Re: [PATCH 1/2] kbuild: Remove '-mno-global-merge'

Quoted 61 lines · Nathan Chancellor
Quoted 47 lines · Sedat Dilek
Quoted 40 lines · Nathan Chancellor

This flag is specific to clang, where it is only used by the 32-bit and 64-bit ARM backends. In certain situations, the presence of this flag will cause a warning, as shown by commit 6580c5c18fb3 ("um: clang: Strip out -mno-global-merge from USER_CFLAGS").

Since commit 61163efae020 ("kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang") that added this flag back in 2014, there have been quite a few changes to the GlobalMerge pass in LLVM. Building several different ARCH=arm and ARCH=arm64 configurations with LLVM 11 (minimum) and 15 (current main version) with this flag removed (i.e., with the default of '-mglobal-merge') reveals no modpost warnings, so it is likely that the issue noted in the comment is no longer relevant due to changes in LLVM or modpost, meaning this flag can be removed.

If any new warnings show up that are a result of the removal of this flag, it can be added back under arch/arm{,64}/Makefile to avoid warnings on other architectures.

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)
Makefile +0 -5
index daeb5c88b50b..f2723d9bfca4 100644
@@ -784,10 +784,6 @@ ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 # The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable.
 KBUILD_CFLAGS += -Wno-gnu
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += -mno-global-merge
 else
 
 # gcc inanely warns about local variables called 'main'
--
Quoted 2 lines

2.35.1

I have tested this several times and was able to boot into bar metal - no problems with building and/or booting my kernel-modules.

Quoted 2 lines

I would be very concerned if you did see any impact, given this flag is ARM specific :) thanks as always for verifying!

Quoted 5 lines

Just as a side-note:
As with Linux v5.18-rc1 and -std=gnu11 we change the above comment ...?

# The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable. KBUILD_CFLAGS += -Wno-gnu

Quoted 7 lines

It was updated as part of the shift to '-std=gnu11':

https://git.kernel.org/linus/e8c07082a810fbb9db303a2b66b66b8d7e588b53

The UML tree is based on 5.17-rc6, which does not have that change. There should not be a merge conflict though.

Ah OK, a different base for UML.

- Sedat -

author maintainer
#7 lore raw

PATCH 2/2 Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"

In reply to Nathan Chancellor

This reverts commit 6580c5c18fb3df2b11c5e0452372f815deeff895.

This patch is buggy, as noted in the patch linked below. The root cause has been solved by removing '-mno-global-merge' for the entire kernel.

---
 arch/um/Makefile | 4 ----
 1 file changed, 4 deletions(-)
arch/um/Makefile +0 -4
index 320b09cd513c..f2fe63bfd819 100644
@@ -75,10 +75,6 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_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)
 
Signature · 1 line
2.35.1
Reviewed-by on v1 2/2
#8 lore raw

Re: [PATCH 2/2] Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"

Quoted 9 lines · Nathan Chancellor

This reverts commit 6580c5c18fb3df2b11c5e0452372f815deeff895.

This patch is buggy, as noted in the patch linked below. The root cause has been solved by removing '-mno-global-merge' for the entire kernel.

---

Looks good to me: getting rid of -mno-global-merge entirely is nicer, anyway.

Cheers,
-- David

Reviewed-by on v1 2/2
#9 lore raw

Re: [PATCH 2/2] Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"

In reply to Nathan Chancellor
Quoted 7 lines · Nathan Chancellor

This reverts commit 6580c5c18fb3df2b11c5e0452372f815deeff895.

This patch is buggy, as noted in the patch linked below. The root cause has been solved by removing '-mno-global-merge' for the entire kernel.

Signature · 1 line
Kees Cook
#10 lore raw
In reply to Nathan Chancellor
Quoted 14 lines · Nathan Chancellor

As discussed at [1] and [2], this series removes '-mno-global-merge' from KBUILD_CFLAGS for clang, as it causes warnings for UML, and it no longer appears to be necessary, as I do not see any modpost warnings with LLVM 11 through 15 with several different ARCH=arm and ARCH=arm64 configurations.

[1] is currently in the UML tree, destined for 5.18, but it is buggy, as I note in [2]. This series is an alternative to [2], which has not been picked up yet, so it is based on the current UML tree. If [2] is picked up, I can rework the first patch to remove the '-mno-global-merge' filtering from arch/um/Makefile; otherwise, this should be picked up in place of [2].

Quoted 7 lines

I intentionally kept the first patch vague around what fixed the modpost warnings, as I am not too sure. [3] seems somewhat likely, but I don't think that will revert cleanly on main to test. I think the testing is enough to show that the original issue is resolved but I do note that we can add this flag back in the architecture specific Makefiles if needed.

Please review and ack as necessary.

Both applied to linux-kbuild/fixes.

Quoted 17 lines

[1]: https://lore.kernel.org/r/[email protected]/
[2]: https://lore.kernel.org/r/[email protected]/
[3]: https://github.com/llvm/llvm-project/commit/863bfdbfb446adaef767ff514d1f2ffb5d489562

Nathan Chancellor (2):
kbuild: Remove '-mno-global-merge'
Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"

 Makefile         | 4 ----
 arch/um/Makefile | 4 ----
 2 files changed, 8 deletions(-)

base-commit: 82017457957a550d7d00dde419435dd74a890887 --
2.35.1

Signature · 2 lines
Best Regards
Masahiro Yamada