From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227cBKYakfkSBUp1tAvEowttmmcCnBUyOwmM1L4bEtaC+n6I++5tii7TQWFr6s7cjBcoQAsf ARC-Seal: i=1; a=rsa-sha256; t=1517271110; cv=none; d=google.com; s=arc-20160816; b=0KAubqOj4OpYorcNyZG7dMGRxKOPqlvNFzZceldt1A9Dm3ToX1AjW1F4ASx2v8ZKGF tdTCvEKWy5yDgib4ygm073xe5CIF7y3VAwRu84wiyyNo7p4a/43HAcPa7s0pBIp2AFJ5 Rh7pbYDJeKkCJ1eEpa2hxVzKQokjg7JX5ZzZ/EQIRxgqoRvjew2WAZB+txXRFGw4S65b Cr7vpxYzE9biWdHyNx/RDEpvMtKSqe9FJ3vCDLqUbkp5BlLNlwgzEMxU6H6xGvkN9H7i FM9VgzfbW6XOFEDRt4DDzzKTSyE7IJQBwUgQwLxKKMyp/H9fwz/PLgidy/Emyg5A1u8z wh/g== 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=kXKKRROnDhkPD0hKNfqAmr3jpBzAjtkrfKgATFFio1Q=; b=ZyNt+1PEYjyeZW1Z3vrw0KUlhJkhUwPvI7yi8i83A2NOqikgjQte4qAYdvtAvRPWOl abnLv2+E1ZjDNtTAsU/gXtIfLfXwENezFZvxQgGQgy0NgSY2Rszg2/8cRQdyGT9tB9LH 9Fdg2+VOCCvghPsLI90VCJHLOKObGZ2Oubl/Ek7NcMMkHE7/lo2Jo5+C8qUWQBlOYn/4 H5pF7V5R0GzWQeVpcsqiFHUX3ZZhLKeH/JatbgYqmf+lP3EqPLb81wzBZQo/0h4O+fHv z2vOyqmopyJ/dAhx6kqq3NNcnFUOcVRMmCspB1u8rr7Vo89ksDK6GM8XycfhxnEPsDwK SoWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=sRIJ0vCG; spf=pass (google.com: domain of prvs=561eaea62=karahmed@amazon.com designates 207.171.184.29 as permitted sender) smtp.mailfrom=prvs=561eaea62=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=sRIJ0vCG; spf=pass (google.com: domain of prvs=561eaea62=karahmed@amazon.com designates 207.171.184.29 as permitted sender) smtp.mailfrom=prvs=561eaea62=karahmed@amazon.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.de X-IronPort-AV: E=Sophos;i="5.46,433,1511827200"; d="scan'208";a="591103180" 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 , David Woodhouse Subject: [PATCH v3 3/4] KVM: VMX: Emulate MSR_IA32_ARCH_CAPABILITIES Date: Tue, 30 Jan 2018 01:10:27 +0100 Message-Id: <1517271028-15916-4-git-send-email-karahmed@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517271028-15916-1-git-send-email-karahmed@amazon.de> References: <1517271028-15916-1-git-send-email-karahmed@amazon.de> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590974072319856252?= X-GMAIL-MSGID: =?utf-8?q?1590974072319856252?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Future intel processors will use MSR_IA32_ARCH_CAPABILITIES MSR to indicate RDCL_NO (bit 0) and IBRS_ALL (bit 1). This is a read-only MSR. By default the contents will come directly from the hardware, but user-space can still override it. [dwmw2: The bit in kvm_cpuid_7_0_edx_x86_features can be unconditional] 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 Signed-off-by: David Woodhouse --- arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/vmx.c | 15 +++++++++++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 033004d..1909635 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -394,7 +394,7 @@ 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 = - F(AVX512_4VNNIW) | F(AVX512_4FMAPS); + F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(ARCH_CAPABILITIES); /* 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 ea278ce..798a00b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -581,6 +581,8 @@ struct vcpu_vmx { u64 msr_host_kernel_gs_base; u64 msr_guest_kernel_gs_base; #endif + u64 arch_capabilities; + u32 vm_entry_controls_shadow; u32 vm_exit_controls_shadow; u32 secondary_exec_control; @@ -3224,6 +3226,12 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_TSC: msr_info->data = guest_read_tsc(vcpu); break; + case MSR_IA32_ARCH_CAPABILITIES: + if (!msr_info->host_initiated && + !guest_cpuid_has(vcpu, X86_FEATURE_ARCH_CAPABILITIES)) + return 1; + msr_info->data = to_vmx(vcpu)->arch_capabilities; + break; case MSR_IA32_SYSENTER_CS: msr_info->data = vmcs_read32(GUEST_SYSENTER_CS); break; @@ -3339,6 +3347,11 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) if (data & PRED_CMD_IBPB) wrmsrl(MSR_IA32_PRED_CMD, PRED_CMD_IBPB); break; + case MSR_IA32_ARCH_CAPABILITIES: + if (!msr_info->host_initiated) + return 1; + vmx->arch_capabilities = data; + break; case MSR_IA32_CR_PAT: if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data)) @@ -5599,6 +5612,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) ++vmx->nmsrs; } + if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) + rdmsrl(MSR_IA32_ARCH_CAPABILITIES, vmx->arch_capabilities); vm_exit_controls_init(vmx, vmcs_config.vmexit_ctrl); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 03869eb..8e889dc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1006,6 +1006,7 @@ static u32 msrs_to_save[] = { #endif MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, MSR_IA32_FEATURE_CONTROL, MSR_IA32_BNDCFGS, MSR_TSC_AUX, + MSR_IA32_ARCH_CAPABILITIES }; static unsigned num_msrs_to_save; -- 2.7.4