From patchwork Mon Jul 2 18:11:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 140847 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp248356ljj; Mon, 2 Jul 2018 11:13:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLKqMKk2cSH5UthesxxmuwRyPt7uO8dAyZe2nmQ8D5itoYo7EQQA5wzkpSTN5HhXs4XyCHI X-Received: by 2002:a63:2d45:: with SMTP id t66-v6mr22288661pgt.381.1530555219630; Mon, 02 Jul 2018 11:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530555219; cv=none; d=google.com; s=arc-20160816; b=PBnysxXuT4c7nup2fCph5HVjfTPSgmFRUW/UVp8027Q2/jus9sOkoCYctp0whs/Uy3 izAtrpjhmOp3VqMhQsDxnHaslAgDV3GXnb0JXfK4T4PvUl2rlQNHAOnHetlCM2/Pb5S7 lXQxJrH+OZSG7dmSQTjS62O2meJYU6wNp5POBNNAjgGjalhyuCua4AHUjRe9lMumMdV3 PPDnwG2X4qO1qHogc13ynA5OxzZa8VmDNmzdMlmU3zThTUg987sxyV5fuOMqPyoFRfoT oj6sOZH2HxHOsnLU1DJSdcD7qRvXpvGHnWC/jkx7748dOX9vhXMQy59XQVfEjQAFS6lH PtBQ== 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=L7ZgdBdHSh65TnBtMV8VfmyEs0kgJc5Pfx1hmdMEX3g=; b=G4BWSHTZ35QKWpUyx8JuHRt+XeBils7aICwvt1Dqx38i0bKUW1BIBj1s0ezRsLUtTb ZNNxrOoFPVXzXTvcugbCsmgDwLvUBnXjRCot9SsAyL+sK+s5eRXbkKR34QtM9BkikVlt BR9h0Eut8L2NluoQ0PcrPotluXRtFrIciNf43ysbotZpwL7Xr1mX0DGxmCcoXTO8HFSN yt6sSy6QLKIF6/msn9FcqN4EdkO5jAr2ERRu2fLNIPOFGQNwMHNnIHBvE/3vk9I3X+w7 lO/2zr/yzjZhPYTaE5+S47t6t85mH9dtmHr8dKzrY50oAYA26q0q6XUPrAaJKpjggeOr jigg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FLdBsiKw; 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 b59-v6si16421362plb.107.2018.07.02.11.13.39; Mon, 02 Jul 2018 11:13:39 -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=FLdBsiKw; 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 S1753346AbeGBSNi (ORCPT + 31 others); Mon, 2 Jul 2018 14:13:38 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:45533 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753392AbeGBSMH (ORCPT ); Mon, 2 Jul 2018 14:12:07 -0400 Received: by mail-wr0-f195.google.com with SMTP id u7-v6so16423599wrn.12 for ; Mon, 02 Jul 2018 11:12:06 -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=L7ZgdBdHSh65TnBtMV8VfmyEs0kgJc5Pfx1hmdMEX3g=; b=FLdBsiKwQ9szv78kIWndu3Hz8IIvvO7FXMKscslgC2tgl9L9/n9Hb1iUaVlXKY02uI 4x8+w+oT5OV/+Q6RthuEO13DIgB+cWxmieYol+xyO0Rt4R6vyLUuhD/MvjMMmDSnYrpy NPI5FJkO5YJq4yOsj0IscLAF76B10J09kuSgM= 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=L7ZgdBdHSh65TnBtMV8VfmyEs0kgJc5Pfx1hmdMEX3g=; b=Z51n03UnxmRfqizmSSg5+6+uL5UrCzW+y2g2aD/1RgnWHdTMS4ZipMhO5Azm1G5BiO Lyh5oiymqRkpozFmd6XUzK8OzHp/MbRUcAGu/TpMyKylMJrbsbaJnzdeyCxrMAgA2Dr3 y+BhO2dE6+9m/pHstPGTzwab9fRIaGqQY1OucBS7mFE3YfbeByyo9om9kpdGyfX65Y7Y Rq1wZGHbNg2xT+SQM/1k7Wds4fXX5LfV95vpYe6fmOGJZZJ09d+lEI6fh4mcczb0/zDE lB/Qo8YIRuESzTE1a9yjul3a8THTlm9bLxKsEo6yjQO2JTE1E8XF2ZTWtPysgp2Lqmpm M/sQ== X-Gm-Message-State: APt69E36rSUHmjW+OfVl+7j8eLJ38kUgyWi/Q0CxjYaQjZw8BsXVuG+O 2zF5heooUwInT0cQA3tY+VX3EA== X-Received: by 2002:adf:b90a:: with SMTP id k10-v6mr3724078wrf.169.1530555125951; Mon, 02 Jul 2018 11:12:05 -0700 (PDT) Received: from localhost.localdomain (151.21.90.92.rev.sfr.net. [92.90.21.151]) by smtp.gmail.com with ESMTPSA id 189-v6sm10582822wmd.17.2018.07.02.11.12.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 11:12:05 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-arch@vger.kernel.org Cc: Ard Biesheuvel , Arnd Bergmann , Heiko Carstens , Kees Cook , Will Deacon , Thomas Gleixner , Catalin Marinas , Ingo Molnar , Steven Rostedt , Martin Schwidefsky , Jessica Yu , Peter Zijlstra Subject: [PATCH v2 6/8] x86/kernel: jump_table: use relative references Date: Mon, 2 Jul 2018 20:11:43 +0200 Message-Id: <20180702181145.4799-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702181145.4799-1-ard.biesheuvel@linaro.org> References: <20180702181145.4799-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 relative references rather than absolute ones when emitting struct jump_entry instances. Not only does this reduce the memory footprint of the entries themselves by 33%, 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/Kconfig | 1 + arch/x86/include/asm/jump_label.h | 24 +++++++------------- tools/objtool/special.c | 4 ++-- 3 files changed, 11 insertions(+), 18 deletions(-) -- 2.17.1 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e10a3542db7e..dd71258ec1cc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -118,6 +118,7 @@ config X86 select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if X86_64 select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS if MMU diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index 8c0de4282659..21efc9d07ed9 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -37,7 +37,8 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran ".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" + ".long 1b - ., %l[l_yes] - . \n\t" + _ASM_PTR "%c0 + %c1 - .\n\t" ".popsection \n\t" : : "i" (key), "i" (branch) : : l_yes); @@ -53,7 +54,8 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool "2:\n\t" ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" + ".long 1b - ., %l[l_yes] - . \n\t" + _ASM_PTR "%c0 + %c1 - .\n\t" ".popsection \n\t" : : "i" (key), "i" (branch) : : l_yes); @@ -62,18 +64,6 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool return true; } -#ifdef CONFIG_X86_64 -typedef u64 jump_label_t; -#else -typedef u32 jump_label_t; -#endif - -struct jump_entry { - jump_label_t code; - jump_label_t target; - jump_label_t key; -}; - #else /* __ASSEMBLY__ */ .macro STATIC_JUMP_IF_TRUE target, key, def @@ -88,7 +78,8 @@ struct jump_entry { .endif .pushsection __jump_table, "aw" _ASM_ALIGN - _ASM_PTR .Lstatic_jump_\@, \target, \key + .long .Lstatic_jump_\@ - ., \target - . + _ASM_PTR \key - . .popsection .endm @@ -104,7 +95,8 @@ struct jump_entry { .endif .pushsection __jump_table, "aw" _ASM_ALIGN - _ASM_PTR .Lstatic_jump_\@, \target, \key + 1 + .long .Lstatic_jump_\@ - ., \target - . + _ASM_PTR \key + 1 - . .popsection .endm diff --git a/tools/objtool/special.c b/tools/objtool/special.c index 84f001d52322..50af4e1274b3 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 16 #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