Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1719241
| From | Paolo Bonzini <pbonzini@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/4] kvm: vmx: Raise #UD on unsupported RDSEED |
| Date | 2017-08-24 15:40 +0200 |
| Message-ID | <ui0wy-7c2-19@gated-at.bofh.it> (permalink) |
| References | <ui0wy-7c2-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Jim Mattson <jmattson@google.com>
A guest may not be configured to support RDSEED, even when the host
does. If the guest does not support RDSEED, intercept the instruction
and synthesize #UD. Also clear the "allowed-1" bit for RDSEED exiting
in the IA32_VMX_PROCBASED_CTLS2 MSR.
Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/kvm/vmx.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 1f2c69de7872..954e26079cd6 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2818,7 +2818,6 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)
vmx->nested.nested_vmx_secondary_ctls_high);
vmx->nested.nested_vmx_secondary_ctls_low = 0;
vmx->nested.nested_vmx_secondary_ctls_high &=
- SECONDARY_EXEC_RDSEED |
SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
SECONDARY_EXEC_DESC |
SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |
@@ -3671,6 +3670,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
SECONDARY_EXEC_SHADOW_VMCS |
SECONDARY_EXEC_XSAVES |
+ SECONDARY_EXEC_RDSEED |
SECONDARY_EXEC_RDRAND |
SECONDARY_EXEC_ENABLE_PML |
SECONDARY_EXEC_TSC_SCALING |
@@ -5280,6 +5280,12 @@ static bool vmx_rdrand_supported(void)
SECONDARY_EXEC_RDRAND;
}
+static bool vmx_rdseed_supported(void)
+{
+ return vmcs_config.cpu_based_2nd_exec_ctrl &
+ SECONDARY_EXEC_RDSEED;
+}
+
static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx)
{
struct kvm_vcpu *vcpu = &vmx->vcpu;
@@ -5364,6 +5370,21 @@ static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx)
}
}
+ if (vmx_rdseed_supported()) {
+ bool rdseed_enabled = guest_cpuid_has(vcpu, X86_FEATURE_RDSEED);
+ if (rdseed_enabled)
+ exec_control &= ~SECONDARY_EXEC_RDSEED;
+
+ if (nested) {
+ if (rdseed_enabled)
+ vmx->nested.nested_vmx_secondary_ctls_high |=
+ SECONDARY_EXEC_RDSEED;
+ else
+ vmx->nested.nested_vmx_secondary_ctls_high &=
+ ~SECONDARY_EXEC_RDSEED;
+ }
+ }
+
vmx->secondary_exec_control = exec_control;
}
@@ -8119,6 +8140,7 @@ static int (*const kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
[EXIT_REASON_INVEPT] = handle_invept,
[EXIT_REASON_INVVPID] = handle_invvpid,
[EXIT_REASON_RDRAND] = handle_invalid_op,
+ [EXIT_REASON_RDSEED] = handle_invalid_op,
[EXIT_REASON_XSAVES] = handle_xsaves,
[EXIT_REASON_XRSTORS] = handle_xrstors,
[EXIT_REASON_PML_FULL] = handle_pml_full,
--
1.8.3.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v7 0/4] Raise #UD and disable execution controls for more CPUID bits Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 15:40 +0200
[PATCH 3/4] kvm: vmx: Raise #UD on unsupported RDSEED Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 15:40 +0200
Re: [PATCH 3/4] kvm: vmx: Raise #UD on unsupported RDSEED David Hildenbrand <david@redhat.com> - 2017-08-24 19:50 +0200
[PATCH 1/4] KVM: VMX: cache secondary exec controls Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 15:40 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Jim Mattson <jmattson@google.com> - 2017-08-24 16:50 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 17:30 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Jim Mattson <jmattson@google.com> - 2017-08-24 17:50 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 17:50 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 18:10 +0200
Re: [PATCH 1/4] KVM: VMX: cache secondary exec controls Jim Mattson <jmattson@google.com> - 2017-08-24 18:10 +0200
[PATCH 2/4] kvm: vmx: Raise #UD on unsupported RDRAND Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 15:40 +0200
Re: [PATCH 2/4] kvm: vmx: Raise #UD on unsupported RDRAND David Hildenbrand <david@redhat.com> - 2017-08-24 19:50 +0200
[PATCH 4/4] kvm: vmx: Raise #UD on unsupported XSAVES/XRSTORS Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 15:40 +0200
Re: [PATCH 4/4] kvm: vmx: Raise #UD on unsupported XSAVES/XRSTORS Jim Mattson <jmattson@google.com> - 2017-08-24 17:00 +0200
[PATCH v8 4/4] kvm: vmx: Raise #UD on unsupported XSAVES/XRSTORS Paolo Bonzini <pbonzini@redhat.com> - 2017-08-24 18:20 +0200
Re: [PATCH v8 4/4] kvm: vmx: Raise #UD on unsupported XSAVES/XRSTORS Jim Mattson <jmattson@google.com> - 2017-08-24 22:50 +0200
csiph-web