Skip to contentSkip to conversation

efi/libstub: refactor Makefile to not use lib-y syntax

PATCH In review Masahiro Yamada 2 participants 10 messages Jun 3, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi/libstub: refactor Makefile to not use lib-y syntax

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

---

 arch/arm64/Makefile                   |  1 -
 drivers/firmware/efi/Makefile         |  2 +-
 drivers/firmware/efi/libstub/Makefile | 51 +++++++++++++++------------
 3 files changed, 30 insertions(+), 24 deletions(-)
arch/arm64/Makefile +0 -1
index 650e1185c190..ab79b20efc8d 100644
@@ -145,7 +145,6 @@ export	TEXT_OFFSET
 
 core-y		+= arch/arm64/
 libs-y		:= arch/arm64/lib/ $(libs-y)
-core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot		:= arch/arm64/boot
drivers/firmware/efi/Makefile +1 -1
index 7a216984552b..317a05cd388b 100644
@@ -20,7 +20,7 @@ obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o
 obj-$(CONFIG_UEFI_CPER)			+= cper.o
 obj-$(CONFIG_EFI_RUNTIME_MAP)		+= runtime-map.o
 obj-$(CONFIG_EFI_RUNTIME_WRAPPERS)	+= runtime-wrappers.o
-subdir-$(CONFIG_EFI_STUB)		+= libstub
+obj-$(CONFIG_EFI_STUB)			+= libstub/
 obj-$(CONFIG_EFI_FAKE_MEMMAP)		+= fake_map.o
 obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)	+= efibc.o
 obj-$(CONFIG_EFI_TEST)			+= test/
drivers/firmware/efi/libstub/Makefile +29 -22

77 lines not on this page · raw message

Signature · 7 lines
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#1 lore raw
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Quoted 6 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 126 lines

---

 arch/arm64/Makefile                   |  1 -
 drivers/firmware/efi/Makefile         |  2 +-
 drivers/firmware/efi/libstub/Makefile | 51 +++++++++++++++------------
 3 files changed, 30 insertions(+), 24 deletions(-)
arch/arm64/Makefile +0 -1
index 650e1185c190..ab79b20efc8d 100644
@@ -145,7 +145,6 @@ export      TEXT_OFFSET
 
 core-y         += arch/arm64/
 libs-y         := arch/arm64/lib/ $(libs-y)
-core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot           := arch/arm64/boot
drivers/firmware/efi/Makefile +1 -1
index 7a216984552b..317a05cd388b 100644
@@ -20,7 +20,7 @@ obj-$(CONFIG_EFI_VARS_PSTORE)         += efi-pstore.o
 obj-$(CONFIG_UEFI_CPER)                        += cper.o
 obj-$(CONFIG_EFI_RUNTIME_MAP)          += runtime-map.o
 obj-$(CONFIG_EFI_RUNTIME_WRAPPERS)     += runtime-wrappers.o
-subdir-$(CONFIG_EFI_STUB)              += libstub
+obj-$(CONFIG_EFI_STUB)                 += libstub/
 obj-$(CONFIG_EFI_FAKE_MEMMAP)          += fake_map.o
 obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)   += efibc.o
 obj-$(CONFIG_EFI_TEST)                 += test/
drivers/firmware/efi/libstub/Makefile +29 -23
index cce4a7436052..e4e9b17fa3b2 100644
@@ -44,7 +44,7 @@ OBJECT_FILES_NON_STANDARD     := y
 # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
 KCOV_INSTRUMENT                        := n
 
-lib-y                          := efi-stub-helper.o gop.o secureboot.o tpm.o \
+stub-obj-y                     := efi-stub-helper.o gop.o secureboot.o tpm.o \
                                   file.o mem.o random.o randomalloc.o pci.o \
                                   skip_spaces.o lib-cmdline.o lib-ctype.o \
                                   alignedmem.o relocate.o vsprintf.o
@@ -55,15 +55,19 @@ efi-deps-y := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c
 $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE
        $(call if_changed_rule,cc_o_c)
 
-lib-$(CONFIG_EFI_GENERIC_STUB) += efi-stub.o fdt.o string.o \
+stub-obj-$(CONFIG_EFI_GENERIC_STUB)    += efi-stub.o fdt.o string.o \
                                   $(patsubst %.c,lib-%.o,$(efi-deps-y))
 
-lib-$(CONFIG_ARM)              += arm32-stub.o
-lib-$(CONFIG_ARM64)            += arm64-stub.o
-lib-$(CONFIG_X86)              += x86-stub.o
+stub-obj-$(CONFIG_ARM)         += arm32-stub.o
+stub-obj-$(CONFIG_ARM64)       += arm64-stub.o
+stub-obj-$(CONFIG_X86)         += x86-stub.o
 CFLAGS_arm32-stub.o            := -DTEXT_OFFSET=$(TEXT_OFFSET)
 CFLAGS_arm64-stub.o            := -DTEXT_OFFSET=$(TEXT_OFFSET)
 
+targets                                += $(stub-obj-y)
+stub-obj-y                     := $(patsubst %.o,%.stub.o, $(stub-obj-y))
+targets                                += $(stub-obj-y)
+
 #
 # For x86, bootloaders like systemd-boot or grub-efi do not zero-initialize the
 # .bss section, so the .bss section of the EFI stub needs to be included in the
@@ -83,23 +87,6 @@ STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub \
                                   --rename-section .bss=.bss.efistub,load,alloc
 STUBCOPY_RELOC-$(CONFIG_ARM)   := R_ARM_ABS
 
-#
-# arm64 puts the stub in the kernel proper, which will unnecessarily retain all
-# code indefinitely unless it is annotated as __init/__initdata/__initconst etc.
-# So let's apply the __init annotations at the section level, by prefixing
-# the section names directly. This will ensure that even all the inline string
-# literals are covered.
-# The fact that the stub and the kernel proper are essentially the same binary
-# also means that we need to be extra careful to make sure that the stub does
-# not rely on any absolute symbol references, considering that the virtual
-# kernel mapping that the linker uses is not active yet when the stub is
-# executing. So build all C dependencies of the EFI stub into libstub, and do
-# a verification pass to see if any absolute relocations exist in any of the
-# object files.
-#
-extra-y                                := $(lib-y)
-lib-y                          := $(patsubst %.o,%.stub.o,$(lib-y))
-
 STUBCOPY_FLAGS-$(CONFIG_ARM64) += --prefix-alloc-sections=.init \
                                   --prefix-symbols=__efistub_
 STUBCOPY_RELOC-$(CONFIG_ARM64) := R_AARCH64_ABS
@@ -121,3 +108,23 @@ quiet_cmd_stubcopy = STUBCPY $@
                /bin/false;                                             \
        fi;                                                             \
        $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@
+
+# arm64 puts the stub in the kernel proper, which will unnecessarily retain all
+# code indefinitely unless it is annotated as __init/__initdata/__initconst etc.
+# So let's apply the __init annotations at the section level, by prefixing
+# the section names directly. This will ensure that even all the inline string
+# literals are covered.
+# The fact that the stub and the kernel proper are essentially the same binary
+# also means that we need to be extra careful to make sure that the stub does
+# not rely on any absolute symbol references, considering that the virtual
+# kernel mapping that the linker uses is not active yet when the stub is
+# executing. So build all C dependencies of the EFI stub into libstub, and do
+# a verification pass to see if any absolute relocations exist in any of the
+# object files.
+#
+obj-$(CONFIG_ARM64)            += $(stub-obj-y)
+extra-$(CONFIG_ARM)            += lib.a
+extra-$(CONFIG_X86)            += lib.a
+
+$(obj)/lib.a: $(addprefix $(obj)/, $(stub-obj-y)) FORCE
+       $(call if_changed,ar)
--

2.25.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Thanks.

Quoted 129 lines
Quoted 129 lines

---

 arch/arm64/Makefile                   |  1 -
 drivers/firmware/efi/Makefile         |  2 +-
 drivers/firmware/efi/libstub/Makefile | 51 +++++++++++++++------------
 3 files changed, 30 insertions(+), 24 deletions(-)
arch/arm64/Makefile +0 -1
index 650e1185c190..ab79b20efc8d 100644
@@ -145,7 +145,6 @@ export      TEXT_OFFSET
 
 core-y         += arch/arm64/
 libs-y         := arch/arm64/lib/ $(libs-y)
-core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot           := arch/arm64/boot
drivers/firmware/efi/Makefile +1 -1
index 7a216984552b..317a05cd388b 100644
@@ -20,7 +20,7 @@ obj-$(CONFIG_EFI_VARS_PSTORE)         += efi-pstore.o
 obj-$(CONFIG_UEFI_CPER)                        += cper.o
 obj-$(CONFIG_EFI_RUNTIME_MAP)          += runtime-map.o
 obj-$(CONFIG_EFI_RUNTIME_WRAPPERS)     += runtime-wrappers.o
-subdir-$(CONFIG_EFI_STUB)              += libstub
+obj-$(CONFIG_EFI_STUB)                 += libstub/
 obj-$(CONFIG_EFI_FAKE_MEMMAP)          += fake_map.o
 obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)   += efibc.o
 obj-$(CONFIG_EFI_TEST)                 += test/
drivers/firmware/efi/libstub/Makefile +29 -23
index cce4a7436052..e4e9b17fa3b2 100644
@@ -44,7 +44,7 @@ OBJECT_FILES_NON_STANDARD     := y
 # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
 KCOV_INSTRUMENT                        := n
 
-lib-y                          := efi-stub-helper.o gop.o secureboot.o tpm.o \
+stub-obj-y                     := efi-stub-helper.o gop.o secureboot.o tpm.o \
                                   file.o mem.o random.o randomalloc.o pci.o \
                                   skip_spaces.o lib-cmdline.o lib-ctype.o \
                                   alignedmem.o relocate.o vsprintf.o
@@ -55,15 +55,19 @@ efi-deps-y := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c
 $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE
        $(call if_changed_rule,cc_o_c)
 
-lib-$(CONFIG_EFI_GENERIC_STUB) += efi-stub.o fdt.o string.o \
+stub-obj-$(CONFIG_EFI_GENERIC_STUB)    += efi-stub.o fdt.o string.o \
                                   $(patsubst %.c,lib-%.o,$(efi-deps-y))
 
-lib-$(CONFIG_ARM)              += arm32-stub.o
-lib-$(CONFIG_ARM64)            += arm64-stub.o
-lib-$(CONFIG_X86)              += x86-stub.o
+stub-obj-$(CONFIG_ARM)         += arm32-stub.o
+stub-obj-$(CONFIG_ARM64)       += arm64-stub.o
+stub-obj-$(CONFIG_X86)         += x86-stub.o
 CFLAGS_arm32-stub.o            := -DTEXT_OFFSET=$(TEXT_OFFSET)
 CFLAGS_arm64-stub.o            := -DTEXT_OFFSET=$(TEXT_OFFSET)
 
+targets                                += $(stub-obj-y)
+stub-obj-y                     := $(patsubst %.o,%.stub.o, $(stub-obj-y))
+targets                                += $(stub-obj-y)
+
 #
 # For x86, bootloaders like systemd-boot or grub-efi do not zero-initialize the
 # .bss section, so the .bss section of the EFI stub needs to be included in the
@@ -83,23 +87,6 @@ STUBCOPY_FLAGS-$(CONFIG_ARM) += --rename-section .data=.data.efistub \
                                   --rename-section .bss=.bss.efistub,load,alloc
 STUBCOPY_RELOC-$(CONFIG_ARM)   := R_ARM_ABS
 
-#
-# arm64 puts the stub in the kernel proper, which will unnecessarily retain all
-# code indefinitely unless it is annotated as __init/__initdata/__initconst etc.
-# So let's apply the __init annotations at the section level, by prefixing
-# the section names directly. This will ensure that even all the inline string
-# literals are covered.
-# The fact that the stub and the kernel proper are essentially the same binary
-# also means that we need to be extra careful to make sure that the stub does
-# not rely on any absolute symbol references, considering that the virtual
-# kernel mapping that the linker uses is not active yet when the stub is
-# executing. So build all C dependencies of the EFI stub into libstub, and do
-# a verification pass to see if any absolute relocations exist in any of the
-# object files.
-#
-extra-y                                := $(lib-y)
-lib-y                          := $(patsubst %.o,%.stub.o,$(lib-y))
-
 STUBCOPY_FLAGS-$(CONFIG_ARM64) += --prefix-alloc-sections=.init \
                                   --prefix-symbols=__efistub_
 STUBCOPY_RELOC-$(CONFIG_ARM64) := R_AARCH64_ABS
@@ -121,3 +108,23 @@ quiet_cmd_stubcopy = STUBCPY $@
                /bin/false;                                             \
        fi;                                                             \
        $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@
+
+# arm64 puts the stub in the kernel proper, which will unnecessarily retain all
+# code indefinitely unless it is annotated as __init/__initdata/__initconst etc.
+# So let's apply the __init annotations at the section level, by prefixing
+# the section names directly. This will ensure that even all the inline string
+# literals are covered.
+# The fact that the stub and the kernel proper are essentially the same binary
+# also means that we need to be extra careful to make sure that the stub does
+# not rely on any absolute symbol references, considering that the virtual
+# kernel mapping that the linker uses is not active yet when the stub is
+# executing. So build all C dependencies of the EFI stub into libstub, and do
+# a verification pass to see if any absolute relocations exist in any of the
+# object files.
+#
+obj-$(CONFIG_ARM64)            += $(stub-obj-y)
+extra-$(CONFIG_ARM)            += lib.a
+extra-$(CONFIG_X86)            += lib.a
+
+$(obj)/lib.a: $(addprefix $(obj)/, $(stub-obj-y)) FORCE
+       $(call if_changed,ar)
--

2.25.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#3 lore raw
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

#4 lore raw
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel
Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#5 lore raw
Quoted 90 lines · Masahiro Yamada
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

Quoted 9 lines

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel

That is strange. I tested this before, and it worked.

Did anything change recently in the way the linker is invoked?

#6 lore raw
Quoted 102 lines · Ard Biesheuvel
Quoted 90 lines · Masahiro Yamada
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

Quoted 9 lines

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel
Quoted 3 lines

That is strange. I tested this before, and it worked.

Did anything change recently in the way the linker is invoked?

Nothing recently.

This is obvious result because
drivers/firmware/efi/libstub/lib.a
is passed after ----whole-archive flag.

I guess the following commit is it,
but it is already 3 years ago.

commit 799c43415442414b1032580c47684cb709dfed6d (HEAD)

Author: Nicholas Piggin <[email protected]>
Date:   Fri Jun 9 15:24:17 2017 +1000

kbuild: thin archives make default for all archs

Make thin archives build the default, but keep the config option to allow exemptions if any breakage can't be quickly solved.

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#7 lore raw
Quoted 111 lines · Masahiro Yamada
Quoted 102 lines · Ard Biesheuvel
Quoted 90 lines · Masahiro Yamada
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

Quoted 9 lines

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel
Quoted 3 lines

That is strange. I tested this before, and it worked.

Did anything change recently in the way the linker is invoked?

Nothing recently.

Quoted 8 lines

This is obvious result because
drivers/firmware/efi/libstub/lib.a
is passed after ----whole-archive flag.

I guess the following commit is it,
but it is already 3 years ago.

Right.

So that means there is no point at all in using static libraries, no? Or does --whole-archive still allow duplicate definitions like static libraries do usually?

#8 lore raw
Quoted 122 lines · Ard Biesheuvel
Quoted 111 lines · Masahiro Yamada
Quoted 102 lines · Ard Biesheuvel
Quoted 90 lines · Masahiro Yamada
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

Quoted 9 lines

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel
Quoted 3 lines

That is strange. I tested this before, and it worked.

Did anything change recently in the way the linker is invoked?

Nothing recently.

Quoted 8 lines

This is obvious result because
drivers/firmware/efi/libstub/lib.a
is passed after ----whole-archive flag.

I guess the following commit is it,
but it is already 3 years ago.

Quoted 5 lines

Right.

So that means there is no point at all in using static libraries, no? Or does --whole-archive still allow duplicate definitions like static libraries do usually?

--whole-archive literally links the whole of the archive. If there are duplicate definitions, the linking fails due to multiple definition.
So, --whole-archive is similar to linking .o files in this regard.

There is a point for arm and x86 because the decompressor link does not use --whole-archive.

As for arm64, there is no point,
but you can pass lib.a after --no-whole-archive
by the following patch.

arch/arm64/Makefile +1 -1
index 650e1185c190..48a6afa774fc 100644
@@ -145,7 +145,7 @@ export      TEXT_OFFSET
 
 core-y         += arch/arm64/
 libs-y         := arch/arm64/lib/ $(libs-y)
-core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
+libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot           := arch/arm64/boot

Then, _efistub_efi_low_alloc_above
and __efistub_efi_relocate_kernel will be dropped.

If you like the static library
do you want me to send v2?

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#9 lore raw
Quoted 161 lines · Masahiro Yamada
Quoted 122 lines · Ard Biesheuvel
Quoted 111 lines · Masahiro Yamada
Quoted 102 lines · Ard Biesheuvel
Quoted 90 lines · Masahiro Yamada
Quoted 76 lines · Ard Biesheuvel
Quoted 67 lines · Masahiro Yamada
Quoted 11 lines · Ard Biesheuvel
Quoted 7 lines · Masahiro Yamada

Documentation/kbuild/makefiles.rst says:

Use of lib-y is normally restricted to lib/ and arch/*/lib.

I want to disallow lib-y outside of them.

Why?

Because I plan to remove lib-y entirely at some point.

lib-y is not so useful to shrink the image size because:

- An object in lib.a can be omitted only when no symbol in that object is referenced. This rarely happens.

- lib-y objects are often exported by nature because lib-y is a collection of utility functions. Even if no in-tree user, we always need to keep them because EXPORT_SYMBOL() is the interface to modules.

When I worked on commit 7273ad2b08f8ac9563579d16a3cf528857b26f49, I made some research.

The benefit of lib-y is just 362 byte for x86_64_defconfig. ( Before: 26578002, After: 26578364)

My hope is lib-y will be replaced by dead-code elimination or ultimately by LTO.

drivers/firmware/efi/libstub/Makefile
is the only Makefile that breaks the rule:
"Use of lib-y is normally restricted to lib/ and arch/*/lib"

Quoted 11 lines
Quoted 7 lines

Add a custom rule to build lib.a, which is linked to the decompressor for ARCH=x86, ARCH=arm.

For ARCH=arm64, use obj-y to link objects to vmlinux in the ordinary way.

The code works perfectly fine as is, and I don't see what is fundamentally wrong with using static libraries outside of lib/ and arch/*/lib.

The intended usage of lib-y is to hook lib.a
to scripts/vmlinux.sh via KBUILD_VMLINUX_LIBS.

This Makefile is just what you found to work.

Quoted 4 lines

Also, I would like this code to still be incorporated as a static library into arm64 as well, so that only pieces that are actually needed are incorporated into the final image.

Quoted 6 lines

No.
It is not working like that because you set
lib.a to core-y.

All objects in core-y are always linked to vmlinux.

Quoted 6 lines

The lib.a file is passed to the linker as a static library, so it will only grab what it needs.

For instance, if you build arm64 from mainline today, the efi_relocate_kernel will not be in the final image, even though it is built as part of libstub

I built today's mainline kernel
(d6f9469a03d832dcd17041ed67774ffb5f3e73b3).

Quoted 9 lines

I see it in vmlinux.

$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-  -j24
    ...
$ aarch64-linux-gnu-nm  -n  vmlinux | grep  efi_relocate_kernel
ffff8000114afb90 t __efistub_efi_relocate_kernel
Quoted 3 lines

That is strange. I tested this before, and it worked.

Did anything change recently in the way the linker is invoked?

Nothing recently.

Quoted 8 lines

This is obvious result because
drivers/firmware/efi/libstub/lib.a
is passed after ----whole-archive flag.

I guess the following commit is it,
but it is already 3 years ago.

Quoted 5 lines

Right.

So that means there is no point at all in using static libraries, no? Or does --whole-archive still allow duplicate definitions like static libraries do usually?

--whole-archive literally links the whole of the archive. If there are duplicate definitions, the linking fails due to multiple definition.
So, --whole-archive is similar to linking .o files in this regard.

There is a point for arm and x86 because the decompressor link does not use --whole-archive.

As for arm64, there is no point,
but you can pass lib.a after --no-whole-archive
by the following patch.

arch/arm64/Makefile +1 -1
index 650e1185c190..48a6afa774fc 100644
@@ -145,7 +145,7 @@ export      TEXT_OFFSET
 
 core-y         += arch/arm64/
 libs-y         := arch/arm64/lib/ $(libs-y)
-core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
+libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot           := arch/arm64/boot
Quoted 7 lines

Then, _efistub_efi_low_alloc_above
and __efistub_efi_relocate_kernel will be dropped.

If you like the static library
do you want me to send v2?

Yes please