From patchwork Thu Nov 9 23:48:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 10052121 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 EE12F601EA for ; Thu, 9 Nov 2017 23:50:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0C6628E53 for ; Thu, 9 Nov 2017 23:50:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5B522B1F7; Thu, 9 Nov 2017 23:50:35 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 4827328E53 for ; Thu, 9 Nov 2017 23:50:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755331AbdKIXud (ORCPT ); Thu, 9 Nov 2017 18:50:33 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:45215 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754502AbdKIXua (ORCPT ); Thu, 9 Nov 2017 18:50:30 -0500 Received: by mail-pg0-f67.google.com with SMTP id l19so3441842pgo.2; Thu, 09 Nov 2017 15:50:30 -0800 (PST) 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=QZSKSt+O5+vYboMiWOmZWliRM+Ti3viXsQm4YQqwSi4=; b=BURgEf3PtayC1XQ6kDDpiYK3xUaiqB+SSkf5cnt5AJBQsh2bLOxVgxM26T3Le/6Tuw 2TuDt9ze9HKmr1xr1KYddGgTj3bvF6l29oYGkDao6nvvJJeBTAhs3Yn+z7uClT9eUstR aiBxChFQJZuyyghhEcRE7enY5Ky0LjWiaSn/ox34U+BTkPBcMacau6ZG0tyZfBtooQGe kzOKF65DISM8JA3qqxyWT/y6BKahggn5xEsBXR+gFBh6mHjLgmz36Xs0qduhiCZWCoF1 biTb/+yyACJkiOyPiUClKlCMWg/K/yenCe0WCLE7WX3llAcNOC+NCr1Rb4Is1ZaHhqr0 zSxQ== 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=QZSKSt+O5+vYboMiWOmZWliRM+Ti3viXsQm4YQqwSi4=; b=o9Ricyv3n1iQ7mOqRdBDzOmjPfq4Q5Q1PsAPZkZhfVFktpag1cD2OcoVXRLpn+NLAH XuNuJrMhL+g4jwfrHP0Ah0BbV7U/6NxP7PY/w9YdXJ4gf69Cu7FISuM/t3DK+tH5dSpL 0HfU/nz/snpV4MyEQZfXsDqz+al39w3/Is8zcZT+52fnI5zvjDZtXb+CdKmQVGEzBCxA YIc/SdlbFDmnDmZPTU9+uOm5fj479AR7B0Gj+Y3M0WKBHhKymubX6sZvVbesbVWM+p4r lwjSumBcDIgD/4sLn1dS7j5MWjU7sNltUGSLDG8pR4ju+VFa75583waSAyk8bTGk+NY0 X4lA== X-Gm-Message-State: AJaThX6K6ffo1FeQBwPdRE5j7bQQaV4a6a8IEZAXKjazuHHzz17xJoK6 rx0N3Ps0ySvcF+qOiFC5M6w= X-Google-Smtp-Source: ABhQp+TwogsEdwNO9VwhrHBUrflDXsqf3NNYyhJ5kjSvbNlJjkJ1SXhKMAkLyIkfHUJVtmBXL11E3A== X-Received: by 10.99.133.200 with SMTP id u191mr2097175pgd.327.1510271429548; Thu, 09 Nov 2017 15:50:29 -0800 (PST) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id t25sm13160477pfh.67.2017.11.09.15.50.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Nov 2017 15:50:28 -0800 (PST) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , James Bottomley Cc: Andrew Morton , Jessica Yu , Petr Mladek , Steven Rostedt , linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [PATCHv4 1/6] sections: split dereference_function_descriptor() Date: Fri, 10 Nov 2017 08:48:25 +0900 Message-Id: <20171109234830.5067-2-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171109234830.5067-1-sergey.senozhatsky@gmail.com> References: <20171109234830.5067-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 There are two format specifiers to print out a pointer in symbolic format: '%pS/%ps' and '%pF/%pf'. On most architectures, the two mean exactly the same thing, but some architectures (ia64, ppc64, parisc64) use an indirect pointer for C function pointers, where the function pointer points to a function descriptor (which in turn contains the actual pointer to the code). The '%pF/%pf, when used appropriately, automatically does the appropriate function descriptor dereference on such architectures. The "when used appropriately" part is tricky. Basically this is a subtle ABI detail, specific to some platforms, that made it to the API level and people can be unaware of it and miss the whole "we need to dereference the function" business out. [1] proves that point (note that it fixes only '%pF' and '%pS', there might be '%pf' and '%ps' cases as well). It appears that we can handle everything within the affected arches and make '%pS/%ps' smart enough to retire '%pF/%pf'. Function descriptors live in .opd elf section and all affected arches (ia64, ppc64, parisc64) handle it properly for kernel and modules. So we, technically, can decide if the dereference is needed by simply looking at the pointer: if it belongs to .opd section then we need to dereference it. The kernel and modules have their own .opd sections, obviously, that's why we need to split dereference_function_descriptor() and use separate kernel and module dereference arch callbacks. This patch does the first step, it a) adds dereference_kernel_function_descriptor() function. b) adds a weak alias to dereference_module_function_descriptor() function. So, for the time being, we will have: 1) dereference_function_descriptor() A generic function, that simply dereferences the pointer. There is bunch of places that call it: kgdbts, init/main.c, extable, etc. 2) dereference_kernel_function_descriptor() A function to call on kernel symbols that does kernel .opd section address range test. 3) dereference_module_function_descriptor() A function to call on modules' symbols that does modules' .opd section address range test. [1] https://marc.info/?l=linux-kernel&m=150472969730573 Signed-off-by: Sergey Senozhatsky --- include/asm-generic/sections.h | 8 ++++++-- include/linux/module.h | 3 +++ kernel/module.c | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 03cc5f9bba71..849cd8eb5ca0 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -30,6 +30,7 @@ * __ctors_start, __ctors_end * __irqentry_text_start, __irqentry_text_end * __softirqentry_text_start, __softirqentry_text_end + * __start_opd, __end_opd */ extern char _text[], _stext[], _etext[]; extern char _data[], _sdata[], _edata[]; @@ -49,12 +50,15 @@ extern char __start_once[], __end_once[]; /* Start and end of .ctors section - used for constructor calls. */ extern char __ctors_start[], __ctors_end[]; +/* Start and end of .opd section - used for function descriptors. */ +extern char __start_opd[], __end_opd[]; + extern __visible const void __nosave_begin, __nosave_end; -/* function descriptor handling (if any). Override - * in asm/sections.h */ +/* Function descriptor handling (if any). Override in asm/sections.h */ #ifndef dereference_function_descriptor #define dereference_function_descriptor(p) (p) +#define dereference_kernel_function_descriptor(p) (p) #endif /* random extra sections (if any). Override diff --git a/include/linux/module.h b/include/linux/module.h index c69b49abe877..9dac6973b001 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -606,6 +606,9 @@ int ref_module(struct module *a, struct module *b); __mod ? __mod->name : "kernel"; \ }) +/* Dereference module function descriptor */ +void *dereference_module_function_descriptor(struct module *mod, void *ptr); + /* For kallsyms to ask for address resolution. namebuf should be at * least KSYM_NAME_LEN long: a pointer to namebuf is returned if * found, otherwise NULL. */ diff --git a/kernel/module.c b/kernel/module.c index ab2978e4239c..1d6e996caa13 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3938,6 +3938,12 @@ static const char *get_ksymbol(struct module *mod, return symname(kallsyms, best); } +void * __weak dereference_module_function_descriptor(struct module *mod, + void *ptr) +{ + return ptr; +} + /* For kallsyms to ask for address resolution. NULL means not found. Careful * not to lock to avoid deadlock on oopses, simply disable preemption. */ const char *module_address_lookup(unsigned long addr,