From patchwork Wed Sep 20 16:29:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 9961837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95DEC60208 for ; Wed, 20 Sep 2017 16:30:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8717F29198 for ; Wed, 20 Sep 2017 16:30:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C0442919B; Wed, 20 Sep 2017 16:30:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EED9629198 for ; Wed, 20 Sep 2017 16:30:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbdITQ34 (ORCPT ); Wed, 20 Sep 2017 12:29:56 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:38774 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbdITQ3y (ORCPT ); Wed, 20 Sep 2017 12:29:54 -0400 Received: by mail-pf0-f196.google.com with SMTP id a7so1381315pfj.5; Wed, 20 Sep 2017 09:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5eIjg/ySaCRfpzRnqi0tMWSm+HJQGizVM74onIhSWcg=; b=EYACIY/85bxiwzKyji/JGfkKrb+hKh2w1Grph1h2siq0bq3Bc0+kjazx5ywiVeqER0 rpUwLa88CPEsABVDMWkxHl31lQ9mOJ6DLab//9Ohwe0McxnhtwnjtTEnfFBxwZA9NPqQ uIaJAM3FNhKL+jyDnvM3YShaO+eTbtPOGwRroFytBFXAaBZ3nftEl7bD0xH1+RV3AoS3 1d6u7YOhUOczgA57eczgncO3/P26Xba8CI3ES2NQl+k5biCpxho+FZ3MgP+SElxRE31i sbXuE872rsEQCJ+qUchpxXKYWpenpTaDAtLQJYSfl6ufyFI2VdPY3Dv8ZLaXQb+FZ76P KUBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5eIjg/ySaCRfpzRnqi0tMWSm+HJQGizVM74onIhSWcg=; b=jVh31DGbyLqpek17iw4A8VcwEFr7llM67qemQxeZyLGVV94mhJKg2QHhrbBCYc9C55 CQlzE1dRQf7fM7RdJ5RAteAxABMXOtnj1vy+6/MRWW+cARC26R4H9mZpldItkhU1zqg1 /XSarT6nZ2Cw/SXPmJfxW5Nx1DlG+nR69EZVjg8W8IML7SSKKKyPMAs0fNnz+YeuP4hT /BET2tVMTWLRcObhklqA7itAiFkualcffHd6GDLQe9toUvzQuccXbajMk44HKtqMLbmt EikWgtAir67Ari2pz1CxsN1xU6Q5pC9je6sTEn4/WiT4Hx6GeiuIhpyBZxQMnV2pjbCP h14Q== X-Gm-Message-State: AHPjjUhqG2LLx4ktU2dMM6a3WDJjKGBHsJsAkLGLKFPQp0ekQj5w8Vz8 uzUJOIwJWZoiTs0Sgr2tsYo= X-Google-Smtp-Source: AOwi7QAYa+3JtEOvkBLsP+qwgBdQG8fYt4kSJ3hmVGmmEX/f380U2izXDo5cNKhDv/DbogyDvWzVfA== X-Received: by 10.99.154.18 with SMTP id o18mr1720623pge.18.1505924993567; Wed, 20 Sep 2017 09:29:53 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id c185sm8890567pfb.57.2017.09.20.09.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 09:29:52 -0700 (PDT) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , James Bottomley , Helge Deller Cc: Petr Mladek , Steven Rostedt , Andrew Morton , Jessica Yu , Alexei Starovoitov , linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [RFC][PATCH v2 5/7] parisc64: Add .opd based function descriptor dereference Date: Thu, 21 Sep 2017 01:29:07 +0900 Message-Id: <20170920162910.32053-6-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170920162910.32053-1-sergey.senozhatsky@gmail.com> References: <20170920162910.32053-1-sergey.senozhatsky@gmail.com> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Helge Deller --- arch/parisc/boot/compressed/vmlinux.lds.S | 2 ++ arch/parisc/include/asm/sections.h | 2 ++ arch/parisc/kernel/module.c | 17 +++++++++++++++++ arch/parisc/kernel/process.c | 9 +++++++++ arch/parisc/kernel/vmlinux.lds.S | 2 ++ 5 files changed, 32 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 59fbe0067112..845ddc9a3421 100644 --- a/arch/parisc/include/asm/sections.h +++ b/arch/parisc/include/asm/sections.h @@ -7,6 +7,8 @@ #ifdef CONFIG_64BIT #undef dereference_function_descriptor unsigned long dereference_function_descriptor(unsigned long); +#undef dereference_kernel_function_descriptor +unsigned long dereference_kernel_function_descriptor(unsigned long); #endif #endif diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index f1a76935a314..28f89b3dcc11 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -66,6 +66,7 @@ #include #include +#include #if 0 #define DEBUGP printk @@ -954,3 +955,19 @@ 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) +{ + unsigned long start_opd = (Elf64_Addr)mod->core_layout.base + + mod->arch.fdesc_offset; + unsigned long end_opd = start_opd + + mod->arch.fdesc_count * sizeof(Elf64_Fdesc); + + if (addr < start_opd || addr >= end_opd) + return addr; + + return dereference_function_descriptor(addr); +} +#endif diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index f00a5f93492a..ff13726b2d2d 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -276,6 +276,15 @@ unsigned long dereference_function_descriptor(unsigned long ptr) ptr = (unsigned long)p; return ptr; } + +unsigned long dereference_kernel_function_descriptor(unsigned long addr) +{ + if (addr < (unsigned long)__start_opd || + addr >= (unsigned long)__end_opd) + return addr; + + return dereference_function_descriptor(addr); +} #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)