Skip to contentSkip to conversation

kvm: svm: Intercept RDPRU

PATCH Applied Jim Mattson 3 participants 4 messages Sep 19, 2019 – Sep 24, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm: svm: Intercept RDPRU

The RDPRU instruction gives the guest read access to the IA32_APERF MSR and the IA32_MPERF MSR. According to volume 3 of the APM, "When virtualization is enabled, this instruction can be intercepted by the Hypervisor. The intercept bit is at VMCB byte offset 10h, bit 14." Since we don't enumerate the instruction in KVM_SUPPORTED_CPUID, intercept it and synthesize #UD.

---
 arch/x86/include/asm/svm.h      | 1 +
 arch/x86/include/uapi/asm/svm.h | 1 +
 arch/x86/kvm/svm.c              | 8 ++++++++
 3 files changed, 10 insertions(+)
arch/x86/include/asm/svm.h +1 -0
index dec9c1e84c78..6ece8561ba66 100644
@@ -52,6 +52,7 @@ enum {
 	INTERCEPT_MWAIT,
 	INTERCEPT_MWAIT_COND,
 	INTERCEPT_XSETBV,
+	INTERCEPT_RDPRU,
 };
 
 
arch/x86/include/uapi/asm/svm.h +1 -0
index a9731f8a480f..2e8a30f06c74 100644
@@ -75,6 +75,7 @@
 #define SVM_EXIT_MWAIT         0x08b
 #define SVM_EXIT_MWAIT_COND    0x08c
 #define SVM_EXIT_XSETBV        0x08d
+#define SVM_EXIT_RDPRU         0x08e
 #define SVM_EXIT_NPF           0x400
 #define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401
 #define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402
arch/x86/kvm/svm.c +8 -0
index 04fe21849b6e..cef00e959679 100644
@@ -1539,6 +1539,7 @@ static void init_vmcb(struct vcpu_svm *svm)
 	set_intercept(svm, INTERCEPT_SKINIT);
 	set_intercept(svm, INTERCEPT_WBINVD);
 	set_intercept(svm, INTERCEPT_XSETBV);
+	set_intercept(svm, INTERCEPT_RDPRU);
 	set_intercept(svm, INTERCEPT_RSM);
 
 	if (!kvm_mwait_in_guest(svm->vcpu.kvm)) {
@@ -3830,6 +3831,12 @@ static int xsetbv_interception(struct vcpu_svm *svm)
 	return 1;
 }
 
+static int rdpru_interception(struct vcpu_svm *svm)
+{
+	kvm_queue_exception(&svm->vcpu, UD_VECTOR);
+	return 1;
+}
+
 static int task_switch_interception(struct vcpu_svm *svm)
 {
 	u16 tss_selector;
@@ -4791,6 +4798,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {
 	[SVM_EXIT_MONITOR]			= monitor_interception,
 	[SVM_EXIT_MWAIT]			= mwait_interception,
 	[SVM_EXIT_XSETBV]			= xsetbv_interception,
+	[SVM_EXIT_RDPRU]			= rdpru_interception,
 	[SVM_EXIT_NPF]				= npf_interception,
 	[SVM_EXIT_RSM]                          = rsm_interception,
 	[SVM_EXIT_AVIC_INCOMPLETE_IPI]		= avic_incomplete_ipi_interception,
Signature · 1 line
2.23.0.351.gc4317032e6-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 67 lines · Jim Mattson

The RDPRU instruction gives the guest read access to the IA32_APERF MSR and the IA32_MPERF MSR. According to volume 3 of the APM, "When virtualization is enabled, this instruction can be intercepted by the Hypervisor. The intercept bit is at VMCB byte offset 10h, bit 14." Since we don't enumerate the instruction in KVM_SUPPORTED_CPUID, intercept it and synthesize #UD.

---
  arch/x86/include/asm/svm.h      | 1 +
  arch/x86/include/uapi/asm/svm.h | 1 +
  arch/x86/kvm/svm.c              | 8 ++++++++
  3 files changed, 10 insertions(+)
arch/x86/include/asm/svm.h +1 -0
index dec9c1e84c78..6ece8561ba66 100644
@@ -52,6 +52,7 @@ enum {
  	INTERCEPT_MWAIT,
  	INTERCEPT_MWAIT_COND,
  	INTERCEPT_XSETBV,
+	INTERCEPT_RDPRU,
  };
 
 
arch/x86/include/uapi/asm/svm.h +1 -0
index a9731f8a480f..2e8a30f06c74 100644
@@ -75,6 +75,7 @@
  #define SVM_EXIT_MWAIT         0x08b
  #define SVM_EXIT_MWAIT_COND    0x08c
  #define SVM_EXIT_XSETBV        0x08d
+#define SVM_EXIT_RDPRU         0x08e
  #define SVM_EXIT_NPF           0x400
  #define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401
  #define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402
arch/x86/kvm/svm.c +7 -0
index 04fe21849b6e..cef00e959679 100644
@@ -1539,6 +1539,7 @@ static void init_vmcb(struct vcpu_svm *svm)
  	set_intercept(svm, INTERCEPT_SKINIT);
  	set_intercept(svm, INTERCEPT_WBINVD);
  	set_intercept(svm, INTERCEPT_XSETBV);
+	set_intercept(svm, INTERCEPT_RDPRU);
  	set_intercept(svm, INTERCEPT_RSM);
 
  	if (!kvm_mwait_in_guest(svm->vcpu.kvm)) {
@@ -3830,6 +3831,12 @@ static int xsetbv_interception(struct vcpu_svm *svm)
  	return 1;
  }
 
+static int rdpru_interception(struct vcpu_svm *svm)
+{
+	kvm_queue_exception(&svm->vcpu, UD_VECTOR);
+	return 1;
+}
+
  static int task_switch_interception(struct vcpu_svm *svm)
  {
  	u16 tss_selector;

arch/x86/kvm/svm.c static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = { · line 4804

Quoted 7 lines
arch/x86/kvm/svm.c +1 -0
@@ -4791,6 +4798,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {
  	[SVM_EXIT_MONITOR]			= monitor_interception,
  	[SVM_EXIT_MWAIT]			= mwait_interception,
  	[SVM_EXIT_XSETBV]			= xsetbv_interception,
+	[SVM_EXIT_RDPRU]			= rdpru_interception,
  	[SVM_EXIT_NPF]				= npf_interception,
  	[SVM_EXIT_RSM]                          = rsm_interception,
  	[SVM_EXIT_AVIC_INCOMPLETE_IPI]		= avic_incomplete_ipi_interception,
maintainer Applied
#2 lore raw
In reply to Jim Mattson
Quoted 11 lines · Jim Mattson

The RDPRU instruction gives the guest read access to the IA32_APERF MSR and the IA32_MPERF MSR. According to volume 3 of the APM, "When virtualization is enabled, this instruction can be intercepted by the Hypervisor. The intercept bit is at VMCB byte offset 10h, bit 14." Since we don't enumerate the instruction in KVM_SUPPORTED_CPUID, intercept it and synthesize #UD.

Ugly stuff---Intel did the right thing in making the execution controls "enable xxx" (xxx = RDRAND, RDSEED, etc.).

Queued, thanks.

Paolo

Quoted 64 lines
---
 arch/x86/include/asm/svm.h      | 1 +
 arch/x86/include/uapi/asm/svm.h | 1 +
 arch/x86/kvm/svm.c              | 8 ++++++++
 3 files changed, 10 insertions(+)
arch/x86/include/asm/svm.h +1 -0
index dec9c1e84c78..6ece8561ba66 100644
@@ -52,6 +52,7 @@ enum {
 	INTERCEPT_MWAIT,
 	INTERCEPT_MWAIT_COND,
 	INTERCEPT_XSETBV,
+	INTERCEPT_RDPRU,
 };
 
 
arch/x86/include/uapi/asm/svm.h +1 -0
index a9731f8a480f..2e8a30f06c74 100644
@@ -75,6 +75,7 @@
 #define SVM_EXIT_MWAIT         0x08b
 #define SVM_EXIT_MWAIT_COND    0x08c
 #define SVM_EXIT_XSETBV        0x08d
+#define SVM_EXIT_RDPRU         0x08e
 #define SVM_EXIT_NPF           0x400
 #define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401
 #define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402
arch/x86/kvm/svm.c +8 -0
index 04fe21849b6e..cef00e959679 100644
@@ -1539,6 +1539,7 @@ static void init_vmcb(struct vcpu_svm *svm)
 	set_intercept(svm, INTERCEPT_SKINIT);
 	set_intercept(svm, INTERCEPT_WBINVD);
 	set_intercept(svm, INTERCEPT_XSETBV);
+	set_intercept(svm, INTERCEPT_RDPRU);
 	set_intercept(svm, INTERCEPT_RSM);
 
 	if (!kvm_mwait_in_guest(svm->vcpu.kvm)) {
@@ -3830,6 +3831,12 @@ static int xsetbv_interception(struct vcpu_svm *svm)
 	return 1;
 }
 
+static int rdpru_interception(struct vcpu_svm *svm)
+{
+	kvm_queue_exception(&svm->vcpu, UD_VECTOR);
+	return 1;
+}
+
 static int task_switch_interception(struct vcpu_svm *svm)
 {
 	u16 tss_selector;
@@ -4791,6 +4798,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {
 	[SVM_EXIT_MONITOR]			= monitor_interception,
 	[SVM_EXIT_MWAIT]			= mwait_interception,
 	[SVM_EXIT_XSETBV]			= xsetbv_interception,
+	[SVM_EXIT_RDPRU]			= rdpru_interception,
 	[SVM_EXIT_NPF]				= npf_interception,
 	[SVM_EXIT_RSM]                          = rsm_interception,
 	[SVM_EXIT_AVIC_INCOMPLETE_IPI]		= avic_incomplete_ipi_interception,
#3 lore raw
Quoted 2 lines · Paolo Bonzini

Ugly stuff---Intel did the right thing in making the execution controls "enable xxx" (xxx = RDRAND, RDSEED, etc.).

I agree. RDPRU should have been disabled by default, or at least guarded by a new EFER bit, like MCOMMIT is.