Skip to contentSkip to conversation

x86/boot: define CC_HAVE_ASM_GOTO

PATCH In review [email protected] 4 participants 6 messages Sep 27, 2018 – Oct 1, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/boot: define CC_HAVE_ASM_GOTO

Early prototypes of Clang with asm goto support produce 6 instances of the following warning:

In file included from arch/x86/boot/compressed/misc.h:20:
In file included from ./include/linux/elf.h:5:
In file included from ./arch/x86/include/asm/elf.h:8:
In file included from ./include/linux/thread_info.h:38:
In file included from ./arch/x86/include/asm/thread_info.h:53:
./arch/x86/include/asm/cpufeature.h:150:2: warning: "Compiler lacks ASM_GOTO support. Add -D __BPF_TRACING__ to your compiler arguments" [-W#warnings]
your compiler arguments"
^

Since 6 files under arch/x86/boot/compressed/ include arch/x86/boot/compressed/misc.h AND arch/x86/boot/compressed/Makefile happens to redefine KBUILD_CFLAGS, which set these variables in the top level MAKEFILE.

---
v1 -> v2:
Updated commit message to provide more context as per Borislav.

 arch/x86/boot/compressed/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/boot/compressed/Makefile +7 -0
index 28764dacf018..158c0b4e178a 100644
@@ -56,6 +56,13 @@ KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
 endif
 LDFLAGS_vmlinux := -T
 
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
+  CC_HAVE_ASM_GOTO := 1
+  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
+endif
+
 hostprogs-y	:= mkpiggy
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
Signature · 1 line
2.19.0.605.g01d371f741-goog
Reviewed-by on v2 1/1
#1 lore raw
Quoted 47 lines · On Thu, Sep 27, 2018 at 1:47 PM, <[email protected]> wrote:

Early prototypes of Clang with asm goto support produce 6 instances of the following warning:

In file included from arch/x86/boot/compressed/misc.h:20:
In file included from ./include/linux/elf.h:5:
In file included from ./arch/x86/include/asm/elf.h:8:
In file included from ./include/linux/thread_info.h:38:
In file included from ./arch/x86/include/asm/thread_info.h:53:
./arch/x86/include/asm/cpufeature.h:150:2: warning: "Compiler lacks ASM_GOTO support. Add -D __BPF_TRACING__ to your compiler arguments" [-W#warnings]
your compiler arguments"
^

Since 6 files under arch/x86/boot/compressed/ include arch/x86/boot/compressed/misc.h AND arch/x86/boot/compressed/Makefile happens to redefine KBUILD_CFLAGS, which set these variables in the top level MAKEFILE.

---
v1 -> v2:
Updated commit message to provide more context as per Borislav.

 arch/x86/boot/compressed/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/boot/compressed/Makefile +7 -1
index 28764dacf018..158c0b4e178a 100644
@@ -56,6 +56,13 @@ KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
 endif
 LDFLAGS_vmlinux := -T
 
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
+  CC_HAVE_ASM_GOTO := 1
+  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
+endif
+
 hostprogs-y    := mkpiggy
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
--
Quoted 2 lines

2.19.0.605.g01d371f741-goog

-Kees

Signature · 2 lines
Kees Cook
Pixel Security
maintainer
#2 lore raw
In reply to [email protected]
Quoted 33 lines · On Thu, Sep 27, 2018 at 01:47:58PM -0700, [email protected] wrote:

Early prototypes of Clang with asm goto support produce 6 instances of the following warning:

In file included from arch/x86/boot/compressed/misc.h:20:
In file included from ./include/linux/elf.h:5:
In file included from ./arch/x86/include/asm/elf.h:8:
In file included from ./include/linux/thread_info.h:38:
In file included from ./arch/x86/include/asm/thread_info.h:53:
./arch/x86/include/asm/cpufeature.h:150:2: warning: "Compiler lacks ASM_GOTO support. Add -D __BPF_TRACING__ to your compiler arguments" [-W#warnings]
your compiler arguments"
^

Since 6 files under arch/x86/boot/compressed/ include arch/x86/boot/compressed/misc.h AND arch/x86/boot/compressed/Makefile happens to redefine KBUILD_CFLAGS, which set these variables in the top level MAKEFILE.

---
v1 -> v2:
Updated commit message to provide more context as per Borislav.

 arch/x86/boot/compressed/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/boot/compressed/Makefile +0 -0
index 28764dacf018..158c0b4e178a 100644

arch/x86/boot/compressed/Makefile KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \ · line 64

Quoted 9 lines
arch/x86/boot/compressed/Makefile +6 -0
@@ -56,6 +56,13 @@ KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
 endif
 LDFLAGS_vmlinux := -T
 
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
+  CC_HAVE_ASM_GOTO := 1
+  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
+endif

I would still like to know why can't we do the -D_SETUP thing here:
https://lkml.kernel.org/r/[email protected]

instead of polluting this Makefile with defines which are not really needed in the compressed kernel build, except to silence build warnings.

I mean, we can perpetuate that ugly hack and do:

#define __BPF_TRACING__

here in arch/x86/boot/compressed/misc.h which we could kill once clang can do asm goto...

Hmm.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#3 lore raw
Quoted 38 lines · Borislav Petkov
Quoted 36 lines · On Thu, Sep 27, 2018 at 01:47:58PM -0700, [email protected] wrote:

Early prototypes of Clang with asm goto support produce 6 instances of the following warning:

In file included from arch/x86/boot/compressed/misc.h:20:
In file included from ./include/linux/elf.h:5:
In file included from ./arch/x86/include/asm/elf.h:8:
In file included from ./include/linux/thread_info.h:38:
In file included from ./arch/x86/include/asm/thread_info.h:53:
./arch/x86/include/asm/cpufeature.h:150:2: warning: "Compiler lacks ASM_GOTO support. Add -D __BPF_TRACING__ to your compiler arguments" [-W#warnings]
your compiler arguments"
^

Since 6 files under arch/x86/boot/compressed/ include arch/x86/boot/compressed/misc.h AND arch/x86/boot/compressed/Makefile happens to redefine KBUILD_CFLAGS, which set these variables in the top level MAKEFILE.

---
v1 -> v2:
Updated commit message to provide more context as per Borislav.

 arch/x86/boot/compressed/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/boot/compressed/Makefile +0 -0
index 28764dacf018..158c0b4e178a 100644
@@ -56,6 +56,13 @@ KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
 endif
 LDFLAGS_vmlinux := -T
 
Quoted 9 lines

arch/x86/boot/compressed/Makefile KBUILD_LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \ · line 64

Quoted 6 lines
arch/x86/boot/compressed/Makefile +6 -0
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
+  CC_HAVE_ASM_GOTO := 1
+  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
+endif

I would still like to know why can't we do the -D_SETUP thing here:
https://lkml.kernel.org/r/[email protected]

That's another case that I look at and wonder "why does this exist?" The _SETUP guard exists in only one place:

$ grep -rP 'ifdef\s+_SETUP'
arch/x86/boot/cpucheck.c:#ifdef _SETUP

which is already under arch/x86/boot/. arch/x86/boot/Makefile unconditionally sets -D_SETUP, so what/who are we guarding against? Looks like a guard that's ALWAYS true (and thus could be removed).

Quoted 10 lines

instead of polluting this Makefile with defines which are not really needed in the compressed kernel build, except to silence build warnings.

I mean, we can perpetuate that ugly hack and do:

#define __BPF_TRACING__

here in arch/x86/boot/compressed/misc.h which we could kill once clang can do asm goto...

Or, or... we don't redefine KBUILD_CFLAGS in arch/x86/boot/Makefile (or any Makefile other than the top level one), and simply filter out the flags we DONT want, a la:

drivers/firmware/efi/libstub/Makefile:
16 cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) ...

ie, using Make's subst function to copy KBUILD_CFLAGS, filter out results, then use that for cflags-y.
https://www.gnu.org/software/make/manual/html_node/Text-Functions.html

I'm curious to know Masahiro's thoughts on this? I can't help but shake the feeling that reassigning KBUILD_CFLAGS should be considered an anti-pattern and warned from checkpatch.pl. For the reasons enumerated above AND in v1:
https://lore.kernel.org/lkml/CAKwvOdmLSVH7EVGY1ExU1Fh_hvL=FUzhq-80snDfZ+QhCT2FOA@mail.gmail.com/
(though there may be additional context from hpa answering
https://lore.kernel.org/lkml/[email protected]/).

Relying on the compiler's default/implicit C standard (which changed in gcc 5) for parts of the kernel but not others I feel like should be a big red flag.

Shall I prototype up what such a change might look like (not reassigning KBUILD_CFLAGS in arch/x86/boot/Makefile)? Maybe it's harder/uglier than I imagine?

Signature · 2 lines
Thanks,
~Nick Desaulniers
maintainer
#4 lore raw
Quoted 8 lines · Nick Desaulniers

That's another case that I look at and wonder "why does this exist?" The _SETUP guard exists in only one place:

$ grep -rP 'ifdef\s+_SETUP'
arch/x86/boot/cpucheck.c:#ifdef _SETUP

which is already under arch/x86/boot/. arch/x86/boot/Makefile unconditionally sets -D_SETUP, so what/who are we guarding against? Looks like a guard that's ALWAYS true (and thus could be removed).

Looks like cpucheck.c was used somewhere else before and that guard was for when it is being built in arch/x86/boot/...

Also, hpa says the override is because some 64-bit flags fail the 32-bit compile:

https://lkml.kernel.org/r/[email protected]

Quoted 10 lines

Or, or... we don't redefine KBUILD_CFLAGS in arch/x86/boot/Makefile (or any Makefile other than the top level one), and simply filter out the flags we DONT want, a la:

drivers/firmware/efi/libstub/Makefile:
16 cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) ...

ie, using Make's subst function to copy KBUILD_CFLAGS, filter out results, then use that for cflags-y.
https://www.gnu.org/software/make/manual/html_node/Text-Functions.html

Hmm, definitely sounds like an interesting idea to try...

Quoted 11 lines

I'm curious to know Masahiro's thoughts on this? I can't help but shake the feeling that reassigning KBUILD_CFLAGS should be considered an anti-pattern and warned from checkpatch.pl. For the reasons enumerated above AND in v1:
https://lore.kernel.org/lkml/CAKwvOdmLSVH7EVGY1ExU1Fh_hvL=FUzhq-80snDfZ+QhCT2FOA@mail.gmail.com/
(though there may be additional context from hpa answering
https://lore.kernel.org/lkml/[email protected]/).

Relying on the compiler's default/implicit C standard (which changed in gcc 5) for parts of the kernel but not others I feel like should be a big red flag.

I sure see your point. But then there's also the opposing argument where having stuff leak from kernel proper into .../boot/ is simply breaking the build.

But then we have headers including stuff from kernel proper so I guess *that* last fact kinda wants us to not redefine KBUILD_CFLAGS ...

Oh boy.

Quoted 3 lines

Shall I prototype up what such a change might look like (not reassigning KBUILD_CFLAGS in arch/x86/boot/Makefile)? Maybe it's harder/uglier than I imagine?

Sounds to me like a good thing to try. If anything, we'll know more whether it makes sense at all.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#5 lore raw
In reply to [email protected]
Quoted 14 lines · On 09/27/18 13:47, [email protected] wrote:

Early prototypes of Clang with asm goto support produce 6 instances of the following warning:

In file included from arch/x86/boot/compressed/misc.h:20:
In file included from ./include/linux/elf.h:5:
In file included from ./arch/x86/include/asm/elf.h:8:
In file included from ./include/linux/thread_info.h:38:
In file included from ./arch/x86/include/asm/thread_info.h:53:
./arch/x86/include/asm/cpufeature.h:150:2: warning: "Compiler lacks ASM_GOTO support. Add -D __BPF_TRACING__ to your compiler arguments" [-W#warnings]
your compiler arguments"
^

Quoted 5 lines

Since 6 files under arch/x86/boot/compressed/ include arch/x86/boot/compressed/misc.h AND arch/x86/boot/compressed/Makefile happens to redefine KBUILD_CFLAGS, which set these variables in the top level MAKEFILE.

The Right Thing[TM] would probably be to split the CFLAGS into those that are independent of x86_64 vs i386. After all, there is no fundamental reason we couldn't want to use asm goto in the setup or real-mode code in the future. In addition to BIOS entry code there is the EFI32 code.

-hpa