arm64: add PAGE_ALIGNED_DATA to linker script
PATCH 1/1 arm64: add PAGE_ALIGNED_DATA to linker script
The arm64 linker script doesn't use the PAGE_ALIGNED_DATA macro which leads to a ".data..page_aligned" section being placed between the end of .data and start of .bss:
% readelf -e vmlinux
...
Section to Segment mapping:
Segment Sections...
00 .head.text .text .text.init .rodata __ksymtab __ksymtab_gpl \
__ksymtab_strings __param __modver __ex_table .notes \
.init.text .init.data .data..percpu .data .data..page_aligned .bss
This causes problems for the EFI stub which may have to relocate the kernel image based on stext and _edata symbols.
This patch adds PAGE_ALIGNED_DATA() to the linker script inside the the .data section.
--- arch/arm64/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/vmlinux.lds.S +1 -0
@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)
Signature · 1 line
1.8.3.1
Quoted 28 lines · Mark Salter
The arm64 linker script doesn't use the
PAGE_ALIGNED_DATAmacro which leads to a ".data..page_aligned" section being placed between the end of .data and start of .bss:% readelf -e vmlinux
...
Section to Segment mapping:
Segment Sections...
00 .head.text .text .text.init .rodata__ksymtab__ksymtab_gpl\
__ksymtab_strings__param__modver__ex_table.notes \
.init.text .init.data .data..percpu .data .data..page_aligned .bssThis causes problems for the EFI stub which may have to relocate the kernel image based on stext and
_edatasymbols.This patch adds
PAGE_ALIGNED_DATA()to the linker script inside the the .data section.Signed-off-by Mark Salter <[email protected]>--- arch/arm64/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+)arch/arm64/kernel/vmlinux.lds.S +0
-0
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 6 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)
Can we just replace this chunk with RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE) instead?
Will
Quoted 24 lines · Will Deacon
Quoted 23 lines · Mark Salter
The arm64 linker script doesn't use the
PAGE_ALIGNED_DATAmacro which leads to a ".data..page_aligned" section being placed between the end of .data and start of .bss:% readelf -e vmlinux
...
Section to Segment mapping:
Segment Sections...
00 .head.text .text .text.init .rodata__ksymtab__ksymtab_gpl\
__ksymtab_strings__param__modver__ex_table.notes \
.init.text .init.data .data..percpu .data .data..page_aligned .bssThis causes problems for the EFI stub which may have to relocate the kernel image based on stext and
_edatasymbols.This patch adds
PAGE_ALIGNED_DATA()to the linker script inside the the .data section.Signed-off-by Mark Salter <[email protected]>--- arch/arm64/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 11 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)Can we just replace this chunk with
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)instead?
Possibly. The layout of the included macros is the same. The only difference being the placement of _data, _sdata, and _edata inside .data and the use of __data_loc.
--Mark
Quoted 11 lines · Will Deacon
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 7 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)Can we just replace this chunk with
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)instead?
I took a look at this. It can be done, but the RW_DATA_SECTION aligns data to PAGE_SIZE where the existing alignment is THREAD_SIZE. So using RW_DATA_SECTION would waste some space if using 64K pagesize.
--Mark
Quoted 13 lines · Mark Salter
Quoted 11 lines · Will Deacon
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 7 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)Can we just replace this chunk with
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)instead?
Quoted 5 lines
I took a look at this. It can be done, but the
RW_DATA_SECTIONaligns data toPAGE_SIZEwhere the existing alignment isTHREAD_SIZE. So usingRW_DATA_SECTIONwould waste some space if using 64K pagesize.--Mark
So where do we stand with this one?
Quoted 14 lines · Mark Salter
Quoted 13 lines · Mark Salter
Quoted 11 lines · Will Deacon
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 7 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)Can we just replace this chunk with
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)instead?
Quoted 7 lines
Quoted 5 lines
I took a look at this. It can be done, but the
RW_DATA_SECTIONaligns data toPAGE_SIZEwhere the existing alignment isTHREAD_SIZE. So usingRW_DATA_SECTIONwould waste some space if using 64K pagesize.--Mark
So where do we stand with this one?
I'd probably go for using the generic macro, but I don't have strong preferences either way.
Will
Catalin Marinas
maintainerQuoted 13 lines · Mark Salter
Quoted 11 lines · Will Deacon
arch/arm64/kernel/vmlinux.lds.S SECTIONS · line 115
Quoted 7 lines
arch/arm64/kernel/vmlinux.lds.S +1
-0@@ -110,6 +110,7 @@ SECTIONS */ INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA + PAGE_ALIGNED_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(64) READ_MOSTLY_DATA(64)Can we just replace this chunk with
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)instead?
Quoted 3 lines
I took a look at this. It can be done, but the
RW_DATA_SECTIONaligns data toPAGE_SIZEwhere the existing alignment isTHREAD_SIZE. So usingRW_DATA_SECTIONwould waste some space if using 64K pagesize.
I think that's ok, especially since we may get security patches in the future to create more restrictive page table attributes (well, with the drawback of more TLB pressure). So I'm for more cleanup in the vmlinux file by using the generic defines.
Signature · 1 line
Catalin
PATCH 1/1 arm64: use generic RW_DATA_SECTION macro in linker script
The .data section in the arm64 linker script currently lacks a definition for page-aligned data. This leads to a .page_aligned section being placed between the end of data and start of bss. This patch corrects that by using the generic RW_DATA_SECTION macro which includes support for page-aligned data.
--- arch/arm64/kernel/vmlinux.lds.S | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-)
arch/arm64/kernel/vmlinux.lds.S +7 -24
@@ -97,30 +97,13 @@ SECTIONS PERCPU_SECTION(64) __init_end = .; - . = ALIGN(THREAD_SIZE); - __data_loc = .; - - .data : AT(__data_loc) { - _data = .; /* address in memory */ - _sdata = .; - - /* - * first, the init task union, aligned - * to an 8192 byte boundary. - */ - INIT_TASK_DATA(THREAD_SIZE) - NOSAVE_DATA - CACHELINE_ALIGNED_DATA(64) - READ_MOSTLY_DATA(64) - - /* - * and the usual data section - */ - DATA_DATA - CONSTRUCTORS - - _edata = .; - } + + . = ALIGN(PAGE_SIZE); + _data = .; + __data_loc = _data - LOAD_OFFSET; + _sdata = .; + RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE) + _edata = .; _edata_loc = __data_loc + SIZEOF(.data); BSS_SECTION(0, 0, 0)
Signature · 1 line
1.8.3.1
Re: [PATCH] arm64: use generic RW_DATA_SECTION macro in linker script
Quoted 7 lines · Mark Salter
The .data section in the arm64 linker script currently lacks a definition for page-aligned data. This leads to a .page_aligned section being placed between the end of data and start of bss. This patch corrects that by using the generic
RW_DATA_SECTIONmacro which includes support for page-aligned data.Signed-off-by Mark Salter <[email protected]>
Cheers Mark!
Will
Catalin Marinas
maintainerRe: [PATCH] arm64: use generic RW_DATA_SECTION macro in linker script
In reply to Mark SalterQuoted 7 lines · Mark Salter
The .data section in the arm64 linker script currently lacks a definition for page-aligned data. This leads to a .page_aligned section being placed between the end of data and start of bss. This patch corrects that by using the generic
RW_DATA_SECTIONmacro which includes support for page-aligned data.Signed-off-by Mark Salter <[email protected]>
Thanks. Applied.
Signature · 1 line
Catalin