From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1520974839; cv=none; d=google.com; s=arc-20160816; b=jFEdUHjLBhnf0B0i3s+BEwUv6AKg3SCi+cPK6zdDRUFA9wX0Brk1sikBiD9Be6hG2a XxsWOieFZ6XLQZDKB7GpDU6mdvWkIXMjDS5d3tK4h9ej+/9xmhVLe3xcRdZXDmnf89JK GD99B8Nch/idFutnC8O9P+zjPnAeqcQHq0zPr4wgPZRUkeEQqncSWWvvxq7YBAcUmLN/ aBlIvtNhsCrTjYNiMypVl0pCWbzJm1P6H3VjeuqYgZ03iZCBdTu4TSJ8P0TkAnK81fZa b49mg5YJyojFA1txeiht8j1QlnYx9hk9rV3KIO5S4A1zJjCcBiicIDlLtqRaA/QT8JHl IgAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=DZsEq1zFEG7w9tiVZ8nBqBYJOHCVzWGdhc4pdAiMld8=; b=d+fSmvEcbDLBsltCoyXKD2yzeZjIivZ1nyt+2ZDFVK0kZqr6buRrSRThpAfuH8c8nU BrMtnuKnOhv2F1yTQ9uCWshQf3qmQQe9UoNcpXNHMdge3dsLmF4iK+7aFF8TD0i5Rl4y DimbIZs0JpNgFdSV9+Fe++0bYNmj2Nax3N3bPk4YQlJp5fK1uQMLWvvg8fOAHC8YRj1M jYWVEV+6ItXzMQhR+wO1R9FU8uH4wcnjW0KIKwNIcJ3AwjPOUL8sL9LbFqUvkF15zQmT nJLUJOgu7TCtGbM3Tp+zLc34Re1Lt9/cglvKegFlGv3Vxdm/Mk/1xoalM+L3tZnfD3+f hPiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=my7DXLCg; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=my7DXLCg; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Google-Smtp-Source: AG47ELt4TdcVakLAqPXDdnHvEFhN0XdsVDyKDPPQLqvkFilmMxK+MwPG4q9vj6jNW7PpKic5ac+AIg== From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Greg Kroah-Hartman , Kate Stewart , Thomas Garnier , Arnd Bergmann , Philippe Ombredanne , Arnaldo Carvalho de Melo , Andrey Ryabinin , Matthias Kaehlcke , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Andy Lutomirski , Dominik Brodowski , Borislav Petkov , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Alok Kataria , Steven Rostedt , Tejun Heo , Christoph Lameter , Dennis Zhou , Boris Ostrovsky , David Woodhouse , Alexey Dobriyan , "Paul E . McKenney" , Andrew Morton , Nicolas Pitre , Randy Dunlap , "Luis R . Rodriguez" , Christopher Li , Jason Baron , Ashish Kalra , Kyle McMartin , Dou Liyang , Lukas Wunner , Petr Mladek , Sergey Senozhatsky , Masahiro Yamada , Ingo Molnar , Nicholas Piggin , Cao jin , "H . J . Lu" , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Dave Hansen , Rik van Riel , Jia Zhang , Jiri Slaby , Kyle Huey , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Rob Landley , Baoquan He , Daniel Micay , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH v2 12/27] x86/paravirt: Adapt assembly for PIE support Date: Tue, 13 Mar 2018 13:59:30 -0700 Message-Id: <20180313205945.245105-13-thgarnie@google.com> X-Mailer: git-send-email 2.16.2.660.g709887971b-goog In-Reply-To: <20180313205945.245105-1-thgarnie@google.com> References: <20180313205945.245105-1-thgarnie@google.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594857713119854492?= X-GMAIL-MSGID: =?utf-8?q?1594857713119854492?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 180bc0bff0fb..140747a98d94 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -337,9 +337,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) @@ -395,7 +403,7 @@ int paravirt_disable_iospace(void); */ #define PARAVIRT_CALL \ ANNOTATE_RETPOLINE_SAFE \ - "call *%c[paravirt_opptr];" + "call *%" paravirt_opptr_call "[paravirt_opptr];" /* * These macros are intended to wrap calls through one of the paravirt -- 2.16.2.660.g709887971b-goog