From patchwork Tue Jan 2 20:05:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 123220 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp4761722edv; Tue, 2 Jan 2018 12:07:15 -0800 (PST) X-Google-Smtp-Source: ACJfBovn4uoRlcNEB8HvHfcKfh8PiFsMCT5TePStZBSbU86UKSGBFN9HK9vqdveWEEbR8mTY14tG X-Received: by 10.98.204.10 with SMTP id a10mr46927460pfg.18.1514923635507; Tue, 02 Jan 2018 12:07:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514923635; cv=none; d=google.com; s=arc-20160816; b=AwvboGg1tP1QcdgJLfT/eGQDgWLDZdzKGwuZZY+tftkTHe2BAgXrloqBRvt9yhhiY3 p590MuKSfi9Qa2DrVdJV+AtSALToq8HE1g4EeZxo8Jm1pTDjIg7iz3+yFR/HYF787tyZ yjuF7qrGvtIlQr1MQJulPKE7v25waNmIvDwbsT8Mhn3r0DiUr+fK6KFILYmO9FHMrXVb XaO4f6ZSFEhf0SR8OMjDbj0s1FTQx84WASe8qZLDrBQX6Q9xSxhXItr0BfLzZtnhg/7a Eg5TEbHpaDIAl1PCGHq87FEAlXOO1iqvHJELRC/ZWzX2towYXWksT12z4ffA4fGN8T6N Ic9w== 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=RtgdmqqE7QnNDS0Od8ctH/UMcFkuxkhGpZ1L+nRoK9Y=; b=gJ4aQfu2bbULtKjDsIqPPto1HJQ9F6CzzsLynWJ+ltMdEEtm4QgBYJT9aW4N4Z+Cc5 C/ceHeyxbliT/QXD5b13mAc0umZrpB9PyANDzsE9RT8gfGyBkdpsibfnMg+EPzJXNLYT zpOvnx58LBYj6EkvM03PkqJcO22jvb57xdN1DZgJDDYxXmIieoap164+rkE0ND/y+sCi jjJIl/NJYTF2WTcexvAiqP6/2mwmy2jB4Wi+TPGGdg1272Q6ZX+AqTzn4j7LVnDPTvaP ea5P+1YLF6pQBqVIR9mZRtXgKXiWXbJkQED28RotTSQmMpu/AhjUjiFHAhMG6ZaWT3ns a87g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZXOsFAJi; 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 q17si34367969pfj.31.2018.01.02.12.07.14; Tue, 02 Jan 2018 12:07:15 -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=ZXOsFAJi; 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 S1751244AbeABUHK (ORCPT + 28 others); Tue, 2 Jan 2018 15:07:10 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35190 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbeABUHD (ORCPT ); Tue, 2 Jan 2018 15:07:03 -0500 Received: by mail-wr0-f193.google.com with SMTP id l19so37219715wrc.2 for ; Tue, 02 Jan 2018 12:07:03 -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=RtgdmqqE7QnNDS0Od8ctH/UMcFkuxkhGpZ1L+nRoK9Y=; b=ZXOsFAJioLobdvr9YpnYOCxgnNq32bEakvz+d8oHqbR+rWFbkbaVPtVyawqeeowoT1 Dzbj11m2Bi/29hzMeufYCDd4u72LhfE0tCsxWkG9HEh2S9NwOvXB6vLZxGTzpuOUsPI5 3M8pDezCKUo4tMXGIDfUWJ0EZBHr/1jyyzjGc= 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=RtgdmqqE7QnNDS0Od8ctH/UMcFkuxkhGpZ1L+nRoK9Y=; b=A5levprkxsGP3pK4iNhyjpHLbjRcip8t/TDO3pi1qKW3olyW46jyTG3wVVt2IZ1TVG C6+0eFArSvY5yNazItrSKd6Y97TQhqCWGwz6JST13MtFhTMMHENFbj+UOo4j6qTu3c5z yr3UFSc7VpkzUMtpoY+vNxsyX79EejqsDgE7PZBESZ315eBHaOi+Z3EVjslnTxP+TSlm /3yMyXFJYAr/8/0O6kslJifVXdCX6Uz7dFAt23cF+cbAlSUXUTwXV1HYwtHRxCqy6nug 9mF8dtX9xsBAIPlE1lc29jjOEfA2m7IAZbZmQnbv2v9oQA2tYWaRNGDr44ylhG3k1s6c s0FQ== X-Gm-Message-State: AKGB3mKZ32b10JOzmW7yIvuA3YE9w2QUYsQxGWugG3Kq2yq+rGByVug9 xUahPpLyyYbxkObdyAFiLCHNUZ9LxcA= X-Received: by 10.223.186.13 with SMTP id o13mr15747922wrg.43.1514923622162; Tue, 02 Jan 2018 12:07:02 -0800 (PST) Received: from localhost.localdomain ([160.89.138.198]) by smtp.gmail.com with ESMTPSA id m70sm19128526wma.36.2018.01.02.12.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 12:07:01 -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 08/10] arm64/kernel: jump_label: use relative references Date: Tue, 2 Jan 2018 20:05:47 +0000 Message-Id: <20180102200549.22984-9-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 On a randomly chosen distro kernel build for arm64, vmlinux.o shows the following sections, containing jump label entries, and the associated RELA relocation records, respectively: ... [38088] __jump_table PROGBITS 0000000000000000 00e19f30 000000000002ea10 0000000000000000 WA 0 0 8 [38089] .rela__jump_table RELA 0000000000000000 01fd8bb0 000000000008be30 0000000000000018 I 38178 38088 8 ... In other words, we have 190 KB worth of 'struct jump_entry' instances, and 573 KB worth of RELA entries to relocate each entry's code, target and key members. This means the RELA section occupies 10% of the .init segment, and the two sections combined represent 5% of vmlinux's entire memory footprint. So let's switch from 64-bit absolute references to 32-bit relative references: this reduces the size of the __jump_table by 50%, and gets rid of the RELA section entirely. Note that this requires some extra care in the sorting routine, given that the offsets change when entries are moved around in the jump_entry table. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/jump_label.h | 27 ++++++++++++-------- arch/arm64/kernel/jump_label.c | 22 +++++++++++++--- 2 files changed, 36 insertions(+), 13 deletions(-) -- 2.11.0 diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h index 9d6e46355c89..8f82adeb7b0b 100644 --- a/arch/arm64/include/asm/jump_label.h +++ b/arch/arm64/include/asm/jump_label.h @@ -30,8 +30,8 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran { asm goto("1: nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" - ".align 3\n\t" - ".quad 1b, %l[l_yes], %c0\n\t" + ".align 2\n\t" + ".long 1b - ., %l[l_yes] - ., %c0 - .\n\t" ".popsection\n\t" : : "i"(&((char *)key)[branch]) : : l_yes); @@ -44,8 +44,8 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool { asm goto("1: b %l[l_yes]\n\t" ".pushsection __jump_table, \"aw\"\n\t" - ".align 3\n\t" - ".quad 1b, %l[l_yes], %c0\n\t" + ".align 2\n\t" + ".long 1b - ., %l[l_yes] - ., %c0 - .\n\t" ".popsection\n\t" : : "i"(&((char *)key)[branch]) : : l_yes); @@ -57,19 +57,26 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool typedef u64 jump_label_t; 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) @@ -87,7 +94,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); #endif /* __ASSEMBLY__ */ #endif /* __ASM_JUMP_LABEL_H */ diff --git a/arch/arm64/kernel/jump_label.c b/arch/arm64/kernel/jump_label.c index c2dd1ad3e648..2b8e459e91f7 100644 --- a/arch/arm64/kernel/jump_label.c +++ b/arch/arm64/kernel/jump_label.c @@ -25,12 +25,12 @@ void arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type) { - void *addr = (void *)entry->code; + void *addr = (void *)jump_entry_code(entry); u32 insn; if (type == JUMP_LABEL_JMP) { - insn = aarch64_insn_gen_branch_imm(entry->code, - entry->target, + insn = aarch64_insn_gen_branch_imm(jump_entry_code(entry), + jump_entry_target(entry), AARCH64_INSN_BRANCH_NOLINK); } else { insn = aarch64_insn_gen_nop(); @@ -50,4 +50,20 @@ void arch_jump_label_transform_static(struct jump_entry *entry, */ } +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 /* HAVE_JUMP_LABEL */