On Thu, Feb 28, 2019 at 02:35:06AM +0000, Maya Nakamura wrote:
> Remove a duplicate definition of VP set (hv_vp_set) and use the common
> definition (hv_vpset) that is used in other places.
>
> Change the order of the members in struct hv_pcibus_device so that the
> declaration of retarget_msi_interrupt_params is the last member. Struct
> hv_vpset, which contains a flexible array, is nested two levels deep in
> struct hv_pcibus_device via retarget_msi_interrupt_params.
>
> Add a comment that retarget_msi_interrupt_params should be the last
> member of struct hv_pcibus_device.
>
> Based on Vitaly's finding, add __aligned(8) to struct
> retarget_msi_interrupt because Hyper-V requires that hypercall arguments
> be aligned on an 8 byte boundary.
Hi Maya,
a couple of comments:
1) Please always carry review tags, I can do it for you but you would
make my life easier.
2) Vitaly's comment should be addressed in a separate patch that should
come before this patch in chronological order, as he said, it is not
an issue with this patch per-se.
3) "Based on Vitaly's finding" is meaningless to a commit log reader.
Please add a "Link:" tag pointing at the relevant mailing list
discussion.
Comments (1)-(3) apply to patch 2 in this series as well.
Update the patches with my comments above and if Vitaly ACKs them I
will try to merge them for v5.1 but this must be made very promptly.
Lorenzo
> Signed-off-by: Maya Nakamura <m.maya.nakamura@xxxxxxxxx>
> ---
> Changes in v4:
> - Add __aligned(8) to struct retarget_msi_interrupt.
> - Update the commit message.
>
> Change in v3:
> - Correct the v2 change log.
>
> Change in v2:
> - Update the commit message.
>
> drivers/pci/controller/pci-hyperv.c | 27 +++++++++++++--------------
> 1 file changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
> index 9ba4d12c179c..d71695db1ba0 100644
> --- a/drivers/pci/controller/pci-hyperv.c
> +++ b/drivers/pci/controller/pci-hyperv.c
> @@ -393,12 +393,6 @@ struct hv_interrupt_entry {
>
> #define HV_VP_SET_BANK_COUNT_MAX 5 /* current implementation limit */
>
> -struct hv_vp_set {
> - u64 format; /* 0 (HvGenericSetSparse4k) */
> - u64 valid_banks;
> - u64 masks[HV_VP_SET_BANK_COUNT_MAX];
> -};
> -
> /*
> * flags for hv_device_interrupt_target.flags
> */
> @@ -410,7 +404,7 @@ struct hv_device_interrupt_target {
> u32 flags;
> union {
> u64 vp_mask;
> - struct hv_vp_set vp_set;
> + struct hv_vpset vp_set;
> };
> };
>
> @@ -420,7 +414,7 @@ struct retarget_msi_interrupt {
> struct hv_interrupt_entry int_entry;
> u64 reserved2;
> struct hv_device_interrupt_target int_target;
> -} __packed;
> +} __packed __aligned(8);
>
> /*
> * Driver specific state.
> @@ -460,12 +454,16 @@ struct hv_pcibus_device {
> struct msi_controller msi_chip;
> struct irq_domain *irq_domain;
>
> - /* hypercall arg, must not cross page boundary */
> - struct retarget_msi_interrupt retarget_msi_interrupt_params;
> -
> spinlock_t retarget_msi_interrupt_lock;
>
> struct workqueue_struct *wq;
> +
> + /* hypercall arg, must not cross page boundary */
> + struct retarget_msi_interrupt retarget_msi_interrupt_params;
> +
> + /*
> + * Don't put anything here: retarget_msi_interrupt_params must be last
> + */
> };
>
> /*
> @@ -955,12 +953,13 @@ static void hv_irq_unmask(struct irq_data *data)
> */
> params->int_target.flags |=
> HV_DEVICE_INTERRUPT_TARGET_PROCESSOR_SET;
> - params->int_target.vp_set.valid_banks =
> + params->int_target.vp_set.valid_bank_mask =
> (1ull << HV_VP_SET_BANK_COUNT_MAX) - 1;
>
> /*
> * var-sized hypercall, var-size starts after vp_mask (thus
> - * vp_set.format does not count, but vp_set.valid_banks does).
> + * vp_set.format does not count, but vp_set.valid_bank_mask
> + * does).
> */
> var_size = 1 + HV_VP_SET_BANK_COUNT_MAX;
>
> @@ -974,7 +973,7 @@ static void hv_irq_unmask(struct irq_data *data)
> goto exit_unlock;
> }
>
> - params->int_target.vp_set.masks[cpu_vmbus / 64] |=
> + params->int_target.vp_set.bank_contents[cpu_vmbus / 64] |=
> (1ULL << (cpu_vmbus & 63));
> }
> } else {
> --
> 2.17.1
>
