livepatch: set -f{function,data}-sections compiler option
PATCH v2 1/1 livepatch: set -f{function,data}-sections compiler option
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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment 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 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.
---
Given that now the header is explicitly placed in .text.header, it's likely possible to simplify some of the ordering of the object files for the prelink.o generation, as arch/x86/boot/built_in.o no longer needs to be the first object file in the list.
It also 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/Makefile | 2 ++ xen/arch/arm/arm32/head.S | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/xen.lds.S | 49 +++++++++++++++++++++------------------ xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/xen.lds.S | 22 +++++++++++------- xen/common/Kconfig | 4 ++++ 7 files changed, 49 insertions(+), 32 deletions(-)
xen/Makefile +2 -0
@@ -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/arm32/head.S +1 -0
@@ -120,6 +120,7 @@ #endif /* !CONFIG_EARLY_PRINTK */ + .section .text.header, "ax", %progbits .arm /*
xen/arch/arm/arm64/head.S +1 -0
@@ -133,6 +133,7 @@ add \xb, \xb, x20 .endm + .section .text.header, "ax", %progbits /*.aarch64*/ /*
xen/arch/arm/xen.lds.S +27 -22
79 lines not on this page · raw message
xen/arch/x86/boot/head.S +1 -1
@@ -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 +13 -9
@@ -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 = .;
@@ -86,8 +84,16 @@ SECTIONS *(.text.kexec) /* Page aligned in the object file. */ kexec_reloc_end = .; - *(.text.cold) - *(.text.unlikely) + *(.text.cold .text.cold.*) + *(.text.unlikely .text.*_unlikely .text.unlikely.*) + + *(.text) +#ifdef CONFIG_CC_SPLIT_SECTIONS + *(.text.*) +#endif + *(.text.__x86_indirect_thunk_*) + *(.text.page_aligned) + *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */
@@ -289,9 +295,7 @@ SECTIONS DECL_SECTION(.data) { *(.data.page_aligned) - *(.data) - *(.data.rel) - *(.data.rel.*) + *(.data .data.*) } PHDR(text) DECL_SECTION(.bss) {
@@ -306,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 +4 -0
@@ -350,10 +350,14 @@ source "common/sched/Kconfig" config CRYPTO bool +config CC_SPLIT_SECTIONS + bool + 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
Quoted 30 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 7 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>
The x86 part of this looks fine to me, just one other remark:
xen/common/Kconfig source "common/sched/Kconfig" · line 354
Quoted 8 lines
xen/common/Kconfig +2
-0@@ -350,10 +350,14 @@ source "common/sched/Kconfig" config CRYPTO bool +config CC_SPLIT_SECTIONS + bool
I think this wants to live higher up in the file, perhaps between ALTERNATIVE_CALL and HAS_ALTERNATIVE. (CRYPTO, as seen in context here, imo also would better live higher up.) Or alternatively it may want to move to xen/Kconfig, next to CC_HAS_VISIBILITY_ATTRIBUTE.
Jan
Quoted 47 lines · Jan Beulich
Quoted 30 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 7 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>The x86 part of this looks fine to me, just one other remark:
Quoted 6 lines
xen/common/Kconfig +0
-0@@ -350,10 +350,14 @@ source "common/sched/Kconfig" config CRYPTO bool
Quoted 7 lines
xen/common/Kconfig source "common/sched/Kconfig" · line 354
Quoted 2 lines
xen/common/Kconfig +2
-0+config CC_SPLIT_SECTIONS + boolI think this wants to live higher up in the file, perhaps between
ALTERNATIVE_CALLandHAS_ALTERNATIVE. (CRYPTO, as seen in context here, imo also would better live higher up.) Or alternatively it may want to move to xen/Kconfig, next toCC_HAS_VISIBILITY_ATTRIBUTE.
I was tempted to place it in xen/Kconfig. The logic for the current suggested placement is to be closer to it's current only user (LIVEPATCH), but I'm not opposed to moving it somewhere else if there's consensus.
Thanks, Roger.
Quoted 56 lines · Roger Pau Monné
Quoted 47 lines · Jan Beulich
Quoted 30 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 7 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>The x86 part of this looks fine to me, just one other remark:
Quoted 6 lines
xen/common/Kconfig +0
-0@@ -350,10 +350,14 @@ source "common/sched/Kconfig" config CRYPTO boolQuoted 7 lines
xen/common/Kconfig source "common/sched/Kconfig" · line 354
Quoted 2 lines
xen/common/Kconfig +2
-0+config CC_SPLIT_SECTIONS + boolI think this wants to live higher up in the file, perhaps between
ALTERNATIVE_CALLandHAS_ALTERNATIVE. (CRYPTO, as seen in context here, imo also would better live higher up.) Or alternatively it may want to move to xen/Kconfig, next toCC_HAS_VISIBILITY_ATTRIBUTE.
Quoted 4 lines
I was tempted to place it in xen/Kconfig. The logic for the current suggested placement is to be closer to it's current only user (LIVEPATCH), but I'm not opposed to moving it somewhere else if there's consensus.
I guess the main question is whether this option is intended to gain a prompt. If so, xen/common/Kconfig is likely the better place. If not, I think it better fits in xen/Kconfig.
Jan
Quoted 57 lines · Jan Beulich
Quoted 56 lines · Roger Pau Monné
Quoted 54 lines · Jan Beulich
Quoted 30 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 7 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>The x86 part of this looks fine to me, just one other remark:
xen/common/Kconfig source "common/sched/Kconfig" · line 354
Quoted 8 lines
xen/common/Kconfig +2
-0@@ -350,10 +350,14 @@ source "common/sched/Kconfig" config CRYPTO bool +config CC_SPLIT_SECTIONS + boolI think this wants to live higher up in the file, perhaps between
ALTERNATIVE_CALLandHAS_ALTERNATIVE. (CRYPTO, as seen in context here, imo also would better live higher up.) Or alternatively it may want to move to xen/Kconfig, next toCC_HAS_VISIBILITY_ATTRIBUTE.
Quoted 8 lines
Quoted 4 lines
I was tempted to place it in xen/Kconfig. The logic for the current suggested placement is to be closer to it's current only user (LIVEPATCH), but I'm not opposed to moving it somewhere else if there's consensus.
I guess the main question is whether this option is intended to gain a prompt. If so, xen/common/Kconfig is likely the better place. If not, I think it better fits in xen/Kconfig.
I think it's unlikely for it to gain a prompt, other options selecting it is what I would expect.
Will move to xen/Kconfig unless someone objects.
Thanks, Roger.
Hi Roger,
Quoted 23 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
Quoted 6 lines
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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.
This sounds like a bug not related to this patch. Can this be split separately?
Quoted 79 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- IntroduceCC_SPLIT_SECTIONSfor 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.
---
Given that now the header is explicitly placed in .text.header, it's likely possible to simplify some of the ordering of the object files for the prelink.o generation, asarch/x86/boot/built_in.ono longer needs to be the first object file in the list.It also 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/Makefile | 2 ++ xen/arch/arm/arm32/head.S | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/xen.lds.S | 49 +++++++++++++++++++++------------------ xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/xen.lds.S | 22 +++++++++++------- xen/common/Kconfig | 4 ++++ 7 files changed, 49 insertions(+), 32 deletions(-)xen/Makefile +2
-0@@ -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/arm32/head.S +1
-0@@ -120,6 +120,7 @@ #endif /* !CONFIG_EARLY_PRINTK */ + .section .text.header, "ax", %progbits .arm /*xen/arch/arm/arm64/head.S +1
-0@@ -133,6 +133,7 @@ add \xb, \xb, x20 .endm + .section .text.header, "ax", %progbits /*.aarch64*/ /*xen/arch/arm/xen.lds.S +0
-0
xen/arch/arm/xen.lds.S SECTIONS · line 33
Quoted 4 lines
xen/arch/arm/xen.lds.S +1
-0@@ -30,9 +30,16 @@ SECTIONS _start = .; .text : { _stext = .; /* Text section */ + *(.text.header)
With this change, the changes in arch/*/arch.mk to order head.o looks unnecessary. Can we remove it at the same time? (The .text.header and the update of arch.mk may want to be done together in a separate patch).
Quoted 15 lines
xen/arch/arm/xen.lds.S +8
-2+ + *(.text.cold .text.cold.*) + *(.text.unlikely .text.*_unlikely .text.unlikely.*) + *(.text) - *(.text.cold) - *(.text.unlikely) +#ifdef CONFIG_CC_SPLIT_SECTIONS + *(.text.*) +#endif + *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */
xen/arch/arm/xen.lds.S SECTIONS · line 86
Quoted 2 lines
xen/arch/arm/xen.lds.S +0
-0@@ -78,10 +85,24 @@ SECTIONS #endif _erodata = .; /* End of read-only data */
Cheers,
Signature · 1 line
Julien Grall
Quoted 33 lines · Julien Grall
Hi Roger,
Quoted 23 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
Quoted 6 lines
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 2 lines
This sounds like a bug not related to this patch. Can this be split separately?
No, .data.read_mostly needs to be moved before .data so that the catch all .data.* introduced to .data to account for -fdata-sections doesn't end up also including .data.read_mostly.
Quoted 73 lines
Quoted 73 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- IntroduceCC_SPLIT_SECTIONSfor 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.
---
Given that now the header is explicitly placed in .text.header, it's likely possible to simplify some of the ordering of the object files for the prelink.o generation, asarch/x86/boot/built_in.ono longer needs to be the first object file in the list.It also 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/Makefile | 2 ++ xen/arch/arm/arm32/head.S | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/xen.lds.S | 49 +++++++++++++++++++++------------------ xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/xen.lds.S | 22 +++++++++++------- xen/common/Kconfig | 4 ++++ 7 files changed, 49 insertions(+), 32 deletions(-)xen/Makefile +2
-0@@ -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/arm32/head.S +1
-0@@ -120,6 +120,7 @@ #endif /* !CONFIG_EARLY_PRINTK */ + .section .text.header, "ax", %progbits .arm /*xen/arch/arm/arm64/head.S +1
-0@@ -133,6 +133,7 @@ add \xb, \xb, x20 .endm + .section .text.header, "ax", %progbits /*.aarch64*/ /*xen/arch/arm/xen.lds.S +0
-0@@ -30,9 +30,16 @@ SECTIONS
Quoted 8 lines
xen/arch/arm/xen.lds.S SECTIONS · line 33
Quoted 4 lines
xen/arch/arm/xen.lds.S +1
-0_start = .; .text : { _stext = .; /* Text section */ + *(.text.header)With this change, the changes in
arch/*/arch.mkto order head.o looks unnecessary. Can we remove it at the same time? (The .text.header and the update of arch.mk may want to be done together in a separate patch).
I had a note below the commit message about this, as I didn't think it was strictly necessary to get this accepted. I will do a pre-patch then with those added.
Thanks, Roger.
Hi Roger,
Quoted 34 lines · Roger Pau Monné
Quoted 33 lines · Julien Grall
Hi Roger,
Quoted 29 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.
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. This requires having a separate section for the header in order to place it at the begging of the output image, followed with the unlikely and related sections, and finally the main .text section.
On Arm the .data.read_mostly needs to be moved ahead of the .data section like it's already done on x86, and the alignment needs to be set to
PAGE_SIZEso 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 6 lines
Quoted 2 lines
This sounds like a bug not related to this patch. Can this be split separately?
No, .data.read_mostly needs to be moved before .data so that the catch all .data.* introduced to .data to account for -fdata-sections doesn't end up also including .data.read_mostly.
Sorry I misread it. I thought you suggested the alignment was also wrong before this patch. Thanks for the clarification!
Quoted 83 lines
Quoted 74 lines
Quoted 74 lines
The benefit of having
CONFIG_LIVEPATCHenable 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.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- IntroduceCC_SPLIT_SECTIONSfor 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.
---
Given that now the header is explicitly placed in .text.header, it's likely possible to simplify some of the ordering of the object files for the prelink.o generation, asarch/x86/boot/built_in.ono longer needs to be the first object file in the list.It also 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/Makefile | 2 ++ xen/arch/arm/arm32/head.S | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/xen.lds.S | 49 +++++++++++++++++++++------------------ xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/xen.lds.S | 22 +++++++++++------- xen/common/Kconfig | 4 ++++ 7 files changed, 49 insertions(+), 32 deletions(-)xen/Makefile +2
-0@@ -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/arm32/head.S +1
-0@@ -120,6 +120,7 @@ #endif /* !CONFIG_EARLY_PRINTK */ + .section .text.header, "ax", %progbits .arm /*xen/arch/arm/arm64/head.S +1
-0@@ -133,6 +133,7 @@ add \xb, \xb, x20 .endm + .section .text.header, "ax", %progbits /*.aarch64*/ /*xen/arch/arm/xen.lds.S +0
-0@@ -30,9 +30,16 @@ SECTIONSQuoted 8 lines
xen/arch/arm/xen.lds.S SECTIONS · line 33
Quoted 4 lines
xen/arch/arm/xen.lds.S +1
-0_start = .; .text : { _stext = .; /* Text section */ + *(.text.header)With this change, the changes in
arch/*/arch.mkto order head.o looks unnecessary. Can we remove it at the same time? (The .text.header and the update of arch.mk may want to be done together in a separate patch).
Quoted 3 lines
I had a note below the commit message about this, as I didn't think it was strictly necessary to get this accepted. I will do a pre-patch then with those added.
Ah, I didn't spot the note. I would prefer if such clean-up is done now.
Cheers,
Signature · 1 line
Julien Grall