Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp22570ima; Thu, 31 Jan 2019 11:44:49 -0800 (PST) X-Google-Smtp-Source: AHgI3IZwlYHcDn5E0gzrwZbx4lKmz9H+KrDV9bsjYb1dKezFiwFjeX4xzAqO2iP408lgkmG6ywdd X-Received: by 2002:a62:4618:: with SMTP id t24mr18769710pfa.139.1548963889169; Thu, 31 Jan 2019 11:44:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548963889; cv=none; d=google.com; s=arc-20160816; b=Z7dy45BMFVOdKe+BCEEwP1P+Kb9ZRGu4MsUjiXMM5hGEXOoxXOXy1waOw1rmqojaCT Khdd/mrvEPlC1TBNiO+kaWFZXdO4uzFCJWEPxPRot8q1N49dvrtzv7CJku8OVjE64Ke0 9HuNZaWK5LrZou42nkfLxDEyhUkI8GJia5OtY7V9uyW0g4YXwOUGRo57aygRYhFtMvFM FTw0fhdEYva9xb8zAoNejVKO5obbCzTf02rcnOWYeQELKI/w8F5zjLRyg38ghO+vwR1g baTCoGCuwkAgFDFrs8FgXYkeGl3L5KlnEk1CuoL5Pc9M91lGLP4GL7KaXsdAa4Y5gCnz mxPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e3dk7ZZLbgfAGqbWuqUoL9HQGz8pGKWmGgQPHhRwhHc=; b=UY9uH9hUO6W7w0mflj9i7eSuuf+Ql3MCC0i3zrrUwQnmeSAqJnG8lQHurrNvlRzSGS hUMGW4sQw1g9ecK+Ettf26Qce3Vf14wgE5sFeLw/WAzEiKmQWlxiCoA5XPv2+XtcpWQh rlUNdMUQAr8vovt/zOZx3svgszpw9oqcyNDlev840iRDueiG2JN8HTipeFam01Xqsz1O D991ipnwAzgZbFCI/+DrqeWlcw5doab7bZIhVToMAsvOoYsP+F4Ts7od9c2u7bhvwd3D Frm2eMgk/9fgSAmKjRZrjvxe6mzpJ6hlhG1fRuez6TmAOG/5ytYcpUE6veZwEb2+TAA/ kRjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=LSObIfuT; 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=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s84si4989600pgs.306.2019.01.31.11.44.33; Thu, 31 Jan 2019 11:44:49 -0800 (PST) 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=@chromium.org header.s=google header.b=LSObIfuT; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728526AbfAaTan (ORCPT + 99 others); Thu, 31 Jan 2019 14:30:43 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:37726 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbfAaT2b (ORCPT ); Thu, 31 Jan 2019 14:28:31 -0500 Received: by mail-pl1-f196.google.com with SMTP id b5so1931754plr.4 for ; Thu, 31 Jan 2019 11:28:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e3dk7ZZLbgfAGqbWuqUoL9HQGz8pGKWmGgQPHhRwhHc=; b=LSObIfuTa0xQZr+bKcohW5Q4cnEUGVS1uN0e+E+t5yGY3ixq2p0ylnhjahS+VsAoud dfQFfu/K65GhONSXV/9Ig0S2IkwVgCuC03FqMl483WxEI8aBASFGlOqsYI9nwZ+tkzYl 0j0jR+quzA89kEo+E3f8gJx+6sY+4pX2Wao2E= 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:mime-version:content-transfer-encoding; bh=e3dk7ZZLbgfAGqbWuqUoL9HQGz8pGKWmGgQPHhRwhHc=; b=J98yBBEKwk8KGv7hYv79z5FsZo99PhJuu5K4GM40fzuIjvsDF4+i1DyumXprQ6d5oo cIbK0bOUOYov03OpuptdodzFBzRylO9UbUMeG57edI86O41+6Q2fr8/qP6/comZXZvoC 6xHqdTXiK7UwPgC3jR0+6EcImOga5oeHupCi02Tif/FVMMvxmO3i4zCmw/zNReFT6A9z DvtZcNdwUoB/0pNw25Qkysf94LuHBtE6+3BJ7GSOR3awywdV51CpmadmBCvY2Thld8kN BCOoGjX+TUUkJD860SfKeWj0oPw0TjGPni/e4tX+3Ko5VuQYVRkmE9ts20E62AeLt16y 3wog== X-Gm-Message-State: AHQUAuag11DxQ3HIg0MZyIdLkOaB0iQECp57fKxqljdT1wki4ULypQ1P qgS6YFEKE9YFejcPb3zvJlt+rg== X-Received: by 2002:a17:902:e01:: with SMTP id 1mr21126754plw.251.1548962911253; Thu, 31 Jan 2019 11:28:31 -0800 (PST) Received: from skynet.sea.corp.google.com ([2620:15c:17:4:29de:3bb1:1270:e679]) by smtp.gmail.com with ESMTPSA id s130sm11164399pgc.60.2019.01.31.11.28.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 11:28:30 -0800 (PST) From: Thomas Garnier To: kernel-hardening@lists.openwall.com Cc: kristen@linux.intel.com, Thomas Garnier , Juergen Gross , Alok Kataria , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 11/27] x86/paravirt: Adapt assembly for PIE support Date: Thu, 31 Jan 2019 11:24:18 -0800 Message-Id: <20190131192533.34130-12-thgarnie@chromium.org> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog In-Reply-To: <20190131192533.34130-1-thgarnie@chromium.org> References: <20190131192533.34130-1-thgarnie@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 extend the KASLR randomization range below 0xffffffff80000000. 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 488c59686a73..8cfcc1b463de 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -342,9 +342,17 @@ extern struct paravirt_patch_template pv_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" (&(pv_ops.op)) + [paravirt_opptr] paravirt_opptr_type (&(pv_ops.op)) #define paravirt_clobber(clobber) \ [paravirt_clobber] "i" (clobber) @@ -392,7 +400,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.20.1.495.gaa96b0ce6b-goog