From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, "James E . J . Bottomley" <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de> Cc: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>, Andrew Morton <akpm@linux-foundation.org>, Jessica Yu <jeyu@kernel.org>, Alexei Starovoitov <ast@kernel.org>, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [PATCH 4/5] parisc64: Add .opd based function descriptor dereference Date: Sat, 16 Sep 2017 12:53:46 +0900 [thread overview] Message-ID: <20170916035347.19705-5-sergey.senozhatsky@gmail.com> (raw) In-Reply-To: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> We are moving towards separate kernel and module function descriptor dereference callbacks. This patch enables it for parisc64. For pointers that belong to the kernel - Added __start_opd and __end_opd pointers, to track the kernel .opd section address range; - Added dereference_kernel_function_descriptor(). Now we will dereference only function pointers that are within [__start_opd, __end_opd]; For pointers that belong to a module - Added dereference_module_function_descriptor() to handle module function descriptor dereference. Now we will dereference only pointers that are within [module->opd.start, module->opd.end]. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> --- arch/parisc/boot/compressed/vmlinux.lds.S | 2 ++ arch/parisc/include/asm/sections.h | 3 +++ arch/parisc/kernel/module.c | 14 ++++++++++++++ arch/parisc/kernel/process.c | 10 ++++++++++ arch/parisc/kernel/vmlinux.lds.S | 2 ++ 5 files changed, 31 insertions(+) diff --git a/arch/parisc/boot/compressed/vmlinux.lds.S b/arch/parisc/boot/compressed/vmlinux.lds.S index a4ce3314e78e..4ebd4e65524c 100644 --- a/arch/parisc/boot/compressed/vmlinux.lds.S +++ b/arch/parisc/boot/compressed/vmlinux.lds.S @@ -29,7 +29,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt) diff --git a/arch/parisc/include/asm/sections.h b/arch/parisc/include/asm/sections.h index 9d13c3507ad6..e3cde650b2f9 100644 --- a/arch/parisc/include/asm/sections.h +++ b/arch/parisc/include/asm/sections.h @@ -6,7 +6,10 @@ #ifdef CONFIG_64BIT #undef dereference_function_descriptor +#undef dereference_kernel_function_descriptor + void *dereference_function_descriptor(void *); +void *dereference_kernel_function_descriptor(void *); #endif #endif diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index f1a76935a314..bc2eae8634fd 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -954,3 +954,17 @@ void module_arch_cleanup(struct module *mod) { deregister_unwind_table(mod); } + +#ifdef CONFIG_64BIT +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + void *opd_sz = mod->arch.fdesc_offset + + mod->arch.fdesc_max * sizeof(Elf64_Fdesc); + + if (addr < mod->arch.fdesc_offset || opd_sz < addr) + return addr; + + return dereference_function_descriptor(addr); +} +#endif diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 30f92391a93e..f30776bdaa79 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -267,6 +267,8 @@ get_wchan(struct task_struct *p) } #ifdef CONFIG_64BIT +extern char __start_opd[], __end_opd[]; + void *dereference_function_descriptor(void *ptr) { Elf64_Fdesc *desc = ptr; @@ -276,6 +278,14 @@ void *dereference_function_descriptor(void *ptr) ptr = p; return ptr; } + +void *dereference_kernel_function_descriptor(void *ptr) +{ + if (ptr < (void *)__start_opd || (void *)__end_opd < ptr) + return ptr; + + return dereference_function_descriptor(ptr); +} #endif static inline unsigned long brk_rnd(void) diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index ffe2cbf52d1a..ab030895dd1e 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -99,7 +99,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt) -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, "James E . J . Bottomley" <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de> Cc: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>, Andrew Morton <akpm@linux-foundation.org>, Jessica Yu <jeyu@kernel.org>, Alexei Starovoitov <ast@kernel.org>, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [PATCH 4/5] parisc64: Add .opd based function descriptor dereference Date: Sat, 16 Sep 2017 03:53:46 +0000 [thread overview] Message-ID: <20170916035347.19705-5-sergey.senozhatsky@gmail.com> (raw) In-Reply-To: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> We are moving towards separate kernel and module function descriptor dereference callbacks. This patch enables it for parisc64. For pointers that belong to the kernel - Added __start_opd and __end_opd pointers, to track the kernel .opd section address range; - Added dereference_kernel_function_descriptor(). Now we will dereference only function pointers that are within [__start_opd, __end_opd]; For pointers that belong to a module - Added dereference_module_function_descriptor() to handle module function descriptor dereference. Now we will dereference only pointers that are within [module->opd.start, module->opd.end]. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> --- arch/parisc/boot/compressed/vmlinux.lds.S | 2 ++ arch/parisc/include/asm/sections.h | 3 +++ arch/parisc/kernel/module.c | 14 ++++++++++++++ arch/parisc/kernel/process.c | 10 ++++++++++ arch/parisc/kernel/vmlinux.lds.S | 2 ++ 5 files changed, 31 insertions(+) diff --git a/arch/parisc/boot/compressed/vmlinux.lds.S b/arch/parisc/boot/compressed/vmlinux.lds.S index a4ce3314e78e..4ebd4e65524c 100644 --- a/arch/parisc/boot/compressed/vmlinux.lds.S +++ b/arch/parisc/boot/compressed/vmlinux.lds.S @@ -29,7 +29,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt) diff --git a/arch/parisc/include/asm/sections.h b/arch/parisc/include/asm/sections.h index 9d13c3507ad6..e3cde650b2f9 100644 --- a/arch/parisc/include/asm/sections.h +++ b/arch/parisc/include/asm/sections.h @@ -6,7 +6,10 @@ #ifdef CONFIG_64BIT #undef dereference_function_descriptor +#undef dereference_kernel_function_descriptor + void *dereference_function_descriptor(void *); +void *dereference_kernel_function_descriptor(void *); #endif #endif diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index f1a76935a314..bc2eae8634fd 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -954,3 +954,17 @@ void module_arch_cleanup(struct module *mod) { deregister_unwind_table(mod); } + +#ifdef CONFIG_64BIT +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + void *opd_sz = mod->arch.fdesc_offset + + mod->arch.fdesc_max * sizeof(Elf64_Fdesc); + + if (addr < mod->arch.fdesc_offset || opd_sz < addr) + return addr; + + return dereference_function_descriptor(addr); +} +#endif diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 30f92391a93e..f30776bdaa79 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -267,6 +267,8 @@ get_wchan(struct task_struct *p) } #ifdef CONFIG_64BIT +extern char __start_opd[], __end_opd[]; + void *dereference_function_descriptor(void *ptr) { Elf64_Fdesc *desc = ptr; @@ -276,6 +278,14 @@ void *dereference_function_descriptor(void *ptr) ptr = p; return ptr; } + +void *dereference_kernel_function_descriptor(void *ptr) +{ + if (ptr < (void *)__start_opd || (void *)__end_opd < ptr) + return ptr; + + return dereference_function_descriptor(ptr); +} #endif static inline unsigned long brk_rnd(void) diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index ffe2cbf52d1a..ab030895dd1e 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -99,7 +99,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt) -- 2.14.1
next prev parent reply other threads:[~2017-09-16 3:53 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-16 3:53 [PATCH 0/5] [RFC] printk/ia64/ppc64/parisc64: let's deprecate %pF/%pf printk specifiers Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky 2017-09-16 3:53 ` [PATCH 1/5] sections: split dereference_function_descriptor() Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky 2017-09-16 3:53 ` [PATCH 2/5] ia64: Add .opd based function descriptor dereference Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky 2017-09-16 3:53 ` [PATCH 3/5] powerpc64: " Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky 2017-09-16 9:43 ` Naveen N. Rao 2017-09-16 9:55 ` Naveen N. Rao 2017-09-16 11:25 ` Sergey Senozhatsky 2017-09-16 11:25 ` Sergey Senozhatsky 2017-09-19 10:22 ` Michael Ellerman 2017-09-19 10:22 ` Michael Ellerman 2017-09-19 10:31 ` Sergey Senozhatsky 2017-09-19 10:31 ` Sergey Senozhatsky 2017-09-20 1:51 ` Michael Ellerman 2017-09-20 1:51 ` Michael Ellerman 2017-09-20 6:10 ` Sergey Senozhatsky 2017-09-20 6:10 ` Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky [this message] 2017-09-16 3:53 ` [PATCH 4/5] parisc64: " Sergey Senozhatsky 2017-09-16 3:53 ` [PATCH 5/5] symbol lookup: use new kernel and module dereference functions Sergey Senozhatsky 2017-09-16 3:53 ` Sergey Senozhatsky 2017-09-18 17:44 ` [PATCH 0/5] [RFC] printk/ia64/ppc64/parisc64: let's deprecate %pF/%pf printk specifiers Luck, Tony 2017-09-18 17:44 ` Luck, Tony 2017-09-18 18:39 ` Helge Deller 2017-09-18 18:39 ` Helge Deller 2017-09-19 2:05 ` Sergey Senozhatsky 2017-09-19 2:05 ` Sergey Senozhatsky 2017-09-19 13:38 ` David Laight 2017-09-19 20:07 ` Helge Deller 2017-09-19 20:07 ` Helge Deller 2017-09-20 8:41 ` David Laight 2017-09-20 8:41 ` David Laight 2017-09-20 10:20 ` Helge Deller 2017-09-20 10:20 ` Helge Deller 2017-09-20 16:31 ` Sergey Senozhatsky 2017-09-20 16:31 ` Sergey Senozhatsky 2017-09-19 14:07 ` Helge Deller 2017-09-19 14:07 ` Helge Deller 2017-09-19 20:03 ` Helge Deller 2017-09-19 20:03 ` Helge Deller 2017-09-20 0:47 ` Sergey Senozhatsky 2017-09-20 0:47 ` Sergey Senozhatsky 2017-09-19 2:08 ` Sergey Senozhatsky 2017-09-19 2:08 ` Sergey Senozhatsky
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170916035347.19705-5-sergey.senozhatsky@gmail.com \ --to=sergey.senozhatsky@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=ast@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=deller@gmx.de \ --cc=fenghua.yu@intel.com \ --cc=jejb@parisc-linux.org \ --cc=jeyu@kernel.org \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-parisc@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=pmladek@suse.com \ --cc=rostedt@goodmis.org \ --cc=tony.luck@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.