From patchwork Wed Sep 20 16:29:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 816355 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 3xy50T0D0nz9t2V for ; Thu, 21 Sep 2017 02:33:45 +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="Y7eqD8Ht"; 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 3xy50S5zLXzDqYd for ; Thu, 21 Sep 2017 02:33:44 +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="Y7eqD8Ht"; 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::242; helo=mail-pg0-x242.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="Y7eqD8Ht"; dkim-atps=neutral Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (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 3xy4vd228HzDqYN for ; Thu, 21 Sep 2017 02:29:33 +1000 (AEST) Received: by mail-pg0-x242.google.com with SMTP id m30so1906201pgn.5 for ; Wed, 20 Sep 2017 09:29:33 -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=G3fttGkVsLeBQ/cCLWZ6QdhMs0FgorO2EWGYUeruwG0=; b=Y7eqD8Ht+CcUll8q0UACbHJ1DqwnvRJgaqu3+IL/Sicf6UonArIbxf19UmrfHEqskB 6HXNwkgFlb76npldONMLJzUFMkhw7UxIrt++k+WQOuQqIdNweSyywJ0T5sXLKCYIOgTH UWP3X7e/w/EcY41pbQLE4bw2sYY7nbAEWISSAE/YvgiGYBpbfH0bVbecMAOuXnuvbWM2 hn7dNRyWmWk69LO341FwX56EZ5brYlZpfPa25HbO/4zUq6t02LCSmAcRt052kEmyKFS4 oAWUYqZHZ3fLDyC+s8+IW/RpHwMMjFvxkoibSbazJRCCjjubXy2Wm+AwhYjjmD27RSl3 +EIw== 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=G3fttGkVsLeBQ/cCLWZ6QdhMs0FgorO2EWGYUeruwG0=; b=FODncM7gfrCws8yhUiAt3yxRy7+bvY+8s78Vyf8E4D/anu77Ce7zggXvmO7AhXjtdY JCsr7YBPe7q2a+WJP0dpJjgljmwz6OgMQtam95qQX3nTDPU755fUBTEdzoDSrwgsegbC UBGgvSDKsGoHBppOFGNDBB1APIj7gdKWY6IT+Dv2P1l7w47lv3XbFBqUjTPRLHFWcHxA ra7PB3+V93+ZWj1mzCttf+cB1bsQ1YjjtX9F8xGQLNv2dJEsdKXo6tLK+qnqq1sORt9u /tZr8+u4ix7kWTWH7ObjtqfGtmjgb6FErNkRMG0JnGU8+5sqGM6xUkRIA1DO4SOwVrDy HlSA== X-Gm-Message-State: AHPjjUgXC0JL3wX4wGHon+WSA62LuIKA4b7+fXyj0acSVAjDYXNZUSBV IWFNo94FcbbM6RYFsTrbA9Y= X-Google-Smtp-Source: AOwi7QC9NDeyUMFXPom2wdTml5vvs2L6YlGXxxyyIl/OPsvINQTv4D1YAUBl82hj7MzwNMTZHoJHHw== X-Received: by 10.159.244.9 with SMTP id x9mr2648860plr.34.1505924970757; Wed, 20 Sep 2017 09:29:30 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id c185sm8890567pfb.57.2017.09.20.09.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 09:29:29 -0700 (PDT) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , James Bottomley , Helge Deller Subject: [RFC][PATCH v2 1/7] switch dereference_function_descriptor() to `unsigned long' Date: Thu, 21 Sep 2017 01:29:03 +0900 Message-Id: <20170920162910.32053-2-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" Convert dereference_function_descriptor() to accept and return `unsigned long'. There will be two new ARCH function for kernel and module function pointer dereference, which will work with `unsigned long', so the patch unifies interfaces. Besides, dereference_function_descriptor() mostly work with `unsigned long': drivers/misc/kgdbts.c: addr = (unsigned long) dereference_function_descriptor((void *)addr); init/main.c: addr = (unsigned long) dereference_function_descriptor(fn); kernel/extable.c: addr = (unsigned long) dereference_function_descriptor(ptr); kernel/module.c: unsigned long a = (unsigned long)dereference_function_descriptor(addr); Convert dereference_function_descriptor() users tree-wide. Signed-off-by: Sergey Senozhatsky --- arch/ia64/include/asm/sections.h | 6 +++--- arch/parisc/include/asm/sections.h | 2 +- arch/parisc/kernel/process.c | 6 +++--- arch/parisc/mm/init.c | 4 ++-- arch/powerpc/include/asm/sections.h | 6 +++--- drivers/misc/kgdbts.c | 2 +- init/main.c | 2 +- kernel/extable.c | 2 +- kernel/module.c | 2 +- lib/vsprintf.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index 2ab2003698ef..de6bfa1ef8fb 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h @@ -27,13 +27,13 @@ extern char __start_unwind[], __end_unwind[]; extern char __start_ivt_text[], __end_ivt_text[]; #undef dereference_function_descriptor -static inline void *dereference_function_descriptor(void *ptr) +static inline unsigned long dereference_function_descriptor(unsigned long ptr) { - struct fdesc *desc = ptr; + struct fdesc *desc = (struct fdesc *)ptr; void *p; if (!probe_kernel_address(&desc->ip, p)) - ptr = p; + ptr = (unsigned long)p; return ptr; } diff --git a/arch/parisc/include/asm/sections.h b/arch/parisc/include/asm/sections.h index 9d13c3507ad6..59fbe0067112 100644 --- a/arch/parisc/include/asm/sections.h +++ b/arch/parisc/include/asm/sections.h @@ -6,7 +6,7 @@ #ifdef CONFIG_64BIT #undef dereference_function_descriptor -void *dereference_function_descriptor(void *); +unsigned long dereference_function_descriptor(unsigned long); #endif #endif diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index a45a67d526f8..f00a5f93492a 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -267,13 +267,13 @@ get_wchan(struct task_struct *p) } #ifdef CONFIG_64BIT -void *dereference_function_descriptor(void *ptr) +unsigned long dereference_function_descriptor(unsigned long ptr) { - Elf64_Fdesc *desc = ptr; + Elf64_Fdesc *desc = (Elf64_Fdesc *)ptr; void *p; if (!probe_kernel_address(&desc->addr, p)) - ptr = p; + ptr = (unsigned long)p; return ptr; } #endif diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 1ca9a2b4239f..06e1b79e2946 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -389,10 +389,10 @@ static void __init setup_bootmem(void) static int __init parisc_text_address(unsigned long vaddr) { static unsigned long head_ptr __initdata; + unsigned long addr = (unsigned long)&parisc_kernel_start; if (!head_ptr) - head_ptr = PAGE_MASK & (unsigned long) - dereference_function_descriptor(&parisc_kernel_start); + head_ptr = PAGE_MASK & dereference_function_descriptor(addr); return core_kernel_text(vaddr) || vaddr == head_ptr; } diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h index 7902d6358854..67379b8945e8 100644 --- a/arch/powerpc/include/asm/sections.h +++ b/arch/powerpc/include/asm/sections.h @@ -66,13 +66,13 @@ static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end) #ifdef PPC64_ELF_ABI_v1 #undef dereference_function_descriptor -static inline void *dereference_function_descriptor(void *ptr) +static inline unsigned long dereference_function_descriptor(unsigned long ptr) { - struct ppc64_opd_entry *desc = ptr; + struct ppc64_opd_entry *desc = (struct ppc64_opd_entry *)ptr; void *p; if (!probe_kernel_address(&desc->funcaddr, p)) - ptr = p; + ptr = (unsigned long)p; return ptr; } #endif /* PPC64_ELF_ABI_v1 */ diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index fc7efedbc4be..6a5a159dfb75 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c @@ -225,7 +225,7 @@ static unsigned long lookup_addr(char *arg) addr = (unsigned long)_do_fork; else if (!strcmp(arg, "hw_break_val")) addr = (unsigned long)&hw_break_val; - addr = (unsigned long) dereference_function_descriptor((void *)addr); + addr = dereference_function_descriptor(addr); return addr; } diff --git a/init/main.c b/init/main.c index 0ee9c6866ada..396b0bda696e 100644 --- a/init/main.c +++ b/init/main.c @@ -761,7 +761,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn) if (list_empty(&blacklisted_initcalls)) return false; - addr = (unsigned long) dereference_function_descriptor(fn); + addr = dereference_function_descriptor((unsigned long)fn); sprint_symbol_no_offset(fn_name, addr); /* diff --git a/kernel/extable.c b/kernel/extable.c index 38c2412401a1..ca4c34d1d5a4 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -150,7 +150,7 @@ int kernel_text_address(unsigned long addr) int func_ptr_is_kernel_text(void *ptr) { unsigned long addr; - addr = (unsigned long) dereference_function_descriptor(ptr); + addr = dereference_function_descriptor((unsigned long)ptr); if (core_kernel_text(addr)) return 1; return is_module_text_address(addr); diff --git a/kernel/module.c b/kernel/module.c index de66ec825992..ea77ab13bead 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1067,7 +1067,7 @@ EXPORT_SYMBOL(__symbol_put); void symbol_put_addr(void *addr) { struct module *modaddr; - unsigned long a = (unsigned long)dereference_function_descriptor(addr); + unsigned long a = dereference_function_descriptor((unsigned long)addr); if (core_kernel_text(a)) return; diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 86c3385b9eb3..bcd906a39010 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1723,7 +1723,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, switch (*fmt) { case 'F': case 'f': - ptr = dereference_function_descriptor(ptr); + ptr = (void *)dereference_function_descriptor((unsigned long)ptr); /* Fallthrough */ case 'S': case 's':