lds: align RO_DATA_SECTION members
PATCH 1/1 lds: align RO_DATA_SECTION members
When using the RO_DATA_SECTION macro, all the individual components are put into the rodata section. As they now end up in the same section there is no alignment enforced between them anymore. This leads to unaligned start pointers when any of the components have a unaligned size. Enforce some alignment between them.
--- include/asm-generic/barebox.lds.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/asm-generic/barebox.lds.h +11 -0
@@ -17,6 +17,7 @@#endif #define BAREBOX_INITCALLS \ + . = ALIGN(8); \ __barebox_initcalls_start = .; \ KEEP(*(.initcall.0)) \ KEEP(*(.initcall.1)) \
@@ -36,6 +37,7 @@ __barebox_initcalls_end = .;#define BAREBOX_EXITCALLS \ + . = ALIGN(8); \ __barebox_exitcalls_start = .; \ KEEP(*(.exitcall.0)) \ KEEP(*(.exitcall.1)) \
@@ -47,37 +49,44 @@ __barebox_exitcalls_end = .;#define BAREBOX_CMDS \ + . = ALIGN(8); \ __barebox_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \ __barebox_cmd_end = .;#define BAREBOX_RATP_CMDS \ + . = ALIGN(8); \ __barebox_ratp_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \ __barebox_ratp_cmd_end = .;#define BAREBOX_SYMS \ + . = ALIGN(8); \ __usymtab_start = .; \ KEEP(*(__usymtab)) \ __usymtab_end = .;#define BAREBOX_MAGICVARS \ + . = ALIGN(8); \ __barebox_magicvar_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \ __barebox_magicvar_end = .;#define BAREBOX_CLK_TABLE \ + . = ALIGN(8); \ __clk_of_table_start = .; \ KEEP(*(.__clk_of_table)); \ KEEP(*(.__clk_of_table_end)); \ __clk_of_table_end = .;#define BAREBOX_DTB \ + . = ALIGN(8); \ __dtb_start = .; \ KEEP(*(.dtb.rodata.*)); \ __dtb_end = .;#define BAREBOX_IMD \ + . = ALIGN(8); \ KEEP(*(.barebox_imd_start)) \ KEEP(*(.barebox_imd_1*)) \ *(.barebox_imd_0*) \
@@ -85,6 +94,7 @@#ifdef CONFIG_PCI #define BAREBOX_PCI_FIXUP \ + . = ALIGN(8); \ __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ __end_pci_fixups_early = .; \
@@ -99,6 +109,7 @@#endif #define BAREBOX_RSA_KEYS \ + . = ALIGN(8); \ __rsa_keys_start = .; \ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \
Signature · 7 lines
2.23.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Hi Lucas.
Quoted 5 lines · Lucas Stach
When using the
RO_DATA_SECTIONmacro, all the individual components are put into the rodata section. As they now end up in the same section there is no alignment enforced between them anymore. This leads to unaligned start pointers when any of the components have a unaligned size. Enforce some alignment between them.
In the kernel we have:
#define ALIGN_FUNCTION() . = ALIGN(8) #define STRUCT_ALIGNMENT 32
#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT)
Could we use something similar here?
Sam
Quoted 96 lines
Fixes c5d38e920101 (lds: Add and use RO_DATA_SECTION macro)Signed-off-by Lucas Stach <[email protected]>--- include/asm-generic/barebox.lds.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/asm-generic/barebox.lds.h +11
-0@@ -17,6 +17,7 @@#endif #define BAREBOX_INITCALLS \ + . = ALIGN(8); \ __barebox_initcalls_start = .; \ KEEP(*(.initcall.0)) \ KEEP(*(.initcall.1)) \@@ -36,6 +37,7 @@ __barebox_initcalls_end = .;#define BAREBOX_EXITCALLS \ + . = ALIGN(8); \ __barebox_exitcalls_start = .; \ KEEP(*(.exitcall.0)) \ KEEP(*(.exitcall.1)) \@@ -47,37 +49,44 @@ __barebox_exitcalls_end = .;#define BAREBOX_CMDS \ + . = ALIGN(8); \ __barebox_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \ __barebox_cmd_end = .;#define BAREBOX_RATP_CMDS \ + . = ALIGN(8); \ __barebox_ratp_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \ __barebox_ratp_cmd_end = .;#define BAREBOX_SYMS \ + . = ALIGN(8); \ __usymtab_start = .; \ KEEP(*(__usymtab)) \ __usymtab_end = .;#define BAREBOX_MAGICVARS \ + . = ALIGN(8); \ __barebox_magicvar_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \ __barebox_magicvar_end = .;#define BAREBOX_CLK_TABLE \ + . = ALIGN(8); \ __clk_of_table_start = .; \ KEEP(*(.__clk_of_table)); \ KEEP(*(.__clk_of_table_end)); \ __clk_of_table_end = .;#define BAREBOX_DTB \ + . = ALIGN(8); \ __dtb_start = .; \ KEEP(*(.dtb.rodata.*)); \ __dtb_end = .;#define BAREBOX_IMD \ + . = ALIGN(8); \ KEEP(*(.barebox_imd_start)) \ KEEP(*(.barebox_imd_1*)) \ *(.barebox_imd_0*) \@@ -85,6 +94,7 @@#ifdef CONFIG_PCI #define BAREBOX_PCI_FIXUP \ + . = ALIGN(8); \ __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ __end_pci_fixups_early = .; \@@ -99,6 +109,7 @@#endif #define BAREBOX_RSA_KEYS \ + . = ALIGN(8); \ __rsa_keys_start = .; \ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \Signature · 7 lines
2.23.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Hi Sam,
Quoted 9 lines · Sam Ravnborg
Hi Lucas.
Quoted 5 lines · Lucas Stach
When using the
RO_DATA_SECTIONmacro, all the individual components are put into the rodata section. As they now end up in the same section there is no alignment enforced between them anymore. This leads to unaligned start pointers when any of the components have a unaligned size. Enforce some alignment between them.
Quoted 6 lines
In the kernel we have:
#defineALIGN_FUNCTION(). = ALIGN(8) #defineSTRUCT_ALIGNMENT32
#defineSTRUCT_ALIGN(). =ALIGN(STRUCT_ALIGNMENT)Could we use something similar here?
Actually the STRUCT_ALIGN() define is available in Barebox in the very same file changed in this commit. However I'm not sure if using those defines is an improvement. We have some stuff in the RO_DATA_SECTION like DTB and RSA keys that are neither a struct nor a function, so using any of those defines is at least misleading.
So if we want to make this more descriptive we would need a new define with a somewhat fitting name.
Regards,
Lucas
Quoted 94 lines
Sam
Quoted 92 lines
Fixes c5d38e920101 (lds: Add and use RO_DATA_SECTION macro)Signed-off-by Lucas Stach <[email protected]>--- include/asm-generic/barebox.lds.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/asm- renamed from include/asm-generic/barebox.lds.h +0
-0
generic/barebox.lds.h
indexb6ca8eb2be27..113392d567fa100644include/asm-generic/barebox.lds.h +11
-0@@ -17,6 +17,7 @@#endif #define BAREBOX_INITCALLS \ + . = ALIGN(8); \ __barebox_initcalls_start = .; \ KEEP(*(.initcall.0)) \ KEEP(*(.initcall.1)) \@@ -36,6 +37,7 @@ __barebox_initcalls_end = .;#define BAREBOX_EXITCALLS \ + . = ALIGN(8); \ __barebox_exitcalls_start = .; \ KEEP(*(.exitcall.0)) \ KEEP(*(.exitcall.1)) \@@ -47,37 +49,44 @@ __barebox_exitcalls_end = .;#define BAREBOX_CMDS \ + . = ALIGN(8); \ __barebox_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \ __barebox_cmd_end = .;#define BAREBOX_RATP_CMDS \ + . = ALIGN(8); \ __barebox_ratp_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \ __barebox_ratp_cmd_end = .;#define BAREBOX_SYMS \ + . = ALIGN(8); \ __usymtab_start = .; \ KEEP(*(__usymtab)) \ __usymtab_end = .;#define BAREBOX_MAGICVARS \ + . = ALIGN(8); \ __barebox_magicvar_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \ __barebox_magicvar_end = .;#define BAREBOX_CLK_TABLE \ + . = ALIGN(8); \ __clk_of_table_start = .; \ KEEP(*(.__clk_of_table)); \ KEEP(*(.__clk_of_table_end)); \ __clk_of_table_end = .;#define BAREBOX_DTB \ + . = ALIGN(8); \ __dtb_start = .; \ KEEP(*(.dtb.rodata.*)); \ __dtb_end = .;#define BAREBOX_IMD \ + . = ALIGN(8); \ KEEP(*(.barebox_imd_start)) \ KEEP(*(.barebox_imd_1*)) \ *(.barebox_imd_0*) \@@ -85,6 +94,7 @@#ifdef CONFIG_PCI #define BAREBOX_PCI_FIXUP \ + . = ALIGN(8); \ __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ __end_pci_fixups_early = .; \@@ -99,6 +109,7 @@#endif #define BAREBOX_RSA_KEYS \ + . = ALIGN(8); \ __rsa_keys_start = .; \ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \Signature · 1 line
2.23.0
Quoted 9 lines
Quoted 4 lines
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Hi Lucas.
Quoted 8 lines · Lucas Stach
When using the
RO_DATA_SECTIONmacro, all the individual components are put into the rodata section. As they now end up in the same section there is no alignment enforced between them anymore. This leads to unaligned start pointers when any of the components have a unaligned size. Enforce some alignment between them.Fixes c5d38e920101 (lds: Add and use RO_DATA_SECTION macro)Signed-off-by Lucas Stach <[email protected]>
After a rather painful bisect I ended up with the commit c5d38e920101 (lds: Add and use RO_DATA_SECTION macro) as the bad commit.
So in my case missing the alignment prevented barebox from starting up.
The bisect was painful because this is a proprietary board where I have too many patches accumulated - and my first attempt pointed out used a good commit as bad (missing edits after applying patches).
I saw a v2 of this patch that I already deleted from my mailbox, but re-did it locally. That fixed barebox for me.
According to: http://lists.infradead.org/pipermail/barebox/2019-December/040439.html
the patch is applied - but I cannot find it neither in master nor in next. Seems it has not been pushed out in the xmas rush.
You can add a:
in case it is relevant / doable.
Sam
Quoted 93 lines
--- include/asm-generic/barebox.lds.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/asm-generic/barebox.lds.h +11
-0@@ -17,6 +17,7 @@#endif #define BAREBOX_INITCALLS \ + . = ALIGN(8); \ __barebox_initcalls_start = .; \ KEEP(*(.initcall.0)) \ KEEP(*(.initcall.1)) \@@ -36,6 +37,7 @@ __barebox_initcalls_end = .;#define BAREBOX_EXITCALLS \ + . = ALIGN(8); \ __barebox_exitcalls_start = .; \ KEEP(*(.exitcall.0)) \ KEEP(*(.exitcall.1)) \@@ -47,37 +49,44 @@ __barebox_exitcalls_end = .;#define BAREBOX_CMDS \ + . = ALIGN(8); \ __barebox_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \ __barebox_cmd_end = .;#define BAREBOX_RATP_CMDS \ + . = ALIGN(8); \ __barebox_ratp_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \ __barebox_ratp_cmd_end = .;#define BAREBOX_SYMS \ + . = ALIGN(8); \ __usymtab_start = .; \ KEEP(*(__usymtab)) \ __usymtab_end = .;#define BAREBOX_MAGICVARS \ + . = ALIGN(8); \ __barebox_magicvar_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \ __barebox_magicvar_end = .;#define BAREBOX_CLK_TABLE \ + . = ALIGN(8); \ __clk_of_table_start = .; \ KEEP(*(.__clk_of_table)); \ KEEP(*(.__clk_of_table_end)); \ __clk_of_table_end = .;#define BAREBOX_DTB \ + . = ALIGN(8); \ __dtb_start = .; \ KEEP(*(.dtb.rodata.*)); \ __dtb_end = .;#define BAREBOX_IMD \ + . = ALIGN(8); \ KEEP(*(.barebox_imd_start)) \ KEEP(*(.barebox_imd_1*)) \ *(.barebox_imd_0*) \@@ -85,6 +94,7 @@#ifdef CONFIG_PCI #define BAREBOX_PCI_FIXUP \ + . = ALIGN(8); \ __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ __end_pci_fixups_early = .; \@@ -99,6 +109,7 @@#endif #define BAREBOX_RSA_KEYS \ + . = ALIGN(8); \ __rsa_keys_start = .; \ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \Signature · 7 lines
2.23.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox