From patchwork Mon Nov 13 16:50:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118816 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2014219qgn; Mon, 13 Nov 2017 08:52:13 -0800 (PST) X-Google-Smtp-Source: AGs4zMYg928uVO3LUF6QyECG9PBFkgBBbH/zyZZiVlhN2paICODwOFnaF5L7YSyfUmJ79qK+BQmW X-Received: by 10.98.36.199 with SMTP id k68mr8515451pfk.236.1510591933033; Mon, 13 Nov 2017 08:52:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510591933; cv=none; d=google.com; s=arc-20160816; b=x4tPP5jx4u1+Zr++U2lMGUAV0ArURJoGpIUAXXHRG7V9EQAxPTY3j8WGoPleKUnpxG ZyvzFTza9/EHJhSkILntoC9M+Ibws9q0ksY5DDifb9bic34qjByR5Q1eMRkuQ2YWshTz jtx568K0INywXnoxi0OkkE7C1/f3Gwtt4NJEB0uZY6KeS+yAyrVsZ+VgKki9OYWJLDHR kRhM4nYIUstlqAydKpoSmbHTZYNzReOtFvsxA2J77CwWZa16iHZ/FKmlbhPaKcCATjEK +9s1PM76tAHne/IoUrVg6tX7Z/VoJ+/5zcNkT/bP5eP+FlDNeuEAhMuVGORDAA/gvYqw D1Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=aTiAPuKSIfYqdgBor6vs0MTPVZop7nard4ZLloIhaBc=; b=Ipyj5ea8eLp+7Es5Nw1itzUI8/2B4IndXLrJlSWVzijvwA0lhwrZloCbNtoHnx8xYQ P5pgAydiYTMqZW/YdMA54amtYbFFCEYFH3jTNotgG6zhVs135ENUC9VGUhBOs8co1OMB xUWmLPEVlEk5ZrJ1WHKOC5w8Hh59IJ/59ubPqgv9HY8QkLhDP5iTUU8XlIlG4mX+0ZR5 iJmlUSdeFnJpWx+xSL8IJk5SQj7XckWZWJdc6ahGW7Tf5BDr094CYd6oQqBPzEwjegK4 O5LgU//BWXlk0gF64E4cllR8WdEF7kGbLXKWpTSTkWOa3gLTcP1c+G6n+3U7FNSoomG/ ZHsg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g17si13114017plo.107.2017.11.13.08.52.12; Mon, 13 Nov 2017 08:52:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753942AbdKMQwK (ORCPT + 27 others); Mon, 13 Nov 2017 11:52:10 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:50040 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753869AbdKMQwJ (ORCPT ); Mon, 13 Nov 2017 11:52:09 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LxryC-1fJE1D07K0-015Hb3; Mon, 13 Nov 2017 17:51:59 +0100 From: Arnd Bergmann To: Linus Torvalds Cc: Arnd Bergmann , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kallsyms: fix building without printk Date: Mon, 13 Nov 2017 17:50:59 +0100 Message-Id: <20171113165146.2287420-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:W5rCfiiteJCylAWSWLAJQZE9oQMWYA8lB2cGKObFDHtbDc7e/4e RQTWNLBohLX0wNFtlwkrRZGFsyKX2x8NQM9YUEydZcND0yzV4DIKtrNCo35Mq+axxG4gJjf sggLTPjD5GiPlgNBqZCxlcL18cPXgkeHDzYQ5xGuIAg1RA/mcncGoPUBcUDWotK7B0dZ+0w bimtDpfev/GyvAzrFosrw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Bq9wiGzKhZs=:Gc3QYjlS9hKXkFHjKn3SrK EzcmSEcYcRSW6eyS5G6qsBlMiQ+SqaG9EctvcVrZLfeMD8mWLLctDbn8ahnEJs/+G2Ka3j7cn BJgU6LeqENN8yZidCdcliYqQe6EPklFu4N9zMUTZ9TNd2JdT8tik1ywAwH8/fv1zn/s1PuVgk lFGFALd9J8GFE02KIB/fslyq8pUZCeDskO5TXnfnNCQQPfzNQBSTGY5r1Ggg0QeX9sFD789/u fK4qCs0wuYYXaaRmjwy7zakgl0K/0UJRS0h0cV37w0DLl8Fdxogo/BCRQWx/czC8HvwkId71Q ElOYZSNL88ryy2ZiH+xxHKVGxqdhJFWl9L9Uz2e4SQjm+ltRqmjqmSFppHH9EsRKkjAiU3OiZ B5VUUoq25YD5bWQd6Tsj2SBD9P4vV/KsdSqJMR3tZpKco6MlT40eFZFhmXn4J+o/E6MjukVRA hKBm90ThDauPnQJtY13KbSWJAn1T+9ya1+4wMBdbdoR5Wz1oUaCEYXGp6R4RZ9h98VVeJPXZs A74FmvsyXqqOEqG4CISIGFFuvhc1OInEU5RVyxuMZ+zKKrUw42d0ig70DLeTSCUfKw9uAOzY8 XbUkNS4etkFcnoiVh1/f9V2zrWPd5dd8LX4Zaj546vU2csx1u17fNmRcJ/w3TPAic+/lgv9ox 5hh6icp5T7PLNtBmO79dYs7GeoGOCin8go4SlzkUCuaK3lDrtQ0SPRaf7P0j3NcqGMdveyxQs XEsg9UPIxaHZrZeZbCjT0e919SMtKxWChCurmg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building kallsyms fails without CONFIG_PRINTK due to a missing declaration: kernel/kallsyms.c: In function 'kallsyms_show_value': kernel/kallsyms.c:670:10: error: 'kptr_restrict' undeclared (first use in this function); did you mean 'keyring_restrict'? This moves the declaration outside of the #ifdef guard, the definition is already available without CONFIG_PRINTK. Fixes: c0f3ea158939 ("stop using '%pK' for /proc/kallsyms pointer values") Signed-off-by: Arnd Bergmann --- include/linux/printk.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 Reviewed-by: Sergey Senozhatsky diff --git a/include/linux/printk.h b/include/linux/printk.h index fbb75cac9028..e9b603ee9953 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -187,7 +187,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies, extern int printk_delay_msec; extern int dmesg_restrict; -extern int kptr_restrict; extern int devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf, @@ -278,6 +277,8 @@ static inline void printk_safe_flush_on_panic(void) } #endif +extern int kptr_restrict; + extern asmlinkage void dump_stack(void) __cold; #ifndef pr_fmt From patchwork Mon Nov 13 16:51:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118817 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2014482qgn; Mon, 13 Nov 2017 08:52:28 -0800 (PST) X-Google-Smtp-Source: AGs4zMaLOwHk+Aw3UuxLd/9ycQjDG/taV30F8rdLOqGwkWpFN+EsYRDehTmELxKD6GCZEx8X4Emw X-Received: by 10.159.229.203 with SMTP id t11mr9559053plq.190.1510591948777; Mon, 13 Nov 2017 08:52:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510591948; cv=none; d=google.com; s=arc-20160816; b=oJZLRHq0OWpu4uObGPJF1WeRfp0V7wJy+FvoF4bnTaCpNHpQv7vXbpq7nytgtwJAFN STPJ9MbzWXzeLifvof2l6EHrpeLVJBY9kU52cgNp5Gt8FC9Epi/C7FXGlujCUARHRcHC C148GLcwsFn91wULkC7q4k6OvCLex2YkItXMo/BEaOEf9VqCsLD3HlwaRc2y2si74moc C32Kl9ln4aIjs1qZmvR1s4u7xhSEH2UODKMwvaUCa+zLz9WGM66rDCpCJBgbBOLHL6A+ fajCeM766Aedht/bNMK7bl0oQHKTPm7ECTap5kYUAQav29XGhcVv1H7olJR4Gkhbvbtb SsQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=kfyw9eSpLdV+ABkWx827vaxIb/mFKRCIZr3LiKa4y8E=; b=GPuYHXtqJVbdB4IU/ePWYOliWtCAwZE6z+XlmBQ3k96WV7I8oQyh0VbN6hULtnqHiz o2poXLXKT45xxPDfVsNQ4xZn88F8NhFPJ3BZ53L8RtuFsul3eQX59mDMOb7ixSO3a+ur SMa1Qttr9VglK8GbnwkLcBnU1dva5kLRDCyarAeBqbrGuI9fcJbQRgm+6hYmQsBy49Pg GmJJ6YuuhG9NeCaN0X/hoVViphJXn5fJexKC+p+9v/PBh5bbiOnDA7BOb6srQZcuxW4f Z4IftGk3z+I8QD1zVqHOgaxBeBgQ+WEWtBIFBX9H0ZxAOajDidBEh/t+pMNqqb66s4D2 TRKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 60si14284529pla.417.2017.11.13.08.52.28; Mon, 13 Nov 2017 08:52:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958AbdKMQw0 (ORCPT + 27 others); Mon, 13 Nov 2017 11:52:26 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:57869 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753752AbdKMQwZ (ORCPT ); Mon, 13 Nov 2017 11:52:25 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MJYJr-1eCMA50Fz9-0036vC; Mon, 13 Nov 2017 17:52:18 +0100 From: Arnd Bergmann To: Linus Torvalds Cc: Arnd Bergmann , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] /proc/module: fix building without kallsyms Date: Mon, 13 Nov 2017 17:51:00 +0100 Message-Id: <20171113165146.2287420-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171113165146.2287420-1-arnd@arndb.de> References: <20171113165146.2287420-1-arnd@arndb.de> X-Provags-ID: V03:K0:xgWOflf4vguySSloPJH6LKzYbLSs7EUr1piFKbqh8OhtXRlX6pY Coeyh+a3x8W+gmDCqV2PKGNkEZSwPo4vKIlrbbRwhFc8lS21zuCk42gtpCaUEyQLjuM3CuN Oii7H5/mhSuaEYkbtsKcdvz4sQfzdkOsiyKEFRF7SDzpAV/W3l3l6IA49knWrMMy9o9Rw0X Vvy6pRFYy8W7nYBrdKqXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:m7//pRXGoTE=:6eOiRy8xP+qtWde/4SCPIo hspUQbVQWqmMSrMk560FZO0zR1jG3oBc1m50RxUCnJCbplQnmfwaLHpqUGPsjTj90w2D0hLe3 NWAKZpxttvRfswdCNOMINaQAwXU4AlpB0V8WR8S+dZTIpRPCFZ4+DhKaPUwdVh7OYPk/hZhJ7 CpFDNqtFV/wno95fkrygiYNmTFENSlpIH4aV8b7lsCm5D0lmtPQEAMIQ4KlyvI0XC37kCB6k+ MiEYRclonmjhhlCv/4lkZ9sW062+JPar02PGbzzZ23w/0imHUC6ctCEaiJQ3XiAyf0ZNepdNw qWJscGko7191N55Ppr5wnaTCDxFOaea2UcxuSQq57SlvEbqc77NqAwN2AGGS45caU8IBlKWyp /gTuIAgOvMGGLkO3/jf3g65KmfQbOx+nxaWaj3ENJYKe/Et527qiG7Fnn58WuIoJCYz6Htj7b UXMAOYh7KM1ubYZYU58vFBwkLVOh8b7OJ4GSEklYc2L5udb9ikIna19O1ovEP7eB4GcJdvDHm GV2HSubSa32/dtxzlQrThvIZUvbBq2In5HTYino3eO7GFtbTQ19Q55KVyobZR7o28Vgzpn0JA j4RB7t+H9t0nw5UlM/AevfCoRAtz8dydSXJvPR0Nuc/UvPfwpEPTX9YG8SAHIfH6tviulkuFL QxSjXeFrE9HmCwIDgJVasH/mfKmOOOQuin5wA9yxGSK9UDbl301ypkEvX93oTptucS0wI8D/6 Zcwl8frVeiWfaG/8FNmFMofXzX7kBbSODtxHJw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As reported by kernelci and other build bots, we now get a link failure without CONFIG_KALLSYMS: module.c:(.text+0xf2c): undefined reference to `kallsyms_show_value' This adds a dummy helper with the same name that can be used for compilation. It's not entirely clear to me what this should return for !CONFIG_KALLSYMS, I picked an unconditional 'false', which leads to the module address being unavailable to user space. Link: https://kernelci.org/build/mainline/branch/master/kernel/v4.14-5-g516fb7f2e73d/ Fixes: 516fb7f2e73d ("/proc/module: use the same logic as /proc/kallsyms for address exposure") Signed-off-by: Arnd Bergmann --- include/linux/kallsyms.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 0a777c5216b1..708f337d780b 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -14,8 +14,6 @@ #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \ 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1) -/* How and when do we show kallsyms values? */ -extern int kallsyms_show_value(void); #ifndef CONFIG_64BIT # define KALLSYM_FMT "%08lx" #else @@ -54,6 +52,9 @@ extern void __print_symbol(const char *fmt, unsigned long address); int lookup_symbol_name(unsigned long addr, char *symname); int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name); +/* How and when do we show kallsyms values? */ +extern int kallsyms_show_value(void); + #else /* !CONFIG_KALLSYMS */ static inline unsigned long kallsyms_lookup_name(const char *name) @@ -112,6 +113,11 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u return -ERANGE; } +static inline int kallsyms_show_value(void) +{ + return false; +} + /* Stupid that this does nothing, but I didn't create this mess. */ #define __print_symbol(fmt, addr) #endif /*CONFIG_KALLSYMS*/