2020-04-08 12:01:57

by Zenghui Yu

Subject: [PATCH] irqchip/mbigen: Free msi_desc on device teardown

Using irq_domain_free_irqs_common() on the irqdomain free path will
leave the MSI descriptor unfreed when platform devices get removed.
Properly free it by MSI domain free function.

Signed-off-by: Zenghui Yu <[email protected]>
---
drivers/irqchip/irq-mbigen.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 6b566bba263b..ff7627b57772 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -220,10 +220,16 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
return 0;
}

+static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq,
+ unsigned int nr_irqs)
+{
+ platform_msi_domain_free(domain, virq, nr_irqs);
+}
+
static const struct irq_domain_ops mbigen_domain_ops = {
.translate = mbigen_domain_translate,
.alloc = mbigen_irq_domain_alloc,
- .free = irq_domain_free_irqs_common,
+ .free = mbigen_irq_domain_free,
};

static int mbigen_of_create_domain(struct platform_device *pdev,
--
2.19.1

2020-04-09 09:28:26

by Marc Zyngier

Subject: Re: [PATCH] irqchip/mbigen: Free msi_desc on device teardown

On Wed, 8 Apr 2020 19:43:52 +0800
Zenghui Yu <[email protected]> wrote:

Hi Zenghui,

> Using irq_domain_free_irqs_common() on the irqdomain free path will
> leave the MSI descriptor unfreed when platform devices get removed.
> Properly free it by MSI domain free function.
>
> Signed-off-by: Zenghui Yu <[email protected]>
> ---
> drivers/irqchip/irq-mbigen.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
> index 6b566bba263b..ff7627b57772 100644
> --- a/drivers/irqchip/irq-mbigen.c
> +++ b/drivers/irqchip/irq-mbigen.c
> @@ -220,10 +220,16 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
> return 0;
> }
>
> +static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq,
> + unsigned int nr_irqs)
> +{
> + platform_msi_domain_free(domain, virq, nr_irqs);
> +}
> +
> static const struct irq_domain_ops mbigen_domain_ops = {
> .translate = mbigen_domain_translate,
> .alloc = mbigen_irq_domain_alloc,
> - .free = irq_domain_free_irqs_common,
> + .free = mbigen_irq_domain_free,
> };
>
> static int mbigen_of_create_domain(struct platform_device *pdev,

Should this deserve a:

Fixes: 9650c60ebfec0 ("irqchip/mbigen: Create irq domain for each
mbigen device")

Otherwise queued for post -rc1.

Thanks,

M.
--
Jazz is not dead. It just smells funny...

2020-04-09 10:32:11

by Zenghui Yu

Subject: Re: [PATCH] irqchip/mbigen: Free msi_desc on device teardown

Hi Marc,

On 2020/4/9 17:27, Marc Zyngier wrote:
> On Wed, 8 Apr 2020 19:43:52 +0800
> Zenghui Yu <[email protected]> wrote:
>
> Hi Zenghui,
>
>> Using irq_domain_free_irqs_common() on the irqdomain free path will
>> leave the MSI descriptor unfreed when platform devices get removed.
>> Properly free it by MSI domain free function.
>>
>> Signed-off-by: Zenghui Yu <[email protected]>
>> ---
>> drivers/irqchip/irq-mbigen.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
>> index 6b566bba263b..ff7627b57772 100644
>> --- a/drivers/irqchip/irq-mbigen.c
>> +++ b/drivers/irqchip/irq-mbigen.c
>> @@ -220,10 +220,16 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
>> return 0;
>> }
>>
>> +static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq,
>> + unsigned int nr_irqs)
>> +{
>> + platform_msi_domain_free(domain, virq, nr_irqs);
>> +}
>> +
>> static const struct irq_domain_ops mbigen_domain_ops = {
>> .translate = mbigen_domain_translate,
>> .alloc = mbigen_irq_domain_alloc,
>> - .free = irq_domain_free_irqs_common,
>> + .free = mbigen_irq_domain_free,
>> };
>>
>> static int mbigen_of_create_domain(struct platform_device *pdev,
>
> Should this deserve a:
>
> Fixes: 9650c60ebfec0 ("irqchip/mbigen: Create irq domain for each
> mbigen device")

Yes, please help to add it.

>
> Otherwise queued for post -rc1.

Thanks!


Zenghui

2020-04-17 09:59:04

by tip-bot2 for Alexey Makhalov

Subject: [tip: irq/urgent] irqchip/mbigen: Free msi_desc on device teardown

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID: edfc23f6f9fdbd7825d50ac1f380243cde19b679
Gitweb: https://git.kernel.org/tip/edfc23f6f9fdbd7825d50ac1f380243cde19b679
Author: Zenghui Yu <[email protected]>
AuthorDate: Wed, 08 Apr 2020 19:43:52 +08:00
Committer: Marc Zyngier <[email protected]>
CommitterDate: Fri, 17 Apr 2020 08:59:27 +01:00

irqchip/mbigen: Free msi_desc on device teardown

Using irq_domain_free_irqs_common() on the irqdomain free path will
leave the MSI descriptor unfreed when platform devices get removed.
Properly free it by MSI domain free function.

Fixes: 9650c60ebfec0 ("irqchip/mbigen: Create irq domain for each mbigen device")
Signed-off-by: Zenghui Yu <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
drivers/irqchip/irq-mbigen.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 6b566bb..ff7627b 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -220,10 +220,16 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
return 0;
}

+static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq,
+ unsigned int nr_irqs)
+{
+ platform_msi_domain_free(domain, virq, nr_irqs);
+}
+
static const struct irq_domain_ops mbigen_domain_ops = {
.translate = mbigen_domain_translate,
.alloc = mbigen_irq_domain_alloc,
- .free = irq_domain_free_irqs_common,
+ .free = mbigen_irq_domain_free,
};

static int mbigen_of_create_domain(struct platform_device *pdev,