Skip to contentSkip to conversation

livepatch: enable -f{function,data}-sections compiler option

PATCH In review Roger Pau Monne 3 participants 6 messages Mar 9, 2022

lore
Share & tools
lore
#0 lore raw

v4 cover livepatch: enable -f{function,data}-sections compiler option

Hello,

The content in v3 has been split in two patches, but is still mostly the same. The main difference is that first patch does a bit of cleanup of the build logic now that the header object file doesn't need to be the first one passed to the linker script.

Thanks, Roger.

Roger Pau Monne (2):
xen/build: put image header into a separate section
livepatch: set -f{function,data}-sections compiler option

 xen/Kconfig                 |  4 +++
 xen/Makefile                |  2 ++
 xen/arch/arm/arch.mk        |  2 --
 xen/arch/arm/arm32/Makefile |  3 +--
 xen/arch/arm/arm32/head.S   |  1 +
 xen/arch/arm/arm64/Makefile |  3 +--
 xen/arch/arm/arm64/head.S   |  1 +
 xen/arch/arm/xen.lds.S      | 49 ++++++++++++++++++++-----------------
 xen/arch/x86/Makefile       |  5 ++--
 xen/arch/x86/arch.mk        |  2 --
 xen/arch/x86/boot/head.S    |  2 +-
 xen/arch/x86/xen.lds.S      | 20 +++++++++------
 xen/common/Kconfig          |  1 +
 13 files changed, 53 insertions(+), 42 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v4 1/2 xen/build: put image header into a separate section

So it can be explicitly placed ahead of the rest of the .text content in the linker script (and thus the resulting image). This is a prerequisite for further work that will add a catch-all to the text section (.text.*).

Note that placement of the sections inside of .text is also slightly adjusted to be more similar to the position found in the default GNU ld linker script.

The special handling of the object file containing the header data as the first object file passed to the linker command line can also be removed.

While there also remove the special handling of efi/ on x86. There's no need for the resulting object file to be passed in any special order to the linker.

---
Changes since v3:
- Drop .text.cold.* handling.

Changes since v2:
- New in this version (split from patch 2).

---
 xen/arch/arm/arch.mk        |  2 --
 xen/arch/arm/arm32/Makefile |  3 +--
 xen/arch/arm/arm32/head.S   |  1 +
 xen/arch/arm/arm64/Makefile |  3 +--
 xen/arch/arm/arm64/head.S   |  1 +
 xen/arch/arm/xen.lds.S      |  8 ++++++--
 xen/arch/x86/Makefile       |  5 ++---
 xen/arch/x86/arch.mk        |  2 --
 xen/arch/x86/boot/head.S    |  2 +-
 xen/arch/x86/xen.lds.S      | 11 +++++++----
 10 files changed, 20 insertions(+), 18 deletions(-)
xen/arch/arm/arch.mk +0 -2
index 094b670723..58db76c4e1 100644
@@ -23,5 +23,3 @@ ifeq ($(CONFIG_ARM64_ERRATUM_843419),y)
         LDFLAGS += --fix-cortex-a53-843419
     endif
 endif
-
-ALL_OBJS-y := arch/arm/$(TARGET_SUBARCH)/head.o $(ALL_OBJS-y)
xen/arch/arm/arm32/Makefile +1 -2
index 3040eabce3..520fb42054 100644
@@ -4,11 +4,10 @@ obj-$(CONFIG_EARLY_PRINTK) += debug.o
 obj-y += domctl.o
 obj-y += domain.o
 obj-y += entry.o
+obj-y += head.o
 obj-y += insn.o
 obj-$(CONFIG_LIVEPATCH) += livepatch.o
 obj-y += proc-v7.o proc-caxx.o
 obj-y += smpboot.o
 obj-y += traps.o
 obj-y += vfp.o
-
-extra-y += head.o
xen/arch/arm/arm32/head.S +1 -0
index 7a906167ef..c837d3054c 100644
@@ -120,6 +120,7 @@
 
 #endif /* !CONFIG_EARLY_PRINTK */
 
+        .section .text.header, "ax", %progbits
         .arm
 
         /*
xen/arch/arm/arm64/Makefile +1 -2
index baa87655fa..6d507da0d4 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_EARLY_PRINTK) += debug.o
 obj-y += domctl.o
 obj-y += domain.o
 obj-y += entry.o
+obj-y += head.o
 obj-y += insn.o
 obj-$(CONFIG_LIVEPATCH) += livepatch.o
 obj-y += smc.o
@@ -14,5 +15,3 @@ obj-y += smpboot.o
 obj-y += traps.o
 obj-y += vfp.o
 obj-y += vsysreg.o
-
-extra-y += head.o
xen/arch/arm/arm64/head.S +1 -0
index 66d862fc81..e62c48ec1c 100644
@@ -133,6 +133,7 @@
         add \xb, \xb, x20
 .endm
 
+        .section .text.header, "ax", %progbits
         /*.aarch64*/
 
         /*
xen/arch/arm/xen.lds.S +6 -2
index 08016948ab..743455a5f9 100644
@@ -30,9 +30,13 @@ SECTIONS
   _start = .;
   .text : {
         _stext = .;            /* Text section */
-       *(.text)
+       *(.text.header)
+
        *(.text.cold)
-       *(.text.unlikely)
+       *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+
+       *(.text)
+
        *(.fixup)
        *(.gnu.warning)
        _etext = .;             /* End of text section */
xen/arch/x86/Makefile +2 -3
index 9c40e0b4d7..04065a7310 100644
@@ -1,5 +1,7 @@
 obj-y += acpi/
+obj-y += boot/
 obj-y += cpu/
+obj-y += efi/
 obj-y += genapic/
 obj-$(CONFIG_GUEST) += guest/
 obj-$(CONFIG_HVM) += hvm/
@@ -77,9 +79,6 @@ obj-$(CONFIG_COMPAT) += x86_64/platform_hypercall.o
 obj-y += sysctl.o
 endif
 
-# Allows "clean" to descend into boot/
-subdir- += boot
-
 extra-y += asm-macros.i
 extra-y += xen.lds
 
xen/arch/x86/arch.mk +0 -2
index 8e57476d65..c90e56aeab 100644
@@ -117,5 +117,3 @@ endif
 
 # Set up the assembler include path properly for older toolchains.
 CFLAGS += -Wa,-I$(srctree)/include
-
-ALL_OBJS-y := arch/x86/boot/built_in.o arch/x86/efi/built_in.o $(ALL_OBJS-y)
xen/arch/x86/boot/head.S +1 -1
index dd1bea0d10..92d73345f0 100644
@@ -9,7 +9,7 @@
 #include <asm/cpufeature.h>
 #include <public/elfnote.h>
 
-        .text
+        .section .text.header, "ax", @progbits
         .code32
 
 #define sym_offs(sym)     ((sym) - __XEN_VIRT_START)
xen/arch/x86/xen.lds.S +7 -4
index 506bc8e404..960c51eb4c 100644
@@ -73,9 +73,7 @@ SECTIONS
   _start = .;
   DECL_SECTION(.text) {
         _stext = .;            /* Text and read-only data */
-       *(.text)
-       *(.text.__x86_indirect_thunk_*)
-       *(.text.page_aligned)
+       *(.text.header)
 
        . = ALIGN(PAGE_SIZE);
        _stextentry = .;
@@ -87,7 +85,12 @@ SECTIONS
        kexec_reloc_end = .;
 
        *(.text.cold)
-       *(.text.unlikely)
+       *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+
+       *(.text)
+       *(.text.__x86_indirect_thunk_*)
+       *(.text.page_aligned)
+
        *(.fixup)
        *(.gnu.warning)
        _etext = .;             /* End of text section */
Signature · 1 line
2.34.1
#2 lore raw

PATCH v4 2/2 livepatch: set -f{function,data}-sections compiler option

In reply to Roger Pau Monne

If livepatching support is enabled build the hypervisor with -f{function,data}-sections compiler options, which is required by the livepatching tools to detect changes and create livepatches.

This shouldn't result in any functional change on the hypervisor binary image, but does however require some changes in the linker script in order to handle that each function and data item will now be placed into its own section in object files. As a result add catch-all for .text, .data and .bss in order to merge each individual item section into the final image.

The main difference will be that .text.startup will end up being part of .text rather than .init, and thus won't be freed. .text.exit will also be part of .text rather than dropped. Overall this could make the image bigger, and package some .text code in a sub-optimal way.

On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, so the .data.* catch-all doesn't also include .data.read_mostly. The alignment of .data.read_mostly also needs to be set to PAGE_SIZE so it doesn't end up being placed at the tail of a read-only page from the previous section. While there move the alignment of the .data section ahead of the section declaration, like it's done for other sections.

The benefit of having CONFIG_LIVEPATCH enable those compiler option is that the livepatch build tools no longer need to fiddle with the build system in order to enable them. Note the current livepatch tools are broken after the recent build changes due to the way they attempt to set -f{function,data}-sections.

---
Changes since v3:
- Place .text.page_aligned ahead of the .text.* catch-all.

Changes since v2:
- Split the placing of the header code in a separate section to a pre-patch.
- Move Kconfig option to xen/Kconfig.
- Expand reasoning why .data.read_mostly needs to be moved on Arm.

Changes since v1:
- Introduce CC_SPLIT_SECTIONS for selecting the compiler options.
- Drop check for compiler options, all supported versions have them.
- Re-arrange section placement in .text, to match the default linker script.
- Introduce .text.header to contain the headers bits that must appear first in the final binary.
---
It seems on Arm the schedulers and hypfs .data sections should be moved into read_mostly.
---
Tested by gitlab in order to assert I didn't introduce any regression on Arm specially.

---
 xen/Kconfig            |  4 ++++
 xen/Makefile           |  2 ++
 xen/arch/arm/xen.lds.S | 41 +++++++++++++++++++++--------------------
 xen/arch/x86/xen.lds.S | 11 ++++++-----
 xen/common/Kconfig     |  1 +
 5 files changed, 34 insertions(+), 25 deletions(-)
xen/Kconfig +4 -0
index bcbd2758e5..d134397a0b 100644
@@ -27,6 +27,10 @@ config CLANG_VERSION
 config CC_HAS_VISIBILITY_ATTRIBUTE
 	def_bool $(cc-option,-fvisibility=hidden)
 
+# Use -f{function,data}-sections compiler parameters
+config CC_SPLIT_SECTIONS
+	bool
+
 source "arch/$(SRCARCH)/Kconfig"
 
 config DEFCONFIG_LIST
xen/Makefile +2 -0
index 5c21492d6f..18a4f7e101 100644
@@ -273,6 +273,8 @@ else
 CFLAGS += -fomit-frame-pointer
 endif
 
+CFLAGS-$(CONFIG_CC_SPLIT_SECTIONS) += -ffunction-sections -fdata-sections
+
 CFLAGS += -nostdinc -fno-builtin -fno-common
 CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith
 $(call cc-option-add,CFLAGS,CC,-Wvla)
xen/arch/arm/xen.lds.S +21 -20

70 lines not on this page · raw message

xen/arch/x86/xen.lds.S +6 -5
index 960c51eb4c..4103763f63 100644
@@ -87,9 +87,12 @@ SECTIONS
        *(.text.cold)
        *(.text.unlikely .text.*_unlikely .text.unlikely.*)
 
+       *(.text.page_aligned)
        *(.text)
+#ifdef CONFIG_CC_SPLIT_SECTIONS
+       *(.text.*)
+#endif
        *(.text.__x86_indirect_thunk_*)
-       *(.text.page_aligned)
 
        *(.fixup)
        *(.gnu.warning)
@@ -292,9 +295,7 @@ SECTIONS
 
   DECL_SECTION(.data) {
        *(.data.page_aligned)
-       *(.data)
-       *(.data.rel)
-       *(.data.rel.*)
+       *(.data .data.*)
   } PHDR(text)
 
   DECL_SECTION(.bss) {
@@ -309,7 +310,7 @@ SECTIONS
        *(.bss.percpu.read_mostly)
        . = ALIGN(SMP_CACHE_BYTES);
        __per_cpu_data_end = .;
-       *(.bss)
+       *(.bss .bss.*)
        . = ALIGN(POINTER_ALIGN);
        __bss_end = .;
   } PHDR(text)
xen/common/Kconfig +1 -0
index 6443943889..d921c74d61 100644
@@ -354,6 +354,7 @@ config LIVEPATCH
 	bool "Live patching support"
 	default X86
 	depends on "$(XEN_HAS_BUILD_ID)" = "y"
+	select CC_SPLIT_SECTIONS
 	---help---
 	  Allows a running Xen hypervisor to be dynamically patched using
 	  binary patches without rebooting. This is primarily used to binarily
Signature · 1 line
2.34.1
Reviewed-by on v4 2/2
#3 lore raw

Re: [PATCH v4 2/2] livepatch: set -f{function,data}-sections compiler option

Quoted 24 lines · Roger Pau Monne

If livepatching support is enabled build the hypervisor with -f{function,data}-sections compiler options, which is required by the livepatching tools to detect changes and create livepatches.

This shouldn't result in any functional change on the hypervisor binary image, but does however require some changes in the linker script in order to handle that each function and data item will now be placed into its own section in object files. As a result add catch-all for .text, .data and .bss in order to merge each individual item section into the final image.

The main difference will be that .text.startup will end up being part of .text rather than .init, and thus won't be freed. .text.exit will also be part of .text rather than dropped. Overall this could make the image bigger, and package some .text code in a sub-optimal way.

On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, so the .data.* catch-all doesn't also include .data.read_mostly. The alignment of .data.read_mostly also needs to be set to PAGE_SIZE so it doesn't end up being placed at the tail of a read-only page from the previous section. While there move the alignment of the .data section ahead of the section declaration, like it's done for other sections.

Quoted 8 lines

The benefit of having CONFIG_LIVEPATCH enable those compiler option is that the livepatch build tools no longer need to fiddle with the build system in order to enable them. Note the current livepatch tools are broken after the recent build changes due to the way they attempt to set -f{function,data}-sections.

#4 lore raw

Re: [PATCH v4 2/2] livepatch: set -f{function,data}-sections compiler option

In reply to Roger Pau Monne
Quoted 30 lines · Roger Pau Monne
xen/arch/x86/xen.lds.S +5 -4
index 960c51eb4c..4103763f63 100644
@@ -87,9 +87,12 @@ SECTIONS
        *(.text.cold)
        *(.text.unlikely .text.*_unlikely .text.unlikely.*)
 
+       *(.text.page_aligned)
        *(.text)
+#ifdef CONFIG_CC_SPLIT_SECTIONS
+       *(.text.*)
+#endif
        *(.text.__x86_indirect_thunk_*)
-       *(.text.page_aligned)
 
        *(.fixup)
        *(.gnu.warning)
@@ -292,9 +295,7 @@ SECTIONS
 
   DECL_SECTION(.data) {
        *(.data.page_aligned)
-       *(.data)
-       *(.data.rel)
-       *(.data.rel.*)
+       *(.data .data.*)
   } PHDR(text)
 
   DECL_SECTION(.bss) {

xen/arch/x86/xen.lds.S SECTIONS · line 313

Quoted 5 lines
xen/arch/x86/xen.lds.S +1 -1
@@ -309,7 +310,7 @@ SECTIONS
        *(.bss.percpu.read_mostly)
        . = ALIGN(SMP_CACHE_BYTES);
        __per_cpu_data_end = .;
-       *(.bss)
+       *(.bss .bss.*)

Sorry if I've missed it elsewhere, but why are .data.* and .bss.* unguarded, but .text.* under ifdef ?

Surely they should have the same disposition?

~Andrew

#5 lore raw

Re: [PATCH v4 2/2] livepatch: set -f{function,data}-sections compiler option

Quoted 40 lines · Andrew Cooper
Quoted 30 lines · Roger Pau Monne
xen/arch/x86/xen.lds.S +5 -4
index 960c51eb4c..4103763f63 100644
@@ -87,9 +87,12 @@ SECTIONS
        *(.text.cold)
        *(.text.unlikely .text.*_unlikely .text.unlikely.*)
 
+       *(.text.page_aligned)
        *(.text)
+#ifdef CONFIG_CC_SPLIT_SECTIONS
+       *(.text.*)
+#endif
        *(.text.__x86_indirect_thunk_*)
-       *(.text.page_aligned)
 
        *(.fixup)
        *(.gnu.warning)
@@ -292,9 +295,7 @@ SECTIONS
 
   DECL_SECTION(.data) {
        *(.data.page_aligned)
-       *(.data)
-       *(.data.rel)
-       *(.data.rel.*)
+       *(.data .data.*)
   } PHDR(text)
 
   DECL_SECTION(.bss) {

xen/arch/x86/xen.lds.S SECTIONS · line 313

Quoted 5 lines
xen/arch/x86/xen.lds.S +1 -1
@@ -309,7 +310,7 @@ SECTIONS
        *(.bss.percpu.read_mostly)
        . = ALIGN(SMP_CACHE_BYTES);
        __per_cpu_data_end = .;
-       *(.bss)
+       *(.bss .bss.*)

Sorry if I've missed it elsewhere, but why are .data.* and .bss.* unguarded, but .text.* under ifdef ?

Quoted 1 line

Surely they should have the same disposition?

The catch-all .text.* added for -ffunction-sections will mean that .text.startup and .text.exit will end up in .text instead of in .init and discarded respectively. That's not the case for the data or bss catch-alls.

Thanks, Roger.