* [PATCH 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset()
@ 2019-01-23 20:58 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 20:58 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 also
removes the duplicate implementation of cpumask_to_vpset() and uses the
shared implementation. Finally, it 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 | 60 ++++++++++++++---------------
2 files changed, 29 insertions(+), 32 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset()
@ 2019-01-23 20:58 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 20:58 UTC (permalink / raw)
To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin
Cc: marcelo.cerri, vkuznets, haiyangz, driverdev-devel, linux-kernel
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 also
removes the duplicate implementation of cpumask_to_vpset() and uses the
shared implementation. Finally, it 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 | 60 ++++++++++++++---------------
2 files changed, 29 insertions(+), 32 deletions(-)
--
2.17.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
2019-01-23 20:58 ` Maya Nakamura
@ 2019-01-23 21:00 ` Maya Nakamura
-1 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 21:00 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.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
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] 14+ messages in thread
* [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
@ 2019-01-23 21:00 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 21:00 UTC (permalink / raw)
To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin
Cc: marcelo.cerri, vkuznets, haiyangz, driverdev-devel, linux-kernel
Remove a duplicate definition of VP set (hv_vp_set) and use the common
definition (hv_vpset) that is used in other places.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
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
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
2019-01-23 20:58 ` Maya Nakamura
@ 2019-01-23 21:02 ` Maya Nakamura
-1 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 21:02 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().
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
arch/x86/hyperv/hv_init.c | 1 +
drivers/pci/controller/pci-hyperv.c | 39 +++++++++++++----------------
2 files changed, 19 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..d879458d441f 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 = 0;
u64 res;
dest = irq_data_get_effective_affinity_mask(data);
@@ -953,29 +951,28 @@ 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)) {
+ dev_err(&hbus->hdev->device, "out of memory");
+ return;
+ }
+
+ 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) {
+ dev_err(&hbus->hdev->device, "too high CPU");
+ 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] 14+ messages in thread
* [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
@ 2019-01-23 21:02 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-23 21:02 UTC (permalink / raw)
To: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin
Cc: marcelo.cerri, vkuznets, haiyangz, driverdev-devel, linux-kernel
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().
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
arch/x86/hyperv/hv_init.c | 1 +
drivers/pci/controller/pci-hyperv.c | 39 +++++++++++++----------------
2 files changed, 19 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..d879458d441f 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 = 0;
u64 res;
dest = irq_data_get_effective_affinity_mask(data);
@@ -953,29 +951,28 @@ 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)) {
+ dev_err(&hbus->hdev->device, "out of memory");
+ return;
+ }
+
+ 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) {
+ dev_err(&hbus->hdev->device, "too high CPU");
+ 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
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
2019-01-23 21:02 ` Maya Nakamura
@ 2019-01-24 12:29 ` Dan Carpenter
-1 siblings, 0 replies; 14+ messages in thread
From: Dan Carpenter @ 2019-01-24 12:29 UTC (permalink / raw)
To: Maya Nakamura
Cc: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin, marcelo.cerri, vkuznets,
haiyangz, driverdev-devel, linux-kernel
On Wed, Jan 23, 2019 at 01:02:12PM -0800, Maya Nakamura wrote:
> @@ -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 = 0;
^^^^^
No need to initialize this to a bogus value. It's misleading and it
turns off GCC's uninitialized variable warning so it can lead to bugs.
> u64 res;
>
> dest = irq_data_get_effective_affinity_mask(data);
> @@ -953,29 +951,28 @@ 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)) {
> + dev_err(&hbus->hdev->device, "out of memory");
No need for this error message. alloc_cpumask_var() already has better
debug messages built in.
> + return;
We can't return directly. We need to unlock first.
> + }
> +
> + 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) {
> + dev_err(&hbus->hdev->device, "too high CPU");
This error message is not useful.
> + res = 1;
> + goto exit_unlock;
> + }
regards,
dan carpenter
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
@ 2019-01-24 12:29 ` Dan Carpenter
0 siblings, 0 replies; 14+ messages in thread
From: Dan Carpenter @ 2019-01-24 12:29 UTC (permalink / raw)
To: Maya Nakamura
Cc: olaf, lorenzo.pieralisi, sthemmin, linux-pci, jasowang,
driverdev-devel, linux-kernel, mikelley, Alexander.Levin, apw,
marcelo.cerri, bhelgaas, vkuznets, haiyangz
On Wed, Jan 23, 2019 at 01:02:12PM -0800, Maya Nakamura wrote:
> @@ -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 = 0;
^^^^^
No need to initialize this to a bogus value. It's misleading and it
turns off GCC's uninitialized variable warning so it can lead to bugs.
> u64 res;
>
> dest = irq_data_get_effective_affinity_mask(data);
> @@ -953,29 +951,28 @@ 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)) {
> + dev_err(&hbus->hdev->device, "out of memory");
No need for this error message. alloc_cpumask_var() already has better
debug messages built in.
> + return;
We can't return directly. We need to unlock first.
> + }
> +
> + 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) {
> + dev_err(&hbus->hdev->device, "too high CPU");
This error message is not useful.
> + res = 1;
> + goto exit_unlock;
> + }
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
2019-01-23 21:00 ` Maya Nakamura
@ 2019-01-24 13:12 ` Vitaly Kuznetsov
-1 siblings, 0 replies; 14+ messages in thread
From: Vitaly Kuznetsov @ 2019-01-24 13:12 UTC (permalink / raw)
To: Maya Nakamura
Cc: linux-kernel, driverdev-devel, haiyangz, marcelo.cerri,
lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin
Maya Nakamura <m.maya.nakamura@gmail.com> writes:
> Remove a duplicate definition of VP set (hv_vp_set) and use the common
> definition (hv_vpset) that is used in other places.
>
> Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> ---
> 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
> + */
This change seems to be unrelated and not anyhow described in the commit
message - or did I miss something?
> };
>
> /*
> @@ -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 {
--
Vitaly
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
@ 2019-01-24 13:12 ` Vitaly Kuznetsov
0 siblings, 0 replies; 14+ messages in thread
From: Vitaly Kuznetsov @ 2019-01-24 13:12 UTC (permalink / raw)
To: Maya Nakamura
Cc: apw, olaf, lorenzo.pieralisi, sthemmin, linux-pci, haiyangz,
driverdev-devel, linux-kernel, mikelley, Alexander.Levin,
bhelgaas, marcelo.cerri, jasowang
Maya Nakamura <m.maya.nakamura@gmail.com> writes:
> Remove a duplicate definition of VP set (hv_vp_set) and use the common
> definition (hv_vpset) that is used in other places.
>
> Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> ---
> 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
> + */
This change seems to be unrelated and not anyhow described in the commit
message - or did I miss something?
> };
>
> /*
> @@ -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 {
--
Vitaly
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
2019-01-24 12:29 ` Dan Carpenter
@ 2019-01-26 0:22 ` Maya Nakamura
-1 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-26 0:22 UTC (permalink / raw)
To: Dan Carpenter
Cc: lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin, marcelo.cerri, vkuznets,
haiyangz, driverdev-devel, linux-kernel
On Thu, Jan 24, 2019 at 03:29:18PM +0300, Dan Carpenter wrote:
> On Wed, Jan 23, 2019 at 01:02:12PM -0800, Maya Nakamura wrote:
> > @@ -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 = 0;
> ^^^^^
> No need to initialize this to a bogus value. It's misleading and it
> turns off GCC's uninitialized variable warning so it can lead to bugs.
>
Thank you for pointing that out. I will remove its initialization in v2.
> > @@ -953,29 +951,28 @@ 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)) {
> > + dev_err(&hbus->hdev->device, "out of memory");
>
>
> No need for this error message. alloc_cpumask_var() already has better
> debug messages built in.
>
I will delete this dev_err() in v2.
> > + return;
>
> We can't return directly. We need to unlock first.
>
I will unlock in v2.
> > + if (!nr_bank) {
> > + dev_err(&hbus->hdev->device, "too high CPU");
>
> This error message is not useful.
>
I will delete this dev_err() in v2.
Maya
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
@ 2019-01-26 0:22 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-26 0:22 UTC (permalink / raw)
To: Dan Carpenter
Cc: olaf, lorenzo.pieralisi, sthemmin, linux-pci, jasowang,
driverdev-devel, linux-kernel, mikelley, Alexander.Levin, apw,
marcelo.cerri, bhelgaas, vkuznets, haiyangz
On Thu, Jan 24, 2019 at 03:29:18PM +0300, Dan Carpenter wrote:
> On Wed, Jan 23, 2019 at 01:02:12PM -0800, Maya Nakamura wrote:
> > @@ -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 = 0;
> ^^^^^
> No need to initialize this to a bogus value. It's misleading and it
> turns off GCC's uninitialized variable warning so it can lead to bugs.
>
Thank you for pointing that out. I will remove its initialization in v2.
> > @@ -953,29 +951,28 @@ 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)) {
> > + dev_err(&hbus->hdev->device, "out of memory");
>
>
> No need for this error message. alloc_cpumask_var() already has better
> debug messages built in.
>
I will delete this dev_err() in v2.
> > + return;
>
> We can't return directly. We need to unlock first.
>
I will unlock in v2.
> > + if (!nr_bank) {
> > + dev_err(&hbus->hdev->device, "too high CPU");
>
> This error message is not useful.
>
I will delete this dev_err() in v2.
Maya
>
> regards,
> dan carpenter
>
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
2019-01-24 13:12 ` Vitaly Kuznetsov
@ 2019-01-26 0:32 ` Maya Nakamura
-1 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-26 0:32 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: linux-kernel, driverdev-devel, haiyangz, marcelo.cerri,
lorenzo.pieralisi, bhelgaas, linux-pci, kys, sthemmin, olaf, apw,
jasowang, mikelley, Alexander.Levin
On Thu, Jan 24, 2019 at 02:12:13PM +0100, Vitaly Kuznetsov wrote:
> Maya Nakamura <m.maya.nakamura@gmail.com> writes:
>
> > @@ -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
> > + */
>
> This change seems to be unrelated and not anyhow described in the commit
> message - or did I miss something?
>
Thank you for pointing that out. I will add why it was moved in v2.
Maya
>
> --
> Vitaly
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset
@ 2019-01-26 0:32 ` Maya Nakamura
0 siblings, 0 replies; 14+ messages in thread
From: Maya Nakamura @ 2019-01-26 0:32 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: apw, olaf, lorenzo.pieralisi, sthemmin, linux-pci, haiyangz,
driverdev-devel, linux-kernel, mikelley, Alexander.Levin,
bhelgaas, marcelo.cerri, jasowang
On Thu, Jan 24, 2019 at 02:12:13PM +0100, Vitaly Kuznetsov wrote:
> Maya Nakamura <m.maya.nakamura@gmail.com> writes:
>
> > @@ -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
> > + */
>
> This change seems to be unrelated and not anyhow described in the commit
> message - or did I miss something?
>
Thank you for pointing that out. I will add why it was moved in v2.
Maya
>
> --
> Vitaly
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-01-26 0:32 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-23 20:58 [PATCH 0/2] PCI: hv: Refactor hv_irq_unmask() to use hv_vpset and cpumask_to_vpset() Maya Nakamura
2019-01-23 20:58 ` Maya Nakamura
2019-01-23 21:00 ` [PATCH 1/2] PCI: hv: Replace hv_vp_set with hv_vpset Maya Nakamura
2019-01-23 21:00 ` Maya Nakamura
2019-01-24 13:12 ` Vitaly Kuznetsov
2019-01-24 13:12 ` Vitaly Kuznetsov
2019-01-26 0:32 ` Maya Nakamura
2019-01-26 0:32 ` Maya Nakamura
2019-01-23 21:02 ` [PATCH 2/2] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() Maya Nakamura
2019-01-23 21:02 ` Maya Nakamura
2019-01-24 12:29 ` Dan Carpenter
2019-01-24 12:29 ` Dan Carpenter
2019-01-26 0:22 ` Maya Nakamura
2019-01-26 0:22 ` Maya Nakamura
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.