From patchwork Mon Aug 14 10:52:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 109979 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4170597qge; Mon, 14 Aug 2017 03:53:24 -0700 (PDT) X-Received: by 10.98.69.7 with SMTP id s7mr24983167pfa.231.1502708004834; Mon, 14 Aug 2017 03:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502708004; cv=none; d=google.com; s=arc-20160816; b=x+Ovz5YsPjT1ceqQVsdvxLg1EDs2xj/5MkH+qG9qON4SgXA04d7xaqa6b6aC0fXHkA kSC47CnphrfmfhV5nZrt5vE36G3PoGPAPIHLYDyomhTLT1R3U8o6bB1SYDRpl1H6aFSp 9sSdA8p+7JbWzuIkmLJ5PokkReq68E18hW9m9pwCvgPWYrpkSaeiNGSz+t32Nj+exFpP NWM2PzFjV73oo73MxieLYrHM4zj5oIfimZ1iaQuvRAjY5ebsKQGlPUq/T2CcxESHUhqz 1P2+8hHL8P1ERWuH9CaMKF8oPVxexL+kktpPrQns0ziY1sN3TLz1GDha5upTPcQxLp9/ IHkg== 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:dkim-signature:arc-authentication-results; bh=KUktAMBNiR4VldSs3RYzjjbVX5C11nfPK/CCOZrDP6A=; b=fHnJvB87hJtqtLsd5n+rpq1orlt9I2UkzhWl/M8n8E0tqwYIUepWtclhqV8pykwe5O R+ekf4sYNnJWZUXVRJxqTJWRVXGlBaujfrWbQMbtWofsYT4rh6h5tvMMwpRAZ+s+AzsQ 2nTR6KfcHKmkNJfcYHqwMnuQ4Q2rFSQlHsSazbQLW2Kg7gERyRWDcJAfzALlMmqv/Kvo MU4UaHOnRMSGms83m9WdP9b9qvMnk8f6iDU4qAMKjwK6xnxxy4gqUJ4pmCRRdv7E+xc7 imRxDDJ5kzBNKaGjv92sX3mVYv95uiORVWq4iU/pLKxUgax1b2GqmUlgNob4kXa8rMRl wsLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eEaq432d; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si3951383pgq.53.2017.08.14.03.53.24; Mon, 14 Aug 2017 03:53:24 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=eEaq432d; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753018AbdHNKxU (ORCPT + 25 others); Mon, 14 Aug 2017 06:53:20 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:38547 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752986AbdHNKxQ (ORCPT ); Mon, 14 Aug 2017 06:53:16 -0400 Received: by mail-wr0-f181.google.com with SMTP id m57so2924163wrm.5 for ; Mon, 14 Aug 2017 03:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KUktAMBNiR4VldSs3RYzjjbVX5C11nfPK/CCOZrDP6A=; b=eEaq432dmqExvSYjNORKNKTooB9HpL0y+Zc3bYfb7mgl8o1+M1Qq93fGj82Ji6u4ka TIOk1QXwsBS7K6h4Ztp58rxSm02rg8n+kgDteHfW+R4ntnxq86usiDNVNQqnr7wEzrqp EzfNHpEXPc54YrbBqUYC9cAUgp1gMAZaiAOaw= 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=KUktAMBNiR4VldSs3RYzjjbVX5C11nfPK/CCOZrDP6A=; b=OgQwIKM6l4Mxfy4lMiKvqq8cd0XZuiaZI+CknQhgDhFEiOXURpXkL3cS5mse4nhlQ2 zB6cYDtsMZ6zUVbQixY/KXyoIJ6YSKu0eBYMW+8LdN1wOxm5qtCUVQtQlKplk1tjO/8k KTBGZ4H30QMQp9i+Ghnn6U14LbwdBbrHP6222wN4HyhG3aC5rbLHTAm8tU7HFqTz44td gC+7m8nqZ9qZ/upf2KLY6HdZVy5g9tF9pmJMvXlwir3icc2LR0ICkqLBDZGj4eNiqWKU HuLaUDCuKg1C22bLvfC5YzMSkt+Dq7OTUI5e5UWPEwteoY8m3k06OtDXIx8Ten50JtF3 hd1w== X-Gm-Message-State: AHYfb5jbnQT1JSIoyMz9vzNH49KLH1NtJVPqIUHmvxAyE6ZYfPTdbaid A2SNt/MaM8pbTQmCmvPZ+w== X-Received: by 10.223.161.84 with SMTP id r20mr16984155wrr.91.1502707995269; Mon, 14 Aug 2017 03:53:15 -0700 (PDT) Received: from localhost.localdomain ([154.146.161.128]) by smtp.gmail.com with ESMTPSA id b15sm1490732wra.68.2017.08.14.03.53.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Aug 2017 03:53:14 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Ard Biesheuvel , "H. Peter Anvin" , Arnd Bergmann , Heiko Carstens , Kees Cook , Will Deacon , Michael Ellerman , Thomas Garnier , Thomas Gleixner , "Serge E. Hallyn" , Bjorn Helgaas , Benjamin Herrenschmidt , Paul Mackerras , Catalin Marinas , Petr Mladek , Ingo Molnar , James Morris , Andrew Morton , Nicolas Pitre , Steven Rostedt , Martin Schwidefsky , Sergey Senozhatsky , Jessica Yu Subject: [PATCH 3/5] init: allow initcall tables to be emitted using relative references Date: Mon, 14 Aug 2017 11:52:29 +0100 Message-Id: <20170814105231.14608-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814105231.14608-1-ard.biesheuvel@linaro.org> References: <20170814105231.14608-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow the initcall tables to be emitted using relative references that are only half the size on 64-bit architectures and don't require fixups at runtime on relocatable kernels. Cc: Petr Mladek Cc: Sergey Senozhatsky Cc: Steven Rostedt Cc: James Morris Cc: "Serge E. Hallyn" Signed-off-by: Ard Biesheuvel --- include/linux/init.h | 44 +++++++++++++++----- init/main.c | 32 +++++++------- kernel/printk/printk.c | 4 +- security/security.c | 4 +- 4 files changed, 53 insertions(+), 31 deletions(-) -- 2.11.0 diff --git a/include/linux/init.h b/include/linux/init.h index 94769d687cf0..a65628998ce3 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -110,8 +110,24 @@ typedef int (*initcall_t)(void); typedef void (*exitcall_t)(void); -extern initcall_t __con_initcall_start[], __con_initcall_end[]; -extern initcall_t __security_initcall_start[], __security_initcall_end[]; +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS +typedef signed int initcall_entry_t; + +static inline initcall_t initcall_from_entry(initcall_entry_t *entry) +{ + return (initcall_t)((unsigned long)entry + *entry); +} +#else +typedef initcall_t initcall_entry_t; + +static inline initcall_t initcall_from_entry(initcall_entry_t *entry) +{ + return *entry; +} +#endif + +extern initcall_entry_t __con_initcall_start[], __con_initcall_end[]; +extern initcall_entry_t __security_initcall_start[], __security_initcall_end[]; /* Used for contructor calls. */ typedef void (*ctor_fn_t)(void); @@ -161,9 +177,20 @@ extern bool initcall_debug; * as KEEP() in the linker script. */ -#define __define_initcall(fn, id) \ +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS +#define ___define_initcall(fn, id, __sec) \ + __ADDRESSABLE(fn) \ + asm(".section \"" #__sec ".init\", \"a\" \n" \ + "__initcall_" #fn #id ": \n" \ + ".long " VMLINUX_SYMBOL_STR(fn) " - . \n" \ + ".previous \n"); +#else +#define ___define_initcall(fn, id, __sec) \ static initcall_t __initcall_##fn##id __used \ - __attribute__((__section__(".initcall" #id ".init"))) = fn; + __attribute__((__section__(#__sec ".init"))) = fn; +#endif + +#define __define_initcall(fn, id) ___define_initcall(fn, id, .initcall##id) /* * Early initcalls run before initializing SMP. @@ -202,13 +229,8 @@ extern bool initcall_debug; #define __exitcall(fn) \ static exitcall_t __exitcall_##fn __exit_call = fn -#define console_initcall(fn) \ - static initcall_t __initcall_##fn \ - __used __section(.con_initcall.init) = fn - -#define security_initcall(fn) \ - static initcall_t __initcall_##fn \ - __used __section(.security_initcall.init) = fn +#define console_initcall(fn) ___define_initcall(fn,, .con_initcall) +#define security_initcall(fn) ___define_initcall(fn,, .security_initcall) struct obs_kernel_param { const char *str; diff --git a/init/main.c b/init/main.c index 052481fbe363..ac2a91f71107 100644 --- a/init/main.c +++ b/init/main.c @@ -833,18 +833,18 @@ int __init_or_module do_one_initcall(initcall_t fn) } -extern initcall_t __initcall_start[]; -extern initcall_t __initcall0_start[]; -extern initcall_t __initcall1_start[]; -extern initcall_t __initcall2_start[]; -extern initcall_t __initcall3_start[]; -extern initcall_t __initcall4_start[]; -extern initcall_t __initcall5_start[]; -extern initcall_t __initcall6_start[]; -extern initcall_t __initcall7_start[]; -extern initcall_t __initcall_end[]; - -static initcall_t *initcall_levels[] __initdata = { +extern initcall_entry_t __initcall_start[]; +extern initcall_entry_t __initcall0_start[]; +extern initcall_entry_t __initcall1_start[]; +extern initcall_entry_t __initcall2_start[]; +extern initcall_entry_t __initcall3_start[]; +extern initcall_entry_t __initcall4_start[]; +extern initcall_entry_t __initcall5_start[]; +extern initcall_entry_t __initcall6_start[]; +extern initcall_entry_t __initcall7_start[]; +extern initcall_entry_t __initcall_end[]; + +static initcall_entry_t *initcall_levels[] __initdata = { __initcall0_start, __initcall1_start, __initcall2_start, @@ -870,7 +870,7 @@ static char *initcall_level_names[] __initdata = { static void __init do_initcall_level(int level) { - initcall_t *fn; + initcall_entry_t *fn; strcpy(initcall_command_line, saved_command_line); parse_args(initcall_level_names[level], @@ -880,7 +880,7 @@ static void __init do_initcall_level(int level) NULL, &repair_env_string); for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) - do_one_initcall(*fn); + do_one_initcall(initcall_from_entry(fn)); } static void __init do_initcalls(void) @@ -911,10 +911,10 @@ static void __init do_basic_setup(void) static void __init do_pre_smp_initcalls(void) { - initcall_t *fn; + initcall_entry_t *fn; for (fn = __initcall_start; fn < __initcall0_start; fn++) - do_one_initcall(*fn); + do_one_initcall(initcall_from_entry(fn)); } /* diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fc47863f629c..39d343c1c4b2 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2623,7 +2623,7 @@ EXPORT_SYMBOL(unregister_console); */ void __init console_init(void) { - initcall_t *call; + initcall_entry_t *call; /* Setup the default TTY line discipline. */ n_tty_init(); @@ -2634,7 +2634,7 @@ void __init console_init(void) */ call = __con_initcall_start; while (call < __con_initcall_end) { - (*call)(); + initcall_from_entry(call)(); call++; } } diff --git a/security/security.c b/security/security.c index 30132378d103..63b5f52bb098 100644 --- a/security/security.c +++ b/security/security.c @@ -44,10 +44,10 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = static void __init do_security_initcalls(void) { - initcall_t *call; + initcall_entry_t *call; call = __security_initcall_start; while (call < __security_initcall_end) { - (*call) (); + initcall_from_entry(call)(); call++; } }