From patchwork Mon Dec 25 20:54:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122704 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp226054qgn; Mon, 25 Dec 2017 12:56:08 -0800 (PST) X-Google-Smtp-Source: ACJfBosApFkH3j7oiOLew2hqG1w/iBBdLMaDmuGYpjpACwBENmwojV5QpzeTZ27ho1v1rlfg637/ X-Received: by 10.99.110.13 with SMTP id j13mr1232499pgc.446.1514235368514; Mon, 25 Dec 2017 12:56:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514235368; cv=none; d=google.com; s=arc-20160816; b=bQ2N2hOXqglCaEbnYUrlHlxAOnrevBcVYJCOKb+XzM1Kbj2yOEg2YSTgbw1P2V8/bg lfobeBFOzTF+7Ye4ERvwa13kPqS6b59/DH94ehLAlLWiKUgt4X6Xff88mBeA5qi/BLaT YZQxu7qdKfyhUFe7xagWgLuJMoD540wrSS1PuqqbhU1TP7Do8B9Y6BeaEOjSWr4CzV2M RatLjbEfkcwLU2pZdX5q4ZJBAUS5VvVRvGAP0TW8h+Hx6z6iBmGB77/viRgDovb3x0Iy MOWJOMNDzsqcB2IIm721zuFzrNYx453RGf+ANQO8AeZW5kxZu4VhVCUSB3vOW/Qzxh1F Y3fg== 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=nmovwwxZQQa2ugEDLnXxoU69CsqWUnhsDto5qVfQljI=; b=hODpArk2Mze22wu2+wndPd55S9aqYtSbgwI/5FWCCa5ethZcsdHAku7VMWbY94wqSw 3jJO2J6d1joU7HfCuUWde8QtoeKIZjSSmraImOuAGnsi6CN2ozloz5HAhn9hR/iOnGOc bBZhKWoR27sMPZW/3EHtq10IoPczpcPEiwnUC90TSTyLkufXgJc9Mf9kQtp/Buytak4e SrktJVmd4CuzMpTAugaa+m2WVNocoTL0lZEvN2xTtnULTgMPWPt2kSAAtGJOBIzc6xqL hxuvTIm31VevUTlSUXMNOy7xAaXZcK6dfMaT9FebrGn8YPvH89AMeFcQKSNuiV57yQrj pxJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FoybLdU3; 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 p26si21892532pfh.220.2017.12.25.12.56.08; Mon, 25 Dec 2017 12:56:08 -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=FoybLdU3; 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 S1753385AbdLYU4E (ORCPT + 28 others); Mon, 25 Dec 2017 15:56:04 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:43103 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335AbdLYUzy (ORCPT ); Mon, 25 Dec 2017 15:55:54 -0500 Received: by mail-wm0-f68.google.com with SMTP id n138so32814618wmg.2 for ; Mon, 25 Dec 2017 12:55:53 -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=nmovwwxZQQa2ugEDLnXxoU69CsqWUnhsDto5qVfQljI=; b=FoybLdU34h7tD2YvNo1TOxrVEvcKxDgXeKMEmlTyHo14rK82VWAM7Gt4bG28T0C9j2 PlA5sqnwmPwYuhY3eMCsxXR2D9oaM0zNKDSw5VLk2RKm/LC0aaMgOXCdXgiHjieBY5D9 6dHlDOePmBPWtmBMMmFiCQS3T86vTRkDOcgI4= 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=nmovwwxZQQa2ugEDLnXxoU69CsqWUnhsDto5qVfQljI=; b=ETN7t4UTY0kMfYjofxifPRndFZXDnDi7eOg9wbqmp//m10wnu6n/4MTAC+gzgO6L20 BDF+LAQRV+76zh+7x/q9CgrAmjMGNWN+DBfYRQuXz24Fg101/P4sBcCK5z8OYhUsdryd b776cGqbidleDTqjtTeRNL4BGksnpTAcgTHuoeVZsKIy0PLDXBdftrTBWnza+uUd73NT 07e8vFcW4JLjxjqbtACOb9bn7HkWolAc26/6+t0PjbsjhZBl6m9nn3Y06q7qiukK9t5F GKTRFHYjsOwlgEqtT1oRq4HTPuecMZsIPqLWLkqYk3tzwpuh7QErjL6xl92Fwu/Y1aSg fsSQ== X-Gm-Message-State: AKGB3mKQIa/FrljYPv9PB3NjgWOwyoHkPp72ryAQVyzVdCU+/Zhwkpl6 kN5UUx4qjonJadcekxxDEc+hDbtUKww= X-Received: by 10.28.130.208 with SMTP id e199mr19345255wmd.75.1514235352290; Mon, 25 Dec 2017 12:55:52 -0800 (PST) Received: from localhost.localdomain ([160.171.216.245]) by smtp.gmail.com with ESMTPSA id y42sm39552441wrc.96.2017.12.25.12.55.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Dec 2017 12:55:51 -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 v5 7/8] arm64/kernel: jump_label: use relative references Date: Mon, 25 Dec 2017 20:54:39 +0000 Message-Id: <20171225205440.14575-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171225205440.14575-1-ard.biesheuvel@linaro.org> References: <20171225205440.14575-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..5cec68616125 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 (jump_label_t)&entry->code + entry->code; +} + +static inline jump_label_t jump_entry_target(const struct jump_entry *entry) +{ + return (jump_label_t)&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 */