Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp16807ima; Thu, 31 Jan 2019 11:38:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN6cSsX2ltG5ofUXE4FA3aCGAQ+ROd4hmBZZnCPvVs6AaTS+L11TstUntQ7YAZZFqeIVal4a X-Received: by 2002:a63:ed03:: with SMTP id d3mr32338296pgi.275.1548963484151; Thu, 31 Jan 2019 11:38:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548963484; cv=none; d=google.com; s=arc-20160816; b=DlRbrWvc1GEABBjyfV/y8kgEzex96CzG//oLTJVAtmTaAtuye/xEs6ePZ1I75E7fMx 5RUQu3CS00YhdPC49U0zzDy/dHvd0nk+YKXpcSpgys+K5f3ql5G6PGP3YQ3jRK5tsbil VHf3UQLeyODcQ6AYdElujCuMssemUPAbTIbPYiJU+f6UKly9XgR28kyEu2Bs9m4x18QB VC/l8N1oQHcueEmaLWqN5bbHTJ2CfGzQMsvN3XD+qSSNdx7I4ZmVu+DM3/IdoIXA3XjX LU8Ic66X/+bF+jspmmbF2qfz1qs47Kg933FD/ioL1tXCDAlLEzXVKWLOinVEAGrNThlo 41Mw== 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=xWChR7F0A4W4AZDg/y9+mR/BGhN5+3zmASBqt7KIKCo=; b=GcvjuTpw+RMMojOIMI/U+lg+4kdViuES/zBWvxVhRpbB4Bk5VIAzfDB3RLmo+R+Htq qhBAEMdsd85XtSzCQ7AqHG++9I9baBnkc5OcLvEW8c4nANwEp0Wu9S0d92ypyYhW4jOv MdLO0hv9xxuoaGeqb4fE1JzLW/W5M1FTj0LZfSIV+/k5JQSUd18u0vER1R9NsMJWg1dP N7vKK5caUcYIvp0q1uzErm/8FvsfB0OlLgfg6GD1gE8HZnIxVfhwXEW9EjwKBCTA/Q4z noQJgDES6cX/PzwwiP9c0bhgdjLPs5rnSkJf9b1LJkJvTwc70RlEPMLtu4CbsSjf7VjT MRlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=CVHCH361; 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 cf16si5647737plb.227.2019.01.31.11.37.49; Thu, 31 Jan 2019 11:38:04 -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=CVHCH361; 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 S1729398AbfAaT3F (ORCPT + 99 others); Thu, 31 Jan 2019 14:29:05 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:37638 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729317AbfAaT3C (ORCPT ); Thu, 31 Jan 2019 14:29:02 -0500 Received: by mail-pg1-f196.google.com with SMTP id c25so1783696pgb.4 for ; Thu, 31 Jan 2019 11:29:01 -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=xWChR7F0A4W4AZDg/y9+mR/BGhN5+3zmASBqt7KIKCo=; b=CVHCH361Hzk6Oo+z0ojJCfK8qTMcMvTvLaWBx+1y7/r+EdWqRjX+QpM/ZhfELfNiza ej/mEuQS6Ai7vdacf65cmOWMrEZzGq21+HF3IrG2pm+QGQ2QPrIfDq7uWK2wUuq8Xu9X 0IrAqRsK/Wmy0KZdyiHLg8m/CuHQrsDJUzpCU= 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=xWChR7F0A4W4AZDg/y9+mR/BGhN5+3zmASBqt7KIKCo=; b=Is5k/8YPCnvOjTWrkV7gRbRpCcydPVXEvlrJVN6cGtD4cROD8ruWAKrta+6/Rm4FRs flijGqEAL2wsCo+1CqOnPIMgDGL+IIh8v1pUDzAavOmcqcSyO3ZjMci4AMk1KWam2w5g 8eWehjLz+86sNnYQ16yqasu/57ROxPH/ykN6ijhBCNkKymTRHebpzOum5ygupTPCSxFF WbNcZ2PlTj20HNPQ/dAngOwFOV3TXU9k6xUfIdpQDEH1LfWSb5oJBm9RR7vuRw14GJkz 3rqs1YEeGpa2rxGVMm6y15m7T4PE26oSysDM+AVwKKITdz5to2DW6OMJU7M0V4T48vp5 WVZg== X-Gm-Message-State: AJcUukdA4WebwIMgmLAZU/AYUuzcQOWcODs3SFpi3XsjxghHBW/hc5Fd EJisEarAfa7buaC805D/RuqTuQ== X-Received: by 2002:a63:1a0c:: with SMTP id a12mr32101599pga.157.1548962941290; Thu, 31 Jan 2019 11:29:01 -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.29.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 11:29:00 -0800 (PST) From: Thomas Garnier To: kernel-hardening@lists.openwall.com Cc: kristen@linux.intel.com, Thomas Garnier , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 19/27] kvm: Adapt assembly for PIE support Date: Thu, 31 Jan 2019 11:24:26 -0800 Message-Id: <20190131192533.34130-20-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 Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. The new __ASM_MOVABS macro is used to get the address of a symbol on both 32 and 64-bit with PIE support. Position Independent Executable (PIE) support will allow to extend the KASLR randomization range below 0xffffffff80000000. Signed-off-by: Thomas Garnier --- arch/x86/include/asm/kvm_host.h | 8 ++++++-- arch/x86/kernel/kvm.c | 6 ++++-- arch/x86/kvm/svm.c | 4 ++-- arch/x86/kvm/vmx/vmx.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 4660ce90de7f..fdb3307d5fe1 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1498,9 +1498,13 @@ asmlinkage void kvm_spurious_fault(void); ".pushsection .fixup, \"ax\" \n" \ "667: \n\t" \ cleanup_insn "\n\t" \ - "cmpb $0, kvm_rebooting \n\t" \ + "cmpb $0, kvm_rebooting" __ASM_SEL(, (%%rip)) " \n\t" \ "jne 668b \n\t" \ - __ASM_SIZE(push) " $666b \n\t" \ + __ASM_SIZE(push) "$0 \n\t" \ + __ASM_SIZE(push) "%%" _ASM_AX " \n\t" \ + _ASM_MOVABS " $666b, %%" _ASM_AX "\n\t" \ + _ASM_MOV " %%" _ASM_AX ", " __ASM_SEL(4, 8) "(%%" _ASM_SP ") \n\t" \ + __ASM_SIZE(pop) "%%" _ASM_AX " \n\t" \ "jmp kvm_spurious_fault \n\t" \ ".popsection \n\t" \ _ASM_EXTABLE(666b, 667b) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 5c93a65ee1e5..f6eb02004e43 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -826,8 +826,10 @@ asm( ".global __raw_callee_save___kvm_vcpu_is_preempted;" ".type __raw_callee_save___kvm_vcpu_is_preempted, @function;" "__raw_callee_save___kvm_vcpu_is_preempted:" -"movq __per_cpu_offset(,%rdi,8), %rax;" -"cmpb $0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);" +"leaq __per_cpu_offset(%rip), %rax;" +"movq (%rax,%rdi,8), %rax;" +"addq " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rip), %rax;" +"cmpb $0, (%rax);" "setne %al;" "ret;" ".popsection"); diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index f13a3a24d360..26abb82b1b67 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -706,12 +706,12 @@ static u32 svm_msrpm_offset(u32 msr) static inline void clgi(void) { - asm volatile (__ex("clgi")); + asm volatile (__ex("clgi") : :); } static inline void stgi(void) { - asm volatile (__ex("stgi")); + asm volatile (__ex("stgi") : :); } static inline void invlpga(unsigned long addr, u32 asid) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 4341175339f3..3275761a7375 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2161,7 +2161,7 @@ static void vmclear_local_loaded_vmcss(void) */ static void kvm_cpu_vmxoff(void) { - asm volatile (__ex("vmxoff")); + asm volatile (__ex("vmxoff") :::); intel_pt_handle_vmx(0); cr4_clear_bits(X86_CR4_VMXE); -- 2.20.1.495.gaa96b0ce6b-goog