From patchwork Wed Oct 11 20:30:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000575 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 F13326037F for ; Wed, 11 Oct 2017 20:33:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E613128B66 for ; Wed, 11 Oct 2017 20:33:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA38028B6D; Wed, 11 Oct 2017 20:33:41 +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 74F7528B66 for ; Wed, 11 Oct 2017 20:33:41 +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 1e2Nf5-0000Wd-Pb; Wed, 11 Oct 2017 20:31:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Nf4-0000UK-K2 for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:26 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D3/23-26326-D9F7ED95; Wed, 11 Oct 2017 20:31:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrBIsWRWlGSWpSXmKPExsVyMfTARt059fc iDc6ctbT4vmUykwOjx+EPV1gCGKNYM/OS8isSWDPmn3/KXvCBp+L05vXsDYyzubsYuTiEBGYw Svz/foMdxGEReMUicb97PRuIIyHQzyoxvW8zUxcjJ5CTJTH351oWCDtNYsOH/1B2ucS1A99ZQ WwhASWJrRuWMkOM/ccocXT/P0aQBJuAlsSehvlMIAkRgRPCEps+/GYEcZgFzjBJHO87CdTOzi Es4CbxxxiknkVAVeLF9tVsIDavgKXEpnnr2CGWWUgcO3YYbDEnUPz7xkPMEIstJFbOOs86gVF wASPDKkb14tSistQiXWO9pKLM9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYzAkGMAgh2M zV+cDjFKcjApifI+jLkXKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCV60OKCdYlJqeWpGWmQMMf pi0BAePkgivF0iat7ggMbc4Mx0idYrRkuPCnUt/mDgO7LkFJDtu3v3DJMSSl5+XKiXO+64WqE EApCGjNA9uHCxCLzHKSgnzMgIdKMRTkFqUm1mCKv+KUZyDUUmYlwdkLU9mXgnc1ldABzEBHSS adgfkoJJEhJRUA2PS/0ef2UVd3Zaxsjney2xp92w78Etzz4tTBy+LpSSnPhXzudlmcXpBQGuv a4qEsGpYx/pf3zdYqPw9L6Z4y072h8Fm3h7JaQevlfv+c558dKtTaIbeytk3N15gs/98uuCSb 0munaHsdYGnkrnz1RduXTnpQ9apAyKPjRMW9GfVufGbLBVhuqTEUpyRaKjFXFScCAAi1QXNyw IAAA== X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1507753883!102311670!1 X-Originating-IP: [209.85.192.177] 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 27519 invoked from network); 11 Oct 2017 20:31:24 -0000 Received: from mail-pf0-f177.google.com (HELO mail-pf0-f177.google.com) (209.85.192.177) by server-7.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:24 -0000 Received: by mail-pf0-f177.google.com with SMTP id n14so1942552pfh.8 for ; Wed, 11 Oct 2017 13:31:24 -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=4GE4rc7j4PMH+rm4kc3luySDpxmc4NT0ua/ZYOp8V9o=; b=QyYGkKgg0nzIMsuO5Fy4MYms/5nOLVQBbFSjFXt36v29R2qBUP7tNzbHPoyZdoJUyG KeKrxrDWIO9a9zWUCLJp47+vWeINB2W5E84bxa7rxBs8i2zNmzfdba5Xtr0E3RDmWkl5 zUErg2o8c3QWgrX2iq9VgpQuwCOEVX/0ANR6a/3PuNBGKrLu/F6JSdfL4z368cTfAbsC MFXj9oE5TnW4pPvPbihlYbZXnenHY7KwOEISGxlAzmVHe1FAYw4yLj5Ghf4eP53tVOWD Xv7rrCGKvl80pzsb5r+QyDD9Gbeyf7AwHJyKHiqAgW+5sRDg5Z/x4KvQSmKHE9YbzwGz ckNQ== 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=4GE4rc7j4PMH+rm4kc3luySDpxmc4NT0ua/ZYOp8V9o=; b=D3F14R+zBI6M84xTKCCC1BGsXsw6h5JEbZmNx7KfAvxgrddqQ+FK2YBE+zEIl06aF7 jOTisVbdprsoz2EwqBusCpEuwLLedpImzlp9r/horKsGW3W3c1ttDcArhg30ziUW3UDJ PsvneoT6Rc+ApH4kesrqifx5ghbIFKJfmDok2hbw+vgAZDoQoapWmF49UrX7TVS22mK7 3bXF671F/97ET4mlGIF1QNN4T+pswIWcRpNVoHVhlQe2/2TSgq3z13b65OOxjMS6V2Bz Ph8SlH7SPn4ia3f6EL4QGTBCwfCVffcHi1/dSMxy5rUfUiozeSWOBH6zgFTdFLM2hbuh naMw== X-Gm-Message-State: AMCzsaVUDBqqtHi0C1vAcFkW+WDLQf4yc4pGheCAKyEoWBvE234fK3zz P3XiyNjFHhD0bAdu7aqxF/1CeA== X-Google-Smtp-Source: AOwi7QADw7zP/j49FwELljVcEFbs5iSs7n64Maz8Aa/83MhsL3ROjfi7f6Bm9h1SvG1Ai9tEBNaYug== X-Received: by 10.84.143.68 with SMTP id 62mr161308ply.315.1507753883023; Wed, 11 Oct 2017 13:31:23 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:22 -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:12 -0700 Message-Id: <20171011203027.11248-13-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 12/27] x86/paravirt: Adapt assembly 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 if PIE is enabled, switch the paravirt assembly constraints to be compatible. The %c/i constrains generate smaller code so is kept by default. 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/paravirt_types.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 280d94c36dad..e6961f8a74aa 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -335,9 +335,17 @@ extern struct pv_lock_ops pv_lock_ops; #define PARAVIRT_PATCH(x) \ (offsetof(struct paravirt_patch_template, x) / sizeof(void *)) +#ifdef CONFIG_X86_PIE +#define paravirt_opptr_call "a" +#define paravirt_opptr_type "p" +#else +#define paravirt_opptr_call "c" +#define paravirt_opptr_type "i" +#endif + #define paravirt_type(op) \ [paravirt_typenum] "i" (PARAVIRT_PATCH(op)), \ - [paravirt_opptr] "i" (&(op)) + [paravirt_opptr] paravirt_opptr_type (&(op)) #define paravirt_clobber(clobber) \ [paravirt_clobber] "i" (clobber) @@ -391,7 +399,7 @@ int paravirt_disable_iospace(void); * offset into the paravirt_patch_template structure, and can therefore be * freely converted back into a structure offset. */ -#define PARAVIRT_CALL "call *%c[paravirt_opptr];" +#define PARAVIRT_CALL "call *%" paravirt_opptr_call "[paravirt_opptr];" /* * These macros are intended to wrap calls through one of the paravirt