Modernise VDSO setup
Subsystems (2)
cover Modernise VDSO setup
This series modernises the setup of VDSO:
- Switch to using _install_special_mapping() which has replaced install_special_mapping()
- Move datapage in front of text like most other architectures to simplify its localisation
- Perform link time symbol resolution instead of runtime
This leads to a huge size reduction of vdso.c
Replaces the two following series:
[v1,1/9] powerpc/vdso: Remove BUG_ON() in vdso_init() [v2,1/5] powerpc/vdso: Remove DBG()
This series is based on top of the series to the C generic VDSO. It is functionnaly independant but some trivial merge conflict occurs in some files. I may rebase it on top of merge if the C generic VDSO series cannot be merged soon.
Christophe Leroy (30):
powerpc/vdso: Stripped VDSO is not needed, don't build it powerpc/vdso: Add missing includes and clean vdso_setup_syscall_map() powerpc/vdso: Rename syscall_map_32/64 to simplify
vdso_setup_syscall_map()
powerpc/vdso: Remove get_page() in vdso_pagelist initialization powerpc/vdso: Remove NULL termination element in vdso_pagelist powerpc/vdso: Refactor 32 bits and 64 bits pages setup powerpc/vdso: Remove unnecessary ifdefs in vdso_pagelist
initialization
powerpc/vdso: Use VDSO size in arch_setup_additional_pages() powerpc/vdso: Simplify arch_setup_additional_pages() exit powerpc/vdso: Move to _install_special_mapping() and remove
arch_vma_name()
powerpc/vdso: Provide vdso_remap()
powerpc/vdso: Replace vdso_base by vdso
powerpc/vdso: Move vdso datapage up front
powerpc/vdso: Simplify __get_datapage()
powerpc/vdso: Remove unused \tmp param in __get_datapage()
powerpc/vdso: Retrieve sigtramp offsets at buildtime
powerpc/vdso: Use builtin symbols to locate fixup section
powerpc/vdso: Merge __kernel_sync_dicache_p5() into
__kernel_sync_dicache()
powerpc/vdso: Remove vdso32_pages and vdso64_pages
powerpc/vdso: Remove __kernel_datapage_offset
powerpc/vdso: Remove runtime generated sigtramp offsets
powerpc/vdso: Remove vdso_patches[] and associated functions
powerpc/vdso: Remove unused text member in struct lib32/64_elfinfo
powerpc/vdso: Remove symbol section information in struct
lib32/64_elfinfo powerpc/vdso: Remove lib32_elfinfo and lib64_elfinfo powerpc/vdso: Remove vdso_setup() powerpc/vdso: Remove vdso_ready powerpc/vdso: Remove DBG()
powerpc/vdso: Remove VDSO32_LBASE and VDSO64_LBASE powerpc/vdso: Cleanup vdso.h
arch/powerpc/Makefile | 24 +- arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 +- arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/include/asm/elf.h | 2 +- arch/powerpc/include/asm/mm-arch-hooks.h | 25 - arch/powerpc/include/asm/mmu_context.h | 6 +- arch/powerpc/include/asm/nohash/32/mmu-40x.h | 2 +- arch/powerpc/include/asm/nohash/32/mmu-44x.h | 2 +- arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 2 +- arch/powerpc/include/asm/nohash/mmu-book3e.h | 2 +- arch/powerpc/include/asm/vdso.h | 29 +- arch/powerpc/include/asm/vdso/gettimeofday.h | 4 +- arch/powerpc/include/asm/vdso_datapage.h | 17 +- arch/powerpc/kernel/asm-offsets.c | 6 +- arch/powerpc/kernel/signal_32.c | 8 +- arch/powerpc/kernel/signal_64.c | 4 +- arch/powerpc/kernel/vdso.c | 682 +++--------------- arch/powerpc/kernel/vdso32/Makefile | 27 +- arch/powerpc/kernel/vdso32/cacheflush.S | 19 +- arch/powerpc/kernel/vdso32/datapage.S | 7 +- .../powerpc/kernel/vdso32/gen_vdso_offsets.sh | 16 + arch/powerpc/kernel/vdso32/vdso32.lds.S | 24 +- arch/powerpc/kernel/vdso64/Makefile | 25 +- arch/powerpc/kernel/vdso64/cacheflush.S | 18 +- arch/powerpc/kernel/vdso64/datapage.S | 7 +- .../powerpc/kernel/vdso64/gen_vdso_offsets.sh | 16 + arch/powerpc/kernel/vdso64/vdso64.lds.S | 23 +- arch/powerpc/perf/callchain_32.c | 8 +- arch/powerpc/perf/callchain_64.c | 4 +- 29 files changed, 267 insertions(+), 746 deletions(-) delete mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h create mode 100755 arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh create mode 100755 arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh
Signature · 1 line
2.25.0
PATCH 1/30 powerpc/vdso: Stripped VDSO is not needed, don't build it
Since commit 24b659a13866 ("powerpc: Use unstripped VDSO image for more accurate profiling data"), only the unstripped VDSO image has been used.
Partially revert commit 8150caad0226 ("[POWERPC] powerpc vDSO: install unstripped copies on disk") to avoid building the stripped version.
And the unstripped version in $(MODLIB)/vdso/ is not required anymore as it is the one embedded in the kernel image.
--- arch/powerpc/Makefile | 9 --------- arch/powerpc/kernel/vdso32/Makefile | 19 ++----------------- arch/powerpc/kernel/vdso64/Makefile | 19 ++----------------- 3 files changed, 4 insertions(+), 43 deletions(-)
arch/powerpc/Makefile +0 -9
@@ -407,15 +407,6 @@ PHONY += install install: $(Q)$(MAKE) $(build)=$(boot) install -PHONY += vdso_install -vdso_install: -ifdef CONFIG_PPC64 - $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ -endif -ifdef CONFIG_VDSO32 - $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ -endif - archclean: $(Q)$(MAKE) $(clean)=$(boot)
arch/powerpc/kernel/vdso32/Makefile +2 -17
@@ -34,7 +34,7 @@ CC32FLAGS += -m32 KBUILD_CFLAGS := $(filter-out -mcmodel=medium,$(KBUILD_CFLAGS)) endif -targets := $(obj-vdso32) vdso32.so vdso32.so.dbg +targets := $(obj-vdso32) vdso32.so.dbg obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32)) GCOV_PROFILE := n
@@ -51,17 +51,12 @@ extra-y += vdso32.lds CPPFLAGS_vdso32.lds += -P -C -Upowerpc # Force dependency (incbin is bad) -$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so +$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so.dbg # link rule for the .so file, .lds has to be first $(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday.o FORCE $(call if_changed,vdso32ld_and_check) -# strip rule for the .so file -$(obj)/%.so: OBJCOPYFLAGS := -S -$(obj)/%.so: $(obj)/%.so.dbg FORCE - $(call if_changed,objcopy) - # assembly rules for the .S files $(obj-vdso32): %.o: %.S FORCE $(call if_changed_dep,vdso32as)
@@ -75,13 +70,3 @@ quiet_cmd_vdso32as = VDSO32A $@ cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $< quiet_cmd_vdso32cc = VDSO32C $@ cmd_vdso32cc = $(VDSOCC) $(c_flags) $(CC32FLAGS) -c -o $@ $< - -# install commands for the unstripped file -quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $(obj)/[email protected] $(MODLIB)/vdso/$@ - -vdso32.so: $(obj)/vdso32.so.dbg - @mkdir -p $(MODLIB)/vdso - $(call cmd,vdso_install) - -vdso_install: vdso32.so
arch/powerpc/kernel/vdso64/Makefile +2 -17
@@ -17,7 +17,7 @@ endif # Build rules -targets := $(obj-vdso64) vdso64.so vdso64.so.dbg +targets := $(obj-vdso64) vdso64.so.dbg obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64)) GCOV_PROFILE := n
@@ -36,27 +36,12 @@ CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) $(obj)/vgettimeofday.o: %.o: %.c FORCE # Force dependency (incbin is bad) -$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so +$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so.dbg # link rule for the .so file, .lds has to be first $(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday.o FORCE $(call if_changed,vdso64ld_and_check) -# strip rule for the .so file -$(obj)/%.so: OBJCOPYFLAGS := -S -$(obj)/%.so: $(obj)/%.so.dbg FORCE - $(call if_changed,objcopy) - # actual build commands quiet_cmd_vdso64ld_and_check = VDSO64L $@ cmd_vdso64ld_and_check = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^); $(cmd_vdso_check) - -# install commands for the unstripped file -quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $(obj)/[email protected] $(MODLIB)/vdso/$@ - -vdso64.so: $(obj)/vdso64.so.dbg - @mkdir -p $(MODLIB)/vdso - $(call cmd,vdso_install) - -vdso_install: vdso64.so
Signature · 1 line
2.25.0
PATCH 2/30 powerpc/vdso: Add missing includes and clean vdso_setup_syscall_map()
In reply to Christophe LeroyInstead of including extern references locally in vdso_setup_syscall_map(), add the missing headers.
sys_ni_syscall() being a function, cast its address to an unsigned long instead of declaring it as a fake unsigned long object.
At the same time, remove a comment which paraphrases the function name.
--- arch/powerpc/kernel/vdso.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
arch/powerpc/kernel/vdso.c +5 -12
@@ -17,8 +17,10 @@#include <linux/elf.h> #include <linux/security.h> #include <linux/memblock.h> +#include <linux/syscalls.h> #include <vdso/datapage.h> +#include <asm/syscall.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/mmu_context.h>
@@ -639,24 +641,18 @@ static __init int vdso_setup(void)static void __init vdso_setup_syscall_map (void ) {unsigned int i; -extern unsigned long *sys_call_table; -#ifdef CONFIG_PPC64 -extern unsigned long *compat_sys_call_table; -#endif -extern unsigned long sys_ni_syscall; -for (i =0 ; i < NR_syscalls; i++) {#ifdef CONFIG_PPC64 -if (sys_call_table[i] != sys_ni_syscall) +if (sys_call_table[i] != (unsigned long )&sys_ni_syscall) vdso_data->syscall_map_64[i >>5 ] |=0x80000000UL >> (i &0x1f );if (IS_ENABLED (CONFIG_COMPAT ) && - compat_sys_call_table[i] != sys_ni_syscall) + compat_sys_call_table[i] != (unsigned long )&sys_ni_syscall) vdso_data->syscall_map_32[i >>5 ] |=0x80000000UL >> (i &0x1f );#else /* CONFIG_PPC64 */ -if (sys_call_table[i] != sys_ni_syscall) +if (sys_call_table[i] != (unsigned long )&sys_ni_syscall) vdso_data->syscall_map_32[i >>5 ] |=0x80000000UL >> (i &0x1f );#endif /* CONFIG_PPC64 */
@@ -738,9 +734,6 @@ static int __init vdso_init(void)#endif -/* -* Setup the syscall map in the vDOS -*/ vdso_setup_syscall_map ();/*
Signature · 1 line
2.25.0
PATCH 7/30 powerpc/vdso: Remove unnecessary ifdefs in vdso_pagelist initialization
In reply to Christophe LeroyNo need of all those #ifdefs around the pagelist initialisation, use IS_ENABLED(), GCC will kick out unused static variables.
--- arch/powerpc/kernel/vdso.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-)
arch/powerpc/kernel/vdso.c +6 -25
@@ -53,15 +53,12 @@ static struct page **vdso32_pagelist;unsigned long vdso32_sigtramp;unsigned long vdso32_rt_sigtramp; -#ifdef CONFIG_VDSO32 extern char vdso32_start, vdso32_end; -#endif - -#ifdef CONFIG_PPC64 extern char vdso64_start, vdso64_end;static void *vdso64_kbase = &vdso64_start;static unsigned int vdso64_pages;static struct page **vdso64_pagelist; +#ifdef CONFIG_PPC64 unsigned long vdso64_rt_sigtramp;#endif /* CONFIG_PPC64 */
@@ -136,7 +133,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)if (!vdso_ready)return 0 ; -#ifdef CONFIG_PPC64 if (is_32bit_task ()) { vdso_pagelist = vdso32_pagelist; vdso_pages = vdso32_pages;
@@ -151,11 +147,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)*/ vdso_base =0 ; } -#else - vdso_pagelist = vdso32_pagelist; - vdso_pages = vdso32_pages; - vdso_base =VDSO32_MBASE ; -#endif current->mm->context.vdso_base =0 ;
@@ -614,9 +605,7 @@ static __init int vdso_setup(void)struct lib64_elfinfo v64; v32.hdr = vdso32_kbase; -#ifdef CONFIG_PPC64 v64.hdr = vdso64_kbase; -#endif if (vdso_do_find_sections (&v32, &v64))return -1 ;
@@ -722,16 +711,14 @@ static int __init vdso_init(void) vdso_data->icache_block_size = ppc64_caches.l1i.block_size; vdso_data->dcache_log_block_size = ppc64_caches.l1d.log_block_size; vdso_data->icache_log_block_size = ppc64_caches.l1i.log_block_size; +#endif /* CONFIG_PPC64 */ /* * Calculate the size of the 64 bits vDSO */ vdso64_pages = (&vdso64_end - &vdso64_start) >>PAGE_SHIFT ;DBG ("vdso64_kbase: %p, 0x%x pages\n" , vdso64_kbase, vdso64_pages); -#endif /* CONFIG_PPC64 */ - -#ifdef CONFIG_VDSO32 vdso32_kbase = &vdso32_start;/*
@@ -739,8 +726,6 @@ static int __init vdso_init(void)*/ vdso32_pages = (&vdso32_end - &vdso32_start) >>PAGE_SHIFT ;DBG ("vdso32_kbase: %p, 0x%x pages\n" , vdso32_kbase, vdso32_pages); -#endif -vdso_setup_syscall_map ();
@@ -751,19 +736,15 @@ static int __init vdso_init(void)if (vdso_setup ()) {printk (KERN_ERR "vDSO setup failure, not enabled !\n" ); vdso32_pages =0 ; -#ifdef CONFIG_PPC64 vdso64_pages =0 ; -#endif return 0 ; } -#ifdef CONFIG_VDSO32 - vdso32_pagelist =vdso_setup_pages (&vdso32_start, &vdso32_end); -#endif +if (IS_ENABLED (CONFIG_VDSO32 )) + vdso32_pagelist =vdso_setup_pages (&vdso32_start, &vdso32_end); -#ifdef CONFIG_PPC64 - vdso64_pagelist =vdso_setup_pages (&vdso64_start, &vdso64_end); -#endif /* CONFIG_PPC64 */ +if (IS_ENABLED (CONFIG_PPC64 )) + vdso64_pagelist =vdso_setup_pages (&vdso64_start, &vdso64_end);smp_wmb (); vdso_ready =1 ;
Signature · 1 line
2.25.0
PATCH 8/30 powerpc/vdso: Use VDSO size in arch_setup_additional_pages()
In reply to Christophe LeroyIn arch_setup_additional_pages(), instead of using number of VDSO pages and recalculate VDSO size, directly use the VDSO size.
As vdso_ready is set, vdso_pages can't be 0 so just remove the test.
--- arch/powerpc/kernel/vdso.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
arch/powerpc/kernel/vdso.c +6 -12
@@ -126,7 +126,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) {struct mm_struct *mm = current->mm;struct page **vdso_pagelist; -unsigned long vdso_pages; +unsigned long vdso_size;unsigned long vdso_base;int rc;
@@ -135,11 +135,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)if (is_32bit_task ()) { vdso_pagelist = vdso32_pagelist; - vdso_pages = vdso32_pages; + vdso_size = &vdso32_end - &vdso32_start; vdso_base =VDSO32_MBASE ; }else { vdso_pagelist = vdso64_pagelist; - vdso_pages = vdso64_pages; + vdso_size = &vdso64_end - &vdso64_start;/* * On 64bit we don't have a preferred map address. This * allows get_unmapped_area to find an area near other mmaps
@@ -150,13 +150,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) current->mm->context.vdso_base =0 ; -/* vDSO has a problem and was disabled, just don't "enable" it for the -* process -*/ -if (vdso_pages ==0 ) -return 0 ;/* Add a page to the vdso size for the data page */ - vdso_pages ++; + vdso_size +=PAGE_SIZE ;/* * pick a base address for the vDSO in process space. We try to put it
@@ -167,8 +162,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)if (mmap_write_lock_killable (mm))return -EINTR ; vdso_base =get_unmapped_area (NULL , vdso_base, - (vdso_pages <<PAGE_SHIFT ) + - ((VDSO_ALIGNMENT -1 ) &PAGE_MASK ), + vdso_size + ((VDSO_ALIGNMENT -1 ) &PAGE_MASK ),0 ,0 );if (IS_ERR_VALUE (vdso_base)) { rc = vdso_base;
@@ -195,7 +189,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)* It's fine to use that for setting breakpoints in the vDSO code * pages though. */ - rc =install_special_mapping (mm, vdso_base, vdso_pages <<PAGE_SHIFT , + rc =install_special_mapping (mm, vdso_base, vdso_size,VM_READ |VM_EXEC |VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC , vdso_pagelist);
Signature · 1 line
2.25.0
PATCH 5/30 powerpc/vdso: Remove NULL termination element in vdso_pagelist
In reply to Christophe LeroyNo need of a NULL last element in pagelists, install_special_mapping() knows how long the list is.
Remove that element.
--- arch/powerpc/kernel/vdso.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/powerpc/kernel/vdso.c +2 -4
@@ -743,7 +743,7 @@ static int __init vdso_init(void)#ifdef CONFIG_VDSO32 /* Make sure pages are in the correct state */ - vdso32_pagelist =kcalloc (vdso32_pages +2 ,sizeof (struct page *), + vdso32_pagelist =kcalloc (vdso32_pages +1 ,sizeof (struct page *),GFP_KERNEL );BUG_ON (vdso32_pagelist ==NULL );for (i =0 ; i < vdso32_pages; i++) {
@@ -752,11 +752,10 @@ static int __init vdso_init(void) vdso32_pagelist[i] = pg; } vdso32_pagelist[i++] =virt_to_page (vdso_data); - vdso32_pagelist[i] =NULL ;#endif #ifdef CONFIG_PPC64 - vdso64_pagelist =kcalloc (vdso64_pages +2 ,sizeof (struct page *), + vdso64_pagelist =kcalloc (vdso64_pages +1 ,sizeof (struct page *),GFP_KERNEL );BUG_ON (vdso64_pagelist ==NULL );for (i =0 ; i < vdso64_pages; i++) {
@@ -765,7 +764,6 @@ static int __init vdso_init(void) vdso64_pagelist[i] = pg; } vdso64_pagelist[i++] =virt_to_page (vdso_data); - vdso64_pagelist[i] =NULL ;#endif /* CONFIG_PPC64 */ smp_wmb ();
Signature · 1 line
2.25.0
PATCH 9/30 powerpc/vdso: Simplify arch_setup_additional_pages() exit
In reply to Christophe LeroyTo simplify arch_setup_additional_pages() exit, rename it __arch_setup_additional_pages() and create a caller arch_setup_additional_pages() which does the locking.
--- arch/powerpc/kernel/vdso.c | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-)
arch/powerpc/kernel/vdso.c +21 -19
@@ -122,7 +122,7 @@ struct lib64_elfinfo* This is called from binfmt_elf, we create the special vma for the * vDSO and insert it into the mm struct tree */ -int arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) +static int __arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) {struct mm_struct *mm = current->mm;struct page **vdso_pagelist;
@@ -130,9 +130,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)unsigned long vdso_base;int rc; -if (!vdso_ready) -return 0 ; -if (is_32bit_task ()) { vdso_pagelist = vdso32_pagelist; vdso_size = &vdso32_end - &vdso32_start;
@@ -148,8 +145,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vdso_base =0 ; } - current->mm->context.vdso_base =0 ; -/* Add a page to the vdso size for the data page */ vdso_size +=PAGE_SIZE ;
@@ -159,15 +154,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)* and end up putting it elsewhere. * Add enough to the size so that the result can be aligned. */ -if (mmap_write_lock_killable (mm)) -return -EINTR ; vdso_base =get_unmapped_area (NULL , vdso_base, vdso_size + ((VDSO_ALIGNMENT -1 ) &PAGE_MASK ),0 ,0 ); -if (IS_ERR_VALUE (vdso_base)) { - rc = vdso_base; - goto fail_mmapsem; - } +if (IS_ERR_VALUE (vdso_base)) +return vdso_base;/* Add required alignment. */ vdso_base =ALIGN (vdso_base,VDSO_ALIGNMENT );
@@ -193,15 +184,26 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)VM_READ |VM_EXEC |VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC , vdso_pagelist); -if (rc) { - current->mm->context.vdso_base =0 ; - goto fail_mmapsem; - } +return rc; +} -mmap_write_unlock (mm); -return 0 ; +int arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) +{ +struct mm_struct *mm = current->mm; +int rc; + + mm->context.vdso_base =0 ; + +if (!vdso_ready) +return 0 ; + +if (mmap_write_lock_killable (mm)) +return -EINTR ; + + rc =__arch_setup_additional_pages (bprm, uses_interp); +if (rc) + mm->context.vdso_base =0 ; - fail_mmapsem:mmap_write_unlock (mm);return rc; }
Signature · 1 line
2.25.0
PATCH 15/30 powerpc/vdso: Remove unused \tmp param in __get_datapage()
In reply to Christophe LeroyThe \tmp param is not used anymore, remove it.
--- arch/powerpc/include/asm/vdso/gettimeofday.h | 4 ++-- arch/powerpc/include/asm/vdso_datapage.h | 2 +- arch/powerpc/kernel/vdso32/cacheflush.S | 2 +- arch/powerpc/kernel/vdso32/datapage.S | 4 ++-- arch/powerpc/kernel/vdso64/cacheflush.S | 2 +- arch/powerpc/kernel/vdso64/datapage.S | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/vdso/gettimeofday.h +2 -2
@@ -22,7 +22,7 @@#ifdef CONFIG_PPC64 PPC_STL r2, STACK_FRAME_OVERHEAD + STK_GOT(r1) #endif -get_datapage r5, r0 + get_datapage r5 addi r5, r5, VDSO_DATA_OFFSET bl \funct PPC_LL r0, STACK_FRAME_OVERHEAD + PPC_LR_STKOFF(r1)
@@ -51,7 +51,7 @@#ifdef CONFIG_PPC64 PPC_STL r2, STACK_FRAME_OVERHEAD + STK_GOT(r1) #endif -get_datapage r4, r0 + get_datapage r4 addi r4, r4, VDSO_DATA_OFFSET bl \funct PPC_LL r0, STACK_FRAME_OVERHEAD + PPC_LR_STKOFF(r1)
arch/powerpc/include/asm/vdso_datapage.h +1 -1
@@ -103,7 +103,7 @@ extern struct vdso_arch_data *vdso_data;#else /* __ASSEMBLY__ */ -.macro get_datapage ptr, tmp +.macro get_datapage ptr bcl 20, 31, .+4 999: mflr \ptr
arch/powerpc/kernel/vdso32/cacheflush.S +1 -1
@@ -27,7 +27,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) #ifdef CONFIG_PPC64 mflr r12 .cfi_register lr,r12 - get_datapage r10, r0 + get_datapage r10 mtlr r12 #endif
arch/powerpc/kernel/vdso32/datapage.S +2 -2
@@ -31,7 +31,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) mflr r12 .cfi_register lr,r12 mr. r4,r3 - get_datapage r3, r0 + get_datapage r3 mtlr r12 addi r3,r3,CFG_SYSCALL_MAP32 beqlr
@@ -52,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 lwz r4,(CFG_TB_TICKS_PER_SEC + 4)(r3) lwz r3,CFG_TB_TICKS_PER_SEC(r3) mtlr r12
arch/powerpc/kernel/vdso64/cacheflush.S +1 -1
@@ -25,7 +25,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r10, r0 + get_datapage r10 mtlr r12 lwz r7,CFG_DCACHE_BLOCKSZ(r10)
arch/powerpc/kernel/vdso64/datapage.S +2 -2
@@ -31,7 +31,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) mflr r12 .cfi_register lr,r12 mr r4,r3 - get_datapage r3, r0 + get_datapage r3 mtlr r12 addi r3,r3,CFG_SYSCALL_MAP64 cmpldi cr0,r4,0
@@ -53,7 +53,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 ld r3,CFG_TB_TICKS_PER_SEC(r3) mtlr r12 crclr cr0*4+so
Signature · 1 line
2.25.0
PATCH 6/30 powerpc/vdso: Refactor 32 bits and 64 bits pages setup
In reply to Christophe LeroyThe setup of VDSO pages is identical for 32 bits VDSO and 64 bits VDSO.
Refactor that setup.
And use &vdsoXX_start which is synonym of vdsoXX_kbase.
--- arch/powerpc/kernel/vdso.c | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
arch/powerpc/kernel/vdso.c +19 -20
@@ -678,10 +678,26 @@ int vdso_getcpu_init(void)early_initcall (vdso_getcpu_init);#endif -static int __init vdso_init (void ) +static struct page **__init vdso_setup_pages (void *start,void *end) {int i; +struct page **pagelist; +int pages = (end - start) >>PAGE_SHIFT ; + + pagelist =kcalloc (pages +1 ,sizeof (struct page *),GFP_KERNEL ); +if (!pagelist) +panic ("%s: Cannot allocate page list for VDSO" , __func__); + +for (i =0 ; i < pages; i++) + pagelist[i] =virt_to_page (start + i *PAGE_SIZE ); + + pagelist[i] =virt_to_page (vdso_data); + +return pagelist; +} +static int __init vdso_init (void ) +{#ifdef CONFIG_PPC64 /* * Fill up the "systemcfg" stuff for backward compatibility
@@ -742,28 +758,11 @@ static int __init vdso_init(void) }#ifdef CONFIG_VDSO32 -/* Make sure pages are in the correct state */ - vdso32_pagelist =kcalloc (vdso32_pages +1 ,sizeof (struct page *), -GFP_KERNEL ); -BUG_ON (vdso32_pagelist ==NULL ); -for (i =0 ; i < vdso32_pages; i++) { -struct page *pg =virt_to_page (vdso32_kbase + i*PAGE_SIZE ); - - vdso32_pagelist[i] = pg; - } - vdso32_pagelist[i++] =virt_to_page (vdso_data); + vdso32_pagelist =vdso_setup_pages (&vdso32_start, &vdso32_end);#endif #ifdef CONFIG_PPC64 - vdso64_pagelist =kcalloc (vdso64_pages +1 ,sizeof (struct page *), -GFP_KERNEL ); -BUG_ON (vdso64_pagelist ==NULL ); -for (i =0 ; i < vdso64_pages; i++) { -struct page *pg =virt_to_page (vdso64_kbase + i*PAGE_SIZE ); - - vdso64_pagelist[i] = pg; - } - vdso64_pagelist[i++] =virt_to_page (vdso_data); + vdso64_pagelist =vdso_setup_pages (&vdso64_start, &vdso64_end);#endif /* CONFIG_PPC64 */ smp_wmb ();
Signature · 1 line
2.25.0
PATCH 14/30 powerpc/vdso: Simplify __get_datapage()
In reply to Christophe LeroyThe VDSO datapage and the text pages are always located immediately next to each other, so it can be hardcoded without an indirection through __kernel_datapage_offset
--- arch/powerpc/include/asm/vdso_datapage.h | 8 +++++--- arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 ++ arch/powerpc/kernel/vdso64/vdso64.lds.S | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +5 -3
@@ -105,10 +105,12 @@ extern struct vdso_arch_data *vdso_data; .macro get_datapage ptr, tmp bcl 20, 31, .+4 +999: mflr \ptr - addi \ptr, \ptr, (__kernel_datapage_offset - (.-4))@l - lwz \tmp, 0(\ptr) - add \ptr, \tmp, \ptr +#if CONFIG_PPC_PAGE_SHIFT > 14 + addis \ptr, \ptr, (_vdso_datapage - 999b)@ha +#endif + addi \ptr, \ptr, (_vdso_datapage - 999b)@l .endm #endif /* __ASSEMBLY__ */
arch/powerpc/kernel/vdso32/vdso32.lds.S +2 -0
@@ -4,6 +4,7 @@ * library */ #include <asm/vdso.h> +#include <asm/page.h> #ifdef __LITTLE_ENDIAN__ OUTPUT_FORMAT("elf32-powerpcle", "elf32-powerpcle", "elf32-powerpcle")
@@ -15,6 +16,7 @@ ENTRY(_start) SECTIONS { + PROVIDE(_vdso_datapage = . - PAGE_SIZE); . = VDSO32_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
arch/powerpc/kernel/vdso64/vdso64.lds.S +2 -0
@@ -4,6 +4,7 @@ * library */ #include <asm/vdso.h> +#include <asm/page.h> #ifdef __LITTLE_ENDIAN__ OUTPUT_FORMAT("elf64-powerpcle", "elf64-powerpcle", "elf64-powerpcle")
@@ -15,6 +16,7 @@ ENTRY(_start) SECTIONS { + PROVIDE(_vdso_datapage = . - PAGE_SIZE); . = VDSO64_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
Signature · 1 line
2.25.0
PATCH 12/30 powerpc/vdso: Replace vdso_base by vdso
In reply to Christophe LeroyAll other architectures but s390 use a void pointer named 'vdso' to reference the VDSO mapping.
In a following patch, the VDSO data page will be put in front of text, vdso_base will then not anymore point to VDSO text.
To avoid confusion between vdso_base and VDSO text, rename vdso_base into vdso and make it a void __user *.
--- arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 +- arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/include/asm/elf.h | 2 +- arch/powerpc/include/asm/mmu_context.h | 6 ++++-- arch/powerpc/include/asm/nohash/32/mmu-40x.h | 2 +- arch/powerpc/include/asm/nohash/32/mmu-44x.h | 2 +- arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 2 +- arch/powerpc/include/asm/nohash/mmu-book3e.h | 2 +- arch/powerpc/kernel/signal_32.c | 8 ++++---- arch/powerpc/kernel/signal_64.c | 4 ++-- arch/powerpc/kernel/vdso.c | 8 ++++---- arch/powerpc/perf/callchain_32.c | 8 ++++---- arch/powerpc/perf/callchain_64.c | 4 ++-- 13 files changed, 27 insertions(+), 25 deletions(-)
arch/powerpc/include/asm/book3s/32/mmu-hash.h +1 -1
@@ -90,7 +90,7 @@ struct hash_pte {typedef struct {unsigned long id; -unsigned long vdso_base; +void __user *vdso; }mm_context_t ;void update_bats (void );
arch/powerpc/include/asm/book3s/64/mmu.h +1 -1
@@ -111,7 +111,7 @@ typedef struct {struct hash_mm_context *hash_context; -unsigned long vdso_base; +void __user *vdso;/* * pagetable fragment support */
arch/powerpc/include/asm/elf.h +1 -1
@@ -169,7 +169,7 @@ do { \NEW_AUX_ENT (AT_DCACHEBSIZE , dcache_bsize); \NEW_AUX_ENT (AT_ICACHEBSIZE , icache_bsize); \NEW_AUX_ENT (AT_UCACHEBSIZE , ucache_bsize); \ -VDSO_AUX_ENT (AT_SYSINFO_EHDR , current->mm->context.vdso_base); \ +VDSO_AUX_ENT (AT_SYSINFO_EHDR , (unsigned long )current->mm->context.vdso);\ARCH_DLINFO_CACHE_GEOMETRY ; \ }while (0 )
arch/powerpc/include/asm/mmu_context.h +4 -2
@@ -262,8 +262,10 @@ extern void arch_exit_mmap(struct mm_struct *mm);static inline void arch_unmap (struct mm_struct *mm,unsigned long start,unsigned long end) { -if (start <= mm->context.vdso_base && mm->context.vdso_base < end) - mm->context.vdso_base =0 ; +unsigned long vdso_base = (unsigned long )mm->context.vdso; + +if (start <= vdso_base && vdso_base < end) + mm->context.vdso =NULL ; }#ifdef CONFIG_PPC_MEM_KEYS
arch/powerpc/include/asm/nohash/32/mmu-40x.h +1 -1
@@ -57,7 +57,7 @@typedef struct {unsigned int id;unsigned int active; -unsigned long vdso_base; +void __user *vdso; }mm_context_t ;#endif /* !__ASSEMBLY__ */
arch/powerpc/include/asm/nohash/32/mmu-44x.h +1 -1
@@ -108,7 +108,7 @@ extern unsigned int tlb_44x_index;typedef struct {unsigned int id;unsigned int active; -unsigned long vdso_base; +void __user *vdso; }mm_context_t ;/* patch sites */
arch/powerpc/include/asm/nohash/32/mmu-8xx.h +1 -1
@@ -198,7 +198,7 @@ void mmu_pin_tlb(unsigned long top, bool readonly);typedef struct {unsigned int id;unsigned int active; -unsigned long vdso_base; +void __user *vdso;void *pte_frag; }mm_context_t ;
arch/powerpc/include/asm/nohash/mmu-book3e.h +1 -1
@@ -238,7 +238,7 @@ extern unsigned int tlbcam_index;typedef struct {unsigned int id;unsigned int active; -unsigned long vdso_base; +void __user *vdso; }mm_context_t ;/* Page size definitions, common between 32 and 64-bit
arch/powerpc/kernel/signal_32.c +4 -4
@@ -785,9 +785,9 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,/* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; addr = frame; -if (vdso32_rt_sigtramp && tsk->mm->context.vdso_base) { +if (vdso32_rt_sigtramp && tsk->mm->context.vdso) { sigret =0 ; - tramp = tsk->mm->context.vdso_base + vdso32_rt_sigtramp; + tramp = (unsigned long )tsk->mm->context.vdso + vdso32_rt_sigtramp; }else { sigret = __NR_rt_sigreturn; tramp = (unsigned long ) frame->tramp;
@@ -1247,9 +1247,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, || __put_user(ksig->sig, &sc->signal)) goto badframe; -if (vdso32_sigtramp && tsk->mm->context.vdso_base) { +if (vdso32_sigtramp && tsk->mm->context.vdso) { sigret =0 ; - tramp = tsk->mm->context.vdso_base + vdso32_sigtramp; + tramp = (unsigned long )tsk->mm->context.vdso + vdso32_sigtramp; }else { sigret = __NR_sigreturn; tramp = (unsigned long ) frame->mctx.tramp;
arch/powerpc/kernel/signal_64.c +2 -2
@@ -864,8 +864,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, tsk->thread.fp_state.fpscr =0 ;/* Set up to return from userspace. */ -if (vdso64_rt_sigtramp && tsk->mm->context.vdso_base) { - regs->nip = tsk->mm->context.vdso_base + vdso64_rt_sigtramp; +if (vdso64_rt_sigtramp && tsk->mm->context.vdso) { + regs->nip = (unsigned long )tsk->mm->context.vdso + vdso64_rt_sigtramp; }else { err |=setup_trampoline (__NR_rt_sigreturn, &frame->tramp[0 ]);if (err)
arch/powerpc/kernel/vdso.c +4 -4
@@ -123,7 +123,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_strucif (new_size != text_size +PAGE_SIZE )return -EINVAL ; - current->mm->context.vdso_base = new_vma->vm_start; + current->mm->context.vdso = (void __user *)new_vma->vm_start;return 0 ; }
@@ -198,7 +198,7 @@ static int __arch_setup_additional_pages(struct linux_binprm *bprm, int uses_int* install_special_mapping or the perf counter mmap tracking code * will fail to recognise it as a vDSO. */ - current->mm->context.vdso_base = vdso_base; + mm->context.vdso = (void __user *)vdso_base;/* * our vma flags don't have VM_WRITE so by default, the process isn't
@@ -224,7 +224,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)struct mm_struct *mm = current->mm;int rc; - mm->context.vdso_base =0 ; + mm->context.vdso =NULL ;if (!vdso_ready)return 0 ;
@@ -234,7 +234,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) rc =__arch_setup_additional_pages (bprm, uses_interp);if (rc) - mm->context.vdso_base =0 ; + mm->context.vdso =NULL ;mmap_write_unlock (mm);return rc;
arch/powerpc/perf/callchain_32.c +4 -4
@@ -59,8 +59,8 @@ static int is_sigreturn_32_address(unsigned int nip, unsigned int fp) { if (nip == fp + offsetof(struct signal_frame_32, mctx.mc_pad))return 1 ; -if (vdso32_sigtramp && current->mm->context.vdso_base && - nip == current->mm->context.vdso_base + vdso32_sigtramp) +if (vdso32_sigtramp && current->mm->context.vdso && + nip == (unsigned long )current->mm->context.vdso + vdso32_sigtramp)return 1 ;return 0 ; }
@@ -70,8 +70,8 @@ static int is_rt_sigreturn_32_address(unsigned int nip, unsigned int fp)if (nip == fp + offsetof(struct rt_signal_frame_32 , uc.uc_mcontext.mc_pad))return 1 ; -if (vdso32_rt_sigtramp && current->mm->context.vdso_base && - nip == current->mm->context.vdso_base + vdso32_rt_sigtramp) +if (vdso32_rt_sigtramp && current->mm->context.vdso && + nip == (unsigned long )current->mm->context.vdso + vdso32_rt_sigtramp)return 1 ;return 0 ; }
arch/powerpc/perf/callchain_64.c +2 -2
@@ -67,8 +67,8 @@ static int is_sigreturn_64_address(unsigned long nip, unsigned long fp) {if (nip == fp + offsetof(struct signal_frame_64 , tramp))return 1 ; -if (vdso64_rt_sigtramp && current->mm->context.vdso_base && - nip == current->mm->context.vdso_base + vdso64_rt_sigtramp) +if (vdso64_rt_sigtramp && current->mm->context.vdso && + nip == (unsigned long )current->mm->context.vdso + vdso64_rt_sigtramp)return 1 ;return 0 ; }
Signature · 1 line
2.25.0
PATCH 13/30 powerpc/vdso: Move vdso datapage up front
In reply to Christophe LeroyMove the vdso datapage in front of the VDSO area,
before vdso test.
This will allow to remove the __kernel_datapage_offset symbol and simplify __get_datapage() in following patches.
--- arch/powerpc/include/asm/mmu_context.h | 2 +- arch/powerpc/kernel/vdso.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/mmu_context.h +1 -1
@@ -262,7 +262,7 @@ extern void arch_exit_mmap(struct mm_struct *mm);static inline void arch_unmap (struct mm_struct *mm,unsigned long start,unsigned long end) { -unsigned long vdso_base = (unsigned long )mm->context.vdso; +unsigned long vdso_base = (unsigned long )mm->context.vdso -PAGE_SIZE ;if (start <= vdso_base && vdso_base < end) mm->context.vdso =NULL ;
arch/powerpc/kernel/vdso.c +7 -7
@@ -123,7 +123,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_strucif (new_size != text_size +PAGE_SIZE )return -EINVAL ; - current->mm->context.vdso = (void __user *)new_vma->vm_start; + current->mm->context.vdso = (void __user *)new_vma->vm_start +PAGE_SIZE ;return 0 ; }
@@ -198,7 +198,7 @@ static int __arch_setup_additional_pages(struct linux_binprm *bprm, int uses_int* install_special_mapping or the perf counter mmap tracking code * will fail to recognise it as a vDSO. */ - mm->context.vdso = (void __user *)vdso_base; + mm->context.vdso = (void __user *)vdso_base +PAGE_SIZE ;/* * our vma flags don't have VM_WRITE so by default, the process isn't
@@ -510,7 +510,7 @@ static __init int vdso_fixup_datapage(struct lib32_elfinfo *v32, return -1; } *((int *)(vdso64_kbase + sym64->st_value -VDSO64_LBASE )) = - (vdso64_pages <<PAGE_SHIFT ) - + -PAGE_SIZE - (sym64->st_value -VDSO64_LBASE );#endif /* CONFIG_PPC64 */
@@ -522,7 +522,7 @@ static __init int vdso_fixup_datapage(struct lib32_elfinfo *v32, return -1; } *((int *)(vdso32_kbase + (sym32->st_value -VDSO32_LBASE ))) = - (vdso32_pages <<PAGE_SHIFT ) - + -PAGE_SIZE - (sym32->st_value -VDSO32_LBASE );#endif
@@ -696,10 +696,10 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)if (!pagelist)panic ("%s: Cannot allocate page list for VDSO" , __func__); -for (i =0 ; i < pages; i++) - pagelist[i] =virt_to_page (start + i *PAGE_SIZE ); + pagelist[0 ] =virt_to_page (vdso_data); - pagelist[i] =virt_to_page (vdso_data); +for (i =0 ; i < pages; i++) + pagelist[i +1 ] =virt_to_page (start + i *PAGE_SIZE );return pagelist; }
Signature · 1 line
2.25.0
PATCH 11/30 powerpc/vdso: Provide vdso_remap()
In reply to Christophe LeroyProvide vdso_remap() through _install_special_mapping() and drop arch_remap().
This adds a test of the size and returns -EINVAL if the size is not correct.
--- arch/powerpc/include/asm/mm-arch-hooks.h | 25 ------------------------ arch/powerpc/kernel/vdso.c | 24 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h
arch/powerpc/include/asm/mm-arch-hooks.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Architecture specific mm hooks -* -* Copyright (C) 2015, IBM Corporation -* Author: Laurent Dufour <[email protected]> -*/ - -#ifndef _ASM_POWERPC_MM_ARCH_HOOKS_H -#define _ASM_POWERPC_MM_ARCH_HOOKS_H - -static inline void arch_remap (struct mm_struct *mm, -unsigned long old_start,unsigned long old_end, -unsigned long new_start,unsigned long new_end) -{ -/* -* mremap() doesn't allow moving multiple vmas so we can limit the -* check to old_start == vdso_base. -*/ -if (old_start == mm->context.vdso_base) - mm->context.vdso_base = new_start; -} -#define arch_remap arch_remap - -#endif /* _ASM_POWERPC_MM_ARCH_HOOKS_H */
arch/powerpc/kernel/vdso.c +24 -0
@@ -115,13 +115,37 @@ struct lib64_elfinfounsigned long text; }; +static int vdso_mremap (const struct vm_special_mapping *sm,struct vm_area_struct *new_vma, +unsigned long text_size) +{ +unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + +if (new_size != text_size +PAGE_SIZE ) +return -EINVAL ; + + current->mm->context.vdso_base = new_vma->vm_start; + +return 0 ; +} + +static int vdso32_mremap (const struct vm_special_mapping *sm,struct vm_area_struct *new_vma) +{ +return vdso_mremap (sm, new_vma, &vdso32_end - &vdso32_start); +} + +static int vdso64_mremap (const struct vm_special_mapping *sm,struct vm_area_struct *new_vma) +{ +return vdso_mremap (sm, new_vma, &vdso64_end - &vdso64_start); +}static struct vm_special_mapping vdso32_spec__ro_after_init = { .name ="[vdso]" , + .mremap = vdso32_mremap, };static struct vm_special_mapping vdso64_spec__ro_after_init = { .name ="[vdso]" , + .mremap = vdso64_mremap, };/*
Signature · 1 line
2.25.0
PATCH 30/30 powerpc/vdso: Cleanup vdso.h
In reply to Christophe LeroyRename the guard define to _ASM_POWERPC_VDSO_H
And remove useless #ifdef __KERNEL__
--- arch/powerpc/include/asm/vdso.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/vdso.h +3 -7
@@ -1,8 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __PPC64_VDSO_H__ -#define __PPC64_VDSO_H__ - -#ifdef __KERNEL__ +#ifndef _ASM_POWERPC_VDSO_H +#define _ASM_POWERPC_VDSO_H/* Default map addresses for 32bit vDSO */ #define VDSO32_MBASE 0x100000
@@ -54,6 +52,4 @@ int vdso_getcpu_init(void);#endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ - -#endif /* __PPC64_VDSO_H__ */ +#endif /* _ASM_POWERPC_VDSO_H */
Signature · 1 line
2.25.0
PATCH 29/30 powerpc/vdso: Remove VDSO32_LBASE and VDSO64_LBASE
In reply to Christophe LeroyVDSO32_LBASE and VDSO64_LBASE are 0. Remove them to simplify code.
--- arch/powerpc/include/asm/vdso.h | 4 ---- arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 +- arch/powerpc/kernel/vdso64/vdso64.lds.S | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/vdso.h +0 -4
@@ -4,10 +4,6 @@#ifdef __KERNEL__ -/* Default link addresses for the vDSOs */ -#define VDSO32_LBASE 0x0 -#define VDSO64_LBASE 0x0 -/* Default map addresses for 32bit vDSO */ #define VDSO32_MBASE 0x100000
arch/powerpc/kernel/vdso32/vdso32.lds.S +1 -1
@@ -17,7 +17,7 @@ ENTRY(_start) SECTIONS { PROVIDE(_vdso_datapage = . - PAGE_SIZE); - . = VDSO32_LBASE + SIZEOF_HEADERS; + . = SIZEOF_HEADERS; .hash : { *(.hash) } :text .gnu.hash : { *(.gnu.hash) }
arch/powerpc/kernel/vdso64/vdso64.lds.S +1 -1
@@ -17,7 +17,7 @@ ENTRY(_start) SECTIONS { PROVIDE(_vdso_datapage = . - PAGE_SIZE); - . = VDSO64_LBASE + SIZEOF_HEADERS; + . = SIZEOF_HEADERS; .hash : { *(.hash) } :text .gnu.hash : { *(.gnu.hash) }
Signature · 1 line
2.25.0
PATCH 26/30 powerpc/vdso: Remove vdso_setup()
In reply to Christophe Leroyvdso_fixup_features() cannot fail anymore and that's the only function called by vdso_setup().
vdso_setup() has become trivial and can be removed.
--- arch/powerpc/kernel/vdso.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
arch/powerpc/kernel/vdso.c +2 -19
@@ -192,7 +192,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) do_##type##_fixups((value), __start, __end); \ } while (0) -static int __init vdso_fixup_features (void ) +static void __init vdso_fixup_features (void ) {#ifdef CONFIG_PPC64 VDSO_DO_FIXUPS (feature, cur_cpu_spec->cpu_features,64 , ftr_fixup);
@@ -209,16 +209,6 @@ static int __init vdso_fixup_features(void)#endif /* CONFIG_PPC64 */ VDSO_DO_FIXUPS (lwsync, cur_cpu_spec->cpu_features,32 , lwsync_fixup);#endif - -return 0 ; -} - -static __init int vdso_setup (void ) -{ -if (vdso_fixup_features ()) -return -1 ; - -return 0 ; }/*
@@ -313,14 +303,7 @@ static int __init vdso_init(void)vdso_setup_syscall_map (); -/* -* Initialize the vDSO images in memory, that is do necessary -* fixups of vDSO symbols, locate trampolines, etc... -*/ -if (vdso_setup ()) { -printk (KERN_ERR "vDSO setup failure, not enabled !\n" ); -return 0 ; - } +vdso_fixup_features ();if (IS_ENABLED (CONFIG_VDSO32 )) vdso32_spec.pages =vdso_setup_pages (&vdso32_start, &vdso32_end);
Signature · 1 line
2.25.0
PATCH 28/30 powerpc/vdso: Remove DBG()
In reply to Christophe LeroyDBG() is not used anymore. Remove it.
--- arch/powerpc/kernel/vdso.c | 8 -------- 1 file changed, 8 deletions(-)
arch/powerpc/kernel/vdso.c +0 -8
@@ -33,14 +33,6 @@#include <asm/vdso_datapage.h> #include <asm/setup.h> -#undef DEBUG - -#ifdef DEBUG -#define DBG(fmt...) printk(fmt) -#else -#define DBG(fmt...) -#endif -/* The alignment of the vDSO */ #define VDSO_ALIGNMENT (1 << 16)
Signature · 1 line
2.25.0
PATCH 27/30 powerpc/vdso: Remove vdso_ready
In reply to Christophe LeroyThere is no way to get out of vdso_init() prematuraly anymore.
Remove vdso_ready as it will always be 1.
--- arch/powerpc/kernel/vdso.c | 6 ------ 1 file changed, 6 deletions(-)
arch/powerpc/kernel/vdso.c +0 -6
@@ -47,8 +47,6 @@extern char vdso32_start, vdso32_end;extern char vdso64_start, vdso64_end; -static int vdso_ready; -/* * The vdso data page (aka. systemcfg for old ppc64 fans) is here. * Once the early boot kernel code no longer needs to muck around
@@ -171,9 +169,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) mm->context.vdso =NULL ; -if (!vdso_ready) -return 0 ; -if (mmap_write_lock_killable (mm))return -EINTR ;
@@ -312,7 +307,6 @@ static int __init vdso_init(void) vdso64_spec.pages =vdso_setup_pages (&vdso64_start, &vdso64_end);smp_wmb (); - vdso_ready =1 ;return 0 ; }
Signature · 1 line
2.25.0
PATCH 22/30 powerpc/vdso: Remove vdso_patches[] and associated functions
In reply to Christophe Leroyvdso_patches[] is now empty, remove it and remove
all functions that depends on it.
--- arch/powerpc/kernel/vdso.c | 161 ------------------------------------- 1 file changed, 161 deletions(-)
arch/powerpc/kernel/vdso.c +0 -161
@@ -41,9 +41,6 @@ #define DBG(fmt...)#endif -/* Max supported size for symbol names */ -#define MAX_SYMNAME 64 -/* The alignment of the vDSO */ #define VDSO_ALIGNMENT (1 << 16)
@@ -66,22 +63,6 @@ static union { }vdso_data_store __page_aligned_data;struct vdso_arch_data *vdso_data = &vdso_data_store.data; -/* Format of the patch table */ -struct vdso_patch_def -{ -unsigned long ftr_mask, ftr_value; -const char *gen_name; -const char *fix_name; -}; - -/* Table of functions to patch based on the CPU type/revision -* -* Currently, we only change sync_dicache to do nothing on processors -* with a coherent icache -*/ -static struct vdso_patch_def vdso_patches[] = { -}; -/* * Some infos carried around for each of them during parsing at * boot time.
@@ -252,62 +233,6 @@ static void * __init find_section32(Elf32_Ehdr *ehdr, const char *secname, *size =0 ; return NULL; } - -static Elf32_Sym *__init find_symbol32 (struct lib32_elfinfo *lib, -const char *symname) -{ -unsigned int i; -char name[MAX_SYMNAME ], *c; - -for (i =0 ; i < (lib->dynsymsize /sizeof (Elf32_Sym)); i++) { -if (lib->dynsym[i].st_name ==0 ) -continue ; -strlcpy (name, lib->dynstr + lib->dynsym[i].st_name, -MAX_SYMNAME ); - c =strchr (name,'@' ); -if (c) - *c =0 ; -if (strcmp (symname, name) ==0 ) -return &lib->dynsym[i]; - } -return NULL ; -} - -static int __init vdso_do_func_patch32 (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64, -const char *orig,const char *fix) -{ -Elf32_Sym *sym32_gen, *sym32_fix; - - sym32_gen =find_symbol32 (v32, orig); -if (sym32_gen ==NULL ) { -printk (KERN_ERR "vDSO32: Can't find symbol %s !\n" , orig); -return -1 ; - } -if (fix ==NULL ) { - sym32_gen->st_name =0 ; -return 0 ; - } - sym32_fix =find_symbol32 (v32, fix); -if (sym32_fix ==NULL ) { -printk (KERN_ERR "vDSO32: Can't find symbol %s !\n" , fix); -return -1 ; - } - sym32_gen->st_value = sym32_fix->st_value; - sym32_gen->st_size = sym32_fix->st_size; - sym32_gen->st_info = sym32_fix->st_info; - sym32_gen->st_other = sym32_fix->st_other; - sym32_gen->st_shndx = sym32_fix->st_shndx; - -return 0 ; -} -#else /* !CONFIG_VDSO32 */ -static int __init vdso_do_func_patch32 (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64, -const char *orig,const char *fix) -{ -return 0 ; -}#endif /* CONFIG_VDSO32 */
@@ -336,56 +261,6 @@ static void * __init find_section64(Elf64_Ehdr *ehdr, const char *secname, *size =0 ;return NULL ; } - -static Elf64_Sym *__init find_symbol64 (struct lib64_elfinfo *lib, -const char *symname) -{ -unsigned int i; -char name[MAX_SYMNAME ], *c; - -for (i =0 ; i < (lib->dynsymsize /sizeof (Elf64_Sym)); i++) { -if (lib->dynsym[i].st_name ==0 ) -continue ; -strlcpy (name, lib->dynstr + lib->dynsym[i].st_name, -MAX_SYMNAME ); - c =strchr (name,'@' ); -if (c) - *c =0 ; -if (strcmp (symname, name) ==0 ) -return &lib->dynsym[i]; - } -return NULL ; -} - -static int __init vdso_do_func_patch64 (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64, -const char *orig,const char *fix) -{ -Elf64_Sym *sym64_gen, *sym64_fix; - - sym64_gen =find_symbol64 (v64, orig); -if (sym64_gen ==NULL ) { -printk (KERN_ERR "vDSO64: Can't find symbol %s !\n" , orig); -return -1 ; - } -if (fix ==NULL ) { - sym64_gen->st_name =0 ; -return 0 ; - } - sym64_fix =find_symbol64 (v64, fix); -if (sym64_fix ==NULL ) { -printk (KERN_ERR "vDSO64: Can't find symbol %s !\n" , fix); -return -1 ; - } - sym64_gen->st_value = sym64_fix->st_value; - sym64_gen->st_size = sym64_fix->st_size; - sym64_gen->st_info = sym64_fix->st_info; - sym64_gen->st_other = sym64_fix->st_other; - sym64_gen->st_shndx = sym64_fix->st_shndx; - -return 0 ; -} -#endif /* CONFIG_PPC64 */ #define VDSO_DO_FIXUPS (type, value, bits, sec) do { \
@@ -459,39 +334,6 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,return 0 ; } -static __init int vdso_fixup_alt_funcs (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64) -{ -int i; - -for (i =0 ; i <ARRAY_SIZE (vdso_patches); i++) { -struct vdso_patch_def *patch = &vdso_patches[i]; -int match = (cur_cpu_spec->cpu_features & patch->ftr_mask) - == patch->ftr_value; -if (!match) -continue ; - -DBG ("replacing %s with %s...\n" , patch->gen_name, - patch->fix_name ?"NONE" : patch->fix_name); - -/* -* Patch the 32 bits and 64 bits symbols. Note that we do not -* patch the "." symbol on 64 bits. -* It would be easy to do, but doesn't seem to be necessary, -* patching the OPD symbol is enough. -*/ -vdso_do_func_patch32 (v32, v64, patch->gen_name, - patch->fix_name); -#ifdef CONFIG_PPC64 -vdso_do_func_patch64 (v32, v64, patch->gen_name, - patch->fix_name); -#endif /* CONFIG_PPC64 */ - } - -return 0 ; -} - -static __init int vdso_setup (void ) {struct lib32_elfinfo v32;
@@ -505,9 +347,6 @@ static __init int vdso_setup(void)if (vdso_fixup_features (&v32, &v64))return -1 ; -if (vdso_fixup_alt_funcs (&v32, &v64)) -return -1 ; -return 0 ; }
Signature · 1 line
2.25.0
PATCH 23/30 powerpc/vdso: Remove unused text member in struct lib32/64_elfinfo
In reply to Christophe LeroyThe text member in struct lib32_elfinfo and struct lib64_elfinfo is not used, remove it.
--- arch/powerpc/kernel/vdso.c | 16 ---------------- 1 file changed, 16 deletions(-)
arch/powerpc/kernel/vdso.c +0 -16
@@ -73,7 +73,6 @@ struct lib32_elfinfoElf32_Sym *dynsym;/* ptr to .dynsym section */ unsigned long dynsymsize;/* size of .dynsym section */ char *dynstr;/* ptr to .dynstr section */ -unsigned long text;/* offset of .text section in .so */ };struct lib64_elfinfo
@@ -82,7 +81,6 @@ struct lib64_elfinfoElf64_Sym *dynsym;unsigned long dynsymsize;char *dynstr; -unsigned long text; }; static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_struct *new_vma,
@@ -273,8 +271,6 @@ static void * __init find_section64(Elf64_Ehdr *ehdr, const char *secname,static __init int vdso_do_find_sections (struct lib32_elfinfo *v32,struct lib64_elfinfo *v64) { -void *sect; -/* * Locate symbol tables & text section */
@@ -286,12 +282,6 @@ static __init int vdso_do_find_sections(struct lib32_elfinfo *v32,printk (KERN_ERR "vDSO32: required symbol section not found\n" ); return -1; } - sect =find_section32 (v32->hdr,".text" ,NULL ); -if (sect ==NULL ) { -printk (KERN_ERR "vDSO32: the .text section was not found\n" ); -return -1 ; - } - v32->text = sect - vdso32_kbase;#endif #ifdef CONFIG_PPC64
@@ -301,12 +291,6 @@ static __init int vdso_do_find_sections(struct lib32_elfinfo *v32,printk (KERN_ERR "vDSO64: required symbol section not found\n" ); return -1; } - sect =find_section64 (v64->hdr,".text" ,NULL ); -if (sect ==NULL ) { -printk (KERN_ERR "vDSO64: the .text section was not found\n" ); -return -1 ; - } - v64->text = sect - vdso64_kbase;#endif /* CONFIG_PPC64 */ return 0 ;
Signature · 1 line
2.25.0
PATCH 24/30 powerpc/vdso: Remove symbol section information in struct lib32/64_elfinfo
In reply to Christophe LeroyThe members related to the symbol section in struct lib32_elfinfo and struct lib64_elfinfo are not used anymore, removed them.
--- arch/powerpc/kernel/vdso.c | 90 -------------------------------------- 1 file changed, 90 deletions(-)
arch/powerpc/kernel/vdso.c +0 -90
@@ -70,17 +70,11 @@ struct vdso_arch_data *vdso_data = &vdso_data_store.data;struct lib32_elfinfo {Elf32_Ehdr *hdr;/* ptr to ELF */ -Elf32_Sym *dynsym;/* ptr to .dynsym section */ -unsigned long dynsymsize;/* size of .dynsym section */ -char *dynstr;/* ptr to .dynstr section */ };struct lib64_elfinfo {Elf64_Ehdr *hdr; -Elf64_Sym *dynsym; -unsigned long dynsymsize; -char *dynstr; }; static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_struct *new_vma,
@@ -208,59 +202,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)return rc; } -#ifdef CONFIG_VDSO32 -static void *__init find_section32 (Elf32_Ehdr *ehdr,const char *secname, -unsigned long *size) -{ -Elf32_Shdr *sechdrs; -unsigned int i; -char *secnames; - -/* Grab section headers and strings so we can tell who is who */ - sechdrs = (void *)ehdr + ehdr->e_shoff; - secnames = (void *)ehdr + sechdrs[ehdr->e_shstrndx].sh_offset; - -/* Find the section they want */ -for (i =1 ; i < ehdr->e_shnum; i++) { -if (strcmp (secnames+sechdrs[i].sh_name, secname) ==0 ) { -if (size) - *size = sechdrs[i].sh_size; -return (void *)ehdr + sechdrs[i].sh_offset; - } - } - *size =0 ; -return NULL ; -} -#endif /* CONFIG_VDSO32 */ - - -#ifdef CONFIG_PPC64 - -static void *__init find_section64 (Elf64_Ehdr *ehdr,const char *secname, -unsigned long *size) -{ -Elf64_Shdr *sechdrs; -unsigned int i; -char *secnames; - -/* Grab section headers and strings so we can tell who is who */ - sechdrs = (void *)ehdr + ehdr->e_shoff; - secnames = (void *)ehdr + sechdrs[ehdr->e_shstrndx].sh_offset; - -/* Find the section they want */ -for (i =1 ; i < ehdr->e_shnum; i++) { -if (strcmp (secnames+sechdrs[i].sh_name, secname) ==0 ) { -if (size) - *size = sechdrs[i].sh_size; -return (void *)ehdr + sechdrs[i].sh_offset; - } - } -if (size) - *size =0 ; -return NULL ; -} -#endif /* CONFIG_PPC64 */ -#define VDSO_DO_FIXUPS (type, value, bits, sec) do { \ void *__start = (void *)VDSO##bits##_SYMBOL(&vdso##bits##_start, sec##_start); \ void *__end = (void *)VDSO##bits##_SYMBOL(&vdso##bits##_start, sec##_end); \
@@ -268,34 +209,6 @@ static void * __init find_section64(Elf64_Ehdr *ehdr, const char *secname, do_##type##_fixups((value), __start, __end); \ } while (0) -static __init int vdso_do_find_sections (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64) -{ -/* -* Locate symbol tables & text section -*/ - -#ifdef CONFIG_VDSO32 - v32->dynsym =find_section32 (v32->hdr,".dynsym" , &v32->dynsymsize); - v32->dynstr =find_section32 (v32->hdr,".dynstr" ,NULL ); -if (v32->dynsym ==NULL || v32->dynstr ==NULL ) { -printk (KERN_ERR "vDSO32: required symbol section not found\n" ); -return -1 ; - } -#endif - -#ifdef CONFIG_PPC64 - v64->dynsym =find_section64 (v64->hdr,".dynsym" , &v64->dynsymsize); - v64->dynstr =find_section64 (v64->hdr,".dynstr" ,NULL ); -if (v64->dynsym ==NULL || v64->dynstr ==NULL ) { -printk (KERN_ERR "vDSO64: required symbol section not found\n" ); -return -1 ; - } -#endif /* CONFIG_PPC64 */ - -return 0 ; -} -static __init int vdso_fixup_features (struct lib32_elfinfo *v32,struct lib64_elfinfo *v64) {
@@ -325,9 +238,6 @@ static __init int vdso_setup(void) v32.hdr = vdso32_kbase; v64.hdr = vdso64_kbase; -if (vdso_do_find_sections (&v32, &v64)) -return -1 ; -if (vdso_fixup_features (&v32, &v64))return -1 ;
Signature · 1 line
2.25.0
PATCH 21/30 powerpc/vdso: Remove runtime generated sigtramp offsets
In reply to Christophe LeroySignal trampoline offsets are now generated at buildtime.
Runtime generated offsets are not used anymore, remove them.
--- arch/powerpc/include/asm/vdso.h | 5 --- arch/powerpc/kernel/vdso.c | 59 --------------------------------- 2 files changed, 64 deletions(-)
arch/powerpc/include/asm/vdso.h +0 -5
@@ -27,11 +27,6 @@#define VDSO32_SYMBOL (base, name) ((unsigned long)(base) + (vdso32_offset_##name)) -/* Offsets relative to thread->vdso_base */ -extern unsigned long vdso64_rt_sigtramp; -extern unsigned long vdso32_sigtramp; -extern unsigned long vdso32_rt_sigtramp; -int vdso_getcpu_init (void );#else /* __ASSEMBLY__ */
arch/powerpc/kernel/vdso.c +0 -59
99 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH 19/30 powerpc/vdso: Remove vdso32_pages and vdso64_pages
In reply to Christophe Leroyvdso32_pages and vdso64_pages are not used anymore.
Remove them.
--- arch/powerpc/kernel/vdso.c | 16 ---------------- 1 file changed, 16 deletions(-)
arch/powerpc/kernel/vdso.c +0 -16
@@ -47,7 +47,6 @@/* The alignment of the vDSO */ #define VDSO_ALIGNMENT (1 << 16) -static unsigned int vdso32_pages;static void *vdso32_kbase;unsigned long vdso32_sigtramp;unsigned long vdso32_rt_sigtramp;
@@ -55,7 +54,6 @@ unsigned long vdso32_rt_sigtramp;extern char vdso32_start, vdso32_end;extern char vdso64_start, vdso64_end;static void *vdso64_kbase = &vdso64_start; -static unsigned int vdso64_pages;#ifdef CONFIG_PPC64 unsigned long vdso64_rt_sigtramp;#endif /* CONFIG_PPC64 */
@@ -701,20 +699,8 @@ static int __init vdso_init(void) vdso_data->icache_log_block_size = ppc64_caches.l1i.log_block_size;#endif /* CONFIG_PPC64 */ -/* -* Calculate the size of the 64 bits vDSO -*/ - vdso64_pages = (&vdso64_end - &vdso64_start) >>PAGE_SHIFT ; -DBG ("vdso64_kbase: %p, 0x%x pages\n" , vdso64_kbase, vdso64_pages); - vdso32_kbase = &vdso32_start; -/* -* Calculate the size of the 32 bits vDSO -*/ - vdso32_pages = (&vdso32_end - &vdso32_start) >>PAGE_SHIFT ; -DBG ("vdso32_kbase: %p, 0x%x pages\n" , vdso32_kbase, vdso32_pages); -vdso_setup_syscall_map ();/*
@@ -723,8 +709,6 @@ static int __init vdso_init(void)*/ if (vdso_setup ()) {printk (KERN_ERR "vDSO setup failure, not enabled !\n" ); - vdso32_pages =0 ; - vdso64_pages =0 ;return 0 ; }
Signature · 1 line
2.25.0
PATCH 20/30 powerpc/vdso: Remove __kernel_datapage_offset
In reply to Christophe Leroy__kernel_datapage_offset is not used anymore, remove it.
--- arch/powerpc/kernel/vdso.c | 39 ------------------------- arch/powerpc/kernel/vdso32/datapage.S | 3 -- arch/powerpc/kernel/vdso32/vdso32.lds.S | 5 ---- arch/powerpc/kernel/vdso64/datapage.S | 3 -- arch/powerpc/kernel/vdso64/vdso64.lds.S | 5 ---- 5 files changed, 55 deletions(-)
arch/powerpc/kernel/vdso.c +0 -39
@@ -494,42 +494,6 @@ static __init void vdso_setup_trampolines(struct lib32_elfinfo *v32, vdso32_rt_sigtramp =find_function32 (v32,"__kernel_sigtramp_rt32" ); } -static __init int vdso_fixup_datapage (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64) -{ -#ifdef CONFIG_VDSO32 -Elf32_Sym *sym32; -#endif -#ifdef CONFIG_PPC64 -Elf64_Sym *sym64; - - sym64 =find_symbol64 (v64,"__kernel_datapage_offset" ); -if (sym64 ==NULL ) { -printk (KERN_ERR "vDSO64: Can't find symbol " -"__kernel_datapage_offset !\n" ); -return -1 ; - } - *((int *)(vdso64_kbase + sym64->st_value -VDSO64_LBASE )) = - -PAGE_SIZE - - (sym64->st_value -VDSO64_LBASE ); -#endif /* CONFIG_PPC64 */ - -#ifdef CONFIG_VDSO32 - sym32 =find_symbol32 (v32,"__kernel_datapage_offset" ); -if (sym32 ==NULL ) { -printk (KERN_ERR "vDSO32: Can't find symbol " -"__kernel_datapage_offset !\n" ); -return -1 ; - } - *((int *)(vdso32_kbase + (sym32->st_value -VDSO32_LBASE ))) = - -PAGE_SIZE - - (sym32->st_value -VDSO32_LBASE ); -#endif - -return 0 ; -} - -static __init int vdso_fixup_features (struct lib32_elfinfo *v32,struct lib64_elfinfo *v64) {
@@ -595,9 +559,6 @@ static __init int vdso_setup(void)if (vdso_do_find_sections (&v32, &v64))return -1 ; -if (vdso_fixup_datapage (&v32, &v64)) -return -1 ; -if (vdso_fixup_features (&v32, &v64))return -1 ;
arch/powerpc/kernel/vdso32/datapage.S +0 -3
@@ -13,9 +13,6 @@ #include <asm/vdso_datapage.h> .text - .global __kernel_datapage_offset; -__kernel_datapage_offset: - .long 0 /* * void *__kernel_get_syscall_map(unsigned int *syscall_count) ;
arch/powerpc/kernel/vdso32/vdso32.lds.S +0 -5
@@ -148,11 +148,6 @@ VERSION { VDSO_VERSION_STRING { global: - /* - * Has to be there for the kernel to find - */ - __kernel_datapage_offset; - __kernel_get_syscall_map; #ifndef CONFIG_PPC_BOOK3S_601 __kernel_gettimeofday;
arch/powerpc/kernel/vdso64/datapage.S +0 -3
@@ -13,9 +13,6 @@ #include <asm/vdso_datapage.h> .text -.global __kernel_datapage_offset; -__kernel_datapage_offset: - .long 0 /* * void *__kernel_get_syscall_map(unsigned int *syscall_count) ;
arch/powerpc/kernel/vdso64/vdso64.lds.S +0 -5
@@ -148,11 +148,6 @@ VERSION { VDSO_VERSION_STRING { global: - /* - * Has to be there for the kernel to find - */ - __kernel_datapage_offset; - __kernel_get_syscall_map; __kernel_gettimeofday; __kernel_clock_gettime;
Signature · 1 line
2.25.0
PATCH 25/30 powerpc/vdso: Remove lib32_elfinfo and lib64_elfinfo
In reply to Christophe Leroylib32_elfinfo and lib64_elfinfo are not used anymore, remove them.
Also remove vdso32_kbase and vdso64_kbase while removing the last use.
--- arch/powerpc/kernel/vdso.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
arch/powerpc/kernel/vdso.c +2 -27
@@ -44,11 +44,8 @@/* The alignment of the vDSO */ #define VDSO_ALIGNMENT (1 << 16) -static void *vdso32_kbase; -extern char vdso32_start, vdso32_end;extern char vdso64_start, vdso64_end; -static void *vdso64_kbase = &vdso64_start;static int vdso_ready;
@@ -63,20 +60,6 @@ static union { }vdso_data_store __page_aligned_data;struct vdso_arch_data *vdso_data = &vdso_data_store.data; -/* -* Some infos carried around for each of them during parsing at -* boot time. -*/ -struct lib32_elfinfo -{ -Elf32_Ehdr *hdr;/* ptr to ELF */ -}; - -struct lib64_elfinfo -{ -Elf64_Ehdr *hdr; -}; -static int vdso_mremap (const struct vm_special_mapping *sm,struct vm_area_struct *new_vma,unsigned long text_size) {
@@ -209,8 +192,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) do_##type##_fixups((value), __start, __end); \ } while (0) -static __init int vdso_fixup_features (struct lib32_elfinfo *v32, -struct lib64_elfinfo *v64) +static int __init vdso_fixup_features (void ) {#ifdef CONFIG_PPC64 VDSO_DO_FIXUPS (feature, cur_cpu_spec->cpu_features,64 , ftr_fixup);
@@ -233,12 +215,7 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,static __init int vdso_setup (void ) { -struct lib32_elfinfo v32; -struct lib64_elfinfo v64; - - v32.hdr = vdso32_kbase; - v64.hdr = vdso64_kbase; -if (vdso_fixup_features (&v32, &v64)) +if (vdso_fixup_features ())return -1 ;return 0 ;
@@ -334,8 +311,6 @@ static int __init vdso_init(void) vdso_data->icache_log_block_size = ppc64_caches.l1i.log_block_size;#endif /* CONFIG_PPC64 */ - vdso32_kbase = &vdso32_start; -vdso_setup_syscall_map ();/*
Signature · 1 line
2.25.0
PATCH 17/30 powerpc/vdso: Use builtin symbols to locate fixup section
In reply to Christophe LeroyAdd builtin symbols to locate fixup section and use them instead of locating sections through elf headers at runtime.
--- arch/powerpc/kernel/vdso.c | 55 +++++++------------------ arch/powerpc/kernel/vdso32/vdso32.lds.S | 8 ++++ arch/powerpc/kernel/vdso64/vdso64.lds.S | 8 ++++ 3 files changed, 30 insertions(+), 41 deletions(-)
arch/powerpc/kernel/vdso.c +14 -41
@@ -437,6 +437,12 @@ static int __init vdso_do_func_patch64(struct lib32_elfinfo *v32,#endif /* CONFIG_PPC64 */ +#define VDSO_DO_FIXUPS (type, value, bits, sec) do { \ + void *__start = (void *)VDSO##bits##_SYMBOL(&vdso##bits##_start, sec##_start); \ + void *__end = (void *)VDSO##bits##_SYMBOL(&vdso##bits##_start, sec##_end); \ + \ + do_##type##_fixups((value), __start, __end); \ +} while (0)static __init int vdso_do_find_sections (struct lib32_elfinfo *v32,struct lib64_elfinfo *v64)
@@ -533,53 +539,20 @@ static __init int vdso_fixup_datapage(struct lib32_elfinfo *v32,static __init int vdso_fixup_features (struct lib32_elfinfo *v32,struct lib64_elfinfo *v64) { -unsigned long size; -void *start; -#ifdef CONFIG_PPC64 - start =find_section64 (v64->hdr,"__ftr_fixup" , &size); -if (start) -do_feature_fixups (cur_cpu_spec->cpu_features, - start, start + size); - - start =find_section64 (v64->hdr,"__mmu_ftr_fixup" , &size); -if (start) -do_feature_fixups (cur_cpu_spec->mmu_features, - start, start + size); - - start =find_section64 (v64->hdr,"__fw_ftr_fixup" , &size); -if (start) -do_feature_fixups (powerpc_firmware_features, - start, start + size); - - start =find_section64 (v64->hdr,"__lwsync_fixup" , &size); -if (start) -do_lwsync_fixups (cur_cpu_spec->cpu_features, - start, start + size); +VDSO_DO_FIXUPS (feature, cur_cpu_spec->cpu_features,64 , ftr_fixup); +VDSO_DO_FIXUPS (feature, cur_cpu_spec->mmu_features,64 , mmu_ftr_fixup); +VDSO_DO_FIXUPS (feature, powerpc_firmware_features,64 , fw_ftr_fixup); +VDSO_DO_FIXUPS (lwsync, cur_cpu_spec->cpu_features,64 , lwsync_fixup);#endif /* CONFIG_PPC64 */ #ifdef CONFIG_VDSO32 - start =find_section32 (v32->hdr,"__ftr_fixup" , &size); -if (start) -do_feature_fixups (cur_cpu_spec->cpu_features, - start, start + size); - - start =find_section32 (v32->hdr,"__mmu_ftr_fixup" , &size); -if (start) -do_feature_fixups (cur_cpu_spec->mmu_features, - start, start + size); - +VDSO_DO_FIXUPS (feature, cur_cpu_spec->cpu_features,32 , ftr_fixup); +VDSO_DO_FIXUPS (feature, cur_cpu_spec->mmu_features,32 , mmu_ftr_fixup);#ifdef CONFIG_PPC64 - start =find_section32 (v32->hdr,"__fw_ftr_fixup" , &size); -if (start) -do_feature_fixups (powerpc_firmware_features, - start, start + size); +VDSO_DO_FIXUPS (feature, powerpc_firmware_features,32 , fw_ftr_fixup);#endif /* CONFIG_PPC64 */ - - start =find_section32 (v32->hdr,"__lwsync_fixup" , &size); -if (start) -do_lwsync_fixups (cur_cpu_spec->cpu_features, - start, start + size); +VDSO_DO_FIXUPS (lwsync, cur_cpu_spec->cpu_features,32 , lwsync_fixup);#endif return 0 ;
arch/powerpc/kernel/vdso32/vdso32.lds.S +8 -0
@@ -38,17 +38,25 @@ SECTIONS PROVIDE(etext = .); . = ALIGN(8); + VDSO_ftr_fixup_start = .; __ftr_fixup : { *(__ftr_fixup) } + VDSO_ftr_fixup_end = .; . = ALIGN(8); + VDSO_mmu_ftr_fixup_start = .; __mmu_ftr_fixup : { *(__mmu_ftr_fixup) } + VDSO_mmu_ftr_fixup_end = .; . = ALIGN(8); + VDSO_lwsync_fixup_start = .; __lwsync_fixup : { *(__lwsync_fixup) } + VDSO_lwsync_fixup_end = .; #ifdef CONFIG_PPC64 . = ALIGN(8); + VDSO_fw_ftr_fixup_start = .; __fw_ftr_fixup : { *(__fw_ftr_fixup) } + VDSO_fw_ftr_fixup_end = .; #endif /*
arch/powerpc/kernel/vdso64/vdso64.lds.S +8 -0
@@ -39,16 +39,24 @@ SECTIONS PROVIDE(etext = .); . = ALIGN(8); + VDSO_ftr_fixup_start = .; __ftr_fixup : { *(__ftr_fixup) } + VDSO_ftr_fixup_end = .; . = ALIGN(8); + VDSO_mmu_ftr_fixup_start = .; __mmu_ftr_fixup : { *(__mmu_ftr_fixup) } + VDSO_mmu_ftr_fixup_end = .; . = ALIGN(8); + VDSO_lwsync_fixup_start = .; __lwsync_fixup : { *(__lwsync_fixup) } + VDSO_lwsync_fixup_end = .; . = ALIGN(8); + VDSO_fw_ftr_fixup_start = .; __fw_ftr_fixup : { *(__fw_ftr_fixup) } + VDSO_fw_ftr_fixup_end = .; /* * Other stuff is appended to the text segment:
Signature · 1 line
2.25.0
PATCH 10/30 powerpc/vdso: Move to _install_special_mapping() and remove arch_vma_name()
In reply to Christophe LeroyCopied from commit 2fea7f6c98f5 ("arm64: vdso: move to _install_special_mapping and remove arch_vma_name").
Use the new _install_special_mapping() API added by commit a62c34bd2a8a ("x86, mm: Improve _install_special_mapping and fix x86 vdso naming") which obsolete install_special_mapping().
And remove arch_vma_name() as the name is handled by the new API.
--- arch/powerpc/kernel/vdso.c | 45 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 23 deletions(-)
arch/powerpc/kernel/vdso.c +22 -23
@@ -49,7 +49,6 @@static unsigned int vdso32_pages;static void *vdso32_kbase; -static struct page **vdso32_pagelist;unsigned long vdso32_sigtramp;unsigned long vdso32_rt_sigtramp;
@@ -57,7 +56,6 @@ extern char vdso32_start, vdso32_end;extern char vdso64_start, vdso64_end;static void *vdso64_kbase = &vdso64_start;static unsigned int vdso64_pages; -static struct page **vdso64_pagelist;#ifdef CONFIG_PPC64 unsigned long vdso64_rt_sigtramp;#endif /* CONFIG_PPC64 */
@@ -118,6 +116,14 @@ struct lib64_elfinfo }; +static struct vm_special_mapping vdso32_spec__ro_after_init = { + .name ="[vdso]" , +}; + +static struct vm_special_mapping vdso64_spec__ro_after_init = { + .name ="[vdso]" , +}; +/* * This is called from binfmt_elf, we create the special vma for the * vDSO and insert it into the mm struct tree
@@ -125,17 +131,17 @@ struct lib64_elfinfostatic int __arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) {struct mm_struct *mm = current->mm; -struct page **vdso_pagelist; +struct vm_special_mapping *vdso_spec; +struct vm_area_struct *vma;unsigned long vdso_size;unsigned long vdso_base; -int rc;if (is_32bit_task ()) { - vdso_pagelist = vdso32_pagelist; + vdso_spec = &vdso32_spec; vdso_size = &vdso32_end - &vdso32_start; vdso_base =VDSO32_MBASE ; }else { - vdso_pagelist = vdso64_pagelist; + vdso_spec = &vdso64_spec; vdso_size = &vdso64_end - &vdso64_start;/* * On 64bit we don't have a preferred map address. This
@@ -166,7 +172,7 @@ static int __arch_setup_additional_pages(struct linux_binprm *bprm, int uses_int/* * Put vDSO base into mm struct. We need to do this before calling * install_special_mapping or the perf counter mmap tracking code -* will fail to recognise it as a vDSO (since arch_vma_name fails). +* will fail to recognise it as a vDSO. */ current->mm->context.vdso_base = vdso_base;
@@ -180,11 +186,13 @@ static int __arch_setup_additional_pages(struct linux_binprm *bprm, int uses_int* It's fine to use that for setting breakpoints in the vDSO code * pages though. */ - rc =install_special_mapping (mm, vdso_base, vdso_size, -VM_READ |VM_EXEC | -VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC , - vdso_pagelist); -return rc; + vma =_install_special_mapping (mm, vdso_base, vdso_size, +VM_READ |VM_EXEC |VM_MAYREAD | +VM_MAYWRITE |VM_MAYEXEC , vdso_spec); +if (IS_ERR (vma)) +return PTR_ERR (vma); + +return 0 ; }int arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp)
@@ -208,15 +216,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)return rc; } -const char *arch_vma_name (struct vm_area_struct *vma) -{ -if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso_base) -return "[vdso]" ; -return NULL ; -} - - -#ifdef CONFIG_VDSO32 static void *__init find_section32 (Elf32_Ehdr *ehdr,const char *secname,unsigned long *size)
@@ -737,10 +736,10 @@ static int __init vdso_init(void) }if (IS_ENABLED (CONFIG_VDSO32 )) - vdso32_pagelist =vdso_setup_pages (&vdso32_start, &vdso32_end); + vdso32_spec.pages =vdso_setup_pages (&vdso32_start, &vdso32_end);if (IS_ENABLED (CONFIG_PPC64 )) - vdso64_pagelist =vdso_setup_pages (&vdso64_start, &vdso64_end); + vdso64_spec.pages =vdso_setup_pages (&vdso64_start, &vdso64_end);smp_wmb (); vdso_ready =1 ;
Signature · 1 line
2.25.0
PATCH 18/30 powerpc/vdso: Merge __kernel_sync_dicache_p5() into __kernel_sync_dicache()
In reply to Christophe Leroy__kernel_sync_dicache_p5() is an alternative to __kernel_sync_dicache() when cpu has CPU_FTR_COHERENT_ICACHE
Remove this alternative function and merge __kernel_sync_dicache_p5() into __kernel_sync_dicache() using standard CPU feature fixup.
--- arch/powerpc/kernel/vdso.c | 4 ---- arch/powerpc/kernel/vdso32/cacheflush.S | 17 ++++++----------- arch/powerpc/kernel/vdso32/vdso32.lds.S | 1 - arch/powerpc/kernel/vdso64/cacheflush.S | 16 ++++++---------- arch/powerpc/kernel/vdso64/vdso64.lds.S | 1 - 5 files changed, 12 insertions(+), 27 deletions(-)
arch/powerpc/kernel/vdso.c +0 -4
@@ -87,10 +87,6 @@ struct vdso_patch_def* with a coherent icache */ static struct vdso_patch_def vdso_patches[] = { - { -CPU_FTR_COHERENT_ICACHE ,CPU_FTR_COHERENT_ICACHE , -"__kernel_sync_dicache" ,"__kernel_sync_dicache_p5" - }, };/*
arch/powerpc/kernel/vdso32/cacheflush.S +6 -11
@@ -24,11 +24,15 @@ */ V_FUNCTION_BEGIN(__kernel_sync_dicache) .cfi_startproc +BEGIN_FTR_SECTION + b 3f +END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) #ifdef CONFIG_PPC64 mflr r12 .cfi_register lr,r12 get_datapage r10 mtlr r12 + .cfi_restore lr #endif #ifdef CONFIG_PPC64
@@ -84,20 +88,11 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) isync li r3,0 blr - .cfi_endproc -V_FUNCTION_END(__kernel_sync_dicache) - - -/* - * POWER5 version of __kernel_sync_dicache - */ -V_FUNCTION_BEGIN(__kernel_sync_dicache_p5) - .cfi_startproc +3: crclr cr0*4+so sync isync li r3,0 blr .cfi_endproc -V_FUNCTION_END(__kernel_sync_dicache_p5) - +V_FUNCTION_END(__kernel_sync_dicache)
arch/powerpc/kernel/vdso32/vdso32.lds.S +0 -1
@@ -163,7 +163,6 @@ VERSION __kernel_get_tbfreq; #endif __kernel_sync_dicache; - __kernel_sync_dicache_p5; __kernel_sigtramp32; __kernel_sigtramp_rt32; #if defined(CONFIG_PPC64) || !defined(CONFIG_SMP)
arch/powerpc/kernel/vdso64/cacheflush.S +6 -10
@@ -23,10 +23,14 @@ */ V_FUNCTION_BEGIN(__kernel_sync_dicache) .cfi_startproc +BEGIN_FTR_SECTION + b 3f +END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) mflr r12 .cfi_register lr,r12 get_datapage r10 mtlr r12 + .cfi_restore lr lwz r7,CFG_DCACHE_BLOCKSZ(r10) addi r5,r7,-1
@@ -61,19 +65,11 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) isync li r3,0 blr - .cfi_endproc -V_FUNCTION_END(__kernel_sync_dicache) - - -/* - * POWER5 version of __kernel_sync_dicache - */ -V_FUNCTION_BEGIN(__kernel_sync_dicache_p5) - .cfi_startproc +3: crclr cr0*4+so sync isync li r3,0 blr .cfi_endproc -V_FUNCTION_END(__kernel_sync_dicache_p5) +V_FUNCTION_END(__kernel_sync_dicache)
arch/powerpc/kernel/vdso64/vdso64.lds.S +0 -1
@@ -159,7 +159,6 @@ VERSION __kernel_clock_getres; __kernel_get_tbfreq; __kernel_sync_dicache; - __kernel_sync_dicache_p5; __kernel_sigtramp_rt64; __kernel_getcpu; __kernel_time;
Signature · 1 line
2.25.0
PATCH 16/30 powerpc/vdso: Retrieve sigtramp offsets at buildtime
In reply to Christophe LeroyThis is copied from arm64.
Instead of using runtime generated signal trampoline offsets, get offsets at buildtime.
If the said trampoline doesn't exist, build will fail. So no need to check whether the trampoline exists or not in the VDSO.
--- arch/powerpc/Makefile | 15 +++++++++++++++ arch/powerpc/include/asm/vdso.h | 12 ++++++++++++ arch/powerpc/kernel/signal_32.c | 8 ++++---- arch/powerpc/kernel/signal_64.c | 4 ++-- arch/powerpc/kernel/vdso32/Makefile | 8 ++++++++ arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh | 16 ++++++++++++++++ arch/powerpc/kernel/vdso32/vdso32.lds.S | 6 ++++++ arch/powerpc/kernel/vdso64/Makefile | 8 ++++++++ arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh | 16 ++++++++++++++++ arch/powerpc/kernel/vdso64/vdso64.lds.S | 5 +++++ arch/powerpc/perf/callchain_32.c | 8 ++++---- arch/powerpc/perf/callchain_64.c | 4 ++-- 12 files changed, 98 insertions(+), 12 deletions(-) create mode 100755 arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh create mode 100755 arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh
arch/powerpc/Makefile +15 -0
@@ -410,6 +410,21 @@ install: archclean: $(Q)$(MAKE) $(clean)=$(boot) +ifeq ($(KBUILD_EXTMOD),) +# We need to generate vdso-offsets.h before compiling certain files in kernel/. +# In order to do that, we should use the archprepare target, but we can't since +# asm-offsets.h is included in some files used to generate vdso-offsets.h, and +# asm-offsets.h is built in prepare0, for which archprepare is a dependency. +# Therefore we need to generate the header after prepare0 has been made, hence +# this hack. +prepare: vdso_prepare +vdso_prepare: prepare0 + $(if $(CONFIG_VDSO32),$(Q)$(MAKE) \ + $(build)=arch/powerpc/kernel/vdso32 include/generated/vdso32-offsets.h) + $(if $(CONFIG_PPC64),$(Q)$(MAKE) \ + $(build)=arch/powerpc/kernel/vdso64 include/generated/vdso64-offsets.h) +endif + archprepare: checkbin archheaders:
arch/powerpc/include/asm/vdso.h +12 -0
@@ -15,6 +15,18 @@#ifndef __ASSEMBLY__ +#ifdef CONFIG_PPC64 +#include <generated/vdso64-offsets.h> +#endif + +#ifdef CONFIG_VDSO32 +#include <generated/vdso32-offsets.h> +#endif + +#define VDSO64_SYMBOL (base, name) ((unsigned long)(base) + (vdso64_offset_##name)) + +#define VDSO32_SYMBOL (base, name) ((unsigned long)(base) + (vdso32_offset_##name)) +/* Offsets relative to thread->vdso_base */ extern unsigned long vdso64_rt_sigtramp;extern unsigned long vdso32_sigtramp;
arch/powerpc/kernel/signal_32.c +4 -4
@@ -785,9 +785,9 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,/* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; addr = frame; -if (vdso32_rt_sigtramp && tsk->mm->context.vdso) { +if (tsk->mm->context.vdso) { sigret =0 ; - tramp = (unsigned long )tsk->mm->context.vdso + vdso32_rt_sigtramp; + tramp =VDSO32_SYMBOL (tsk->mm->context.vdso, sigtramp_rt32); }else { sigret = __NR_rt_sigreturn; tramp = (unsigned long ) frame->tramp;
@@ -1247,9 +1247,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, || __put_user(ksig->sig, &sc->signal)) goto badframe; -if (vdso32_sigtramp && tsk->mm->context.vdso) { +if (tsk->mm->context.vdso) { sigret =0 ; - tramp = (unsigned long )tsk->mm->context.vdso + vdso32_sigtramp; + tramp =VDSO32_SYMBOL (tsk->mm->context.vdso, sigtramp32); }else { sigret = __NR_sigreturn; tramp = (unsigned long ) frame->mctx.tramp;
arch/powerpc/kernel/signal_64.c +2 -2
@@ -864,8 +864,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, tsk->thread.fp_state.fpscr =0 ;/* Set up to return from userspace. */ -if (vdso64_rt_sigtramp && tsk->mm->context.vdso) { - regs->nip = (unsigned long )tsk->mm->context.vdso + vdso64_rt_sigtramp; +if (tsk->mm->context.vdso) { + regs->nip =VDSO64_SYMBOL (tsk->mm->context.vdso, sigtramp_rt64); }else { err |=setup_trampoline (__NR_rt_sigreturn, &frame->tramp[0 ]);if (err)
arch/powerpc/kernel/vdso32/Makefile +8 -0
@@ -63,6 +63,14 @@ $(obj-vdso32): %.o: %.S FORCE $(obj)/vgettimeofday.o: %.o: %.c FORCE $(call if_changed_dep,vdso32cc) +# Generate VDSO offsets using helper script +gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh +quiet_cmd_vdsosym = VDSOSYM $@ + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ + +include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE + $(call if_changed,vdsosym) + # actual build commands quiet_cmd_vdso32ld_and_check = VDSO32L $@ cmd_vdso32ld_and_check = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) ; $(cmd_vdso_check)
arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh new file +16 -0
@@ -0,0 +1,16 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +# +# Match symbols in the DSO that look like VDSO_*; produce a header file +# of constant offsets into the shared object. +# +# Doing this inside the Makefile will break the $(filter-out) function, +# causing Kbuild to rebuild the vdso-offsets header file every time. +# +# Author: Will Deacon <[email protected] +# + +LC_ALL=C +sed -n -e 's/^00*/0/' -e \ +'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso32_offset_\2\t0x\1/p'
arch/powerpc/kernel/vdso32/vdso32.lds.S +6 -0
@@ -165,3 +165,9 @@ VERSION local: *; }; } + +/* + * Make the sigreturn code visible to the kernel. + */ +VDSO_sigtramp32 = __kernel_sigtramp32; +VDSO_sigtramp_rt32 = __kernel_sigtramp_rt32;
arch/powerpc/kernel/vdso64/Makefile +8 -0
@@ -42,6 +42,14 @@ $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so.dbg $(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday.o FORCE $(call if_changed,vdso64ld_and_check) +# Generate VDSO offsets using helper script +gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh +quiet_cmd_vdsosym = VDSOSYM $@ + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ + +include/generated/vdso64-offsets.h: $(obj)/vdso64.so.dbg FORCE + $(call if_changed,vdsosym) + # actual build commands quiet_cmd_vdso64ld_and_check = VDSO64L $@ cmd_vdso64ld_and_check = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^); $(cmd_vdso_check)
arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh new file +16 -0
@@ -0,0 +1,16 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +# +# Match symbols in the DSO that look like VDSO_*; produce a header file +# of constant offsets into the shared object. +# +# Doing this inside the Makefile will break the $(filter-out) function, +# causing Kbuild to rebuild the vdso-offsets header file every time. +# +# Author: Will Deacon <[email protected] +# + +LC_ALL=C +sed -n -e 's/^00*/0/' -e \ +'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso64_offset_\2\t0x\1/p'
arch/powerpc/kernel/vdso64/vdso64.lds.S +5 -0
@@ -159,3 +159,8 @@ VERSION local: *; }; } + +/* + * Make the sigreturn code visible to the kernel. + */ +VDSO_sigtramp_rt64 = __kernel_sigtramp_rt64;
arch/powerpc/perf/callchain_32.c +4 -4
@@ -59,8 +59,8 @@ static int is_sigreturn_32_address(unsigned int nip, unsigned int fp) { if (nip == fp + offsetof(struct signal_frame_32, mctx.mc_pad))return 1 ; -if (vdso32_sigtramp && current->mm->context.vdso && - nip == (unsigned long )current->mm->context.vdso + vdso32_sigtramp) +if (current->mm->context.vdso && + nip ==VDSO32_SYMBOL (current->mm->context.vdso, sigtramp32))return 1 ;return 0 ; }
@@ -70,8 +70,8 @@ static int is_rt_sigreturn_32_address(unsigned int nip, unsigned int fp)if (nip == fp + offsetof(struct rt_signal_frame_32 , uc.uc_mcontext.mc_pad))return 1 ; -if (vdso32_rt_sigtramp && current->mm->context.vdso && - nip == (unsigned long )current->mm->context.vdso + vdso32_rt_sigtramp) +if (current->mm->context.vdso && + nip ==VDSO32_SYMBOL (current->mm->context.vdso, sigtramp_rt32))return 1 ;return 0 ; }
arch/powerpc/perf/callchain_64.c +2 -2
@@ -67,8 +67,8 @@ static int is_sigreturn_64_address(unsigned long nip, unsigned long fp) {if (nip == fp + offsetof(struct signal_frame_64 , tramp))return 1 ; -if (vdso64_rt_sigtramp && current->mm->context.vdso && - nip == (unsigned long )current->mm->context.vdso + vdso64_rt_sigtramp) +if (current->mm->context.vdso && + nip ==VDSO64_SYMBOL (current->mm->context.vdso, sigtramp_rt64))return 1 ;return 0 ; }
Signature · 1 line
2.25.0
PATCH 4/30 powerpc/vdso: Remove get_page() in vdso_pagelist initialization
In reply to Christophe LeroyPartly copied from commit 16fb1a9bec61 ("arm64: vdso: clean up vdso_pagelist initialization").
No need to get_page() the vdso text/data - these are part of the kernel image.
--- arch/powerpc/kernel/vdso.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/powerpc/kernel/vdso.c +2 -4
@@ -748,7 +748,7 @@ static int __init vdso_init(void)BUG_ON (vdso32_pagelist ==NULL );for (i =0 ; i < vdso32_pages; i++) {struct page *pg =virt_to_page (vdso32_kbase + i*PAGE_SIZE ); -get_page (pg); + vdso32_pagelist[i] = pg; } vdso32_pagelist[i++] =virt_to_page (vdso_data);
@@ -761,15 +761,13 @@ static int __init vdso_init(void)BUG_ON (vdso64_pagelist ==NULL );for (i =0 ; i < vdso64_pages; i++) {struct page *pg =virt_to_page (vdso64_kbase + i*PAGE_SIZE ); -get_page (pg); + vdso64_pagelist[i] = pg; } vdso64_pagelist[i++] =virt_to_page (vdso_data); vdso64_pagelist[i] =NULL ;#endif /* CONFIG_PPC64 */ -get_page (virt_to_page (vdso_data)); -smp_wmb (); vdso_ready =1 ;
Signature · 1 line
2.25.0
PATCH 3/30 powerpc/vdso: Rename syscall_map_32/64 to simplify vdso_setup_syscall_map()
In reply to Christophe LeroyToday vdso_data structure has:
- syscall_map_32[] and syscall_map_64[] on PPC64
- syscall_map_32[] on PPC32
On PPC32, syscall_map_32[] is populated using sys_call_table[].
On PPC64, syscall_map_64[] is populated using sys_call_table[] and syscal_map_32[] is populated using compat_sys_call_table[].
To simplify vdso_setup_syscall_map(),
- On PPC32 rename syscall_map_32[] into syscall_map[],
- On PPC64 rename syscall_map_64[] into syscall_map[],
- On PPC64 rename syscall_map_32[] into compat_syscall_map[].
That way, syscall_map[] gets populated using sys_call_table[] and compat_syscall_map[] gets population using compat_sys_call_table[].
Also define an empty compat_syscall_map[] on PPC32 to avoid ifdefs.
--- arch/powerpc/include/asm/vdso_datapage.h | 7 ++++--- arch/powerpc/kernel/asm-offsets.c | 6 ++++-- arch/powerpc/kernel/vdso.c | 12 ++---------- 3 files changed, 10 insertions(+), 15 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +4 -3
@@ -79,8 +79,8 @@ struct vdso_arch_data {__u32 icache_block_size;/* L1 i-cache block size */ __u32 dcache_log_block_size;/* L1 d-cache log block size */ __u32 icache_log_block_size;/* L1 i-cache log block size */ -__u32 syscall_map_64[SYSCALL_MAP_SIZE ];/* map of syscalls */ -__u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ +__u32 syscall_map[SYSCALL_MAP_SIZE ];/* Map of syscalls */ +__u32 compat_syscall_map[SYSCALL_MAP_SIZE ];/* Map of compat syscalls */ struct vdso_data data[CS_BASES ]; };
@@ -92,7 +92,8 @@ struct vdso_arch_data {*/ struct vdso_arch_data {__u64 tb_ticks_per_sec;/* Timebase tics / sec 0x38 */ -__u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ +__u32 syscall_map[SYSCALL_MAP_SIZE ];/* Map of syscalls */ +__u32 compat_syscall_map[0 ];/* No compat syscalls on PPC32 */ struct vdso_data data[CS_BASES ]; };
arch/powerpc/kernel/asm-offsets.c +4 -2
@@ -399,13 +399,15 @@ int main(void)/* datapage offsets for use by vdso */ OFFSET (VDSO_DATA_OFFSET , vdso_arch_data, data);OFFSET (CFG_TB_TICKS_PER_SEC , vdso_arch_data, tb_ticks_per_sec); -OFFSET (CFG_SYSCALL_MAP32 , vdso_arch_data, syscall_map_32);#ifdef CONFIG_PPC64 OFFSET (CFG_ICACHE_BLOCKSZ , vdso_arch_data, icache_block_size);OFFSET (CFG_DCACHE_BLOCKSZ , vdso_arch_data, dcache_block_size);OFFSET (CFG_ICACHE_LOGBLOCKSZ , vdso_arch_data, icache_log_block_size);OFFSET (CFG_DCACHE_LOGBLOCKSZ , vdso_arch_data, dcache_log_block_size); -OFFSET (CFG_SYSCALL_MAP64 , vdso_arch_data, syscall_map_64); +OFFSET (CFG_SYSCALL_MAP64 , vdso_arch_data, syscall_map); +OFFSET (CFG_SYSCALL_MAP32 , vdso_arch_data, compat_syscall_map); +#else +OFFSET (CFG_SYSCALL_MAP32 , vdso_arch_data, syscall_map);#endif #ifdef CONFIG_BUG
arch/powerpc/kernel/vdso.c +2 -10
@@ -643,19 +643,11 @@ static void __init vdso_setup_syscall_map(void)unsigned int i;for (i =0 ; i < NR_syscalls; i++) { -#ifdef CONFIG_PPC64 if (sys_call_table[i] != (unsigned long )&sys_ni_syscall) - vdso_data->syscall_map_64[i >>5 ] |= -0x80000000UL >> (i &0x1f ); + vdso_data->syscall_map[i >>5 ] |=0x80000000UL >> (i &0x1f );if (IS_ENABLED (CONFIG_COMPAT ) && compat_sys_call_table[i] != (unsigned long )&sys_ni_syscall) - vdso_data->syscall_map_32[i >>5 ] |= -0x80000000UL >> (i &0x1f ); -#else /* CONFIG_PPC64 */ -if (sys_call_table[i] != (unsigned long )&sys_ni_syscall) - vdso_data->syscall_map_32[i >>5 ] |= -0x80000000UL >> (i &0x1f ); -#endif /* CONFIG_PPC64 */ + vdso_data->compat_syscall_map[i >>5 ] |=0x80000000UL >> (i &0x1f ); } }
Signature · 1 line
2.25.0
Michael Ellerman
AppliedQuoted 8 lines · Christophe Leroy
This series modernises the setup of VDSO:
- Switch to using_install_special_mapping()which has replacedinstall_special_mapping()
- Move datapage in front of text like most other architectures to simplify its localisation
- Perform link time symbol resolution instead of runtimeThis leads to a huge size reduction of
vdso.c[...]
Applied to powerpc/next.
[01/30] powerpc/vdso: Stripped VDSO is not needed, don't build it
https://git.kernel.org/powerpc/c/7fe2de246e21f01212a8923fbabb4ac84c944d4a [02/30] powerpc/vdso: Add missing includes and clean vdso_setup_syscall_map() https://git.kernel.org/powerpc/c/bc9d5bfc4d23fb3580e7da360f2c9bd878dda9b2 [03/30] powerpc/vdso: Rename syscall_map_32/64 to simplify vdso_setup_syscall_map() https://git.kernel.org/powerpc/c/1bb30b7a45976ae02d54fd43a8665e77314cc05e [04/30] powerpc/vdso: Remove get_page() in vdso_pagelist initialization https://git.kernel.org/powerpc/c/abcdbd039e6823305c2841d07a352fbd2343564e [05/30] powerpc/vdso: Remove NULL termination element in vdso_pagelist https://git.kernel.org/powerpc/c/35c1c7c0bc354d8c3d55bea3bf3e239797980013 [06/30] powerpc/vdso: Refactor 32 bits and 64 bits pages setup https://git.kernel.org/powerpc/c/3cf63825413c9eed2dae06070464efb27381bdac [07/30] powerpc/vdso: Remove unnecessary ifdefs in vdso_pagelist initialization https://git.kernel.org/powerpc/c/4fe0e3c1724e397845df75f64059bcea4ff590e8 [08/30] powerpc/vdso: Use VDSO size in arch_setup_additional_pages() https://git.kernel.org/powerpc/c/7461a4f79ba16dc7733c07c00883a10c7e46b602 [09/30] powerpc/vdso: Simplify arch_setup_additional_pages() exit https://git.kernel.org/powerpc/c/b2df3f60b452ab496adcef1b2f9c2560f6d8e8e0 [10/30] powerpc/vdso: Move to _install_special_mapping() and remove arch_vma_name() https://git.kernel.org/powerpc/c/c1bab64360e6850ca54305d2f1902dac829c9752 [11/30] powerpc/vdso: Provide vdso_remap() https://git.kernel.org/powerpc/c/526a9c4a7234cccf6d900c6e82d79356f974cbfd [12/30] powerpc/vdso: Replace vdso_base by vdso https://git.kernel.org/powerpc/c/c102f07667486dc4a6ae1e3fe7aa67135cb40e3e [13/30] powerpc/vdso: Move vdso datapage up front https://git.kernel.org/powerpc/c/511157ab641eb6bedd00d62673388e78a4f871cf [14/30] powerpc/vdso: Simplify __get_datapage() https://git.kernel.org/powerpc/c/591857b635c1f635cae556e1b1f9d81808242493 [15/30] powerpc/vdso: Remove unused \tmp param in __get_datapage() https://git.kernel.org/powerpc/c/550e6074c106e1a6fb57dfef62f0daede12d832c [16/30] powerpc/vdso: Retrieve sigtramp offsets at buildtime https://git.kernel.org/powerpc/c/91bf695596f594e42d69d70deb2ae53cafecf77c [17/30] powerpc/vdso: Use builtin symbols to locate fixup section https://git.kernel.org/powerpc/c/ed07f6353ddf19e51c4db6d2be72ca97f7ed8a08 [18/30] powerpc/vdso: Merge __kernel_sync_dicache_p5() into __kernel_sync_dicache() https://git.kernel.org/powerpc/c/0fc980db9a404a993c4ed542369a745d8a14b0b7 [19/30] powerpc/vdso: Remove vdso32_pages and vdso64_pages https://git.kernel.org/powerpc/c/b7fe9c15b57d767fda250e8eff79be435996ef33 [20/30] powerpc/vdso: Remove __kernel_datapage_offset https://git.kernel.org/powerpc/c/49bf59fd0371b1053a17021f27605f43071584ee [21/30] powerpc/vdso: Remove runtime generated sigtramp offsets https://git.kernel.org/powerpc/c/899367ea50637f382fdc5c927fe47e6090d4aefe [22/30] powerpc/vdso: Remove vdso_patches[] and associated functions https://git.kernel.org/powerpc/c/5cda7c75493fd17a010d7399e39fda6619f69043 [23/30] powerpc/vdso: Remove unused text member in struct lib32/64_elfinfo https://git.kernel.org/powerpc/c/e113f8ef1c7e5fd79b440e5565c8552b36122bfa [24/30] powerpc/vdso: Remove symbol section information in struct lib32/64_elfinfo https://git.kernel.org/powerpc/c/6ed613ad572a84c175629fc8657a197c6415b7d6 [25/30] powerpc/vdso: Remove lib32_elfinfo and lib64_elfinfo https://git.kernel.org/powerpc/c/67a354051da28d482e53146def212b102664ce0e [26/30] powerpc/vdso: Remove vdso_setup() https://git.kernel.org/powerpc/c/a4ccd64acb8c08ce8d36001cdd06477deec6ae89 [27/30] powerpc/vdso: Remove vdso_ready https://git.kernel.org/powerpc/c/23c4ceaf1a457808d031c666760fa325c7b7f23f [28/30] powerpc/vdso: Remove DBG() https://git.kernel.org/powerpc/c/e90903203d94d0a0d0e8ebc979aa0617a7bbe9a3 [29/30] powerpc/vdso: Remove VDSO32_LBASE and VDSO64_LBASE https://git.kernel.org/powerpc/c/676155ab239dc2035d5306438b45695b6fa165e2 [30/30] powerpc/vdso: Cleanup vdso.h https://git.kernel.org/powerpc/c/65d2150c89121a49e4bd4abbb99c436c77003eed
cheers