PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset()
v2 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 v2 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 v2:
- None
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
PATCH v2 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 v2:
- Remove unnecessary nr_bank initialization.
- Delete two unnecessary dev_err()'s.
- Unlock before returning.
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) { + 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 v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
In reply to a message not in the archiveQuoted 13 lines · Michael Kelley
From: Maya Nakamura <[email protected]> Sent: Saturday, January 26, 2019 12:52 AM
Quoted 12 lines
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.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Maya Nakamura <[email protected]>---
Change in v2:
- NoneRight -- there was no code change. But it's customary to note that you updated the commit message.
Thank you for your feedback. I will edit the change log in v3.
Quoted 1 line
Reviewed-by Michael Kelley <[email protected]>
Re: [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
In reply to a message not in the archiveQuoted 24 lines · Michael Kelley
From: Maya Nakamura <[email protected]> Sent: Saturday, January 26, 2019 12:55 AM
Quoted 8 lines
drivers/pci/controller/pci-hyperv.c +1
-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 ; +drivers/pci/controller/pci-hyperv.c static void hv_irq_unmask(struct irq_data *data) · line 964
Quoted 10 lines
drivers/pci/controller/pci-hyperv.c +10
-0+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) {There are two failures cases in
cpumask_to_vpset(). One case returns 0, and the other case returns -1. The above test only catches the 0 failure case. Need to modify the test to catch both cases.
Quoted 2 lines
Michael
Thank you for your feedback. I will correct it in v3.
Maya
Quoted 5 lines
Quoted 4 lines
drivers/pci/controller/pci-hyperv.c +3
-0+ res =1 ; + goto exit_unlock; + }
Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
In reply to Maya NakamuraQuoted 20 lines · Maya Nakamura
Quoted 19 lines · Michael Kelley
From: Maya Nakamura <[email protected]> Sent: Saturday, January 26, 2019 12:52 AM
Quoted 17 lines
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 v2:
- None
Quoted 6 lines
Quoted 3 lines
Right -- there was no code change. But it's customary to note that you updated the commit message.
Thank you for your feedback. I will edit the change log in v3.
Quoted 1 line
Reviewed-by Michael Kelley <[email protected]>
Are you really sure there is no behavioural change ? What piece of code allocates hv_vpset.bank_contents[] memory with this patch applied ?
I suspect the current code does not use hv_vpset for this specific reason, ie allocate struct hv_vp_set.masks array memory statically.
Lorenzo
Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
In reply to a message not in the archiveQuoted 38 lines · Michael Kelley
From: Lorenzo Pieralisi <[email protected]> Sent: Tuesday, February 12, 2019 8:35 AM
Quoted 28 lines · Maya Nakamura
Quoted 2 lines · Michael Kelley
Quoted 1 line
From: Maya Nakamura <[email protected]> Sent: Saturday, January 26,
2019 12:52 AM
Quoted 23 lines
Quoted 12 lines
Quoted 12 lines
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.Quoted 9 lines
Quoted 5 lines
Signed-off-by Maya Nakamura <[email protected]>---
Change in v2:
- NoneRight -- there was no code change. But it's customary to note that you updated the commit message.
Thank you for your feedback. I will edit the change log in v3.
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Reviewed-by Michael Kelley <[email protected]>Are you really sure there is no behavioural change ? What piece of code allocates hv_vpset.bank_contents[] memory with this patch applied ?
I suspect the current code does not use
hv_vpsetfor this specific reason, ie allocate struct hv_vp_set.masks array memory statically.
Quoted 8 lines
There is indeed no behavior change. A full page of memory is
allocated inhv_pci_probe()so that we can be sure that the Hyper-V
hypercall arguments don't cross a page boundary. This page allows
more than enough space for the hv_vpset.bank_contents[] to grow as needed (with one bit allocated in the masks for up to the limit
of 8192 CPUs allowed by Linux). A flexible array is used because
thehv_vpsetstructure is also used in some MMU hypercalls that have two variable size arrays.
I see, thanks for explaining.
Lorenzo
Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
In reply to Maya NakamuraQuoted 20 lines · Maya Nakamura
Quoted 19 lines · Michael Kelley
From: Maya Nakamura <[email protected]> Sent: Saturday, January 26, 2019 12:52 AM
Quoted 17 lines
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 v2:
- None
Quoted 6 lines
Quoted 3 lines
Right -- there was no code change. But it's customary to note that you updated the commit message.
Thank you for your feedback. I will edit the change log in v3.
Quoted 1 line
Reviewed-by Michael Kelley <[email protected]>
I will add Michael's tag to v3 (unless Michael is not happy with that), it is missing there.
Lorenzo