kallsyms: fix absolute addresses for kASLR
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.
Well, __per_cpu_start points into a real section, within the discarded init region. Makes me wonder why it's zero in /proc/kallsyms (it is on my Ubuntu system here too).
... digging ...
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
=kallsyms: make zero-based __per_cpu_start & __per_cpu_end absolute symbols.
Andy reported that x86-64 with CONFIG_RANDOMIZE_BASE has bogus values for __per_cpu_start and __per_cpu_end in /proc/kallsyms:
Several kallsyms output in different boot states for comparison:
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr
0000000000000000 D __per_cpu_start
0000000000014280 D __per_cpu_end
ffffffff810001c8 T _stext
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1
000000001f200000 D __per_cpu_start
000000001f214280 D __per_cpu_end
ffffffffa02001c8 T _stext
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2
000000000d400000 D __per_cpu_start
000000000d414280 D __per_cpu_end
ffffffff8e4001c8 T _stext
$ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed
0000000000000000 D __per_cpu_start
0000000000014280 D __per_cpu_end
ffffffffadc001c8 T _stextx86-64 pretends that the per_cpu section is at address 0, and thus the __per_cpu_start and __per_cpu_end resolve to 0 and <smallnum>.
kallsyms encodes the addresses in the kallsyms_addresses[] as relative to _text: this means they get automatically relocated when the kernel gets moved. But that's clearly wrong for the case where these are fixed addresses.
/proc/kallsyms already handles absolute symbols, so just make __per_cpu_start and __per_cpu_end absolute, and add them to the inclusive list so kallsyms doesn't filter them out.
We make the change to absolute symbols in the PERCPU_VADDR linker script macro, which is only used by x86 (when !CONFIG_X86_32) and ia64, to place the per-cpu section at a specific address. This means that using PERCPU_VADDR is wrong if you don't want an absolute address, so we remove the comment about the vaddr arg being optional.
The comment on PERCPU_VADDR says __per_cpu_load is an absolute symbol, but it isn't (and I don't think it should be). Delete that.
include/asm-generic/vmlinux.lds.h +20 -16
@@ -674,6 +674,16 @@ *(.discard.*) \ } +#define __PERCPU_INPUT (cacheline) \ + *(.data..percpu..first) \ + . = ALIGN(PAGE_SIZE); \ + *(.data..percpu..page_aligned) \ + . = ALIGN(cacheline); \ + *(.data..percpu..readmostly) \ + . = ALIGN(cacheline); \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ +/** * PERCPU_INPUT - the percpu input sections * @cacheline: cacheline size
@@ -686,20 +697,13 @@*/ #define PERCPU_INPUT (cacheline) \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data..percpu..first) \ - . = ALIGN(PAGE_SIZE); \ - *(.data..percpu..page_aligned) \ - . = ALIGN(cacheline); \ - *(.data..percpu..readmostly) \ - . = ALIGN(cacheline); \ - *(.data..percpu) \ - *(.data..percpu..shared_aligned) \ + __PERCPU_INPUT(cacheline) \ VMLINUX_SYMBOL(__per_cpu_end) = .;/** * PERCPU_VADDR - define output section for percpu area * @cacheline: cacheline size -* @vaddr: explicit base address (optional) +* @vaddr: explicit base address * @phdr: destination PHDR (optional) * * Macro which expands to output section for percpu area.
@@ -707,24 +711,25 @@* @cacheline is used to align subsections to avoid false cacheline * sharing between subsections for different purposes. * -* If @vaddr is not blank, it specifies explicit base address and all -* percpu symbols will be offset from the given address. If blank, -* @vaddr always equals @laddr + LOAD_OFFSET. +* @vaddr specifies explicit base address and all +* percpu symbols will be offset from the given address. * * @phdr defines the output PHDR to use if not blank. Be warned that * output PHDR is sticky. If @phdr is specified, the next output * section in the linker script will go there too. @phdr should have * a leading colon. * -* Note that this macros defines __per_cpu_load as an absolute symbol. -* If there is no need to put the percpu section at a predetermined -* address, use PERCPU_SECTION. +* Note that this macros define __per_cpu_start and __per_cpu_end as +* absolute addresses. If there is no need to put the percpu section +* at a predetermined address, use PERCPU_SECTION. */ #define PERCPU_VADDR (cacheline, vaddr, phdr) \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - LOAD_OFFSET) { \ - PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ + __PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \ } phdr \ . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
scripts/kallsyms.c +1 -0
@@ -138,6 +138,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)if (strcmp (sym,"__kernel_syscall_via_break" ) &&strcmp (sym,"__kernel_syscall_via_epc" ) &&strcmp (sym,"__kernel_sigtramp" ) && +strncmp (sym,"__per_cpu" ,strlen ("__per_cpu" )) &&strcmp (sym,"__gp" ))return -1 ;
Quoted 164 lines · Rusty Russell
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.Well,
__per_cpu_startpoints into a real section, within the discarded init region. Makes me wonder why it's zero in/proc/kallsyms(it is on my Ubuntu system here too).... digging ...
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
=> kallsyms: make zero-based
__per_cpu_start&__per_cpu_endabsolute symbols.Andy reported that x86-64 with
CONFIG_RANDOMIZE_BASEhas bogus values for__per_cpu_startand__per_cpu_endin/proc/kallsyms:Several kallsyms output in different boot states for comparison: $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffff810001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1 000000001f200000 D __per_cpu_start 000000001f214280 D __per_cpu_end ffffffffa02001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2 000000000d400000 D __per_cpu_start 000000000d414280 D __per_cpu_end ffffffff8e4001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffffadc001c8 T _stextx86-64 pretends that the
per_cpusection is at address 0, and thus the__per_cpu_startand__per_cpu_endresolve to 0 and <smallnum>.kallsyms encodes the addresses in the kallsyms_addresses[] as relative to
_text: this means they get automatically relocated when the kernel gets moved. But that's clearly wrong for the case where these are fixed addresses.
/proc/kallsymsalready handles absolute symbols, so just make__per_cpu_startand__per_cpu_endabsolute, and add them to the inclusive list so kallsyms doesn't filter them out.We make the change to absolute symbols in the
PERCPU_VADDRlinker script macro, which is only used by x86 (when !CONFIG_X86_32) and ia64, to place the per-cpu section at a specific address. This means that usingPERCPU_VADDRis wrong if you don't want an absolute address, so we remove the comment about the vaddr arg being optional.The comment on
PERCPU_VADDRsays__per_cpu_loadis an absolute symbol, but it isn't (and I don't think it should be). Delete that.Reported-by Andy Honig <[email protected]>Signed-off-by Rusty Russell <[email protected]>include/asm-generic/vmlinux.lds.h +20
-16@@ -674,6 +674,16 @@ *(.discard.*) \ } +#define __PERCPU_INPUT (cacheline) \ + *(.data..percpu..first) \ + . = ALIGN(PAGE_SIZE); \ + *(.data..percpu..page_aligned) \ + . = ALIGN(cacheline); \ + *(.data..percpu..readmostly) \ + . = ALIGN(cacheline); \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ +/** * PERCPU_INPUT - the percpu input sections * @cacheline: cacheline size @@ -686,20 +697,13 @@*/ #define PERCPU_INPUT (cacheline) \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data..percpu..first) \ - . = ALIGN(PAGE_SIZE); \ - *(.data..percpu..page_aligned) \ - . = ALIGN(cacheline); \ - *(.data..percpu..readmostly) \ - . = ALIGN(cacheline); \ - *(.data..percpu) \ - *(.data..percpu..shared_aligned) \ + __PERCPU_INPUT(cacheline) \ VMLINUX_SYMBOL(__per_cpu_end) = .;/** * PERCPU_VADDR - define output section for percpu area * @cacheline: cacheline size -* @vaddr: explicit base address (optional) +* @vaddr: explicit base address * @phdr: destination PHDR (optional) * * Macro which expands to output section for percpu area. @@ -707,24 +711,25 @@* @cacheline is used to align subsections to avoid false cacheline * sharing between subsections for different purposes. * -* If @vaddr is not blank, it specifies explicit base address and all -* percpu symbols will be offset from the given address. If blank, -* @vaddr always equals @laddr + LOAD_OFFSET. +* @vaddr specifies explicit base address and all +* percpu symbols will be offset from the given address. * * @phdr defines the output PHDR to use if not blank. Be warned that * output PHDR is sticky. If @phdr is specified, the next output * section in the linker script will go there too. @phdr should have * a leading colon. * -* Note that this macros defines __per_cpu_load as an absolute symbol. -* If there is no need to put the percpu section at a predetermined -* address, use PERCPU_SECTION. +* Note that this macros define __per_cpu_start and __per_cpu_end as +* absolute addresses. If there is no need to put the percpu section +* at a predetermined address, use PERCPU_SECTION. */ #define PERCPU_VADDR (cacheline, vaddr, phdr) \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - LOAD_OFFSET) { \ - PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ + __PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \ } phdr \ . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);scripts/kallsyms.c +0
-0
scripts/kallsyms.c static int read_symbol(FILE *in, struct sym_entry *s) · line 144
Quoted 7 lines
scripts/kallsyms.c +1
-0@@ -138,6 +138,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)if (strcmp (sym,"__kernel_syscall_via_break" ) &&strcmp (sym,"__kernel_syscall_via_epc" ) &&strcmp (sym,"__kernel_sigtramp" ) && +strncmp (sym,"__per_cpu" ,strlen ("__per_cpu" )) &&strcmp (sym,"__gp" ))return -1 ;
This fails to build for me. The x86 relocs tool fails:
Invalid absolute R_X86_64_32S relocation: __per_cpu_start
I'll see if I can figure out what went wrong...
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 30 lines · Rusty Russell
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.Well,
__per_cpu_startpoints into a real section, within the discarded init region. Makes me wonder why it's zero in/proc/kallsyms(it is on my Ubuntu system here too).... digging ...
Quoted 8 lines
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
=> kallsyms: make zero-based
__per_cpu_start&__per_cpu_endabsolute symbols.Andy reported that x86-64 with
CONFIG_RANDOMIZE_BASEhas bogus values for__per_cpu_startand__per_cpu_endin/proc/kallsyms:
Well, just to make sure it's clear: __per_cpu_start/_end are just markers, and everything between them is mishandled as well, not just things named "__per_cpu" ...
Quoted 108 lines
Several kallsyms output in different boot states for comparison: $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffff810001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1 000000001f200000 D __per_cpu_start 000000001f214280 D __per_cpu_end ffffffffa02001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2 000000000d400000 D __per_cpu_start 000000000d414280 D __per_cpu_end ffffffff8e4001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffffadc001c8 T _stextx86-64 pretends that the
per_cpusection is at address 0, and thus the__per_cpu_startand__per_cpu_endresolve to 0 and <smallnum>.kallsyms encodes the addresses in the kallsyms_addresses[] as relative to
_text: this means they get automatically relocated when the kernel gets moved. But that's clearly wrong for the case where these are fixed addresses.
/proc/kallsymsalready handles absolute symbols, so just make__per_cpu_startand__per_cpu_endabsolute, and add them to the inclusive list so kallsyms doesn't filter them out.We make the change to absolute symbols in the
PERCPU_VADDRlinker script macro, which is only used by x86 (when !CONFIG_X86_32) and ia64, to place the per-cpu section at a specific address. This means that usingPERCPU_VADDRis wrong if you don't want an absolute address, so we remove the comment about the vaddr arg being optional.The comment on
PERCPU_VADDRsays__per_cpu_loadis an absolute symbol, but it isn't (and I don't think it should be). Delete that.Reported-by Andy Honig <[email protected]>Signed-off-by Rusty Russell <[email protected]>include/asm-generic/vmlinux.lds.h +16
-15@@ -674,6 +674,16 @@ *(.discard.*) \ } +#define __PERCPU_INPUT (cacheline) \ + *(.data..percpu..first) \ + . = ALIGN(PAGE_SIZE); \ + *(.data..percpu..page_aligned) \ + . = ALIGN(cacheline); \ + *(.data..percpu..readmostly) \ + . = ALIGN(cacheline); \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ +/** * PERCPU_INPUT - the percpu input sections * @cacheline: cacheline size @@ -686,20 +697,13 @@*/ #define PERCPU_INPUT (cacheline) \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data..percpu..first) \ - . = ALIGN(PAGE_SIZE); \ - *(.data..percpu..page_aligned) \ - . = ALIGN(cacheline); \ - *(.data..percpu..readmostly) \ - . = ALIGN(cacheline); \ - *(.data..percpu) \ - *(.data..percpu..shared_aligned) \ + __PERCPU_INPUT(cacheline) \ VMLINUX_SYMBOL(__per_cpu_end) = .;/** * PERCPU_VADDR - define output section for percpu area * @cacheline: cacheline size -* @vaddr: explicit base address (optional) +* @vaddr: explicit base address * @phdr: destination PHDR (optional) * * Macro which expands to output section for percpu area. @@ -707,24 +711,25 @@* @cacheline is used to align subsections to avoid false cacheline * sharing between subsections for different purposes. * -* If @vaddr is not blank, it specifies explicit base address and all -* percpu symbols will be offset from the given address. If blank, -* @vaddr always equals @laddr + LOAD_OFFSET. +* @vaddr specifies explicit base address and all +* percpu symbols will be offset from the given address. * * @phdr defines the output PHDR to use if not blank. Be warned that * output PHDR is sticky. If @phdr is specified, the next output * section in the linker script will go there too. @phdr should have * a leading colon. * -* Note that this macros defines __per_cpu_load as an absolute symbol. -* If there is no need to put the percpu section at a predetermined -* address, use PERCPU_SECTION. +* Note that this macros define __per_cpu_start and __per_cpu_end as +* absolute addresses. If there is no need to put the percpu section
include/asm-generic/vmlinux.lds.h line 732
Quoted 10 lines
include/asm-generic/vmlinux.lds.h +4
-1+* at a predetermined address, use PERCPU_SECTION. */ #define PERCPU_VADDR (cacheline, vaddr, phdr) \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - LOAD_OFFSET) { \ - PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ + __PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \
I think this portion interacts badly with the x86 relocs tool which is trying to find the per_cpu area via percpu_init(), which looks for the section name ".data..percpu".
Quoted 8 lines
include/asm-generic/vmlinux.lds.h +0
-0} phdr \ . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);scripts/kallsyms.c +0
-0
scripts/kallsyms.c static int read_symbol(FILE *in, struct sym_entry *s) · line 143
Quoted 6 lines
scripts/kallsyms.c +1
-0@@ -138,6 +138,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)if (strcmp (sym,"__kernel_syscall_via_break" ) &&strcmp (sym,"__kernel_syscall_via_epc" ) &&strcmp (sym,"__kernel_sigtramp" ) && +strncmp (sym,"__per_cpu" ,strlen ("__per_cpu" )) &&strcmp (sym,"__gp" ))return -1 ;
We need to keep everything between _start and _end, and they don't have the __per_cpu prefix:
0000000000000000 D irq_stack_union
0000000000000000 D __per_cpu_start
0000000000004000 D gdt_page
0000000000005000 d exception_stacks000000000000b000 D cpu_llc_shared_map000000000000b008 D cpu_core_map000000000000b010 D cpu_sibling_map000000000000b018 D cpu_llc_id
...0000000000013fc0 d call_single_queue
0000000000014000 d cfd_data
0000000000014040 d csd_data
0000000000014080 D softnet_data
0000000000014280 D __per_cpu_end
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 185 lines · Kees Cook
Quoted 30 lines · Rusty Russell
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.Well,
__per_cpu_startpoints into a real section, within the discarded init region. Makes me wonder why it's zero in/proc/kallsyms(it is on my Ubuntu system here too).... digging ...
Quoted 8 lines
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
=>> kallsyms: make zero-based
__per_cpu_start&__per_cpu_endabsolute symbols.Andy reported that x86-64 with
CONFIG_RANDOMIZE_BASEhas bogus values for__per_cpu_startand__per_cpu_endin/proc/kallsyms:Well, just to make sure it's clear: __per_cpu_start/_end are just markers, and everything between them is mishandled as well, not just things named "
__per_cpu" ...Quoted 108 lines
Several kallsyms output in different boot states for comparison: $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffff810001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1 000000001f200000 D __per_cpu_start 000000001f214280 D __per_cpu_end ffffffffa02001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2 000000000d400000 D __per_cpu_start 000000000d414280 D __per_cpu_end ffffffff8e4001c8 T _stext $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed 0000000000000000 D __per_cpu_start 0000000000014280 D __per_cpu_end ffffffffadc001c8 T _stextx86-64 pretends that the
per_cpusection is at address 0, and thus the__per_cpu_startand__per_cpu_endresolve to 0 and <smallnum>.kallsyms encodes the addresses in the kallsyms_addresses[] as relative to
_text: this means they get automatically relocated when the kernel gets moved. But that's clearly wrong for the case where these are fixed addresses.
/proc/kallsymsalready handles absolute symbols, so just make__per_cpu_startand__per_cpu_endabsolute, and add them to the inclusive list so kallsyms doesn't filter them out.We make the change to absolute symbols in the
PERCPU_VADDRlinker script macro, which is only used by x86 (when !CONFIG_X86_32) and ia64, to place the per-cpu section at a specific address. This means that usingPERCPU_VADDRis wrong if you don't want an absolute address, so we remove the comment about the vaddr arg being optional.The comment on
PERCPU_VADDRsays__per_cpu_loadis an absolute symbol, but it isn't (and I don't think it should be). Delete that.Reported-by Andy Honig <[email protected]>Signed-off-by Rusty Russell <[email protected]>include/asm-generic/vmlinux.lds.h +16
-15@@ -674,6 +674,16 @@ *(.discard.*) \ } +#define __PERCPU_INPUT (cacheline) \ + *(.data..percpu..first) \ + . = ALIGN(PAGE_SIZE); \ + *(.data..percpu..page_aligned) \ + . = ALIGN(cacheline); \ + *(.data..percpu..readmostly) \ + . = ALIGN(cacheline); \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ +/** * PERCPU_INPUT - the percpu input sections * @cacheline: cacheline size @@ -686,20 +697,13 @@*/ #define PERCPU_INPUT (cacheline) \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data..percpu..first) \ - . = ALIGN(PAGE_SIZE); \ - *(.data..percpu..page_aligned) \ - . = ALIGN(cacheline); \ - *(.data..percpu..readmostly) \ - . = ALIGN(cacheline); \ - *(.data..percpu) \ - *(.data..percpu..shared_aligned) \ + __PERCPU_INPUT(cacheline) \ VMLINUX_SYMBOL(__per_cpu_end) = .;/** * PERCPU_VADDR - define output section for percpu area * @cacheline: cacheline size -* @vaddr: explicit base address (optional) +* @vaddr: explicit base address * @phdr: destination PHDR (optional) * * Macro which expands to output section for percpu area. @@ -707,24 +711,25 @@* @cacheline is used to align subsections to avoid false cacheline * sharing between subsections for different purposes. * -* If @vaddr is not blank, it specifies explicit base address and all -* percpu symbols will be offset from the given address. If blank, -* @vaddr always equals @laddr + LOAD_OFFSET. +* @vaddr specifies explicit base address and all +* percpu symbols will be offset from the given address. * * @phdr defines the output PHDR to use if not blank. Be warned that * output PHDR is sticky. If @phdr is specified, the next output * section in the linker script will go there too. @phdr should have * a leading colon. * -* Note that this macros defines __per_cpu_load as an absolute symbol. -* If there is no need to put the percpu section at a predetermined -* address, use PERCPU_SECTION. +* Note that this macros define __per_cpu_start and __per_cpu_end as +* absolute addresses. If there is no need to put the percpu section include/asm-generic/vmlinux.lds.h line 732
Quoted 10 lines
include/asm-generic/vmlinux.lds.h +4
-1+* at a predetermined address, use PERCPU_SECTION. */ #define PERCPU_VADDR (cacheline, vaddr, phdr) \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - LOAD_OFFSET) { \ - PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ + __PERCPU_INPUT(cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \I think this portion interacts badly with the x86 relocs tool which is trying to find the
per_cpuarea viapercpu_init(), which looks for the section name ".data..percpu".Quoted 8 lines
include/asm-generic/vmlinux.lds.h +0
-0} phdr \ . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);scripts/kallsyms.c +0
-0scripts/kallsyms.c static int read_symbol(FILE *in, struct sym_entry *s) · line 143
Quoted 6 lines
scripts/kallsyms.c +1
-0@@ -138,6 +138,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)if (strcmp (sym,"__kernel_syscall_via_break" ) &&strcmp (sym,"__kernel_syscall_via_epc" ) &&strcmp (sym,"__kernel_sigtramp" ) && +strncmp (sym,"__per_cpu" ,strlen ("__per_cpu" )) &&strcmp (sym,"__gp" ))return -1 ;We need to keep everything between
_startand_end, and they don't have the__per_cpuprefix:
Quoted 14 lines
0000000000000000 D
irq_stack_union
0000000000000000 D__per_cpu_start
0000000000004000 Dgdt_page
0000000000005000 dexception_stacks000000000000b000Dcpu_llc_shared_map000000000000b008Dcpu_core_map000000000000b010Dcpu_sibling_map000000000000b018Dcpu_llc_id
...0000000000013fc0dcall_single_queue
0000000000014000 dcfd_data
0000000000014040 dcsd_data
0000000000014080 Dsoftnet_data
0000000000014280 D__per_cpu_end
Okay, I've sent a new set of patches ("[PATCH 0/2] kallsyms: handle special absolute symbols") that addresses the kallsyms "confusion" over the per_cpu range of memory. This does the right thing for me, and does not change any global behaviors that I can see.
Thanks for the help on this!
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 35 lines · Kees Cook
Quoted 34 lines · Rusty Russell
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.Well,
__per_cpu_startpoints into a real section, within the discarded init region. Makes me wonder why it's zero in/proc/kallsyms(it is on my Ubuntu system here too).... digging ...
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
Quoted 8 lines
Quoted 4 lines
=>> kallsyms: make zero-based
__per_cpu_start&__per_cpu_endabsolute symbols.Andy reported that x86-64 with
CONFIG_RANDOMIZE_BASEhas bogus values for__per_cpu_startand__per_cpu_endin/proc/kallsyms:Well, just to make sure it's clear: __per_cpu_start/_end are just markers, and everything between them is mishandled as well, not just things named "
__per_cpu" ...
Gah... they should all be absolute, really, but that's going to be harder.
Quoted 8 lines
include/asm-generic/vmlinux.lds.h line 732
Quoted 4 lines
include/asm-generic/vmlinux.lds.h +3
-1-PERCPU_INPUT (cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ +__PERCPU_INPUT (cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \I think this portion interacts badly with the x86 relocs tool which is trying to find the
per_cpuarea viapercpu_init(), which looks for the section name ".data..percpu".
What is "the x86 relocs tool"?
Thanks,
Rusty.
Quoted 53 lines · Rusty Russell
Quoted 35 lines · Kees Cook
Quoted 34 lines · Rusty Russell
Quoted 14 lines · Kees Cook
[+x86 folks]
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Kees Cook
This got NAKed, please don't apply -- this patch works for x86 and ARM, but may cause problems for others:
I'd much rather fix x86 and ARM, than worry about avr32.
Priorities, people.
Somebody who knows how "fix this properly" is supposed to work?
Quoted 8 lines
I have not yet had a chance to more carefully examine the options, but AIUI, the problem is that (at least) the "per cpu" variables are neither absolute nor relative addresses from a relocation perspective. They're relative to the per cpu area, but the linker tools don't know about that state. So, I think, to fix this correctly, we need to teach the linker tools about this third state. This may also help
arch/x86/tools/relocs, which is currently using a whitelist for mis-identified variables.Well,
__per_cpu_startpoints into a real section, within the discarded init region. Makes me wonder why it's zero in/proc/kallsyms(it is on my Ubuntu system here too).... digging ...
Ah, the zero-based percpu patches, of course. Gah.
How's this? Did I break IA64?
Quoted 8 lines
Quoted 4 lines
=>>> kallsyms: make zero-based
__per_cpu_start&__per_cpu_endabsolute symbols.Andy reported that x86-64 with
CONFIG_RANDOMIZE_BASEhas bogus values for__per_cpu_startand__per_cpu_endin/proc/kallsyms:Well, just to make sure it's clear: __per_cpu_start/_end are just markers, and everything between them is mishandled as well, not just things named "
__per_cpu" ...Gah... they should all be absolute, really, but that's going to be harder.
Quoted 5 lines
Quoted 4 lines
include/asm-generic/vmlinux.lds.h +3
-1-PERCPU_INPUT (cacheline) \ + VMLINUX_SYMBOL(__per_cpu_start) = ABSOLUTE(.); \ +__PERCPU_INPUT (cacheline) \ + VMLINUX_SYMBOL(__per_cpu_end) = ABSOLUTE(.); \
Quoted 5 lines
Quoted 3 lines
I think this portion interacts badly with the x86 relocs tool which is trying to find the
per_cpuarea viapercpu_init(), which looks for the section name ".data..percpu".What is "the x86 relocs tool"?
arch/x86/tools/relocs.c is used to generate relocation information on x86-32 (always) and x86-64 (under kASLR). It deals with all kinds of weird special cases that various linkers do differently. I'm glad I didn't have to touch this code again. :)
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 7 lines · Kees Cook
Quoted 1 line · Rusty Russell
What is "the x86 relocs tool"?
arch/x86/tools/relocs.cis used to generate relocation information on x86-32 (always) and x86-64 (under kASLR). It deals with all kinds of weird special cases that various linkers do differently. I'm glad I didn't have to touch this code again. :)
Well, let's fix it!
Making these symbols absolute seems like the Right Thing. We can work around it for the moment but I'll look at that once we have a minimal fix for now (see other thread).
Thanks,
Rusty.