| Message ID | 20170619235444.379861978@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tue, 20 Jun 2017, Keith Busch wrote: > On Tue, Jun 20, 2017 at 01:37:15AM +0200, Thomas Gleixner wrote: > > static int vmd_enable_domain(struct vmd_dev *vmd) > > { > > struct pci_sysdata *sd = &vmd->sysdata; > > + struct fwnode_handle *fn; > > struct resource *res; > > u32 upper_bits; > > unsigned long flags; > > @@ -617,8 +618,13 @@ static int vmd_enable_domain(struct vmd_ > > > > sd->node = pcibus_to_node(vmd->dev->bus); > > > > - vmd->irq_domain = pci_msi_create_irq_domain(NULL, &vmd_msi_domain_info, > > + fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain); > > + if (!fn) > > + return -ENODEV; > > + > > + vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info, > > x86_vector_domain); > > + kfree(fn); > > If I'm following all this correctly, it looks like we need to use > irq_domain_free_fwnode with irq_domain_alloc_named_id_fwnode instead of > freeing 'fn' directly, otherwise we leak 'fwid->name'. Yes, I'm a moron.
On Tue, Jun 20, 2017 at 01:37:15AM +0200, Thomas Gleixner wrote: > static int vmd_enable_domain(struct vmd_dev *vmd) > { > struct pci_sysdata *sd = &vmd->sysdata; > + struct fwnode_handle *fn; > struct resource *res; > u32 upper_bits; > unsigned long flags; > @@ -617,8 +618,13 @@ static int vmd_enable_domain(struct vmd_ > > sd->node = pcibus_to_node(vmd->dev->bus); > > - vmd->irq_domain = pci_msi_create_irq_domain(NULL, &vmd_msi_domain_info, > + fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain); > + if (!fn) > + return -ENODEV; > + > + vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info, > x86_vector_domain); > + kfree(fn); If I'm following all this correctly, it looks like we need to use irq_domain_free_fwnode with irq_domain_alloc_named_id_fwnode instead of freeing 'fn' directly, otherwise we leak 'fwid->name'.
On Tue, 20 Jun 2017, Thomas Gleixner wrote: > On Tue, 20 Jun 2017, Keith Busch wrote: > > On Tue, Jun 20, 2017 at 01:37:15AM +0200, Thomas Gleixner wrote: > > > static int vmd_enable_domain(struct vmd_dev *vmd) > > > { > > > struct pci_sysdata *sd = &vmd->sysdata; > > > + struct fwnode_handle *fn; > > > struct resource *res; > > > u32 upper_bits; > > > unsigned long flags; > > > @@ -617,8 +618,13 @@ static int vmd_enable_domain(struct vmd_ > > > > > > sd->node = pcibus_to_node(vmd->dev->bus); > > > > > > - vmd->irq_domain = pci_msi_create_irq_domain(NULL, &vmd_msi_domain_info, > > > + fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain); > > > + if (!fn) > > > + return -ENODEV; > > > + > > > + vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info, > > > x86_vector_domain); > > > + kfree(fn); > > > > If I'm following all this correctly, it looks like we need to use > > irq_domain_free_fwnode with irq_domain_alloc_named_id_fwnode instead of > > freeing 'fn' directly, otherwise we leak 'fwid->name'. > > Yes, I'm a moron. Fixed up the mess and updated the git branch. Thanks for catching it. tglx
--- a/drivers/pci/host/vmd.c +++ b/drivers/pci/host/vmd.c @@ -554,6 +554,7 @@ static int vmd_find_free_domain(void) static int vmd_enable_domain(struct vmd_dev *vmd) { struct pci_sysdata *sd = &vmd->sysdata; + struct fwnode_handle *fn; struct resource *res; u32 upper_bits; unsigned long flags; @@ -617,8 +618,13 @@ static int vmd_enable_domain(struct vmd_ sd->node = pcibus_to_node(vmd->dev->bus); - vmd->irq_domain = pci_msi_create_irq_domain(NULL, &vmd_msi_domain_info, + fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain); + if (!fn) + return -ENODEV; + + vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info, x86_vector_domain); + kfree(fn); if (!vmd->irq_domain) return -ENODEV;
Use the fwnode to create a named domain so diagnosis works. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Keith Busch <keith.busch@intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org --- drivers/pci/host/vmd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)