Both 'struct hv_send_ipi' and 'struct hv_send_ipi_ex' have an 'union
hv_input_vtl' parameter which has been ignored until now. Expose it, as
KVM will soon provide a way of dealing with VTL-aware IPIs. While doing
Also fixup __send_ipi_mask_ex().

Signed-off-by: Nicolas Saenz Julienne <nsa...@amazon.com>
---
 arch/x86/hyperv/hv_apic.c         | 3 +--
 include/asm-generic/hyperv-tlfs.h | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c
index 0569f579338b5..97907371d51ef 100644
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@ -121,9 +121,8 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, 
int vector,
        if (unlikely(!ipi_arg))
                goto ipi_mask_ex_done;
 
+       memset(ipi_arg, 0, sizeof(*ipi_arg));
        ipi_arg->vector = vector;
-       ipi_arg->reserved = 0;
-       ipi_arg->vp_set.valid_bank_mask = 0;
 
        /*
         * Use HV_GENERIC_SET_ALL and avoid converting cpumask to VP_SET
diff --git a/include/asm-generic/hyperv-tlfs.h 
b/include/asm-generic/hyperv-tlfs.h
index ffac04bbd0c19..28cde641b5474 100644
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
@@ -425,14 +425,16 @@ struct hv_vpset {
 /* HvCallSendSyntheticClusterIpi hypercall */
 struct hv_send_ipi {
        u32 vector;
-       u32 reserved;
+       union hv_input_vtl in_vtl;
+       u8 reserved[3];
        u64 cpu_mask;
 } __packed;
 
 /* HvCallSendSyntheticClusterIpiEx hypercall */
 struct hv_send_ipi_ex {
        u32 vector;
-       u32 reserved;
+       union hv_input_vtl in_vtl;
+       u8 reserved[3];
        struct hv_vpset vp_set;
 } __packed;
 
-- 
2.40.1


Reply via email to