PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset()
v3 cover PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset()
This patchset removes a duplicate definition of VP set (hv_vp_set) and uses the common definition (hv_vpset) that is used in other places. It changes the order of the members in struct hv_pcibus_device due to flexible array in hv_vpset.
It also removes the duplicate implementation of cpumask_to_vpset(), uses the shared implementation, and exports hv_max_vp_index, which is required by cpumask_to_vpset().
Maya Nakamura (2):
PCI: hv: Replace hv_vp_set with hv_vpset
PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 59 +++++++++++++---------------- 2 files changed, 28 insertions(+), 32 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 PCI: hv: Replace hv_vp_set with hv_vpset
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.
---
Change in v3:
- Correct the v2 change log.
Change in v2:
- Update the commit message.
drivers/pci/controller/pci-hyperv.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/pci/controller/pci-hyperv.c +12 -13
@@ -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; }; };
@@ -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 {
Signature · 1 line
2.17.1
Re: [PATCH v3 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
Quoted 52 lines · Maya Nakamura
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_deviceso that the declaration ofretarget_msi_interrupt_paramsis the last member. Structhv_vpset, which contains a flexible array, is nested two levels deep in structhv_pcibus_deviceviaretarget_msi_interrupt_params.Add a comment that
retarget_msi_interrupt_paramsshould be the last member of structhv_pcibus_device.Signed-off-by Maya Nakamura <[email protected]>---
Change in v3:
- Correct the v2 change log.Change in v2:
- Update the commit message.drivers/pci/controller/pci-hyperv.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)drivers/pci/controller/pci-hyperv.c +1
-7@@ -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; }; };@@ -460,12 +454,16 @@ struct hv_pcibus_device {struct msi_controller msi_chip;struct irq_domain *irq_domain;
drivers/pci/controller/pci-hyperv.c struct hv_pcibus_device { · line 463
Quoted 10 lines
drivers/pci/controller/pci-hyperv.c +4
-3-/* 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; +
One more thing here (and again sorry for being late): this structure is being used as Hyper-V hypercall argument and these have special requirements on alignment (8 bytes). struct retarget_msi_interrupt is packed and depending on your environment/compiler you may or may not see the issue but I has able to get HVCALL_RETARGET_INTERRUPT failing with the return value of 4 (HV_STATUS_INVALID_ALIGNMENT).
I suggest we add __aligned(8) to 'struct retarget_msi_interrupt' definition (I haven't tested this but should work). This is not a new issue, it existed before your patch, but the code movement you do may change the exposure.
Quoted 31 lines
drivers/pci/controller/pci-hyperv.c +7
-3+/* +* 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 {
Signature · 1 line
Vitaly
Re: [PATCH v3 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
Quoted 72 lines · Vitaly Kuznetsov
Quoted 52 lines · Maya Nakamura
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_deviceso that the declaration ofretarget_msi_interrupt_paramsis the last member. Structhv_vpset, which contains a flexible array, is nested two levels deep in structhv_pcibus_deviceviaretarget_msi_interrupt_params.Add a comment that
retarget_msi_interrupt_paramsshould be the last member of structhv_pcibus_device.Signed-off-by Maya Nakamura <[email protected]>---
Change in v3:
- Correct the v2 change log.Change in v2:
- Update the commit message.drivers/pci/controller/pci-hyperv.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)drivers/pci/controller/pci-hyperv.c +1
-7@@ -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; }; };@@ -460,12 +454,16 @@ struct hv_pcibus_device {struct msi_controller msi_chip;struct irq_domain *irq_domain;drivers/pci/controller/pci-hyperv.c struct hv_pcibus_device { · line 463
Quoted 10 lines
drivers/pci/controller/pci-hyperv.c +4
-3-/* 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; +One more thing here (and again sorry for being late): this structure is being used as Hyper-V hypercall argument and these have special requirements on alignment (8 bytes). struct
retarget_msi_interruptis packed and depending on your environment/compiler you may or may not see the issue but I has able to getHVCALL_RETARGET_INTERRUPTfailing with the return value of 4 (HV_STATUS_INVALID_ALIGNMENT).
Quoted 4 lines
I suggest we add
__aligned(8)to 'structretarget_msi_interrupt' definition (I haven't tested this but should work). This is not a new issue, it existed before your patch, but the code movement you do may change the exposure.
I am happy to apply this small fix _before_ this patch but if you want me to merge them for v5.1 this must be put together and tested quite quickly.
For the time being I am not dropping this patch from the PCI queue, waiting for an update from you guys.
Thanks,
Lorenzo
Quoted 36 lines
Quoted 33 lines
drivers/pci/controller/pci-hyperv.c +7
-3+/* +* 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 {Signature · 1 line
Vitaly
PATCH v3 2/2 PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
In reply to Maya NakamuraRemove the duplicate implementation of cpumask_to_vpset() and use the shared implementation. Export hv_max_vp_index, which is required by cpumask_to_vpset().
Apply changes to hv_irq_unmask() based on feedback.
---
Changes in v3:
- Modify to catch all failures from cpumask_to_vpset().
- Correct the v2 change log about the commit message.
Changes in v2:
- Remove unnecessary nr_bank initialization.
- Delete two unnecessary dev_err()'s.
- Unlock before returning.
- Update the commit message.
arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 38 +++++++++++++---------------- 2 files changed, 18 insertions(+), 21 deletions(-)
arch/x86/hyperv/hv_init.c +1 -0
@@ -96,6 +96,7 @@ void __percpu **hyperv_pcpu_input_arg;EXPORT_SYMBOL_GPL (hyperv_pcpu_input_arg);u32 hv_max_vp_index; +EXPORT_SYMBOL_GPL (hv_max_vp_index);static int hv_cpu_init (unsigned int cpu) {
drivers/pci/controller/pci-hyperv.c +17 -21
@@ -391,8 +391,6 @@ struct hv_interrupt_entry {u32 data; }; -#define HV_VP_SET_BANK_COUNT_MAX 5/* current implementation limit */ -/* * flags for hv_device_interrupt_target.flags */
@@ -908,12 +906,12 @@ static void hv_irq_unmask(struct irq_data *data)struct retarget_msi_interrupt *params;struct hv_pcibus_device *hbus;struct cpumask *dest; +cpumask_var_t tmp;struct pci_bus *pbus;struct pci_dev *pdev;unsigned long flags;u32 var_size =0 ; -int cpu_vmbus; -int cpu; +int cpu, nr_bank;u64 res; dest =irq_data_get_effective_affinity_mask (data);
@@ -953,29 +951,27 @@ 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_bank_mask = - (1ull <<HV_VP_SET_BANK_COUNT_MAX ) -1 ; + +if (!alloc_cpumask_var (&tmp,GFP_KERNEL )) { + res =1 ; + goto exit_unlock; + } + +cpumask_and (tmp, dest, cpu_online_mask); + nr_bank =cpumask_to_vpset (¶ms->int_target.vp_set, tmp); +free_cpumask_var (tmp); + +if (nr_bank <=0 ) { + res =1 ; + goto exit_unlock; + }/* * var-sized hypercall, var-size starts after vp_mask (thus * vp_set.format does not count, but vp_set.valid_bank_mask * does). */ - var_size =1 +HV_VP_SET_BANK_COUNT_MAX ; - -for_each_cpu_and (cpu, dest, cpu_online_mask) { - cpu_vmbus =hv_cpu_number_to_vp_number (cpu); - -if (cpu_vmbus >=HV_VP_SET_BANK_COUNT_MAX *64 ) { -dev_err (&hbus->hdev->device, -"too high CPU %d" , cpu_vmbus); - res =1 ; - goto exit_unlock; - } - - params->int_target.vp_set.bank_contents[cpu_vmbus /64 ] |= - (1ULL << (cpu_vmbus &63 )); - } + var_size =1 + nr_bank; }else {for_each_cpu_and (cpu, dest, cpu_online_mask) { params->int_target.vp_mask |=
Signature · 1 line
2.17.1
Re: [PATCH v3 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
Quoted 6 lines · Maya Nakamura
Remove the duplicate implementation of
cpumask_to_vpset()and use the shared implementation. Exporthv_max_vp_index, which is required bycpumask_to_vpset().Apply changes to
hv_irq_unmask()based on feedback.
I just noticed an issue with this patch, sorry I've missed it before. I don't see the commit in Linus' tree, not sure if we should amend this one or a follow-up patch is needed.
Quoted 57 lines
Signed-off-by Maya Nakamura <[email protected]>---
Changes in v3:
- Modify to catch all failures fromcpumask_to_vpset().
- Correct the v2 change log about the commit message.Changes in v2:
- Remove unnecessarynr_bankinitialization.
- Delete two unnecessary dev_err()'s.
- Unlock before returning.
- Update the commit message.arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 38 +++++++++++++---------------- 2 files changed, 18 insertions(+), 21 deletions(-)arch/x86/hyperv/hv_init.c +1
-0@@ -96,6 +96,7 @@ void __percpu **hyperv_pcpu_input_arg;EXPORT_SYMBOL_GPL (hyperv_pcpu_input_arg);u32 hv_max_vp_index; +EXPORT_SYMBOL_GPL (hv_max_vp_index);static int hv_cpu_init (unsigned int cpu) {drivers/pci/controller/pci-hyperv.c +2
-4@@ -391,8 +391,6 @@ struct hv_interrupt_entry {u32 data; }; -#define HV_VP_SET_BANK_COUNT_MAX 5/* current implementation limit */ -/* * flags for hv_device_interrupt_target.flags */ @@ -908,12 +906,12 @@ static void hv_irq_unmask(struct irq_data *data)struct retarget_msi_interrupt *params;struct hv_pcibus_device *hbus;struct cpumask *dest; +cpumask_var_t tmp;struct pci_bus *pbus;struct pci_dev *pdev;unsigned long flags;u32 var_size =0 ; -int cpu_vmbus; -int cpu; +int cpu, nr_bank;u64 res; dest =irq_data_get_effective_affinity_mask (data);
drivers/pci/controller/pci-hyperv.c static void hv_irq_unmask(struct irq_data *data) · line 955
Quoted 7 lines
drivers/pci/controller/pci-hyperv.c +2
-2@@ -953,29 +951,27 @@ 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_bank_mask = - (1ull <<HV_VP_SET_BANK_COUNT_MAX ) -1 ; + +if (!alloc_cpumask_var (&tmp,GFP_KERNEL )) {
We can't use GFP_KERNEL here: this is happening under hbus->retarget_msi_interrupt_lock spinlock, we should use GFP_ATOMIC instead. It may, however, make sense to add the cpumask to a pre-allocated structure (e.g. struct hv_pcibus_device) to make sure the allocation never fails.
Quoted 37 lines
drivers/pci/controller/pci-hyperv.c +13
-15+ res =1 ; + goto exit_unlock; + } + +cpumask_and (tmp, dest, cpu_online_mask); + nr_bank =cpumask_to_vpset (¶ms->int_target.vp_set, tmp); +free_cpumask_var (tmp); + +if (nr_bank <=0 ) { + res =1 ; + goto exit_unlock; + }/* * var-sized hypercall, var-size starts after vp_mask (thus * vp_set.format does not count, but vp_set.valid_bank_mask * does). */ - var_size =1 +HV_VP_SET_BANK_COUNT_MAX ; - -for_each_cpu_and (cpu, dest, cpu_online_mask) { - cpu_vmbus =hv_cpu_number_to_vp_number (cpu); - -if (cpu_vmbus >=HV_VP_SET_BANK_COUNT_MAX *64 ) { -dev_err (&hbus->hdev->device, -"too high CPU %d" , cpu_vmbus); - res =1 ; - goto exit_unlock; - } - - params->int_target.vp_set.bank_contents[cpu_vmbus /64 ] |= - (1ULL << (cpu_vmbus &63 )); - } + var_size =1 + nr_bank; }else {for_each_cpu_and (cpu, dest, cpu_online_mask) { params->int_target.vp_mask |=
Signature · 1 line
Vitaly
Re: [PATCH v3 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
Quoted 6 lines · Vitaly Kuznetsov
Quoted 4 lines · Maya Nakamura
Remove the duplicate implementation of
cpumask_to_vpset()and use the shared implementation. Exporthv_max_vp_index, which is required bycpumask_to_vpset().
Quoted 6 lines
Quoted 2 lines
Apply changes to
hv_irq_unmask()based on feedback.I just noticed an issue with this patch, sorry I've missed it before. I don't see the commit in Linus' tree, not sure if we should amend this one or a follow-up patch is needed.
I will drop this patch from the PCI queue, it does not make sense to merge a patch adding a bug and fix it up later with a subsequent one given that it is not upstream yet.
Lorenzo
Quoted 111 lines
Quoted 57 lines
Signed-off-by Maya Nakamura <[email protected]>---
Changes in v3:
- Modify to catch all failures fromcpumask_to_vpset().
- Correct the v2 change log about the commit message.Changes in v2:
- Remove unnecessarynr_bankinitialization.
- Delete two unnecessary dev_err()'s.
- Unlock before returning.
- Update the commit message.arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 38 +++++++++++++---------------- 2 files changed, 18 insertions(+), 21 deletions(-)arch/x86/hyperv/hv_init.c +1
-0@@ -96,6 +96,7 @@ void __percpu **hyperv_pcpu_input_arg;EXPORT_SYMBOL_GPL (hyperv_pcpu_input_arg);u32 hv_max_vp_index; +EXPORT_SYMBOL_GPL (hv_max_vp_index);static int hv_cpu_init (unsigned int cpu) {drivers/pci/controller/pci-hyperv.c +2
-4@@ -391,8 +391,6 @@ struct hv_interrupt_entry {u32 data; }; -#define HV_VP_SET_BANK_COUNT_MAX 5/* current implementation limit */ -/* * flags for hv_device_interrupt_target.flags */ @@ -908,12 +906,12 @@ static void hv_irq_unmask(struct irq_data *data)struct retarget_msi_interrupt *params;struct hv_pcibus_device *hbus;struct cpumask *dest; +cpumask_var_t tmp;struct pci_bus *pbus;struct pci_dev *pdev;unsigned long flags;u32 var_size =0 ; -int cpu_vmbus; -int cpu; +int cpu, nr_bank;u64 res; dest =irq_data_get_effective_affinity_mask (data);drivers/pci/controller/pci-hyperv.c static void hv_irq_unmask(struct irq_data *data) · line 955
Quoted 7 lines
drivers/pci/controller/pci-hyperv.c +2
-2@@ -953,29 +951,27 @@ 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_bank_mask = - (1ull <<HV_VP_SET_BANK_COUNT_MAX ) -1 ; + +if (!alloc_cpumask_var (&tmp,GFP_KERNEL )) {We can't use
GFP_KERNELhere: this is happening underhbus->retarget_msi_interrupt_lockspinlock, we should useGFP_ATOMICinstead. It may, however, make sense to add the cpumask to a pre-allocated structure (e.g. structhv_pcibus_device) to make sure the allocation never fails.Quoted 37 lines
drivers/pci/controller/pci-hyperv.c +13
-15+ res =1 ; + goto exit_unlock; + } + +cpumask_and (tmp, dest, cpu_online_mask); + nr_bank =cpumask_to_vpset (¶ms->int_target.vp_set, tmp); +free_cpumask_var (tmp); + +if (nr_bank <=0 ) { + res =1 ; + goto exit_unlock; + }/* * var-sized hypercall, var-size starts after vp_mask (thus * vp_set.format does not count, but vp_set.valid_bank_mask * does). */ - var_size =1 +HV_VP_SET_BANK_COUNT_MAX ; - -for_each_cpu_and (cpu, dest, cpu_online_mask) { - cpu_vmbus =hv_cpu_number_to_vp_number (cpu); - -if (cpu_vmbus >=HV_VP_SET_BANK_COUNT_MAX *64 ) { -dev_err (&hbus->hdev->device, -"too high CPU %d" , cpu_vmbus); - res =1 ; - goto exit_unlock; - } - - params->int_target.vp_set.bank_contents[cpu_vmbus /64 ] |= - (1ULL << (cpu_vmbus &63 )); - } + var_size =1 + nr_bank; }else {for_each_cpu_and (cpu, dest, cpu_online_mask) { params->int_target.vp_mask |=Signature · 1 line
Vitaly
Quoted 9 lines · Maya Nakamura
This patchset removes a duplicate definition of VP set (
hv_vp_set) and uses the common definition (hv_vpset) that is used in other places. It changes the order of the members in structhv_pcibus_devicedue to flexible array inhv_vpset.It also removes the duplicate implementation of
cpumask_to_vpset(), uses the shared implementation, and exportshv_max_vp_index, which is required bycpumask_to_vpset().
Quoted 7 lines
Maya Nakamura (2):
PCI: hv: Replacehv_vp_setwithhv_vpset
PCI: hv: Refactorhv_irq_unmask()to usecpumask_to_vpset()arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 59 +++++++++++++---------------- 2 files changed, 28 insertions(+), 32 deletions(-)
I need a maintainer ACK to merge this series.
Lorenzo
Sasha Levin
Acked-byQuoted 14 lines · Lorenzo Pieralisi
Quoted 13 lines · Maya Nakamura
This patchset removes a duplicate definition of VP set (
hv_vp_set) and uses the common definition (hv_vpset) that is used in other places. It changes the order of the members in structhv_pcibus_devicedue to flexible array inhv_vpset.It also removes the duplicate implementation of
cpumask_to_vpset(), uses the shared implementation, and exportshv_max_vp_index, which is required bycpumask_to_vpset().Maya Nakamura (2):
PCI: hv: Replacehv_vp_setwithhv_vpset
PCI: hv: Refactorhv_irq_unmask()to usecpumask_to_vpset()
Quoted 5 lines
Quoted 3 lines
arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 59 +++++++++++++---------------- 2 files changed, 28 insertions(+), 32 deletions(-)I need a maintainer ACK to merge this series.
--
Thanks,
Sasha
Lorenzo Pieralisi
AppliedQuoted 9 lines · Maya Nakamura
This patchset removes a duplicate definition of VP set (
hv_vp_set) and uses the common definition (hv_vpset) that is used in other places. It changes the order of the members in structhv_pcibus_devicedue to flexible array inhv_vpset.It also removes the duplicate implementation of
cpumask_to_vpset(), uses the shared implementation, and exportshv_max_vp_index, which is required bycpumask_to_vpset().
Quoted 7 lines
Maya Nakamura (2):
PCI: hv: Replacehv_vp_setwithhv_vpset
PCI: hv: Refactorhv_irq_unmask()to usecpumask_to_vpset()arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 59 +++++++++++++---------------- 2 files changed, 28 insertions(+), 32 deletions(-)
Applied to pci/hv for v5.1, thanks.
Lorenzo