From patchwork Tue Jan 2 20:05:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 123222 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp4762003edv; Tue, 2 Jan 2018 12:07:30 -0800 (PST) X-Google-Smtp-Source: ACJfBouwH1NHE9Gte40rCdzPGNitR/4XCLFmUz0oi6NhfMpcd8i9uxSRFcbEEzViy7RvbgXnUqx3 X-Received: by 10.99.96.69 with SMTP id u66mr41460298pgb.355.1514923650414; Tue, 02 Jan 2018 12:07:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514923650; cv=none; d=google.com; s=arc-20160816; b=OZf80qEu+QJnrThzvYhQI/m6QcZHuseVGg6GVsXQvIWs0EydsMj5F+M16VSGJNclvC 7nbAnHBmlcOgse6+b5SpuSece5g3vx1KMOishGhR4aWd3j82APSuI+CcOufZTNvzqr0P KpZ/IzH/Toorw0lcy5PkJbbbmHQNeQyl9P57dFHHq9y4xuB9zDrMCj/3Wl/fey4UYRXv iWnlb9nGTRzpO6cOYHUaiewjZh2uXpw0hPpEn+VWJvQqz1QnoIGpCVfmr234XIqu9RqP jNY1d5dsL7iDLt7AHZ9Ch4IPK+1MsUGdoFmOP+XXW4epNA1yhe2kMeLFXTIbO0bMQhQK yIng== 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=y3cZHthDjrZdZe+7+thZcDtJZzDXcVyA3ettxQyn2/I=; b=uUO9VRgaaMS1P1teJv/TNcOikdjOPO0Sp2ml5zwQMu3KRRzonfvYeJU8GkvunU9aJL /knZEHfhEFcPValhuOup3Zocve9sutmbO04dcGKkWDaBJ55cIY/rxh78GgL+AeB1ci+S JSkF5EcAi62OtzDsPUh4SWSlYSbksLbjj8UnvcHIO/y1pfWcq0gIHWEBubsPlrKYAXAd TyZOjuXU4tGHdcMzEwVBCZm8NSoa/DGyX2ayEec/IFfHcxrnxxlcRhsk/VfGjnswCyqx B1vOv5RBAIE7f5Za353SNf2vsQVkeES90FxRdNMWGPUXndHaggqPFzxsoB1xuT17o4S5 GgNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U4JVdCRA; 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 b70si34618169pfk.47.2018.01.02.12.07.30; Tue, 02 Jan 2018 12:07:30 -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; dkim=pass header.i=@linaro.org header.s=google header.b=U4JVdCRA; 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 S1751311AbeABUHW (ORCPT + 28 others); Tue, 2 Jan 2018 15:07:22 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:41008 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbeABUHR (ORCPT ); Tue, 2 Jan 2018 15:07:17 -0500 Received: by mail-wm0-f68.google.com with SMTP id g75so63340693wme.0 for ; Tue, 02 Jan 2018 12:07:17 -0800 (PST) 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=y3cZHthDjrZdZe+7+thZcDtJZzDXcVyA3ettxQyn2/I=; b=U4JVdCRAWxIu8asYC7VR7yKgASQ4tUAP3aRQgb65Z/v9h8Of/kX68XF7IQrKEQqRbL mILpXc3g0V1XmE0jvCO2bKvYotrOisM9fdYrmv1LQvUXHa3V9ocBPN5rZ/3uvp1owdcE JyUIUE3jrgb01ODtZJbvYgN0b++pSR4Jo52yo= 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=y3cZHthDjrZdZe+7+thZcDtJZzDXcVyA3ettxQyn2/I=; b=ASgka48SqfBCHh1IZXvwStVWrQyEE/R8hy2zEKyOo7Itn46Xcr/XXA6tAi6Xp3C0Ei bpPC5O3PN0royir8+F1+/ydJDQp+0O93uPpqvJ05yiVhBl++nV3Ws1sLeKLCpGbQNM7c 5eQWNaM32FuFIuXDCtqW/Kgx5q/TtEZZHHPekaFvcabig4zDhm2m+GHwzb5KBQFw8gcQ aH2Fn145vlmWThZVO/pBzlBxiJ6KTa9IZDSe2NF5mLmQ8dO2EkP5kZJnYHJMHAf/sUw7 Gilm44ZbFYP+Q/xk9pkJnHhoce3HPYd7E3gsqqE9gHmm8laEFFjjw4Tw1+hjeucG/JhJ 2TxA== X-Gm-Message-State: AKGB3mLVD3qhOJ3ovndAvGylpv1rIxC03E52Z0z9f0bDaRGracuEaPuI xy8pzwR88/q0GwHMBlVBsAB4xRBrS/4= X-Received: by 10.28.74.147 with SMTP id n19mr40211357wmi.134.1514923636103; Tue, 02 Jan 2018 12:07:16 -0800 (PST) Received: from localhost.localdomain ([160.89.138.198]) by smtp.gmail.com with ESMTPSA id m70sm19128526wma.36.2018.01.02.12.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 12:07:15 -0800 (PST) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , "H. Peter Anvin" , Ralf Baechle , Arnd Bergmann , Heiko Carstens , Kees Cook , Will Deacon , Michael Ellerman , Thomas Garnier , Thomas Gleixner , "Serge E. Hallyn" , Bjorn Helgaas , Benjamin Herrenschmidt , Russell King , Paul Mackerras , Catalin Marinas , "David S. Miller" , Petr Mladek , Ingo Molnar , James Morris , Andrew Morton , Nicolas Pitre , Josh Poimboeuf , Steven Rostedt , Martin Schwidefsky , Sergey Senozhatsky , Linus Torvalds , Jessica Yu , linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v7 10/10] x86/kernel: jump_table: use relative references Date: Tue, 2 Jan 2018 20:05:49 +0000 Message-Id: <20180102200549.22984-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180102200549.22984-1-ard.biesheuvel@linaro.org> References: <20180102200549.22984-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Similar to the arm64 case, 64-bit x86 can benefit from using 32-bit relative references rather than 64-bit absolute ones when emitting struct jump_entry instances. Not only does this reduce the memory footprint of the entries themselves by 50%, it also removes the need for carrying relocation metadata on relocatable builds (i.e., for KASLR) which saves a fair chunk of .init space as well (although the savings are not as dramatic as on arm64) Signed-off-by: Ard Biesheuvel --- arch/x86/include/asm/jump_label.h | 35 ++++++++++++-------- arch/x86/kernel/jump_label.c | 16 +++++++++ tools/objtool/special.c | 4 +-- 3 files changed, 39 insertions(+), 16 deletions(-) -- 2.11.0 diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index 009ff2699d07..35fc2c5ec846 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -36,8 +36,8 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran asm_volatile_goto("1:" ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" ".pushsection __jump_table, \"aw\" \n\t" - _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" + ".balign 4\n\t" + ".long 1b - ., %l[l_yes] - ., %c0 + %c1 - .\n\t" ".popsection \n\t" : : "i" (key), "i" (branch) : : l_yes); @@ -52,8 +52,8 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool ".byte 0xe9\n\t .long %l[l_yes] - 2f\n\t" "2:\n\t" ".pushsection __jump_table, \"aw\" \n\t" - _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" + ".balign 4\n\t" + ".long 1b - ., %l[l_yes] - ., %c0 + %c1 - .\n\t" ".popsection \n\t" : : "i" (key), "i" (branch) : : l_yes); @@ -69,19 +69,26 @@ typedef u32 jump_label_t; #endif struct jump_entry { - jump_label_t code; - jump_label_t target; - jump_label_t key; + s32 code; + s32 target; + s32 key; }; static inline jump_label_t jump_entry_code(const struct jump_entry *entry) { - return entry->code; + return (unsigned long)&entry->code + entry->code; +} + +static inline jump_label_t jump_entry_target(const struct jump_entry *entry) +{ + return (unsigned long)&entry->target + entry->target; } static inline struct static_key *jump_entry_key(const struct jump_entry *entry) { - return (struct static_key *)((unsigned long)entry->key & ~1UL); + unsigned long key = (unsigned long)&entry->key + entry->key; + + return (struct static_key *)(key & ~1UL); } static inline bool jump_entry_is_branch(const struct jump_entry *entry) @@ -99,7 +106,7 @@ static inline void jump_entry_set_module_init(struct jump_entry *entry) entry->code = 0; } -#define jump_label_swap NULL +void jump_label_swap(void *a, void *b, int size); #else /* __ASSEMBLY__ */ @@ -114,8 +121,8 @@ static inline void jump_entry_set_module_init(struct jump_entry *entry) .byte STATIC_KEY_INIT_NOP .endif .pushsection __jump_table, "aw" - _ASM_ALIGN - _ASM_PTR .Lstatic_jump_\@, \target, \key + .balign 4 + .long .Lstatic_jump_\@ - ., \target - ., \key - . .popsection .endm @@ -130,8 +137,8 @@ static inline void jump_entry_set_module_init(struct jump_entry *entry) .Lstatic_jump_after_\@: .endif .pushsection __jump_table, "aw" - _ASM_ALIGN - _ASM_PTR .Lstatic_jump_\@, \target, \key + 1 + .balign 4 + .long .Lstatic_jump_\@ - ., \target - ., \key + 1 - . .popsection .endm diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c index d64296092ef5..cc5034b42335 100644 --- a/arch/x86/kernel/jump_label.c +++ b/arch/x86/kernel/jump_label.c @@ -149,4 +149,20 @@ __init_or_module void arch_jump_label_transform_static(struct jump_entry *entry, __jump_label_transform(entry, type, text_poke_early, 1); } +void jump_label_swap(void *a, void *b, int size) +{ + long delta = (unsigned long)a - (unsigned long)b; + struct jump_entry *jea = a; + struct jump_entry *jeb = b; + struct jump_entry tmp = *jea; + + jea->code = jeb->code - delta; + jea->target = jeb->target - delta; + jea->key = jeb->key - delta; + + jeb->code = tmp.code + delta; + jeb->target = tmp.target + delta; + jeb->key = tmp.key + delta; +} + #endif diff --git a/tools/objtool/special.c b/tools/objtool/special.c index 84f001d52322..98ae55b39037 100644 --- a/tools/objtool/special.c +++ b/tools/objtool/special.c @@ -30,9 +30,9 @@ #define EX_ORIG_OFFSET 0 #define EX_NEW_OFFSET 4 -#define JUMP_ENTRY_SIZE 24 +#define JUMP_ENTRY_SIZE 12 #define JUMP_ORIG_OFFSET 0 -#define JUMP_NEW_OFFSET 8 +#define JUMP_NEW_OFFSET 4 #define ALT_ENTRY_SIZE 13 #define ALT_ORIG_OFFSET 0