Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

gregkh · gregkh · commit 7ec21823634d · 2018-10-13T15:11:15.000+02:00
Paolo writes:
  "KVM fixes for 4.19-rc8

   Leftover bugfixes."

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: vmx: hyper-v: don't pass EPT configuration info to vmx_hv_remote_flush_tlb()
  KVM: x86: support CONFIG_KVM_AMD=y with CONFIG_CRYPTO_DEV_CCP_DD=m
  ARM: KVM: Correctly order SGI register entries in the cp15 array
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
@@ -478,15 +478,15 @@ static const struct coproc_reg cp15_regs[] = {
 
 	/* ICC_SGI1R */
 	{ CRm64(12), Op1( 0), is64, access_gic_sgi},
-	/* ICC_ASGI1R */
-	{ CRm64(12), Op1( 1), is64, access_gic_sgi},
-	/* ICC_SGI0R */
-	{ CRm64(12), Op1( 2), is64, access_gic_sgi},
 
 	/* VBAR: swapped by interrupt.S. */
 	{ CRn(12), CRm( 0), Op1( 0), Op2( 0), is32,
 			NULL, reset_val, c12_VBAR, 0x00000000 },
 
+	/* ICC_ASGI1R */
+	{ CRm64(12), Op1( 1), is64, access_gic_sgi},
+	/* ICC_SGI0R */
+	{ CRm64(12), Op1( 2), is64, access_gic_sgi},
 	/* ICC_SRE */
 	{ CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre },
 
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
@@ -436,14 +436,18 @@ static inline struct kvm_svm *to_kvm_svm(struct kvm *kvm)
 
 static inline bool svm_sev_enabled(void)
 {
-	return max_sev_asid;
+	return IS_ENABLED(CONFIG_KVM_AMD_SEV) ? max_sev_asid : 0;
 }
 
 static inline bool sev_guest(struct kvm *kvm)
 {
+#ifdef CONFIG_KVM_AMD_SEV
 	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
 
 	return sev->active;
+#else
+	return false;
+#endif
 }
 
 static inline int sev_get_asid(struct kvm *kvm)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
@@ -1572,8 +1572,12 @@ static int vmx_hv_remote_flush_tlb(struct kvm *kvm)
 		goto out;
 	}
 
+	/*
+	 * FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE hypercall needs the address of the
+	 * base of EPT PML4 table, strip off EPT configuration information.
+	 */
 	ret = hyperv_flush_guest_mapping(
-			to_vmx(kvm_get_vcpu(kvm, 0))->ept_pointer);
+			to_vmx(kvm_get_vcpu(kvm, 0))->ept_pointer & PAGE_MASK);
 
 out:
 	spin_unlock(&to_kvm_vmx(kvm)->ept_pointer_lock);

Original file line number	Diff line number	Diff line change
`@@ -436,14 +436,18 @@ static inline struct kvm_svm to_kvm_svm(struct kvm kvm)`
`436`	`436`
`437`	`437`	`static inline bool svm_sev_enabled(void)`
`438`	`438`	`{`
`439`		`- return max_sev_asid;`
	`439`	`+ return IS_ENABLED(CONFIG_KVM_AMD_SEV) ? max_sev_asid : 0;`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`static inline bool sev_guest(struct kvm *kvm)`
`443`	`443`	`{`
	`444`	`+#ifdef CONFIG_KVM_AMD_SEV`
`444`	`445`	`struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;`
`445`	`446`
`446`	`447`	`return sev->active;`
	`448`	`+#else`
	`449`	`+ return false;`
	`450`	`+#endif`
`447`	`451`	`}`
`448`	`452`
`449`	`453`	`static inline int sev_get_asid(struct kvm *kvm)`