[PATCH hyperv-next v5 04/16] arch/x86: mshyperv: Trap on access for some synthetic MSRs

[Roman Kisel <romank@linux.microsoft.com>]

hv_set_non_nested_msr() has special handling for SINT MSRs
when a paravisor is present. In addition to updating the MSR on the
host, the mirror MSR in the paravisor is updated, including with the
proxy bit. But with Confidential VMBus, the proxy bit must not be
used, so add a special case to skip it.

Signed-off-by: Roman Kisel <romank@linux.microsoft.com>
Reviewed-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Reviewed-by: Tianyu Lan <tiala@microsoft.com>
---
 arch/x86/include/asm/mshyperv.h |  2 ++
 arch/x86/kernel/cpu/mshyperv.c  | 28 +++++++++++++++++++++++++---
 drivers/hv/hv_common.c          |  5 +++++
 include/asm-generic/mshyperv.h  |  1 +
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index abc4659f5809..4905343c246e 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -42,6 +42,8 @@ static inline unsigned char hv_get_nmi_reason(void)
 #if IS_ENABLED(CONFIG_HYPERV)
 extern bool hyperv_paravisor_present;
 
+extern u64 hyperv_sint_proxy_mask;
+
 extern void *hv_hypercall_pg;
 
 extern union hv_ghcb * __percpu *hv_ghcb_pg;
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index a619b661275b..5e2c6fd637d2 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -28,6 +28,7 @@
 #include <asm/apic.h>
 #include <asm/timer.h>
 #include <asm/reboot.h>
+#include <asm/msr.h>
 #include <asm/nmi.h>
 #include <clocksource/hyperv_timer.h>
 #include <asm/msr.h>
@@ -38,6 +39,16 @@
 bool hv_nested;
 struct ms_hyperv_info ms_hyperv;
 
+#define HYPERV_SINT_PROXY_ENABLE	BIT(20)
+#define HYPERV_SINT_PROXY_DISABLE	0
+
+/*
+ * When running with the paravisor, proxy the synthetic interrupts from the host
+ * by default
+ */
+u64 hv_para_sint_proxy = HYPERV_SINT_PROXY_ENABLE;
+EXPORT_SYMBOL_GPL(hv_para_sint_proxy);
+
 /* Used in modules via hv_do_hypercall(): see arch/x86/include/asm/mshyperv.h */
 bool hyperv_paravisor_present __ro_after_init;
 EXPORT_SYMBOL_GPL(hyperv_paravisor_present);
@@ -79,13 +90,14 @@ EXPORT_SYMBOL_GPL(hv_get_non_nested_msr);
 void hv_set_non_nested_msr(unsigned int reg, u64 value)
 {
 	if (hv_is_synic_msr(reg) && ms_hyperv.paravisor_present) {
+		/* The hypervisor will get the intercept. */
 		hv_ivm_msr_write(reg, value);
 
-		/* Write proxy bit via wrmsl instruction */
+		/* Using wrmsrq so the following goes to the paravisor. */
 		if (hv_is_sint_msr(reg))
-			wrmsrq(reg, value | 1 << 20);
+			native_wrmsrq(reg, value | hv_para_sint_proxy);
 	} else {
-		wrmsrq(reg, value);
+		native_wrmsrq(reg, value);
 	}
 }
 EXPORT_SYMBOL_GPL(hv_set_non_nested_msr);
@@ -109,6 +121,16 @@ bool hv_confidential_vmbus_available(void)
 	return eax & HYPERV_VS_PROPERTIES_EAX_CONFIDENTIAL_VMBUS_AVAILABLE;
 }
 
+/*
+ * Enable or disable proxying synthetic interrupts
+ * to the paravisor.
+ */
+void hv_para_set_sint_proxy(bool enable)
+{
+	hv_para_sint_proxy =
+		enable ? HYPERV_SINT_PROXY_ENABLE : HYPERV_SINT_PROXY_DISABLE;
+}
+
 /*
  * Attempt to get the SynIC register value from the paravisor.
  *
diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c
index 8285ba005a71..eabd582240a3 100644
--- a/drivers/hv/hv_common.c
+++ b/drivers/hv/hv_common.c
@@ -722,6 +722,11 @@ bool __weak hv_confidential_vmbus_available(void)
 }
 EXPORT_SYMBOL_GPL(hv_confidential_vmbus_available);
 
+void __weak hv_para_set_sint_proxy(bool enable)
+{
+}
+EXPORT_SYMBOL_GPL(hv_para_set_sint_proxy);
+
 int __weak hv_para_get_synic_register(unsigned int reg, u64 *val)
 {
 	*val = ~0ULL;
diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
index 4b0b05faef70..bc4e3862a3f9 100644
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
@@ -300,6 +300,7 @@ bool hv_isolation_type_snp(void);
 bool hv_confidential_vmbus_available(void);
 u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size);
 u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2);
+void hv_para_set_sint_proxy(bool enable);
 int hv_para_get_synic_register(unsigned int reg, u64 *val);
 int hv_para_set_synic_register(unsigned int reg, u64 val);
 void hyperv_cleanup(void);
-- 
2.43.0