PCI: vmd: Keep fwnode allocated through VMD irqdomain life
Subsystems (13)
PATCH 1/1 PCI: vmd: Keep fwnode allocated through VMD irqdomain life
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of 181e9d4efaf6a (irqdomain: Make __irq_domain_add() less OF-dependent), the fwnode is put during irq_domain_remove causing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.
---
Hi Lorenzo, Bjorn,
Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Thanks
Jon
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +6 -2
@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }
@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);
@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.18.1
PATCH 1/1 PCI: vmd: Keep fwnode allocated through VMD irqdomain life
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of 181e9d4efaf6a (irqdomain: Make __irq_domain_add() less OF-dependent), the fwnode is put during irq_domain_remove causing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.
---
Hi Lorenzo, Bjorn,
Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Thanks
Jon
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +6 -2
@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }
@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);
@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.18.1
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>
Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas' ae904cafd59d ("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.
But it's not clear to me that ae904cafd59d is actually broken, since the log also says the problem appeared after 181e9d4efaf6 ("irqdomain:
Make __irq_domain_add() less OF-dependent"), which we just merged for v5.8-rc1.
And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain
... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnode
But I can't tell how 181e9d4efaf6a and/or ae904cafd59d are related to that.
Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1
Quoted 41 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain
Quoted 8 lines
... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.
The actual issue is that domain->fwnode was freed (and not set NULL), leading to page fault here:
void irq_domain_remove(struct irq_domain *domain)
{
...
fwnode_handle_put(domain->fwnode);
But it's not obvious to me that VMD has a reason to free fwnode if there's other deps that rely on it existing
Quoted 48 lines
Quoted 48 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1
Quoted 22 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Quoted 6 lines
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.
I didn't word this correctly. What I meant was "I will consider applying this after the commit log is clarified." Just FYI that this isn't resolved yet.
Since this is proposed for v5.8, I really want to understand this better before asking Linus to pull it as a fix.
Quoted 68 lines
But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1
Quoted 30 lines · Bjorn Helgaas
Quoted 22 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Quoted 6 lines
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.
Quoted 6 lines
I didn't word this correctly. What I meant was "I will consider applying this after the commit log is clarified." Just FYI that this isn't resolved yet.
Since this is proposed for v5.8, I really want to understand this better before asking Linus to pull it as a fix.
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
If you think that's fine to have such trick, feel free to update Fixes tag.
Quoted 68 lines
Quoted 68 lines
But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 38 lines · Andy Shevchenko
Quoted 30 lines · Bjorn Helgaas
Quoted 22 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Quoted 6 lines
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.Quoted 6 lines
I didn't word this correctly. What I meant was "I will consider applying this after the commit log is clarified." Just FYI that this isn't resolved yet.
Since this is proposed for v5.8, I really want to understand this better before asking Linus to pull it as a fix.
Quoted 6 lines
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
IIUC, you're saying this pattern:
fwnode = irq_domain_alloc_named_id_fwnode(...) irq_domain = pci_msi_create_irq_domain(fwnode, ...) irq_domain_free_fwnode(fwnode)
leaves a dangling fwnode pointer. That does look suspicious because __irq_domain_add() saves fwnode:
irq_domain = pci_msi_create_irq_domain(fwnode, ...)
msi_create_irq_domain(fwnode, ...)
irq_domain_create_hierarchy(..., fwnode, ...)
irq_domain_create_linear(fwnode, ...)
__irq_domain_add(fwnode, ...)
domain->fwnode = fwnodeand irq_domain_free_fwnode() frees it. But I'm confused because there are several other instances of this pattern:
bridge_probe() # arch/mips/pci/pci-xtalk-bridge.c
mp_irqdomain_create()
arch_init_msi_domain()
arch_create_remap_msi_irq_domain()
dmar_get_irq_domain()
hpet_create_irq_domain()
...
Are they all wrong? I definitely think it's a bad idea to keep a copy of a pointer after we free the data it points to. But if they're all wrong, I don't want to fix just one and leave all the others.
Thomas, can you enlighten us?
Quoted 76 lines
If you think that's fine to have such trick, feel free to update Fixes tag.
Quoted 68 lines
Quoted 68 lines
But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 73 lines · Bjorn Helgaas
Quoted 38 lines · Andy Shevchenko
Quoted 30 lines · Bjorn Helgaas
Quoted 22 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Quoted 6 lines
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.Quoted 6 lines
I didn't word this correctly. What I meant was "I will consider applying this after the commit log is clarified." Just FYI that this isn't resolved yet.
Since this is proposed for v5.8, I really want to understand this better before asking Linus to pull it as a fix.
Quoted 6 lines
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
IIUC, you're saying this pattern:
fwnode =
irq_domain_alloc_named_id_fwnode(...)irq_domain=pci_msi_create_irq_domain(fwnode, ...)irq_domain_free_fwnode(fwnode)leaves a dangling fwnode pointer. That does look suspicious because
__irq_domain_add()saves fwnode:
irq_domain=pci_msi_create_irq_domain(fwnode, ...)msi_create_irq_domain(fwnode, ...) irq_domain_create_hierarchy(..., fwnode, ...) irq_domain_create_linear(fwnode, ...) __irq_domain_add(fwnode, ...) domain->fwnode = fwnodeand
irq_domain_free_fwnode()frees it. But I'm confused because there are several other instances of this pattern:
bridge_probe()#arch/mips/pci/pci-xtalk-bridge.c
mp_irqdomain_create()
arch_init_msi_domain()
arch_create_remap_msi_irq_domain()
dmar_get_irq_domain()
hpet_create_irq_domain()
...
Quoted 6 lines
Are they all wrong? I definitely think it's a bad idea to keep a copy of a pointer after we free the data it points to. But if they're all wrong, I don't want to fix just one and leave all the others.
Thomas, can you enlighten us?
I see that struct irqchip_fwid contains the actual fwnode structure and when that is freed, it's causes the issue.
I'm noticing in each caller of irq_domain_free_fwnode, we have the domain itself available. It seems like it should be up to the caller to deal with the fwnode pointer, but we could just do:
kernel/irq/irqdomain.c +1 -1
@@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(__irq_domain_alloc_fwnode);* * Free a fwnode_handle allocated with irq_domain_alloc_fwnode. */ -void irq_domain_free_fwnode (struct fwnode_handle *fwnode) +void irq_domain_free_fwnode(struct irq_domain *domain, struct
fwnode_handle *fwnode)
{
struct irqchip_fwid *fwid;@@ -109,6 +109,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode)
return;
fwid = container_of(fwnode, struct irqchip_fwid, fwnode);
+ domain->fwnode = NULL;
kfree(fwid->name);
kfree(fwid);}
Quoted 76 lines
Quoted 76 lines
If you think that's fine to have such trick, feel free to update Fixes tag.
Quoted 68 lines
Quoted 68 lines
But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 81 lines · Jonathan
Quoted 73 lines · Bjorn Helgaas
Quoted 38 lines · Andy Shevchenko
Quoted 30 lines · Bjorn Helgaas
Quoted 22 lines · Bjorn Helgaas
[+cc Thomas]
Quoted 13 lines · Jon Derrick
From: Andy Shevchenko <[email protected]>
The VMD domain does not subscribe to ACPI, and so does not operate on it's irqdomain fwnode. It was freeing the handle after allocation of the domain. As of
181e9d4efaf6a(irqdomain: Make__irq_domain_add()less OF-dependent), the fwnode is put duringirq_domain_removecausing a page fault. This patch keeps VMD's fwnode allocated through the lifetime of the VMD irqdomain.Fixes ae904cafd59d ("PCI/vmd: Create named irq domain")Signed-off-by Andy Shevchenko <[email protected]>Co-developed-by Andy Shevchenko <[email protected]>Signed-off-by Jon Derrick <[email protected]>Quoted 5 lines
---
Hi Lorenzo, Bjorn,Please take this patch for v5.8 fixes. It fixes an issue during VMD unload.
Quoted 6 lines
I tentatively applied this to for-linus for v5.8.
But I would like to clarify the commit log. It says this fixes Thomas'
ae904cafd59d("PCI/vmd: Create named irq domain"). That appeared in v4.13, which suggests that this patch should be backported to v4.13 and later.Quoted 6 lines
I didn't word this correctly. What I meant was "I will consider applying this after the commit log is clarified." Just FYI that this isn't resolved yet.
Since this is proposed for v5.8, I really want to understand this better before asking Linus to pull it as a fix.
Quoted 6 lines
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
IIUC, you're saying this pattern:
fwnode =
irq_domain_alloc_named_id_fwnode(...)irq_domain=pci_msi_create_irq_domain(fwnode, ...)irq_domain_free_fwnode(fwnode)leaves a dangling fwnode pointer. That does look suspicious because
__irq_domain_add()saves fwnode:
irq_domain=pci_msi_create_irq_domain(fwnode, ...)msi_create_irq_domain(fwnode, ...) irq_domain_create_hierarchy(..., fwnode, ...) irq_domain_create_linear(fwnode, ...) __irq_domain_add(fwnode, ...) domain->fwnode = fwnodeand
irq_domain_free_fwnode()frees it. But I'm confused because there are several other instances of this pattern:
bridge_probe()#arch/mips/pci/pci-xtalk-bridge.c
mp_irqdomain_create()
arch_init_msi_domain()
arch_create_remap_msi_irq_domain()
dmar_get_irq_domain()
hpet_create_irq_domain()
...Quoted 6 lines
Are they all wrong? I definitely think it's a bad idea to keep a copy of a pointer after we free the data it points to. But if they're all wrong, I don't want to fix just one and leave all the others.
Thomas, can you enlighten us?
Quoted 6 lines
I see that struct
irqchip_fwidcontains the actual fwnode structure and when that is freed, it's causes the issue.I'm noticing in each caller of
irq_domain_free_fwnode, we have the domain itself available. It seems like it should be up to the caller to deal with the fwnode pointer, but we could just do:
It might work as well, but also needs a good documentation.
kernel/irq/irqdomain.c EXPORT_SYMBOL_GPL(__irq_domain_alloc_fwnode); · line 106
Quoted 12 lines
kernel/irq/irqdomain.c +1
-1@@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(__irq_domain_alloc_fwnode);* * Free a fwnode_handle allocated with irq_domain_alloc_fwnode. */ -void irq_domain_free_fwnode(struct fwnode_handle *fwnode) +void irq_domain_free_fwnode (struct irq_domain *domain,struct fwnode_handle *fwnode)
Isn't fwnode == domain->fwnode here and second parameter won't be necessary?
Quoted 91 lines
kernel/irq/irqdomain.c +0
-0{struct irqchip_fwid *fwid;kernel/irq/irqdomain.c +1
-0@@ -109,6 +109,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode)return ; fwid = container_of(fwnode, struct irqchip_fwid, fwnode); + domain->fwnode =NULL ;kfree (fwid->name);kfree (fwid);}
Quoted 76 lines
Quoted 76 lines
If you think that's fine to have such trick, feel free to update Fixes tag.
Quoted 68 lines
Quoted 68 lines
But it's not clear to me that
ae904cafd59dis actually broken, since the log also says the problem appeared after181e9d4efaf6("irqdomain:
Make__irq_domain_add()less OF-dependent"), which we just merged for v5.8-rc1.And obviously, freeing the fwnode doesn't *cause* a page fault. A use-after-free might cause a fault, but it's not clear where that happens. I guess fwnode is used in the interval between:
vmd_enable_domain
pci_msi_create_irq_domain... <-- fwnode used here somewhere
vmd_remove
vmd_cleanup_srcu
irq_domain_free_fwnodeBut I can't tell how
181e9d4efaf6aand/orae904cafd59dare related to that.Quoted 47 lines
drivers/pci/controller/vmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/vmd.c +6
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);@@ -559,6 +560,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!vmd->bus) {pci_free_resource_list (&resources);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn);return -ENODEV ; }@@ -672,6 +674,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)static void vmd_remove (struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); +struct fwnode_handle *fn = vmd->irq_domain->fwnode;sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);@@ -679,6 +682,7 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); +irq_domain_free_fwnode (fn); }#ifdef CONFIG_PM_SLEEP Signature · 1 line
2.18.1Signature · 2 lines
With Best Regards, Andy Shevchenko
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 7 lines · Jonathan
On Tue, 2020-06-30 at 11:33 -0500, Bjorn Helgaas wrote:
I see that structirqchip_fwidcontains the actual fwnode structure and when that is freed, it's causes the issue.I'm noticing in each caller of
irq_domain_free_fwnode, we have the domain itself available. It seems like it should be up to the caller to deal with the fwnode pointer, but we could just do:
Why? The fwnode pointer handling is inconsistent for the various fwnode types. We really don't want to go back to that state.
Thanks,
tglx
Quoted 11 lines · Thomas Gleixner
Quoted 7 lines · Jonathan
On Tue, 2020-06-30 at 11:33 -0500, Bjorn Helgaas wrote:
I see that structirqchip_fwidcontains the actual fwnode structure and when that is freed, it's causes the issue.I'm noticing in each caller of
irq_domain_free_fwnode, we have the domain itself available. It seems like it should be up to the caller to deal with the fwnode pointer, but we could just do:Why? The fwnode pointer handling is inconsistent for the various fwnode types.
I see... That does explain a lot.
Quoted 5 lines
We really don't want to go back to that state.
Thanks,
tglx
Thanks for the prompt fix
Jon
Quoted 7 lines · Bjorn Helgaas
Quoted 6 lines · Andy Shevchenko
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
No. The original patch did not create a dangling pointer because fwnode was not stored for IRQCHIP_FWNODE_NAMED and IRQCHIP_FWNODE_NAMED_ID type nodes.
The fail was introduced in:
711419e504eb ("irqdomain: Add the missing assignment of domain->fwnode for named fwnode")
Quoted 27 lines
IIUC, you're saying this pattern:
fwnode =
irq_domain_alloc_named_id_fwnode(...)irq_domain=pci_msi_create_irq_domain(fwnode, ...)irq_domain_free_fwnode(fwnode)leaves a dangling fwnode pointer. That does look suspicious because
__irq_domain_add()saves fwnode:
irq_domain=pci_msi_create_irq_domain(fwnode, ...)msi_create_irq_domain(fwnode, ...) irq_domain_create_hierarchy(..., fwnode, ...) irq_domain_create_linear(fwnode, ...) __irq_domain_add(fwnode, ...) domain->fwnode = fwnodeand
irq_domain_free_fwnode()frees it. But I'm confused because there are several other instances of this pattern:
bridge_probe()#arch/mips/pci/pci-xtalk-bridge.c
mp_irqdomain_create()
arch_init_msi_domain()
arch_create_remap_msi_irq_domain()
dmar_get_irq_domain()
hpet_create_irq_domain()
...
Quoted 5 lines
Are they all wrong? I definitely think it's a bad idea to keep a copy of a pointer after we free the data it points to. But if they're all wrong, I don't want to fix just one and leave all the others.
Thomas, can you enlighten us?
Did so. And yes, all instances which do alloc/create/free are busted since that commit.
Thanks,
tglx
Quoted 9 lines · Thomas Gleixner
Quoted 7 lines · Bjorn Helgaas
Quoted 6 lines · Andy Shevchenko
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
Quoted 7 lines
No. The original patch did not create a dangling pointer because fwnode was not stored for
IRQCHIP_FWNODE_NAMEDandIRQCHIP_FWNODE_NAMED_IDtype nodes.The fail was introduced in:
711419e504eb("irqdomain: Add the missing assignment ofdomain->fwnodefor named fwnode")
Ah, sorry for missing that and thank you for pointing out.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Thomas Gleixner
Quoted 7 lines · Bjorn Helgaas
Quoted 6 lines · Andy Shevchenko
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
No. The original patch did not create a dangling pointer because fwnode was not stored for
IRQCHIP_FWNODE_NAMEDandIRQCHIP_FWNODE_NAMED_IDtype nodes.
Quoted 5 lines
Quoted 3 lines
The fail was introduced in:
711419e504eb("irqdomain: Add the missing assignment ofdomain->fwnodefor named fwnode")Ah, sorry for missing that and thank you for pointing out.
So something like the below wants to be applied and marked for stable
Thanks,
tglx
---
arch/mips/pci/pci-xtalk-bridge.c +3 -2
@@ -627,9 +627,10 @@ static int bridge_probe(struct platform_device *pdev)return -ENOMEM ; domain =irq_domain_create_hierarchy (parent,0 ,8 , fn, &bridge_domain_ops,NULL ); -irq_domain_free_fwnode (fn); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + }pci_set_flags (PCI_PROBE_ONLY );
arch/x86/kernel/apic/io_apic.c +5 -5
@@ -2316,12 +2316,12 @@ static int mp_irqdomain_create(int ioapic) ip->irqdomain =irq_domain_create_linear (fn, hwirqs, cfg->ops, (void *)(long )ioapic); -/* Release fw handle if it was allocated above */ -if (!cfg->dev) -irq_domain_free_fwnode (fn); - -if (!ip->irqdomain) +if (!ip->irqdomain) { +/* Release fw handle if it was allocated above */ +if (!cfg->dev) +irq_domain_free_fwnode (fn);return -ENOMEM ; + } ip->irqdomain->parent = parent;
arch/x86/kernel/apic/msi.c +12 -6
@@ -263,12 +263,13 @@ void __init arch_init_msi_domain(struct irq_domain *parent) msi_default_domain =pci_msi_create_irq_domain (fn, &pci_msi_domain_info, parent); -irq_domain_free_fwnode (fn); } -if (!msi_default_domain) +if (!msi_default_domain) { +irq_domain_free_fwnode (fn);pr_warn ("failed to initialize irqdomain for MSI/MSI-x.\n" ); -else + }else { msi_default_domain->flags |=IRQ_DOMAIN_MSI_NOMASK_QUIRK ; + } }#ifdef CONFIG_IRQ_REMAP
@@ -301,7 +302,8 @@ struct irq_domain *arch_create_remap_msi_irq_domain(struct irq_domain *parent,if (!fn)return NULL ; d =pci_msi_create_irq_domain (fn, &pci_msi_ir_domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) +irq_domain_free_fwnode (fn); return d; }#endif
@@ -364,7 +366,8 @@ static struct irq_domain *dmar_get_irq_domain(void)if (fn) { dmar_domain =msi_create_irq_domain (fn, &dmar_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); +if (!dmar_domain) +irq_domain_free_fwnode (fn); } out:mutex_unlock (&dmar_lock);
@@ -489,7 +492,10 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id) } d =msi_create_irq_domain (fn, domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) { +irq_domain_free_fwnode (fn); +kfree (domain_info); + }return d; }
arch/x86/kernel/apic/vector.c +0 -1
@@ -709,7 +709,6 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_domain_free_fwnode (fn);irq_set_default_host (x86_vector_domain);arch_init_msi_domain (x86_vector_domain);
arch/x86/platform/uv/uv_irq.c +2 -1
@@ -167,9 +167,10 @@ static struct irq_domain *uv_get_irq_domain(void) goto out; uv_domain =irq_domain_create_tree (fn, &uv_domain_ops,NULL ); -irq_domain_free_fwnode (fn);if (uv_domain) uv_domain->parent = x86_vector_domain; +else +irq_domain_free_fwnode (fn); out:mutex_unlock (&uv_lock);
drivers/iommu/amd/iommu.c +3 -2
@@ -3985,9 +3985,10 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu)if (!fn)return -ENOMEM ; iommu->ir_domain =irq_domain_create_tree (fn, &amd_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn); -if (!iommu->ir_domain) +if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + } iommu->ir_domain->parent =arch_get_ir_parent_domain (); iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,
drivers/iommu/hyperv-iommu.c +4 -1
@@ -155,7 +155,10 @@ static int __init hyperv_prepare_irq_remapping(void)0 ,IOAPIC_REMAPPING_ENTRY , fn, &hyperv_ir_domain_ops, NULL); -irq_domain_free_fwnode (fn); +if (!ioapic_ir_domain) { +irq_domain_free_fwnode (fn); +return -ENOMEM ; + }/* * Hyper-V doesn't provide irq remapping function for
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -563,8 +563,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)0 ,INTR_REMAP_TABLE_ENTRIES , fn, &intel_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn);if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);pr_err ("IR%d: failed to allocate irqdomain\n" , iommu->seq_id); goto out_free_bitmap; }
drivers/mfd/ioc3.c +3 -2
@@ -142,10 +142,11 @@ static int ioc3_irq_domain_setup(struct ioc3_priv_data *ipd, int irq) goto err; domain =irq_domain_create_linear (fn,24 , &ioc3_irq_domain_ops, ipd); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn); goto err; + } -irq_domain_free_fwnode (fn); ipd->domain = domain;irq_set_chained_handler_and_data (irq, ioc3_irq_handler, domain);
drivers/pci/controller/vmd.c +3 -2
@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
Quoted 15 lines · Thomas Gleixner
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Thomas Gleixner
Quoted 7 lines · Bjorn Helgaas
Quoted 6 lines · Andy Shevchenko
The problem here is in the original patch which relies on the knowledge that fwnode is (was) not used anyhow specifically for ACPI case. That said, it makes fwnode a dangling pointer which I personally consider as a mine left for others. That's why the Fixes refers to the initial commit. The latter just has been blasted on that mine.
No. The original patch did not create a dangling pointer because fwnode was not stored for
IRQCHIP_FWNODE_NAMEDandIRQCHIP_FWNODE_NAMED_IDtype nodes.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
The fail was introduced in:
711419e504eb("irqdomain: Add the missing assignment ofdomain->fwnodefor named fwnode")Ah, sorry for missing that and thank you for pointing out.
So something like the below wants to be applied and marked for stable
Great, thanks for all your help, Thomas!
This looks more like a general IRQ domain thing than a PCI thing, so maybe it will make the most sense if Marc takes care of it.
Quoted 203 lines
---
arch/mips/pci/pci-xtalk-bridge.c +3
-2@@ -627,9 +627,10 @@ static int bridge_probe(struct platform_device *pdev)return -ENOMEM ; domain =irq_domain_create_hierarchy (parent,0 ,8 , fn, &bridge_domain_ops,NULL ); -irq_domain_free_fwnode (fn); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + }pci_set_flags (PCI_PROBE_ONLY );arch/x86/kernel/apic/io_apic.c +5
-5@@ -2316,12 +2316,12 @@ static int mp_irqdomain_create(int ioapic) ip->irqdomain =irq_domain_create_linear (fn, hwirqs, cfg->ops, (void *)(long )ioapic); -/* Release fw handle if it was allocated above */ -if (!cfg->dev) -irq_domain_free_fwnode (fn); - -if (!ip->irqdomain) +if (!ip->irqdomain) { +/* Release fw handle if it was allocated above */ +if (!cfg->dev) +irq_domain_free_fwnode (fn);return -ENOMEM ; + } ip->irqdomain->parent = parent;arch/x86/kernel/apic/msi.c +12
-6@@ -263,12 +263,13 @@ void __init arch_init_msi_domain(struct irq_domain *parent) msi_default_domain =pci_msi_create_irq_domain (fn, &pci_msi_domain_info, parent); -irq_domain_free_fwnode (fn); } -if (!msi_default_domain) +if (!msi_default_domain) { +irq_domain_free_fwnode (fn);pr_warn ("failed to initialize irqdomain for MSI/MSI-x.\n" ); -else + }else { msi_default_domain->flags |=IRQ_DOMAIN_MSI_NOMASK_QUIRK ; + } }#ifdef CONFIG_IRQ_REMAP @@ -301,7 +302,8 @@ struct irq_domain *arch_create_remap_msi_irq_domain(struct irq_domain *parent,if (!fn)return NULL ; d =pci_msi_create_irq_domain (fn, &pci_msi_ir_domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) +irq_domain_free_fwnode (fn); return d; }#endif @@ -364,7 +366,8 @@ static struct irq_domain *dmar_get_irq_domain(void)if (fn) { dmar_domain =msi_create_irq_domain (fn, &dmar_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); +if (!dmar_domain) +irq_domain_free_fwnode (fn); } out:mutex_unlock (&dmar_lock);@@ -489,7 +492,10 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id) } d =msi_create_irq_domain (fn, domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) { +irq_domain_free_fwnode (fn); +kfree (domain_info); + }return d; }arch/x86/kernel/apic/vector.c +0
-1@@ -709,7 +709,6 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_domain_free_fwnode (fn);irq_set_default_host (x86_vector_domain);arch_init_msi_domain (x86_vector_domain);arch/x86/platform/uv/uv_irq.c +2
-1@@ -167,9 +167,10 @@ static struct irq_domain *uv_get_irq_domain(void) goto out; uv_domain =irq_domain_create_tree (fn, &uv_domain_ops,NULL ); -irq_domain_free_fwnode (fn);if (uv_domain) uv_domain->parent = x86_vector_domain; +else +irq_domain_free_fwnode (fn); out:mutex_unlock (&uv_lock);drivers/iommu/amd/iommu.c +3
-2@@ -3985,9 +3985,10 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu)if (!fn)return -ENOMEM ; iommu->ir_domain =irq_domain_create_tree (fn, &amd_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn); -if (!iommu->ir_domain) +if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + } iommu->ir_domain->parent =arch_get_ir_parent_domain (); iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,drivers/iommu/hyperv-iommu.c +4
-1@@ -155,7 +155,10 @@ static int __init hyperv_prepare_irq_remapping(void)0 ,IOAPIC_REMAPPING_ENTRY , fn, &hyperv_ir_domain_ops, NULL); -irq_domain_free_fwnode (fn); +if (!ioapic_ir_domain) { +irq_domain_free_fwnode (fn); +return -ENOMEM ; + }/* * Hyper-V doesn't provide irq remapping function for drivers/iommu/intel/irq_remapping.c +1
-1@@ -563,8 +563,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)0 ,INTR_REMAP_TABLE_ENTRIES , fn, &intel_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn);if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);pr_err ("IR%d: failed to allocate irqdomain\n" , iommu->seq_id); goto out_free_bitmap; }drivers/mfd/ioc3.c +3
-2@@ -142,10 +142,11 @@ static int ioc3_irq_domain_setup(struct ioc3_priv_data *ipd, int irq) goto err; domain =irq_domain_create_linear (fn,24 , &ioc3_irq_domain_ops, ipd); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn); goto err; + } -irq_domain_free_fwnode (fn); ipd->domain = domain;irq_set_chained_handler_and_data (irq, ioc3_irq_handler, domain);drivers/pci/controller/vmd.c +3
-2@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
PATCH 1/1 irqdomain/treewide: Keep firmware node unconditionally allocated
Quite some non OF/ACPI users of irqdomains allocate firmware nodes of type IRQCHIP_FWNODE_NAMED or IRQCHIP_FWNODE_NAMED_ID and free them right after creating the irqdomain. The only purpose of these FW nodes is to convey name information. When this was introduced the core code did not store the pointer to the node in the irqdomain. A recent change stored the firmware node pointer in irqdomain for other reasons and missed to notice that the usage sites which do the alloc_fwnode/create_domain/free_fwnode sequence are broken by this. Storing a dangling pointer is dangerous itself, but in case that the domain is destroyed later on this leads to a double free.
Remove the freeing of the firmware node after creating the irqdomain from all affected call sites to cure this.
--- arch/mips/pci/pci-xtalk-bridge.c | 5 +++-- arch/x86/kernel/apic/io_apic.c | 10 +++++----- arch/x86/kernel/apic/msi.c | 18 ++++++++++++------ arch/x86/kernel/apic/vector.c | 1 - arch/x86/platform/uv/uv_irq.c | 3 ++- drivers/iommu/amd/iommu.c | 5 +++-- drivers/iommu/hyperv-iommu.c | 5 ++++- drivers/iommu/intel/irq_remapping.c | 2 +- drivers/mfd/ioc3.c | 5 +++-- drivers/pci/controller/vmd.c | 5 +++-- 10 files changed, 36 insertions(+), 23 deletions(-)
arch/mips/pci/pci-xtalk-bridge.c +3 -2
@@ -627,9 +627,10 @@ static int bridge_probe(struct platform_return -ENOMEM ; domain =irq_domain_create_hierarchy (parent,0 ,8 , fn, &bridge_domain_ops,NULL ); -irq_domain_free_fwnode (fn); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + }pci_set_flags (PCI_PROBE_ONLY );
arch/x86/kernel/apic/io_apic.c +5 -5
@@ -2316,12 +2316,12 @@ static int mp_irqdomain_create(int ioapi ip->irqdomain =irq_domain_create_linear (fn, hwirqs, cfg->ops, (void *)(long )ioapic); -/* Release fw handle if it was allocated above */ -if (!cfg->dev) -irq_domain_free_fwnode (fn); - -if (!ip->irqdomain) +if (!ip->irqdomain) { +/* Release fw handle if it was allocated above */ +if (!cfg->dev) +irq_domain_free_fwnode (fn);return -ENOMEM ; + } ip->irqdomain->parent = parent;
arch/x86/kernel/apic/msi.c +12 -6
@@ -263,12 +263,13 @@ void __init arch_init_msi_domain(struct msi_default_domain =pci_msi_create_irq_domain (fn, &pci_msi_domain_info, parent); -irq_domain_free_fwnode (fn); } -if (!msi_default_domain) +if (!msi_default_domain) { +irq_domain_free_fwnode (fn);pr_warn ("failed to initialize irqdomain for MSI/MSI-x.\n" ); -else + }else { msi_default_domain->flags |=IRQ_DOMAIN_MSI_NOMASK_QUIRK ; + } }#ifdef CONFIG_IRQ_REMAP
@@ -301,7 +302,8 @@ struct irq_domain *arch_create_remap_msiif (!fn)return NULL ; d =pci_msi_create_irq_domain (fn, &pci_msi_ir_domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) +irq_domain_free_fwnode (fn); return d; }#endif
@@ -364,7 +366,8 @@ static struct irq_domain *dmar_get_irq_dif (fn) { dmar_domain =msi_create_irq_domain (fn, &dmar_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); +if (!dmar_domain) +irq_domain_free_fwnode (fn); } out:mutex_unlock (&dmar_lock);
@@ -489,7 +492,10 @@ struct irq_domain *hpet_create_irq_domai } d =msi_create_irq_domain (fn, domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) { +irq_domain_free_fwnode (fn); +kfree (domain_info); + }return d; }
arch/x86/kernel/apic/vector.c +0 -1
@@ -709,7 +709,6 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_domain_free_fwnode (fn);irq_set_default_host (x86_vector_domain);arch_init_msi_domain (x86_vector_domain);
arch/x86/platform/uv/uv_irq.c +2 -1
@@ -167,9 +167,10 @@ static struct irq_domain *uv_get_irq_dom goto out; uv_domain =irq_domain_create_tree (fn, &uv_domain_ops,NULL ); -irq_domain_free_fwnode (fn);if (uv_domain) uv_domain->parent = x86_vector_domain; +else +irq_domain_free_fwnode (fn); out:mutex_unlock (&uv_lock);
drivers/iommu/amd/iommu.c +3 -2
@@ -3985,9 +3985,10 @@ int amd_iommu_create_irq_domain(struct aif (!fn)return -ENOMEM ; iommu->ir_domain =irq_domain_create_tree (fn, &amd_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn); -if (!iommu->ir_domain) +if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + } iommu->ir_domain->parent =arch_get_ir_parent_domain (); iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,
drivers/iommu/hyperv-iommu.c +4 -1
@@ -155,7 +155,10 @@ static int __init hyperv_prepare_irq_rem0 ,IOAPIC_REMAPPING_ENTRY , fn, &hyperv_ir_domain_ops, NULL); -irq_domain_free_fwnode (fn); +if (!ioapic_ir_domain) { +irq_domain_free_fwnode (fn); +return -ENOMEM ; + }/* * Hyper-V doesn't provide irq remapping function for
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -563,8 +563,8 @@ static int intel_setup_irq_remapping(str0 ,INTR_REMAP_TABLE_ENTRIES , fn, &intel_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn);if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);pr_err ("IR%d: failed to allocate irqdomain\n" , iommu->seq_id); goto out_free_bitmap; }
drivers/mfd/ioc3.c +3 -2
@@ -142,10 +142,11 @@ static int ioc3_irq_domain_setup(struct goto err; domain =irq_domain_create_linear (fn,24 , &ioc3_irq_domain_ops, ipd); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn); goto err; + } -irq_domain_free_fwnode (fn); ipd->domain = domain;irq_set_chained_handler_and_data (irq, ioc3_irq_handler, domain);
drivers/pci/controller/vmd.c +3 -2
@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_ vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
Re: [PATCH] irqdomain/treewide: Keep firmware node unconditionally allocated
Hi Thomas,
Catching up on email...
Quoted 10 lines · Thomas Gleixner
Quite some non OF/ACPI users of irqdomains allocate firmware nodes of type
IRQCHIP_FWNODE_NAMEDorIRQCHIP_FWNODE_NAMED_IDand free them right after creating the irqdomain. The only purpose of these FW nodes is to convey name information. When this was introduced the core code did not store the pointer to the node in the irqdomain. A recent change stored the firmware node pointer in irqdomain for other reasons and missed to notice that the usage sites which do the alloc_fwnode/create_domain/free_fwnode sequence are broken by this. Storing a dangling pointer is dangerous itself, but in case that the domain is destroyed later on this leads to a double free.
Quoted 8 lines
Remove the freeing of the firmware node after creating the irqdomain from all affected call sites to cure this.
Fixes 711419e504eb ("irqdomain: Add the missing assignment of
domain->fwnodefor named fwnode")Reported-by Andy Shevchenko <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>
Urgh, that's pretty disastrous. My bad. Thanks a lot for having put this patch together.
If you can take it directly into Linus' tree, that'd be greatly appreciated.
Thanks again,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [PATCH] irqdomain/treewide: Keep firmware node unconditionally allocated
In reply to Thomas GleixnerQuoted 10 lines · Thomas Gleixner
Quite some non OF/ACPI users of irqdomains allocate firmware nodes of type
IRQCHIP_FWNODE_NAMEDorIRQCHIP_FWNODE_NAMED_IDand free them right after creating the irqdomain. The only purpose of these FW nodes is to convey name information. When this was introduced the core code did not store the pointer to the node in the irqdomain. A recent change stored the firmware node pointer in irqdomain for other reasons and missed to notice that the usage sites which do the alloc_fwnode/create_domain/free_fwnode sequence are broken by this. Storing a dangling pointer is dangerous itself, but in case that the domain is destroyed later on this leads to a double free.
Quoted 7 lines
Remove the freeing of the firmware node after creating the irqdomain from all affected call sites to cure this.
Fixes 711419e504eb ("irqdomain: Add the missing assignment of domain->fwnode for named fwnode")Reported-by Andy Shevchenko <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>
[tip: irq/urgent] irqdomain/treewide: Keep firmware node unconditionally allocated
In reply to Thomas GleixnerThe following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: e3beca48a45b5e0e6e6a4e0124276b8248dcc9bb Gitweb: https://git.kernel.org/tip/e3beca48a45b5e0e6e6a4e0124276b8248dcc9bb Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 09 Jul 2020 11:53:06 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jul 2020 17:44:42 +02:00
irqdomain/treewide: Keep firmware node unconditionally allocated
Quite some non OF/ACPI users of irqdomains allocate firmware nodes of type IRQCHIP_FWNODE_NAMED or IRQCHIP_FWNODE_NAMED_ID and free them right after creating the irqdomain. The only purpose of these FW nodes is to convey name information. When this was introduced the core code did not store the pointer to the node in the irqdomain. A recent change stored the firmware node pointer in irqdomain for other reasons and missed to notice that the usage sites which do the alloc_fwnode/create_domain/free_fwnode sequence are broken by this. Storing a dangling pointer is dangerous itself, but in case that the domain is destroyed later on this leads to a double free.
Remove the freeing of the firmware node after creating the irqdomain from all affected call sites to cure this.
--- arch/mips/pci/pci-xtalk-bridge.c | 5 +++-- arch/x86/kernel/apic/io_apic.c | 10 +++++----- arch/x86/kernel/apic/msi.c | 18 ++++++++++++------ arch/x86/kernel/apic/vector.c | 1 - arch/x86/platform/uv/uv_irq.c | 3 ++- drivers/iommu/amd/iommu.c | 5 +++-- drivers/iommu/hyperv-iommu.c | 5 ++++- drivers/iommu/intel/irq_remapping.c | 2 +- drivers/mfd/ioc3.c | 5 +++-- drivers/pci/controller/vmd.c | 5 +++-- 10 files changed, 36 insertions(+), 23 deletions(-)
arch/mips/pci/pci-xtalk-bridge.c +3 -2
@@ -627,9 +627,10 @@ static int bridge_probe(struct platform_device *pdev)return -ENOMEM ; domain =irq_domain_create_hierarchy (parent,0 ,8 , fn, &bridge_domain_ops,NULL ); -irq_domain_free_fwnode (fn); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + }pci_set_flags (PCI_PROBE_ONLY );
arch/x86/kernel/apic/io_apic.c +5 -5
@@ -2316,12 +2316,12 @@ static int mp_irqdomain_create(int ioapic) ip->irqdomain =irq_domain_create_linear (fn, hwirqs, cfg->ops, (void *)(long )ioapic); -/* Release fw handle if it was allocated above */ -if (!cfg->dev) -irq_domain_free_fwnode (fn); - -if (!ip->irqdomain) +if (!ip->irqdomain) { +/* Release fw handle if it was allocated above */ +if (!cfg->dev) +irq_domain_free_fwnode (fn);return -ENOMEM ; + } ip->irqdomain->parent = parent;
arch/x86/kernel/apic/msi.c +12 -6
@@ -263,12 +263,13 @@ void __init arch_init_msi_domain(struct irq_domain *parent) msi_default_domain =pci_msi_create_irq_domain (fn, &pci_msi_domain_info, parent); -irq_domain_free_fwnode (fn); } -if (!msi_default_domain) +if (!msi_default_domain) { +irq_domain_free_fwnode (fn);pr_warn ("failed to initialize irqdomain for MSI/MSI-x.\n" ); -else + }else { msi_default_domain->flags |=IRQ_DOMAIN_MSI_NOMASK_QUIRK ; + } }#ifdef CONFIG_IRQ_REMAP
@@ -301,7 +302,8 @@ struct irq_domain *arch_create_remap_msi_irq_domain(struct irq_domain *parent,if (!fn)return NULL ; d =pci_msi_create_irq_domain (fn, &pci_msi_ir_domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) +irq_domain_free_fwnode (fn); return d; }#endif
@@ -364,7 +366,8 @@ static struct irq_domain *dmar_get_irq_domain(void)if (fn) { dmar_domain =msi_create_irq_domain (fn, &dmar_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); +if (!dmar_domain) +irq_domain_free_fwnode (fn); } out:mutex_unlock (&dmar_lock);
@@ -489,7 +492,10 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id) } d =msi_create_irq_domain (fn, domain_info, parent); -irq_domain_free_fwnode (fn); +if (!d) { +irq_domain_free_fwnode (fn); +kfree (domain_info); + }return d; }
arch/x86/kernel/apic/vector.c +0 -1
@@ -709,7 +709,6 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_domain_free_fwnode (fn);irq_set_default_host (x86_vector_domain);arch_init_msi_domain (x86_vector_domain);
arch/x86/platform/uv/uv_irq.c +2 -1
@@ -167,9 +167,10 @@ static struct irq_domain *uv_get_irq_domain(void) goto out; uv_domain =irq_domain_create_tree (fn, &uv_domain_ops,NULL ); -irq_domain_free_fwnode (fn);if (uv_domain) uv_domain->parent = x86_vector_domain; +else +irq_domain_free_fwnode (fn); out:mutex_unlock (&uv_lock);
drivers/iommu/amd/iommu.c +3 -2
@@ -3985,9 +3985,10 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu)if (!fn)return -ENOMEM ; iommu->ir_domain =irq_domain_create_tree (fn, &amd_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn); -if (!iommu->ir_domain) +if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);return -ENOMEM ; + } iommu->ir_domain->parent =arch_get_ir_parent_domain (); iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,
drivers/iommu/hyperv-iommu.c +4 -1
@@ -155,7 +155,10 @@ static int __init hyperv_prepare_irq_remapping(void)0 ,IOAPIC_REMAPPING_ENTRY , fn, &hyperv_ir_domain_ops, NULL); -irq_domain_free_fwnode (fn); +if (!ioapic_ir_domain) { +irq_domain_free_fwnode (fn); +return -ENOMEM ; + }/* * Hyper-V doesn't provide irq remapping function for
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -563,8 +563,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)0 ,INTR_REMAP_TABLE_ENTRIES , fn, &intel_ir_domain_ops, iommu); -irq_domain_free_fwnode (fn);if (!iommu->ir_domain) { +irq_domain_free_fwnode (fn);pr_err ("IR%d: failed to allocate irqdomain\n" , iommu->seq_id); goto out_free_bitmap; }
drivers/mfd/ioc3.c +3 -2
@@ -142,10 +142,11 @@ static int ioc3_irq_domain_setup(struct ioc3_priv_data *ipd, int irq) goto err; domain =irq_domain_create_linear (fn,24 , &ioc3_irq_domain_ops, ipd); -if (!domain) +if (!domain) { +irq_domain_free_fwnode (fn); goto err; + } -irq_domain_free_fwnode (fn); ipd->domain = domain;irq_set_chained_handler_and_data (irq, ioc3_irq_handler, domain);
drivers/pci/controller/vmd.c +3 -2
@@ -546,9 +546,10 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd->irq_domain =pci_msi_create_irq_domain (fn, &vmd_msi_domain_info, x86_vector_domain); -irq_domain_free_fwnode (fn); -if (!vmd->irq_domain) +if (!vmd->irq_domain) { +irq_domain_free_fwnode (fn);return -ENODEV ; + }pci_add_resource (&resources, &vmd->resources[0 ]);pci_add_resource_offset (&resources, &vmd->resources[1 ], offset[0 ]);
Sasha Levin
maintainerRe: [PATCH] irqdomain/treewide: Keep firmware node unconditionally allocated
In reply to Thomas GleixnerHi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 711419e504eb ("irqdomain: Add the missing assignment of domain->fwnode for named fwnode").
The bot has tested the following trees: v5.7.8, v5.4.51, v4.19.132, v4.14.188.
v5.7.8: Failed to apply! Possible dependencies:
Unable to calculate
v5.4.51: Failed to apply! Possible dependencies:
051a07ec7a3de ("net: sgi: ioc3-eth: simplify setting the DMA mask") 0ce5ebd24d25f ("mfd: ioc3: Add driver for SGI IOC3 chip") 10cf8300ecada ("MIPS: SGI-IP27: fix readb/writeb addressing") 4dd147471dae0 ("net: sgi: ioc3-eth: don't abuse dma_direct_* calls")
v4.19.132: Failed to apply! Possible dependencies:
437f2b8c20858 ("MIPS: remove the HT_PCI config option")
69a07a41d908f ("MIPS: SGI-IP27: rework HUB interrupts")
a15687ca7b927 ("powerpc: PCI_MSI needs PCI")
e6308b6d35ea7 ("MIPS: SGI-IP27: abstract chipset irq from bridge")
eb01d42a77785 ("PCI: consolidate PCI config entry in drivers/pci")v4.14.188: Failed to apply! Possible dependencies:
3369ddb62a42e ("MIPS: make the default mips dma implementation optional") 4a2e130cce1f6 ("m68k: allow ColdFire PCI bus on MMU and non-MMU configuration") 4c301f9b6a94b ("ARM: Convert to GENERIC_IRQ_MULTI_HANDLER") 69a07a41d908f ("MIPS: SGI-IP27: rework HUB interrupts") 76053854f7d10 ("ARC: [plat-hsdk] Add PCIe support")
b6e05477c10c1 ("dma/direct: Handle the memory encryption bit in common code") d1f2564a5639b ("MIPS: ath25: use generic dma noncoherent ops") e6308b6d35ea7 ("MIPS: SGI-IP27: abstract chipset irq from bridge") ea8c64ace8664 ("dma-mapping: move swiotlb arch helpers to a new header") eb01d42a77785 ("PCI: consolidate PCI config entry in drivers/pci") f6d302e33d68d ("MIPS: consolidate the swiotlb implementations")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Signature · 2 lines
Thanks Sasha