From patchwork Wed Sep 20 16:29:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 816360 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xy54j6gsPz9t2V for ; Thu, 21 Sep 2017 02:37:25 +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="jajmRc0Z"; 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 3xy54h5rnVzDqZ9 for ; Thu, 21 Sep 2017 02:37:24 +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="jajmRc0Z"; 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="jajmRc0Z"; 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 3xy4vq4bLZzDqYG for ; Thu, 21 Sep 2017 02:29:43 +1000 (AEST) Received: by mail-pg0-x243.google.com with SMTP id i130so1920804pgc.0 for ; Wed, 20 Sep 2017 09:29:43 -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=IVAulDM2MKKdZk1OZegitOzApbierimhT0gYtTgDJWc=; b=jajmRc0ZwsnkFVu18tnfxCImmLKjOkv2J3cQnWjcnxLMLIaTxwNsBEoWzq4mqKDy2j BdNBQS+J3vJ/A70Tz8I36e13wX8ZTSL/TIWbqPvz6t6+EtYVBLN5ih/uA4xK5RRsYMt/ n8hr/Bjx88YKXXN2iN65HO+GSWkfmHSrvhm+OTjeSrsZZjPyh2Z7UjQ80dRBnad19tfk Ag5TQyEao/v266G6eiOaZN+HG41/1uhcW2QoLl1Pqj4Up14jQeYLapwZV2lxzNO4hqqB aTlOZ3FT5cJu35ilAUPt00B+cIJx+yhrQkwI74Rex4ARpVENszlSJ+dVajmIuOKOjhD/ 2dtw== 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=IVAulDM2MKKdZk1OZegitOzApbierimhT0gYtTgDJWc=; b=ne2jyuPYwDQsGIkkiQJzEdzoJOgBGKumf3fH27N4cOuor55UflULq2RVewnda+6D7w /fz44fQJEb7jwCCNIiMUzwyhfzpHna73DAWkuX6RQk7HEzxyROVX/q9oIFjQul0HyM9M sb5I7ASC/KHbPxNiqxNgPrB7Gulat2NE0EzpmHcuxCRe63wIEBzKl3D8E1AWurduAL/p 705aDTGJVATMBwftnnNBQcUqJ3AlDz7mm1g2EEozUm2vHPyLRp4Z7MXDNvxqpf7EIrEO ZjwxGSB/VwwHd2m4QcdzKMlJCTzaDy0QpW6QDmMoK6pMyC/I8za/yRUuN2zLyIn4u/AK 3f1g== X-Gm-Message-State: AHPjjUhwMv2GvjeH+OwpYmdBMV2b2T1JkErgciqd90qWm0z2P4DC+Ybu +DKDiKkx/pigVPso9QuJShQ= X-Google-Smtp-Source: AOwi7QBP83WtIrL8LGb2FGXLigRnemasRkz5paUxfjDZz+Z9pZJ3qIlcuPqNOuhInxK7aoVNubFARg== X-Received: by 10.99.123.17 with SMTP id w17mr2779371pgc.57.1505924981970; Wed, 20 Sep 2017 09:29:41 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id c185sm8890567pfb.57.2017.09.20.09.29.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 09:29:41 -0700 (PDT) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , James Bottomley , Helge Deller Subject: [RFC][PATCH v2 3/7] ia64: Add .opd based function descriptor dereference Date: Thu, 21 Sep 2017 01:29:05 +0900 Message-Id: <20170920162910.32053-4-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> 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 | 10 +++++++++- arch/ia64/kernel/module.c | 13 +++++++++++++ arch/ia64/kernel/vmlinux.lds.S | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index de6bfa1ef8fb..3ba7ce9d8bc8 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h @@ -37,6 +37,14 @@ static inline unsigned long dereference_function_descriptor(unsigned long ptr) 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 /* _ASM_IA64_SECTIONS_H */ - diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index d1d945c6bd05..0741ae6fa957 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 || + addr >= (opd->sh_addr + opd->sh_size)) + 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 = .; } /*