From patchwork Sat Sep 30 02:53:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 9979067 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 074ED6037F for ; Sat, 30 Sep 2017 02:55:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0BEA297C2 for ; Sat, 30 Sep 2017 02:55:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5534297CD; Sat, 30 Sep 2017 02:55:21 +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 5876C297C2 for ; Sat, 30 Sep 2017 02:55:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752788AbdI3Cy1 (ORCPT ); Fri, 29 Sep 2017 22:54:27 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34986 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752649AbdI3CyY (ORCPT ); Fri, 29 Sep 2017 22:54:24 -0400 Received: by mail-pg0-f68.google.com with SMTP id j16so884839pga.2; Fri, 29 Sep 2017 19:54:24 -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=pHyRusM5cEBProfl5V9JE5l44ygK30WS0SaipSJ1r8o=; b=r7PqTAY7bng3zJeu0B1SS8JKWuW6LNGP9oDv0ZDpBv79V3VOzsnfZi7EdPrNGJGTlM iejn8wOF0f7zw53gmL+I/z0pMvfqKlRHXcqPVQV0B9a7mI5YmXYc8egjsCsS8jDMGUKq DjCWIGN31uEaMj8ER6SP3oWuzI78+P1yACuydOJT4TXxI1EgU6o4ZpsQ9ZQ2a3M9sQkT +sWIhlgGZB0SBUpzGWkL24pCF9ig7ChoDggqjioWQCd7vT/M8ETuKOjWnMi592l0GmjG SsU8YWvtm3DASphu0o7CjnRWWtYvNaZ7sHOV1IU/bmhkOpeekgW3rGpUX1fxcKQNjup9 5dKA== 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=pHyRusM5cEBProfl5V9JE5l44ygK30WS0SaipSJ1r8o=; b=IhgS9HJMHHTcC3etGir6K0w4beXs6SoFDoZd51gZBoUAtx/IFxUa9zsFpDo9aISkhH uAeHe7FCNpJKZoEfX1WY+P5wfZXZBKElLJteEPoDwJmoMflvuPGaUzze29rCDyHiKQZv rrkDWS/+twjTg76eMS4j/AG/0bh32IE3Pk06JcbaLCsog5Vo4E8SPppYLGeQCfBM3bBt cFKAO5w8bf5Ii4CUjNn+587GphonT6AciBZjlS5+JbYQskv+GEviRsRsuh0tUPvOUni3 VAclMqjRZQqiNneVyrWvJie86qtk3sS7gwHsyKLDy+uwwrecICGxrZoiSzIqFUuMycye 561Q== X-Gm-Message-State: AHPjjUimt33MOb2+72ih4aB2YLI7f6qEHc3ziH2PPy+ZjdH9mC4Su0ff N8GwLQ5x4GazAqSpLH1l23c= X-Google-Smtp-Source: AOwi7QA8Ld4/Z9FlNnbsVqMr9tcIquia8HmMmhLxYw+ne3EC+J3eW9zHOlMt9kZZUvaMINOs26Oo+w== X-Received: by 10.98.236.81 with SMTP id k78mr9737468pfh.336.1506740064066; Fri, 29 Sep 2017 19:54:24 -0700 (PDT) Received: from localhost.localdomain ([175.223.27.84]) by smtp.gmail.com with ESMTPSA id b1sm8680714pgn.94.2017.09.29.19.54.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Sep 2017 19:54:23 -0700 (PDT) From: Sergey Senozhatsky To: Petr Mladek , Steven Rostedt Cc: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , James Bottomley , Helge Deller , 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: [PATCHv3 4/7] powerpc64: Add .opd based function descriptor dereference Date: Sat, 30 Sep 2017 11:53:16 +0900 Message-Id: <20170930025319.987-5-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20170930025319.987-1-sergey.senozhatsky@gmail.com> References: <20170930025319.987-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 powerpc64. 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 Tested-by: Helge Deller # parisc64 Tested-by: Santosh Sivaraj # powerpc64 Acked-by: Michael Ellerman # powerpc64 Tested-by: Tony Luck # ia64 Reviewed-by: Petr Mladek --- arch/powerpc/include/asm/module.h | 3 +++ arch/powerpc/include/asm/sections.h | 11 +++++++++++ arch/powerpc/kernel/module_64.c | 16 ++++++++++++++++ arch/powerpc/kernel/vmlinux.lds.S | 2 ++ 4 files changed, 32 insertions(+) diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h index 6c0132c7212f..7e28442827f1 100644 --- a/arch/powerpc/include/asm/module.h +++ b/arch/powerpc/include/asm/module.h @@ -45,6 +45,9 @@ struct mod_arch_specific { unsigned long tramp; #endif + /* For module function descriptor dereference */ + unsigned long start_opd; + unsigned long end_opd; #else /* powerpc64 */ /* Indices of PLT sections within module. */ unsigned int core_plt_section; diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h index 67379b8945e8..6b4ee0d1645f 100644 --- a/arch/powerpc/include/asm/sections.h +++ b/arch/powerpc/include/asm/sections.h @@ -75,6 +75,17 @@ static inline unsigned long dereference_function_descriptor(unsigned long ptr) ptr = (unsigned long)p; return ptr; } + +#undef dereference_kernel_function_descriptor +static inline 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 /* PPC64_ELF_ABI_v1 */ #endif diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 0b0f89685b67..94caec045a90 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c @@ -344,6 +344,11 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr, else if (strcmp(secstrings+sechdrs[i].sh_name,"__versions")==0) dedotify_versions((void *)hdr + sechdrs[i].sh_offset, sechdrs[i].sh_size); + else if (!strcmp(secstrings + sechdrs[i].sh_name, ".opd")) { + me->arch.start_opd = sechdrs[i].sh_addr; + me->arch.end_opd = sechdrs[i].sh_addr + + sechdrs[i].sh_size; + } /* We don't handle .init for the moment: rename to _init */ while ((p = strstr(secstrings + sechdrs[i].sh_name, ".init"))) @@ -712,6 +717,17 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, return 0; } +#ifdef PPC64_ELF_ABI_v1 +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + if (addr < mod->arch.start_opd || addr >= mod->arch.end_opd) + return addr; + + return dereference_function_descriptor(addr); +} +#endif /* PPC64_ELF_ABI_v1 */ + #ifdef CONFIG_DYNAMIC_FTRACE #ifdef CC_USING_MPROFILE_KERNEL diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 882628fa6987..70e10251e083 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -277,7 +277,9 @@ SECTIONS } .opd : AT(ADDR(.opd) - LOAD_OFFSET) { + __start_opd = .; *(.opd) + __end_opd = .; } . = ALIGN(256);