* [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
@ 2022-07-26 0:53 Michael Kelley
2022-07-26 2:39 ` Randy Dunlap
2022-07-26 7:15 ` Joerg Roedel
0 siblings, 2 replies; 9+ messages in thread
From: Michael Kelley @ 2022-07-26 0:53 UTC (permalink / raw)
To: sthemmin, kys, haiyangz, wei.liu, decui, joro, will, robin.murphy,
samuel, linux-kernel, linux-hyperv, iommu
Cc: mikelley
Recent changes to solve inconsistencies in handling IRQ masks #ifdef
out the affinity field in irq_common_data for non-SMP configurations.
The current code in hyperv_irq_remapping_alloc() gets a compiler error
in that case.
Fix this by using the new irq_data_update_affinity() helper, which
handles the non-SMP case correctly.
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
---
drivers/iommu/hyperv-iommu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
index 51bd66a..e190bb8 100644
--- a/drivers/iommu/hyperv-iommu.c
+++ b/drivers/iommu/hyperv-iommu.c
@@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
{
struct irq_alloc_info *info = arg;
struct irq_data *irq_data;
- struct irq_desc *desc;
int ret = 0;
if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
@@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
* Hypver-V IO APIC irq affinity should be in the scope of
* ioapic_max_cpumask because no irq remapping support.
*/
- desc = irq_data_to_desc(irq_data);
- cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
+ irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
return 0;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 0:53 [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity Michael Kelley
@ 2022-07-26 2:39 ` Randy Dunlap
2022-07-26 3:34 ` Michael Kelley (LINUX)
2022-08-03 16:26 ` Michael Kelley (LINUX)
2022-07-26 7:15 ` Joerg Roedel
1 sibling, 2 replies; 9+ messages in thread
From: Randy Dunlap @ 2022-07-26 2:39 UTC (permalink / raw)
To: Michael Kelley, sthemmin, kys, haiyangz, wei.liu, decui, joro,
will, robin.murphy, samuel, linux-kernel, linux-hyperv, iommu
On 7/25/22 17:53, Michael Kelley wrote:
> Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> out the affinity field in irq_common_data for non-SMP configurations.
> The current code in hyperv_irq_remapping_alloc() gets a compiler error
> in that case.
>
> Fix this by using the new irq_data_update_affinity() helper, which
> handles the non-SMP case correctly.
>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> drivers/iommu/hyperv-iommu.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
> index 51bd66a..e190bb8 100644
> --- a/drivers/iommu/hyperv-iommu.c
> +++ b/drivers/iommu/hyperv-iommu.c
> @@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
> {
> struct irq_alloc_info *info = arg;
> struct irq_data *irq_data;
> - struct irq_desc *desc;
> int ret = 0;
>
> if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
> @@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
> * Hypver-V IO APIC irq affinity should be in the scope of
> * ioapic_max_cpumask because no irq remapping support.
> */
> - desc = irq_data_to_desc(irq_data);
> - cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
> + irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
>
> return 0;
> }
--
~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread* RE: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 2:39 ` Randy Dunlap
@ 2022-07-26 3:34 ` Michael Kelley (LINUX)
2022-08-03 16:26 ` Michael Kelley (LINUX)
1 sibling, 0 replies; 9+ messages in thread
From: Michael Kelley (LINUX) @ 2022-07-26 3:34 UTC (permalink / raw)
To: Randy Dunlap, Stephen Hemminger, KY Srinivasan, Haiyang Zhang,
wei.liu@kernel.org, Dexuan Cui, joro@8bytes.org, will@kernel.org,
robin.murphy@arm.com, samuel@sholland.org,
linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org,
iommu@lists.linux.dev, tsbogend@alpha.franken.de,
linux-mips@vger.kernel.org
From: Randy Dunlap <rdunlap@infradead.org> Sent: Monday, July 25, 2022 7:39 PM
>
> On 7/25/22 17:53, Michael Kelley wrote:
> > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > out the affinity field in irq_common_data for non-SMP configurations.
> > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > in that case.
> >
> > Fix this by using the new irq_data_update_affinity() helper, which
> > handles the non-SMP case correctly.
> >
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
Indeed. Apologies for omitting this originally.
> > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
> Tested-by: Randy Dunlap <rdunlap@infradead.org>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
>
> Thanks.
This patch needs to go through the same tree as Samuel Holland's earlier
patch set to solve inconsistencies in handling IRQ masks on SMP and
non-SMP configs. From what I can tell, that's the irq/irqchip-next tree.
FWIW, it appears there's another occurrence of this same kind of
problem in arch/mips/sgi-ip27/ip27-irq.c where the "affinity" field
is referenced without an #ifdef CONFIG_SMP. Copying the MIPS maintainer
and mailing list -- this one is out of my scope to fix.
Michael
>
> > ---
> > drivers/iommu/hyperv-iommu.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
> > index 51bd66a..e190bb8 100644
> > --- a/drivers/iommu/hyperv-iommu.c
> > +++ b/drivers/iommu/hyperv-iommu.c
> > @@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain
> *domain,
> > {
> > struct irq_alloc_info *info = arg;
> > struct irq_data *irq_data;
> > - struct irq_desc *desc;
> > int ret = 0;
> >
> > if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
> > @@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain
> *domain,
> > * Hypver-V IO APIC irq affinity should be in the scope of
> > * ioapic_max_cpumask because no irq remapping support.
> > */
> > - desc = irq_data_to_desc(irq_data);
> > - cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
> > + irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
> >
> > return 0;
> > }
>
> --
> ~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread* RE: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 2:39 ` Randy Dunlap
2022-07-26 3:34 ` Michael Kelley (LINUX)
@ 2022-08-03 16:26 ` Michael Kelley (LINUX)
2022-08-04 9:03 ` Marc Zyngier
1 sibling, 1 reply; 9+ messages in thread
From: Michael Kelley (LINUX) @ 2022-08-03 16:26 UTC (permalink / raw)
To: Randy Dunlap, Stephen Hemminger, KY Srinivasan, Haiyang Zhang,
wei.liu@kernel.org, Dexuan Cui, joro@8bytes.org, will@kernel.org,
robin.murphy@arm.com, samuel@sholland.org,
linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org,
iommu@lists.linux.dev, maz@kernel.org
From: Randy Dunlap <rdunlap@infradead.org> Sent: Monday, July 25, 2022 7:39 PM
>
> On 7/25/22 17:53, Michael Kelley wrote:
> > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > out the affinity field in irq_common_data for non-SMP configurations.
> > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > in that case.
> >
> > Fix this by using the new irq_data_update_affinity() helper, which
> > handles the non-SMP case correctly.
> >
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
> Tested-by: Randy Dunlap <rdunlap@infradead.org>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
>
> Thanks.
>
> > ---
> > drivers/iommu/hyperv-iommu.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
> > index 51bd66a..e190bb8 100644
> > --- a/drivers/iommu/hyperv-iommu.c
> > +++ b/drivers/iommu/hyperv-iommu.c
> > @@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain
> *domain,
> > {
> > struct irq_alloc_info *info = arg;
> > struct irq_data *irq_data;
> > - struct irq_desc *desc;
> > int ret = 0;
> >
> > if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
> > @@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
> > * Hypver-V IO APIC irq affinity should be in the scope of
> > * ioapic_max_cpumask because no irq remapping support.
> > */
> > - desc = irq_data_to_desc(irq_data);
> > - cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
> > + irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
> >
> > return 0;
> > }
>
> --
Marc --
Could you pick up this patch for the 6.0 merge window? It's a fix to a
side effect of Samuel Holland's series to unify SMP and UP handling of
affinity masks that went through your irq/irqchip-next tree.
Michael
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-08-03 16:26 ` Michael Kelley (LINUX)
@ 2022-08-04 9:03 ` Marc Zyngier
0 siblings, 0 replies; 9+ messages in thread
From: Marc Zyngier @ 2022-08-04 9:03 UTC (permalink / raw)
To: Michael Kelley (LINUX)
Cc: Randy Dunlap, Stephen Hemminger, KY Srinivasan, Haiyang Zhang,
wei.liu@kernel.org, Dexuan Cui, joro@8bytes.org, will@kernel.org,
robin.murphy@arm.com, samuel@sholland.org,
linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org,
iommu@lists.linux.dev
On Wed, 03 Aug 2022 17:26:10 +0100,
"Michael Kelley (LINUX)" <mikelley@microsoft.com> wrote:
>
> From: Randy Dunlap <rdunlap@infradead.org> Sent: Monday, July 25, 2022 7:39 PM
> >
> > On 7/25/22 17:53, Michael Kelley wrote:
> > > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > > out the affinity field in irq_common_data for non-SMP configurations.
> > > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > > in that case.
> > >
> > > Fix this by using the new irq_data_update_affinity() helper, which
> > > handles the non-SMP case correctly.
> > >
> >
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
> > Tested-by: Randy Dunlap <rdunlap@infradead.org>
> > Acked-by: Randy Dunlap <rdunlap@infradead.org>
> >
> > Thanks.
> >
> > > ---
> > > drivers/iommu/hyperv-iommu.c | 4 +---
> > > 1 file changed, 1 insertion(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
> > > index 51bd66a..e190bb8 100644
> > > --- a/drivers/iommu/hyperv-iommu.c
> > > +++ b/drivers/iommu/hyperv-iommu.c
> > > @@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain
> > *domain,
> > > {
> > > struct irq_alloc_info *info = arg;
> > > struct irq_data *irq_data;
> > > - struct irq_desc *desc;
> > > int ret = 0;
> > >
> > > if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
> > > @@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
> > > * Hypver-V IO APIC irq affinity should be in the scope of
> > > * ioapic_max_cpumask because no irq remapping support.
> > > */
> > > - desc = irq_data_to_desc(irq_data);
> > > - cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
> > > + irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
> > >
> > > return 0;
> > > }
> >
> > --
>
> Marc --
>
> Could you pick up this patch for the 6.0 merge window? It's a fix to a
> side effect of Samuel Holland's series to unify SMP and UP handling of
> affinity masks that went through your irq/irqchip-next tree.
Applied with a:
Fixes: aa0813581b8d ("genirq: Provide an IRQ affinity mask in non-SMP configs")
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 0:53 [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity Michael Kelley
2022-07-26 2:39 ` Randy Dunlap
@ 2022-07-26 7:15 ` Joerg Roedel
2022-07-26 13:09 ` Wei Liu
1 sibling, 1 reply; 9+ messages in thread
From: Joerg Roedel @ 2022-07-26 7:15 UTC (permalink / raw)
To: Michael Kelley
Cc: sthemmin, kys, haiyangz, wei.liu, decui, will, robin.murphy,
samuel, linux-kernel, linux-hyperv, iommu
Hi Michael,
On Mon, Jul 25, 2022 at 05:53:40PM -0700, Michael Kelley wrote:
> Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> out the affinity field in irq_common_data for non-SMP configurations.
> The current code in hyperv_irq_remapping_alloc() gets a compiler error
> in that case.
>
> Fix this by using the new irq_data_update_affinity() helper, which
> handles the non-SMP case correctly.
>
> Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Please add a fixes tag.
Where is the change which breaks this currently, in some subsystem tree
or already upstream?
In case it is still in a maintainers tree, this patch should be applied
there. Here is my
Acked-by: Joerg Roedel <jroedel@suse.de>
for that.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 7:15 ` Joerg Roedel
@ 2022-07-26 13:09 ` Wei Liu
2022-07-26 13:48 ` Michael Kelley (LINUX)
0 siblings, 1 reply; 9+ messages in thread
From: Wei Liu @ 2022-07-26 13:09 UTC (permalink / raw)
To: Joerg Roedel
Cc: Michael Kelley, sthemmin, kys, haiyangz, wei.liu, decui, will,
robin.murphy, samuel, linux-kernel, linux-hyperv, iommu
On Tue, Jul 26, 2022 at 09:15:58AM +0200, Joerg Roedel wrote:
> Hi Michael,
>
> On Mon, Jul 25, 2022 at 05:53:40PM -0700, Michael Kelley wrote:
> > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > out the affinity field in irq_common_data for non-SMP configurations.
> > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > in that case.
> >
> > Fix this by using the new irq_data_update_affinity() helper, which
> > handles the non-SMP case correctly.
> >
> > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
>
> Please add a fixes tag.
>
> Where is the change which breaks this currently, in some subsystem tree
> or already upstream?
>
The offending patch aa081358 is in linux-next.
> In case it is still in a maintainers tree, this patch should be applied
> there. Here is my
>
> Acked-by: Joerg Roedel <jroedel@suse.de>
I can take this patch via hyperv-next. This is a good improvement
anyway.
Thanks,
Wei.
>
> for that.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 13:09 ` Wei Liu
@ 2022-07-26 13:48 ` Michael Kelley (LINUX)
2022-07-26 14:38 ` Wei Liu
0 siblings, 1 reply; 9+ messages in thread
From: Michael Kelley (LINUX) @ 2022-07-26 13:48 UTC (permalink / raw)
To: Wei Liu, Joerg Roedel
Cc: Stephen Hemminger, KY Srinivasan, Haiyang Zhang, Dexuan Cui,
will@kernel.org, robin.murphy@arm.com, samuel@sholland.org,
linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org,
iommu@lists.linux.dev
From: Wei Liu <wei.liu@kernel.org> Sent: Tuesday, July 26, 2022 6:09 AM
>
> On Tue, Jul 26, 2022 at 09:15:58AM +0200, Joerg Roedel wrote:
> > Hi Michael,
> >
> > On Mon, Jul 25, 2022 at 05:53:40PM -0700, Michael Kelley wrote:
> > > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > > out the affinity field in irq_common_data for non-SMP configurations.
> > > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > > in that case.
> > >
> > > Fix this by using the new irq_data_update_affinity() helper, which
> > > handles the non-SMP case correctly.
> > >
> > > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
> >
> > Please add a fixes tag.
> >
> > Where is the change which breaks this currently, in some subsystem tree
> > or already upstream?
> >
>
> The offending patch aa081358 is in linux-next.
>
> > In case it is still in a maintainers tree, this patch should be applied
> > there. Here is my
> >
> > Acked-by: Joerg Roedel <jroedel@suse.de>
>
> I can take this patch via hyperv-next. This is a good improvement
> anyway.
I don't think this patch should go via hyperv-next. The helper
function is introduced in the linux-next patch in the irq/irqchip-next tree,
so this patch should go through irq/irqchip-next to avoid creating an
interdependency.
Since the original breaking change is not upstream, do I need
a Fixes: tag? Won't using a linux-next commitID in a Fixes:
tag be confusing? There's nothing to backport to stable.
Michael
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity
2022-07-26 13:48 ` Michael Kelley (LINUX)
@ 2022-07-26 14:38 ` Wei Liu
0 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2022-07-26 14:38 UTC (permalink / raw)
To: Michael Kelley (LINUX)
Cc: Wei Liu, Joerg Roedel, Stephen Hemminger, KY Srinivasan,
Haiyang Zhang, Dexuan Cui, will@kernel.org, robin.murphy@arm.com,
samuel@sholland.org, linux-kernel@vger.kernel.org,
linux-hyperv@vger.kernel.org, iommu@lists.linux.dev
On Tue, Jul 26, 2022 at 01:48:35PM +0000, Michael Kelley (LINUX) wrote:
> From: Wei Liu <wei.liu@kernel.org> Sent: Tuesday, July 26, 2022 6:09 AM
> >
> > On Tue, Jul 26, 2022 at 09:15:58AM +0200, Joerg Roedel wrote:
> > > Hi Michael,
> > >
> > > On Mon, Jul 25, 2022 at 05:53:40PM -0700, Michael Kelley wrote:
> > > > Recent changes to solve inconsistencies in handling IRQ masks #ifdef
> > > > out the affinity field in irq_common_data for non-SMP configurations.
> > > > The current code in hyperv_irq_remapping_alloc() gets a compiler error
> > > > in that case.
> > > >
> > > > Fix this by using the new irq_data_update_affinity() helper, which
> > > > handles the non-SMP case correctly.
> > > >
> > > > Signed-off-by: Michael Kelley <mikelley@microsoft.com>
> > >
> > > Please add a fixes tag.
> > >
> > > Where is the change which breaks this currently, in some subsystem tree
> > > or already upstream?
> > >
> >
> > The offending patch aa081358 is in linux-next.
> >
> > > In case it is still in a maintainers tree, this patch should be applied
> > > there. Here is my
> > >
> > > Acked-by: Joerg Roedel <jroedel@suse.de>
> >
> > I can take this patch via hyperv-next. This is a good improvement
> > anyway.
>
> I don't think this patch should go via hyperv-next. The helper
> function is introduced in the linux-next patch in the irq/irqchip-next tree,
> so this patch should go through irq/irqchip-next to avoid creating an
> interdependency.
This is fine too.
Wei.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-08-04 9:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-26 0:53 [PATCH 1/1] iommu/hyper-v: Use helper instead of directly accessing affinity Michael Kelley
2022-07-26 2:39 ` Randy Dunlap
2022-07-26 3:34 ` Michael Kelley (LINUX)
2022-08-03 16:26 ` Michael Kelley (LINUX)
2022-08-04 9:03 ` Marc Zyngier
2022-07-26 7:15 ` Joerg Roedel
2022-07-26 13:09 ` Wei Liu
2022-07-26 13:48 ` Michael Kelley (LINUX)
2022-07-26 14:38 ` Wei Liu
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).