From patchwork Wed Oct 4 21:19:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985539 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 420D260586 for ; Wed, 4 Oct 2017 21:23:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32DE328C2C for ; Wed, 4 Oct 2017 21:23:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26C4428C2F; Wed, 4 Oct 2017 21:23:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C366C28C2C for ; Wed, 4 Oct 2017 21:23:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr67-0002VL-0y; Wed, 04 Oct 2017 21:20:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr65-0002UB-Qb for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 21:20:53 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D2/F1-02223-5B055D95; Wed, 04 Oct 2017 21:20:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRWlGSWpSXmKPExsXiVRtsrLsl4Gq kwdX9nBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8atc34F17krbu39ztTA+Iyzi5GLQ0hgBqPE vQfNzCAOi8ArFokJ196wgzgSAv2sEtf/32HqYuQEcrIkbt98BmWnSbz9t5MVwq6SmDvpKhuIL SSgJLF1w1JmiLF/GSWafv9kB0mwCWhJ7GmYzwSSEBGYJSJx63UPG4jDLHCGSeJ430mgURwcwg JeEk3N4iANLAKqEtvWvGABCfMKWEi8fpAFscxE4uGRa2CLOQUsJY6ceMMMsdhCovXMfaYJjII LGBlWMWoUpxaVpRbpGhnoJRVlpmeU5CZm5ugaGpjq5aYWFyemp+YkJhXrJefnbmIEhlw9AwPj DsbG2X6HGCU5mJREeTf5Xo0U4kvKT6nMSCzOiC8qzUktPsQow8GhJMH70B8oJ1iUmp5akZaZA wx+mLQEB4+SCO9kkDRvcUFibnFmOkTqFKMxx749t/4wcXTcvPuHSYglLz8vVUqcdzNIqQBIaU ZpHtwgWFReYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMqw0yhSczrwRu3yugU5iATpnTdAX klJJEhJRUA6Obso69y8O07Oc1MxaqCXBPfd7Vz+n4bWV6aFle2pmzu8RMLoRz/Z3z9crCoIXM 0bwu/6Jdk89pnjyU0mVXVrkucddEpl35/Lff2BfukTGPEjyy+3bvimCBrf/ixN6uT+mf8vWpz xr/rBdG69/8LGH67bHzYTnjYR77tnspoo5b02bmR19/uFCJpTgj0VCLuag4EQA4vTNuxQIAAA == X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1507152051!112981666!1 X-Originating-IP: [74.125.83.51] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12048 invoked from network); 4 Oct 2017 21:20:52 -0000 Received: from mail-pg0-f51.google.com (HELO mail-pg0-f51.google.com) (74.125.83.51) by server-5.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 21:20:52 -0000 Received: by mail-pg0-f51.google.com with SMTP id b192so4090479pga.2 for ; Wed, 04 Oct 2017 14:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Auij3VDdZJMf47AluGx82Dq+ZwsuQ0eF36Egb27uFO0=; b=CtybM7YtqDrqc2w+2bc+NAUF/AjMnUf+c7EQsx1NRTdsTzuZtmP5uRhVXIS5klouMC OJNBV5Rkc662pqiwKQvZux6h2zUrTxO1QrMGqiRykNtS79QknQVW0UDAdFahF+J26U+v zMEqc+WLSGsth/BLbjTSAM1jZBvuMVYMKkE5BTRxCoPk/JRJsZZTWtc3YcM8FhjFHmgv WXjGJFaD/jZveNmqSsO3ybrx7P/Txk/T1UYNV08WGceTY7a6Q72sAluq5Lpu6MsAFEPH +pGRSOWDtNaHYusM3uxZ6RdgPENAtNPlhF+mk0DOeKHbOdoKpeQ/Eb26OKI2mMujXGq5 ekIg== 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=Auij3VDdZJMf47AluGx82Dq+ZwsuQ0eF36Egb27uFO0=; b=JEY2nv/bcQ4LyMBstIGwzrRIgtuOpMOJihqm0oe0DmDfmFOFngNVBET3LWVlqugboG x7+IuDAIDRH3oT+KfKmIoR7luvtFQkJQEg8yxda7jTdtDemkzJFdDEw0f9cy5rXUB2e8 sRtkbOYSoH9fpsaLqDZ6LE743hz7eEWUeQTrNzNFKBznwH680F/MCI3b6agH+5OsmHDj FBGPyRSaT2Cc6LlUx1BK0CeSH3Mlj69S3HaAmo68jtHReVRWdyOww4IJSJCpTFB95t6c pswP+WoP0e9n3+fRTbC0Rq81hkXmeDrfa5hZJZqhUNX3CR2t4wbHSNN7m85yPLWsjOcH t+2g== X-Gm-Message-State: AMCzsaXkU7U0WOWe54fyrjdNe1LcPIoq+mcytsmUP1uvBaivN5qPCuJz eEeexvfBHLFN8WjBRRmjeDnRFg== X-Google-Smtp-Source: AOwi7QDzL4h7vNL1gEzTWT+pBGlVgCwclt1XJAaVqN6n+CD48zDaU9f8JB9bGuY39PWHfUzgBtUA6Q== X-Received: by 10.84.248.129 with SMTP id q1mr14739386pll.156.1507152049817; Wed, 04 Oct 2017 14:20:49 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id s68sm30204019pfd.72.2017.10.04.14.20.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 14:20:49 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 4 Oct 2017 14:19:39 -0700 Message-Id: <20171004212003.28296-4-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [RFC v3 03/27] x86: Use symbol name in jump table for PIE support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Replace the %c constraint with %P. The %c is incompatible with PIE because it implies an immediate value whereas %P reference a symbol. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. Signed-off-by: Thomas Garnier --- arch/x86/include/asm/jump_label.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index adc54c12cbd1..6e558e4524dc 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -36,9 +36,9 @@ 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" + _ASM_PTR "1b, %l[l_yes], %P0 \n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: @@ -52,9 +52,9 @@ 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" + _ASM_PTR "1b, %l[l_yes], %P0 \n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: