From patchwork Sat Sep 16 03:53:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 814460 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xvJYH6ck7z9t16 for ; Sat, 16 Sep 2017 14:04:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ihzKPt2J"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xvJYH5CLhzDrct for ; Sat, 16 Sep 2017 14:04:03 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ihzKPt2J"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::243; helo=mail-pg0-x243.google.com; envelope-from=sergey.senozhatsky@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ihzKPt2J"; dkim-atps=neutral Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xvJRL5WH9zDrnw for ; Sat, 16 Sep 2017 13:58:54 +1000 (AEST) Received: by mail-pg0-x243.google.com with SMTP id d8so2241256pgt.3 for ; Fri, 15 Sep 2017 20:58: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=OfRmoCKaZTxH76f85Hvnq8h3YMNL73s6OtfMeyJchEA=; b=ihzKPt2JNphNcRhzF55U+ViPAtPrQmrI4I8wS+uNzN58qPLY5oP3FWev2QdTmCt1h8 s7JnP2zWINouAfPuaeoP1QXqNPESvMKATqc0+QIYSeDQ9VxzQzPng1sETMy6vwziSOFm tE9W6TFPC9Bww4gwudoAVpBeuYnSrjaKtBXvhLTNIw1GdqofUeYrcomKjQXkoggrHI08 iJ6h4pAsD7NVc2XbPEbJX9qVT9rZZHPY6Tp7255fOc0VB+xW1Ici3AXwihBPaahFpjb2 uqi6sGgghRXeWHQddHwcAsgzwZSBRDf4Gohtsh5gB4cqx34se+4ItzqwU73DrnW6wJnT DHXA== 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=OfRmoCKaZTxH76f85Hvnq8h3YMNL73s6OtfMeyJchEA=; b=WCFmAGiZ2agoZTLaGc6kMvE8AhSA35G0dYOCj3BoPQYnjRF8CwlQ/OtkPt2S/7f4MT /mryn08+LlC+EK5o+c1zbYiLKkdRIy2r0IupXJSTXTYlVNFvvR+G92d6FYkYJuSyjO9D 4fWzSjiOoYw621XC8Oe8Ntvvx5aX2EoLd4kIQ+l+rPeGEl4KwMikcxxY4r5pkFk7Xyl3 alu/2QGilTiqqnrH2GO3CGf6VDfuib+PLh9EMU1B0SpBb6QOj3KBPwXgV94Z3twjsaf0 Go82uH3iCdTqgk2EDkmoYAcgUHr+4edT5i14G51DEsJOmZWbNPi/EigUF0VM97+xKajp vtlg== X-Gm-Message-State: AHPjjUhmeoDuMwKjDnbsXbVWDU/ocpUwlsSsHNqqjazIyQf2dxn1Ue/3 +CmXJjOlTVd3SA== X-Google-Smtp-Source: ADKCNb5+5Kec3ncfrrAw+emYdbKrMNgzOmgON9Y0elrR2xm82eoL2rFLeoBQGYifIqWj24otNRYx4g== X-Received: by 10.84.225.2 with SMTP id t2mr30313733plj.425.1505534332715; Fri, 15 Sep 2017 20:58:52 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id 76sm4448230pfp.158.2017.09.15.20.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 20:58:52 -0700 (PDT) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "James E . J . Bottomley" , Helge Deller Subject: [PATCH 2/5] ia64: Add .opd based function descriptor dereference Date: Sat, 16 Sep 2017 12:53:44 +0900 Message-Id: <20170916035347.19705-3-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> References: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Petr Mladek , linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, Alexei Starovoitov , Steven Rostedt , linux-kernel@vger.kernel.org, Sergey Senozhatsky , Jessica Yu , Andrew Morton , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" We are moving towards separate kernel and module function descriptor dereference callbacks. This patch enables it for IA64. 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 --- arch/ia64/include/asm/sections.h | 14 +++++++++++++- arch/ia64/kernel/module.c | 13 +++++++++++++ arch/ia64/kernel/vmlinux.lds.S | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index 2ab2003698ef..bff3f3535609 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h @@ -25,8 +25,11 @@ extern char __start_gate_fsyscall_patchlist[], __end_gate_fsyscall_patchlist[]; extern char __start_gate_brl_fsys_bubble_down_patchlist[], __end_gate_brl_fsys_bubble_down_patchlist[]; extern char __start_unwind[], __end_unwind[]; extern char __start_ivt_text[], __end_ivt_text[]; +extern char __start_opd[], __end_opd[]; #undef dereference_function_descriptor +#undef dereference_kernel_function_descriptor + static inline void *dereference_function_descriptor(void *ptr) { struct fdesc *desc = ptr; @@ -37,6 +40,15 @@ static inline void *dereference_function_descriptor(void *ptr) return ptr; } +static inline void *dereference_kernel_function_descriptor(void *ptr) +{ + /* + * Check if the ptr is a function descriptor and thus needs to + * be dereferenced. + */ + if (ptr < (void *)__start_opd || (void *)__end_opd < ptr) + return ptr; + return dereference_function_descriptor(ptr); +} #endif /* _ASM_IA64_SECTIONS_H */ - diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index d1d945c6bd05..d42f1e19d75d 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -35,6 +35,7 @@ #include #include +#include #define ARCH_MODULE_DEBUG 0 @@ -917,3 +918,15 @@ module_arch_cleanup (struct module *mod) if (mod->arch.core_unw_table) unw_remove_unwind_table(mod->arch.core_unw_table); } + +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + Elf64_Shdr *opd = mod->arch.opd; + + if (addr < opd->sh_addr || + (opd->sh_addr + opd->sh_size) < addr) + return addr; + + return dereference_function_descriptor(addr); +} diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 798026dde52e..f872ba5ff82a 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S @@ -107,7 +107,9 @@ SECTIONS { RODATA .opd : AT(ADDR(.opd) - LOAD_OFFSET) { + __start_opd = .; *(.opd) + __end_opd = .; } /*