Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/816355/?format=api
{ "id": 816355, "url": "http://patchwork.ozlabs.org/api/patches/816355/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170920162910.32053-2-sergey.senozhatsky@gmail.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20170920162910.32053-2-sergey.senozhatsky@gmail.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20170920162910.32053-2-sergey.senozhatsky@gmail.com/", "date": "2017-09-20T16:29:03", "name": "[RFC,v2,1/7] switch dereference_function_descriptor() to `unsigned long'", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "7c5f5bd95d17ec36facec6ed7bb6d3d2b3b20037", "submitter": { "id": 3905, "url": "http://patchwork.ozlabs.org/api/people/3905/?format=api", "name": "Sergey Senozhatsky", "email": "sergey.senozhatsky@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170920162910.32053-2-sergey.senozhatsky@gmail.com/mbox/", "series": [ { "id": 4171, "url": "http://patchwork.ozlabs.org/api/series/4171/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=4171", "date": "2017-09-20T16:29:02", "name": "printk/ia64/ppc64/parisc64: let's deprecate %pF/%pf printk specifiers", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/4171/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/816355/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/816355/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xy50T0D0nz9t2V\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 02:33:45 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xy50S5zLXzDqYd\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 02:33:44 +1000 (AEST)", "from mail-pg0-x242.google.com (mail-pg0-x242.google.com\n\t[IPv6:2607:f8b0:400e:c05::242])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xy4vd228HzDqYN\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tThu, 21 Sep 2017 02:29:33 +1000 (AEST)", "by mail-pg0-x242.google.com with SMTP id m30so1906201pgn.5\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tWed, 20 Sep 2017 09:29:33 -0700 (PDT)", "from localhost.localdomain ([121.137.63.184])\n\tby smtp.gmail.com with ESMTPSA id\n\tc185sm8890567pfb.57.2017.09.20.09.29.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 09:29:29 -0700 (PDT)" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Y7eqD8Ht\"; dkim-atps=neutral", "lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Y7eqD8Ht\"; dkim-atps=neutral", "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=2607:f8b0:400e:c05::242; helo=mail-pg0-x242.google.com;\n\tenvelope-from=sergey.senozhatsky@gmail.com; receiver=<UNKNOWN>)", "lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Y7eqD8Ht\"; dkim-atps=neutral" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=G3fttGkVsLeBQ/cCLWZ6QdhMs0FgorO2EWGYUeruwG0=;\n\tb=Y7eqD8Ht+CcUll8q0UACbHJ1DqwnvRJgaqu3+IL/Sicf6UonArIbxf19UmrfHEqskB\n\t6HXNwkgFlb76npldONMLJzUFMkhw7UxIrt++k+WQOuQqIdNweSyywJ0T5sXLKCYIOgTH\n\tUWP3X7e/w/EcY41pbQLE4bw2sYY7nbAEWISSAE/YvgiGYBpbfH0bVbecMAOuXnuvbWM2\n\thn7dNRyWmWk69LO341FwX56EZ5brYlZpfPa25HbO/4zUq6t02LCSmAcRt052kEmyKFS4\n\toAWUYqZHZ3fLDyC+s8+IW/RpHwMMjFvxkoibSbazJRCCjjubXy2Wm+AwhYjjmD27RSl3\n\t+EIw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=G3fttGkVsLeBQ/cCLWZ6QdhMs0FgorO2EWGYUeruwG0=;\n\tb=FODncM7gfrCws8yhUiAt3yxRy7+bvY+8s78Vyf8E4D/anu77Ce7zggXvmO7AhXjtdY\n\tJCsr7YBPe7q2a+WJP0dpJjgljmwz6OgMQtam95qQX3nTDPU755fUBTEdzoDSrwgsegbC\n\tUBGgvSDKsGoHBppOFGNDBB1APIj7gdKWY6IT+Dv2P1l7w47lv3XbFBqUjTPRLHFWcHxA\n\tra7PB3+V93+ZWj1mzCttf+cB1bsQ1YjjtX9F8xGQLNv2dJEsdKXo6tLK+qnqq1sORt9u\n\t/tZr8+u4ix7kWTWH7ObjtqfGtmjgb6FErNkRMG0JnGU8+5sqGM6xUkRIA1DO4SOwVrDy\n\tHlSA==", "X-Gm-Message-State": "AHPjjUgXC0JL3wX4wGHon+WSA62LuIKA4b7+fXyj0acSVAjDYXNZUSBV\n\tIWFNo94FcbbM6RYFsTrbA9Y=", "X-Google-Smtp-Source": "AOwi7QC9NDeyUMFXPom2wdTml5vvs2L6YlGXxxyyIl/OPsvINQTv4D1YAUBl82hj7MzwNMTZHoJHHw==", "X-Received": "by 10.159.244.9 with SMTP id x9mr2648860plr.34.1505924970757;\n\tWed, 20 Sep 2017 09:29:30 -0700 (PDT)", "From": "Sergey Senozhatsky <sergey.senozhatsky@gmail.com>", "To": "Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>,\n\tBenjamin Herrenschmidt <benh@kernel.crashing.org>,\n\tPaul Mackerras <paulus@samba.org>,\n\tMichael Ellerman <mpe@ellerman.id.au>, \n\tJames Bottomley <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de>", "Subject": "[RFC][PATCH v2 1/7] switch dereference_function_descriptor() to\n\t`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\n\t<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "Petr Mladek <pmladek@suse.com>, linux-ia64@vger.kernel.org,\n\tlinux-parisc@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,\n\tSteven Rostedt <rostedt@goodmis.org>, linux-kernel@vger.kernel.org,\n\tSergey Senozhatsky <sergey.senozhatsky@gmail.com>,\n\tJessica Yu <jeyu@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, \n\tlinuxppc-dev@lists.ozlabs.org", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "Convert dereference_function_descriptor() to accept and return\n`unsigned long'. There will be two new ARCH function for kernel\nand module function pointer dereference, which will work with\n`unsigned long', so the patch unifies interfaces.\n\nBesides, dereference_function_descriptor() mostly work with\n`unsigned long':\n\ndrivers/misc/kgdbts.c:\naddr = (unsigned long) dereference_function_descriptor((void *)addr);\n\ninit/main.c:\naddr = (unsigned long) dereference_function_descriptor(fn);\n\nkernel/extable.c:\naddr = (unsigned long) dereference_function_descriptor(ptr);\n\nkernel/module.c:\nunsigned long a = (unsigned long)dereference_function_descriptor(addr);\n\nConvert dereference_function_descriptor() users tree-wide.\n\nSigned-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>\n---\n arch/ia64/include/asm/sections.h | 6 +++---\n arch/parisc/include/asm/sections.h | 2 +-\n arch/parisc/kernel/process.c | 6 +++---\n arch/parisc/mm/init.c | 4 ++--\n arch/powerpc/include/asm/sections.h | 6 +++---\n drivers/misc/kgdbts.c | 2 +-\n init/main.c | 2 +-\n kernel/extable.c | 2 +-\n kernel/module.c | 2 +-\n lib/vsprintf.c | 2 +-\n 10 files changed, 17 insertions(+), 17 deletions(-)", "diff": "diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h\nindex 2ab2003698ef..de6bfa1ef8fb 100644\n--- a/arch/ia64/include/asm/sections.h\n+++ b/arch/ia64/include/asm/sections.h\n@@ -27,13 +27,13 @@ extern char __start_unwind[], __end_unwind[];\n extern char __start_ivt_text[], __end_ivt_text[];\n \n #undef dereference_function_descriptor\n-static inline void *dereference_function_descriptor(void *ptr)\n+static inline unsigned long dereference_function_descriptor(unsigned long ptr)\n {\n-\tstruct fdesc *desc = ptr;\n+\tstruct fdesc *desc = (struct fdesc *)ptr;\n \tvoid *p;\n \n \tif (!probe_kernel_address(&desc->ip, p))\n-\t\tptr = p;\n+\t\tptr = (unsigned long)p;\n \treturn ptr;\n }\n \ndiff --git a/arch/parisc/include/asm/sections.h b/arch/parisc/include/asm/sections.h\nindex 9d13c3507ad6..59fbe0067112 100644\n--- a/arch/parisc/include/asm/sections.h\n+++ b/arch/parisc/include/asm/sections.h\n@@ -6,7 +6,7 @@\n \n #ifdef CONFIG_64BIT\n #undef dereference_function_descriptor\n-void *dereference_function_descriptor(void *);\n+unsigned long dereference_function_descriptor(unsigned long);\n #endif\n \n #endif\ndiff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c\nindex a45a67d526f8..f00a5f93492a 100644\n--- a/arch/parisc/kernel/process.c\n+++ b/arch/parisc/kernel/process.c\n@@ -267,13 +267,13 @@ get_wchan(struct task_struct *p)\n }\n \n #ifdef CONFIG_64BIT\n-void *dereference_function_descriptor(void *ptr)\n+unsigned long dereference_function_descriptor(unsigned long ptr)\n {\n-\tElf64_Fdesc *desc = ptr;\n+\tElf64_Fdesc *desc = (Elf64_Fdesc *)ptr;\n \tvoid *p;\n \n \tif (!probe_kernel_address(&desc->addr, p))\n-\t\tptr = p;\n+\t\tptr = (unsigned long)p;\n \treturn ptr;\n }\n #endif\ndiff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c\nindex 1ca9a2b4239f..06e1b79e2946 100644\n--- a/arch/parisc/mm/init.c\n+++ b/arch/parisc/mm/init.c\n@@ -389,10 +389,10 @@ static void __init setup_bootmem(void)\n static int __init parisc_text_address(unsigned long vaddr)\n {\n \tstatic unsigned long head_ptr __initdata;\n+\tunsigned long addr = (unsigned long)&parisc_kernel_start;\n \n \tif (!head_ptr)\n-\t\thead_ptr = PAGE_MASK & (unsigned long)\n-\t\t\tdereference_function_descriptor(&parisc_kernel_start);\n+\t\thead_ptr = PAGE_MASK & dereference_function_descriptor(addr);\n \n \treturn core_kernel_text(vaddr) || vaddr == head_ptr;\n }\ndiff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h\nindex 7902d6358854..67379b8945e8 100644\n--- a/arch/powerpc/include/asm/sections.h\n+++ b/arch/powerpc/include/asm/sections.h\n@@ -66,13 +66,13 @@ static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)\n \n #ifdef PPC64_ELF_ABI_v1\n #undef dereference_function_descriptor\n-static inline void *dereference_function_descriptor(void *ptr)\n+static inline unsigned long dereference_function_descriptor(unsigned long ptr)\n {\n-\tstruct ppc64_opd_entry *desc = ptr;\n+\tstruct ppc64_opd_entry *desc = (struct ppc64_opd_entry *)ptr;\n \tvoid *p;\n \n \tif (!probe_kernel_address(&desc->funcaddr, p))\n-\t\tptr = p;\n+\t\tptr = (unsigned long)p;\n \treturn ptr;\n }\n #endif /* PPC64_ELF_ABI_v1 */\ndiff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c\nindex fc7efedbc4be..6a5a159dfb75 100644\n--- a/drivers/misc/kgdbts.c\n+++ b/drivers/misc/kgdbts.c\n@@ -225,7 +225,7 @@ static unsigned long lookup_addr(char *arg)\n \t\taddr = (unsigned long)_do_fork;\n \telse if (!strcmp(arg, \"hw_break_val\"))\n \t\taddr = (unsigned long)&hw_break_val;\n-\taddr = (unsigned long) dereference_function_descriptor((void *)addr);\n+\taddr = dereference_function_descriptor(addr);\n \treturn addr;\n }\n \ndiff --git a/init/main.c b/init/main.c\nindex 0ee9c6866ada..396b0bda696e 100644\n--- a/init/main.c\n+++ b/init/main.c\n@@ -761,7 +761,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)\n \tif (list_empty(&blacklisted_initcalls))\n \t\treturn false;\n \n-\taddr = (unsigned long) dereference_function_descriptor(fn);\n+\taddr = dereference_function_descriptor((unsigned long)fn);\n \tsprint_symbol_no_offset(fn_name, addr);\n \n \t/*\ndiff --git a/kernel/extable.c b/kernel/extable.c\nindex 38c2412401a1..ca4c34d1d5a4 100644\n--- a/kernel/extable.c\n+++ b/kernel/extable.c\n@@ -150,7 +150,7 @@ int kernel_text_address(unsigned long addr)\n int func_ptr_is_kernel_text(void *ptr)\n {\n \tunsigned long addr;\n-\taddr = (unsigned long) dereference_function_descriptor(ptr);\n+\taddr = dereference_function_descriptor((unsigned long)ptr);\n \tif (core_kernel_text(addr))\n \t\treturn 1;\n \treturn is_module_text_address(addr);\ndiff --git a/kernel/module.c b/kernel/module.c\nindex de66ec825992..ea77ab13bead 100644\n--- a/kernel/module.c\n+++ b/kernel/module.c\n@@ -1067,7 +1067,7 @@ EXPORT_SYMBOL(__symbol_put);\n void symbol_put_addr(void *addr)\n {\n \tstruct module *modaddr;\n-\tunsigned long a = (unsigned long)dereference_function_descriptor(addr);\n+\tunsigned long a = dereference_function_descriptor((unsigned long)addr);\n \n \tif (core_kernel_text(a))\n \t\treturn;\ndiff --git a/lib/vsprintf.c b/lib/vsprintf.c\nindex 86c3385b9eb3..bcd906a39010 100644\n--- a/lib/vsprintf.c\n+++ b/lib/vsprintf.c\n@@ -1723,7 +1723,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,\n \tswitch (*fmt) {\n \tcase 'F':\n \tcase 'f':\n-\t\tptr = dereference_function_descriptor(ptr);\n+\t\tptr = (void *)dereference_function_descriptor((unsigned long)ptr);\n \t\t/* Fallthrough */\n \tcase 'S':\n \tcase 's':\n", "prefixes": [ "RFC", "v2", "1/7" ] }