From patchwork Wed Oct 11 20:30:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000569 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 81B396037F for ; Wed, 11 Oct 2017 20:33:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74C8228B37 for ; Wed, 11 Oct 2017 20:33:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 686E928B66; Wed, 11 Oct 2017 20:33:38 +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 0556828B6E for ; Wed, 11 Oct 2017 20:33:38 +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 1e2Ner-0000Gh-Hv; Wed, 11 Oct 2017 20:31:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Nep-0000Eo-By for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:11 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id D0/02-32680-E8F7ED95; Wed, 11 Oct 2017 20:31:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRWlGSWpSXmKPExsVyMfTAet3e+nu RBmtvGFp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnnLnaxF9zmrtg++RJzA+Mrzi5GLg4hgRmM EkfeLmcEcVgEXrFIrLu8lAnEkRDoZ5VofHWDtYuRA8jJkpj4J6iLkRPITJPY+GMVC4RdIbH55 ANmEFtIQEli64alzBBT/zFKnHn8FSzBJqAlsadhPthQEYETwhKbPvwGW8cscIZJ4njfSVaQKm EBH4m7T+eBjWURUJW4e7wHzOYVsJB48XwKE8Q6C4ljxw6DxTkFLCW+bzwEtdpCYuWs86wTGAU XMDKsYtQoTi0qSy3SNTTSSyrKTM8oyU3MzNE1NDDVy00tLk5MT81JTCrWS87P3cQIDDsGINjB 2DfL+RCjJAeTkijvw5h7kUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeNXqgHKCRanpqRVpmTnAC IBJS3DwKInwNoGkeYsLEnOLM9MhUqcYLTku3Ln0h4njwJ5bQLLj5t0/TEIsefl5qVLivKUgDQ IgDRmleXDjYFF6iVFWSpiXEehAIZ6C1KLczBJU+VeM4hyMSsK8PCBTeDLzSuC2vgI6iAnoING 0OyAHlSQipKQaGKs3rmTQmKiYUWWUo3RNylrt0Q1PrSCheZM2JM7dU3lt1vSz2a+KhFvqvyzJ 7vwQmWVw/bVknmWtqosm8xYrW88TmbrM9usXrlp9urpko4rygr9LCg2NPe34NRjkNeUV/gqJJ Nl+uBPe93RuvnnLf8VZ5QH333EEPzm9zCBb88VmbsalPRU+SizFGYmGWsxFxYkAMbl/Yc0CAA A= X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1507753868!104933332!1 X-Originating-IP: [209.85.192.175] 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 24115 invoked from network); 11 Oct 2017 20:31:09 -0000 Received: from mail-pf0-f175.google.com (HELO mail-pf0-f175.google.com) (209.85.192.175) by server-5.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:09 -0000 Received: by mail-pf0-f175.google.com with SMTP id b79so1950760pfk.5 for ; Wed, 11 Oct 2017 13:31:09 -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=obSiuTx7+ekITdw7FDuKzseMNE7feyUkWplM1bHCZmA=; b=rWKR4UQnbqvSRfh5UwGu44ufcGx0/485CGVoUeI5VwIt5nu/M2SYZP/iRkU7sVlDKG lOuse29vsF0OJ4qCbodDugshAkINjtMlScO272GCq/1xUOdxsVy8NpjHmrI01a7Fut9t mVosAgaiuouPYPM8rp9X06QJGwwJGU1MbRkmNKxZ/J5MZRKbBehCYeMzyzpMrCJyFhir //wprMvPXI6zgVll51AtweM23aaYcqY+tkBX35K9K6IYt6UivwcJTJXm0/yxY0SDeluO DmUOFd1lToIBSzVNMCLpSePp/QHMZd+lYCeFL0z6rittjg1CU1in0SJXjPJzkO1hOArJ 9NwA== 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=obSiuTx7+ekITdw7FDuKzseMNE7feyUkWplM1bHCZmA=; b=hIciEJ96dzF908Ur91PO15PJt9gSMRSoNK2zzVWblNFVaQ2pwDzLoonKOUENDhS6+t OhrY5MbdjkolmNAKV/H+nmaTFFzbqEiHdn0s8ERe0sHrF6zQO8fwHWDM739BYq5LO8YN Og1H3bZdOV5239hTY+1uDVJAtIeyX9R5f6ILLjbhl/Ky19By9a0Mun85FWIzqUOo40/i 5lPJAWeSqNESdGsNQkr19muUhIjHIgj3brPL1c6J9qRLqj0ryL9H4q2RhBSSloRgFEQp 095Fkjw8KOSeFVWo+9IOfPOa0+EnCIO/CQLdxQ90D66o8bPQGzt5LCGJD7+xjMwhX5Js R2+A== X-Gm-Message-State: AMCzsaV23et7hBN+UMvf1p/Eyliwxj8kQk9guh1Ls9UhGTnB/KiCk8qw R/KGO/iT85/lm8kT/4Kvn77qlg== X-Google-Smtp-Source: AOwi7QCTZVFJBj1grUVddGs//C028UVgIDmlXFDYogk1SqSkVIWD1P3OjqjZpotUakOS6gta7gcoOw== X-Received: by 10.99.137.72 with SMTP id v69mr194256pgd.130.1507753867861; Wed, 11 Oct 2017 13:31:07 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id n12sm20691913pfb.149.2017.10.11.13.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:07 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 11 Oct 2017 13:30:03 -0700 Message-Id: <20171011203027.11248-4-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-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] [PATCH v1 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: