From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225Jj1iaiXNznnsI7d0PfApfovEln4aWVI9GhL9CfTFYoF9E7mdr/w2hscAYMH6Ty5IHuzyf ARC-Seal: i=1; a=rsa-sha256; t=1517187623; cv=none; d=google.com; s=arc-20160816; b=Y3Qk/royX1a3BmbhxXHmeG2vrVrwX6WEmyjCPr56AHiFQBDO47n3pFbMNsrGhIb6p2 lwnRInrO6RaDxAh0+siy7XSas+05JaBaNUXaTDGd2AS31BIYzlNzZNLTCyWTvd5L7q+P 5Xss0gXPfzT7XUroAMiWojqHQFINjN8PQ7P0adGHukGA2mdVVyLEBh7mg23ZYWPNrnEK s/AcDfTnvR2dgOiLsrX1+c5Ga+GpO9f2ErEprj+hb6YnFQDlr9jFVYKyvm5ECSWD9mcK rAb4lL0CB699h0vye5qiawiZ3xX4FNgQoGRu3hBEvRBNAjR3m+7sqpt28Q3diOy4tVRd 5PYA== 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=dTEn4bBCrqNONd8mYQeEL8SchV8Fv6uLRNrG2ZNUiB8=; b=auNz5UALZ1MvaJjUvTmE9xLRegtJTcUi/2wU07eP7WCKMEGKn2WErVtiEJr9sU1Seb lgd3OOYW67QEW4ZxwRfE2xkD34ViVbiH8jhJ/Kcj0/73CJ7tSMcBeS/3Zuo6w7DM7Vkw ym/67/ZKFjl1rhyjrUWCtBpXKtjTFe9H9ev+it/6s8K7wqZ9G79r1P5g3KbXw12Q1xsp ZFmGODH/4TiAKgA99bDpxtY6cpl5oGtweQ8YVkF+ZHp1PdEGvGHqdmLywbt1YSNsOoRl kXFfKf3dmWApczsrAnNTwl/hL9dNyWouD6zmFTEPV+AtKuyOkqf3qSMiwhYmEZ4ajsnq k4NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=WfhlK+Bu; spf=pass (google.com: domain of prvs=56008dfb3=karahmed@amazon.com designates 207.171.190.10 as permitted sender) smtp.mailfrom=prvs=56008dfb3=karahmed@amazon.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.de Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=WfhlK+Bu; spf=pass (google.com: domain of prvs=56008dfb3=karahmed@amazon.com designates 207.171.190.10 as permitted sender) smtp.mailfrom=prvs=56008dfb3=karahmed@amazon.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.de X-IronPort-AV: E=Sophos;i="5.46,428,1511827200"; d="scan'208";a="717361308" From: KarimAllah Ahmed To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: KarimAllah Ahmed , Asit Mallick , Dave Hansen , Arjan Van De Ven , Tim Chen , Linus Torvalds , Andrea Arcangeli , Andi Kleen , Thomas Gleixner , Dan Williams , Jun Nakajima , Andy Lutomirski , Greg KH , Paolo Bonzini , Ashok Raj Subject: [PATCH v2 4/4] x86: vmx: Allow direct access to MSR_IA32_ARCH_CAPABILITIES Date: Mon, 29 Jan 2018 01:58:52 +0100 Message-Id: <1517187532-32286-5-git-send-email-karahmed@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517187532-32286-1-git-send-email-karahmed@amazon.de> References: <1517187532-32286-1-git-send-email-karahmed@amazon.de> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590886528088148863?= X-GMAIL-MSGID: =?utf-8?q?1590886528088148863?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Add direct access to MSR_IA32_SPEC_CTRL for guests. Future intel processors will use this MSR to indicate RDCL_NO (bit 0) and IBRS_ALL (bit 1). Cc: Asit Mallick Cc: Dave Hansen Cc: Arjan Van De Ven Cc: Tim Chen Cc: Linus Torvalds Cc: Andrea Arcangeli Cc: Andi Kleen Cc: Thomas Gleixner Cc: Dan Williams Cc: Jun Nakajima Cc: Andy Lutomirski Cc: Greg KH Cc: Paolo Bonzini Cc: Ashok Raj Signed-off-by: KarimAllah Ahmed --- arch/x86/kvm/cpuid.c | 4 +++- arch/x86/kvm/vmx.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 32c0c14..2339b1a 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -71,6 +71,7 @@ u64 kvm_supported_xcr0(void) #define KVM_CPUID_BIT_AVX512_4VNNIW 2 #define KVM_CPUID_BIT_AVX512_4FMAPS 3 #define KVM_CPUID_BIT_IBRS 26 +#define KVM_CPUID_BIT_ARCH_CAPABILITIES 29 #define KF(x) bit(KVM_CPUID_BIT_##x) int kvm_update_cpuid(struct kvm_vcpu *vcpu) @@ -394,7 +395,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, /* cpuid 7.0.edx*/ const u32 kvm_cpuid_7_0_edx_x86_features = KF(AVX512_4VNNIW) | KF(AVX512_4FMAPS) | \ - (boot_cpu_has(X86_FEATURE_IBRS) ? KF(IBRS) : 0); + (boot_cpu_has(X86_FEATURE_IBRS) ? KF(IBRS) : 0) | \ + (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES) ? KF(ARCH_CAPABILITIES) : 0); /* all calls to cpuid_count() should be made on the same cpu */ get_cpu(); diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index f82a44c..99cb761 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9617,6 +9617,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) if (boot_cpu_has(X86_FEATURE_IBPB)) vmx_disable_intercept_for_msr(msr_bitmap, MSR_IA32_PRED_CMD, MSR_TYPE_RW); + if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) + vmx_disable_intercept_for_msr(msr_bitmap, MSR_IA32_ARCH_CAPABILITIES, MSR_TYPE_R); vmx_disable_intercept_for_msr(msr_bitmap, MSR_FS_BASE, MSR_TYPE_RW); vmx_disable_intercept_for_msr(msr_bitmap, MSR_GS_BASE, MSR_TYPE_RW); vmx_disable_intercept_for_msr(msr_bitmap, MSR_KERNEL_GS_BASE, MSR_TYPE_RW); -- 2.7.4