* [PATCH v2 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset() @ 2019-01-26 8:50 Maya Nakamura 2019-01-26 8:52 ` [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset Maya Nakamura 2019-01-26 8:55 ` [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() Maya Nakamura 0 siblings, 2 replies; 8+ messages in thread From: Maya Nakamura @ 2019-01-26 8:50 UTC (permalink / raw) To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw, jasowang, mikelley, Alexander.Levin Cc: linux-kernel, driverdev-devel, haiyangz, vkuznets, marcelo.cerri 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(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset 2019-01-26 8:50 [PATCH v2 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset() Maya Nakamura @ 2019-01-26 8:52 ` Maya Nakamura [not found] ` <BL0PR2101MB09148DD8AB57D5CD2C41A797D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> 2019-01-26 8:55 ` [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() Maya Nakamura 1 sibling, 1 reply; 8+ messages in thread From: Maya Nakamura @ 2019-01-26 8:52 UTC (permalink / raw) To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw, jasowang, mikelley, Alexander.Levin Cc: linux-kernel, driverdev-devel, haiyangz, vkuznets, marcelo.cerri 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. Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> --- Change in v2: - None drivers/pci/controller/pci-hyperv.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 9ba4d12c179c..da8b58d8630d 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; }; }; @@ -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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <BL0PR2101MB09148DD8AB57D5CD2C41A797D7950@BL0PR2101MB0914.namprd21.prod.outlook.com>]
* Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset [not found] ` <BL0PR2101MB09148DD8AB57D5CD2C41A797D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> @ 2019-01-29 5:49 ` Maya Nakamura 2019-02-12 16:35 ` Lorenzo Pieralisi 2019-02-15 10:26 ` Lorenzo Pieralisi 0 siblings, 2 replies; 8+ messages in thread From: Maya Nakamura @ 2019-01-29 5:49 UTC (permalink / raw) To: Michael Kelley Cc: lorenzo.pieralisi, bhelgaas, linux-pci, KY Srinivasan, Stephen Hemminger, olaf, apw, jasowang, Sasha Levin, linux-kernel, driverdev-devel, Haiyang Zhang, vkuznets, marcelo.cerri On Sun, Jan 27, 2019 at 05:11:48AM +0000, Michael Kelley wrote: > From: Maya Nakamura <m.maya.nakamura@gmail.com> Sent: Saturday, January 26, 2019 12:52 AM > > > > 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. > > > > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> > > --- > > Change in v2: > > - None > > > > 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. > Reviewed-by: Michael Kelley <mikelley@microsoft.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset 2019-01-29 5:49 ` Maya Nakamura @ 2019-02-12 16:35 ` Lorenzo Pieralisi [not found] ` <DM5PR2101MB091868E19484F7DCD8C69171D7660@DM5PR2101MB0918.namprd21.prod.outlook.com> 2019-02-15 10:26 ` Lorenzo Pieralisi 1 sibling, 1 reply; 8+ messages in thread From: Lorenzo Pieralisi @ 2019-02-12 16:35 UTC (permalink / raw) To: Maya Nakamura Cc: Michael Kelley, bhelgaas, linux-pci, KY Srinivasan, Stephen Hemminger, olaf, apw, jasowang, Sasha Levin, linux-kernel, driverdev-devel, Haiyang Zhang, vkuznets, marcelo.cerri On Mon, Jan 28, 2019 at 09:49:32PM -0800, Maya Nakamura wrote: > On Sun, Jan 27, 2019 at 05:11:48AM +0000, Michael Kelley wrote: > > From: Maya Nakamura <m.maya.nakamura@gmail.com> Sent: Saturday, January 26, 2019 12:52 AM > > > > > > 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. > > > > > > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> > > > --- > > > Change in v2: > > > - None > > > > > > > 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. > > > Reviewed-by: Michael Kelley <mikelley@microsoft.com> 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <DM5PR2101MB091868E19484F7DCD8C69171D7660@DM5PR2101MB0918.namprd21.prod.outlook.com>]
* Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset [not found] ` <DM5PR2101MB091868E19484F7DCD8C69171D7660@DM5PR2101MB0918.namprd21.prod.outlook.com> @ 2019-02-13 11:50 ` Lorenzo Pieralisi 0 siblings, 0 replies; 8+ messages in thread From: Lorenzo Pieralisi @ 2019-02-13 11:50 UTC (permalink / raw) To: Michael Kelley Cc: m.maya.nakamura, bhelgaas, linux-pci, KY Srinivasan, Stephen Hemminger, olaf, apw, jasowang, Sasha Levin, linux-kernel, driverdev-devel, Haiyang Zhang, vkuznets, marcelo.cerri On Wed, Feb 13, 2019 at 02:20:29AM +0000, Michael Kelley wrote: > From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Sent: Tuesday, February 12, 2019 8:35 AM > > > > On Mon, Jan 28, 2019 at 09:49:32PM -0800, Maya Nakamura wrote: > > > On Sun, Jan 27, 2019 at 05:11:48AM +0000, Michael Kelley wrote: > > > > From: Maya Nakamura <m.maya.nakamura@gmail.com> Sent: Saturday, January 26, > > 2019 12:52 AM > > > > > > > > > > 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. > > > > > > > > > > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> > > > > > --- > > > > > Change in v2: > > > > > - None > > > > > > > > > > > > > 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. > > > > > > > Reviewed-by: Michael Kelley <mikelley@microsoft.com> > > > > 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. > > > > There is indeed no behavior change. A full page of memory is > allocated in hv_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 > the hv_vpset structure is also used in some MMU hypercalls that > have two variable size arrays. I see, thanks for explaining. Lorenzo ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset 2019-01-29 5:49 ` Maya Nakamura 2019-02-12 16:35 ` Lorenzo Pieralisi @ 2019-02-15 10:26 ` Lorenzo Pieralisi 1 sibling, 0 replies; 8+ messages in thread From: Lorenzo Pieralisi @ 2019-02-15 10:26 UTC (permalink / raw) To: Maya Nakamura Cc: Michael Kelley, bhelgaas, linux-pci, KY Srinivasan, Stephen Hemminger, olaf, apw, jasowang, Sasha Levin, linux-kernel, driverdev-devel, Haiyang Zhang, vkuznets, marcelo.cerri On Mon, Jan 28, 2019 at 09:49:32PM -0800, Maya Nakamura wrote: > On Sun, Jan 27, 2019 at 05:11:48AM +0000, Michael Kelley wrote: > > From: Maya Nakamura <m.maya.nakamura@gmail.com> Sent: Saturday, January 26, 2019 12:52 AM > > > > > > 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. > > > > > > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> > > > --- > > > Change in v2: > > > - None > > > > > > > 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. > > > Reviewed-by: Michael Kelley <mikelley@microsoft.com> I will add Michael's tag to v3 (unless Michael is not happy with that), it is missing there. Lorenzo ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() 2019-01-26 8:50 [PATCH v2 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset() Maya Nakamura 2019-01-26 8:52 ` [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset Maya Nakamura @ 2019-01-26 8:55 ` Maya Nakamura [not found] ` <BL0PR2101MB09148770FD324F4F14F4B306D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> 1 sibling, 1 reply; 8+ messages in thread From: Maya Nakamura @ 2019-01-26 8:55 UTC (permalink / raw) To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw, jasowang, mikelley, Alexander.Levin Cc: linux-kernel, driverdev-devel, haiyangz, vkuznets, marcelo.cerri Remove 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. Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com> --- 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(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 7abb09e2eeb8..7f2eed1fc81b 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -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) { diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index da8b58d8630d..d74c0f111fd0 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -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 |= -- 2.17.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <BL0PR2101MB09148770FD324F4F14F4B306D7950@BL0PR2101MB0914.namprd21.prod.outlook.com>]
* Re: [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() [not found] ` <BL0PR2101MB09148770FD324F4F14F4B306D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> @ 2019-01-29 5:52 ` Maya Nakamura 0 siblings, 0 replies; 8+ messages in thread From: Maya Nakamura @ 2019-01-29 5:52 UTC (permalink / raw) To: Michael Kelley Cc: lorenzo.pieralisi, bhelgaas, linux-pci, KY Srinivasan, Stephen Hemminger, olaf, apw, jasowang, Sasha Levin, linux-kernel, driverdev-devel, Haiyang Zhang, vkuznets, marcelo.cerri On Sun, Jan 27, 2019 at 05:22:06AM +0000, Michael Kelley wrote: > From: Maya Nakamura <m.maya.nakamura@gmail.com> Sent: Saturday, January 26, 2019 12:55 AM > > > > @@ -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) { > > 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. > > Michael > Thank you for your feedback. I will correct it in v3. Maya > > + res = 1; > > + goto exit_unlock; > > + } > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-02-15 10:27 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-01-26 8:50 [PATCH v2 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset() Maya Nakamura 2019-01-26 8:52 ` [PATCH v2 1/2] PCI: hv: Replace hv_vp_set with hv_vpset Maya Nakamura [not found] ` <BL0PR2101MB09148DD8AB57D5CD2C41A797D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> 2019-01-29 5:49 ` Maya Nakamura 2019-02-12 16:35 ` Lorenzo Pieralisi [not found] ` <DM5PR2101MB091868E19484F7DCD8C69171D7660@DM5PR2101MB0918.namprd21.prod.outlook.com> 2019-02-13 11:50 ` Lorenzo Pieralisi 2019-02-15 10:26 ` Lorenzo Pieralisi 2019-01-26 8:55 ` [PATCH v2 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() Maya Nakamura [not found] ` <BL0PR2101MB09148770FD324F4F14F4B306D7950@BL0PR2101MB0914.namprd21.prod.outlook.com> 2019-01-29 5:52 ` Maya Nakamura
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).