Skip to contentSkip to conversation

Intel IOMMU double lock

PATCH Jiri Slaby 1 participant 1 message Jun 14, 2010 PCI

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

Hi,

stanse found the following double lock.

In get_domain_for_dev:
spin_lock_irqsave(&device_domain_lock, flags);

  domain_exit(domain);
    domain_remove_dev_info(domain);
      spin_lock_irqsave(&device_domain_lock, flags);
      spin_unlock_irqrestore(&device_domain_lock, flags);

spin_unlock_irqrestore(&device_domain_lock, flags);

I don't know how to solve this properly. Is this OK:

drivers/pci/intel-iommu.c +0 -0
index 796828f..e6ac8e7 100644
@@ -1874,14 +1874,15 @@ static struct dmar_domain

*get_domain_for_dev(struct pci_dev *pdev, int gaw)

                        }
                }
                if (found) {
+                       spin_unlock_irqrestore(&device_domain_lock, flags);
                        free_devinfo_mem(info);
                        domain_exit(domain);
                        domain = found;
                } else {
                        list_add(&info->link, &domain->devices);
                        list_add(&info->global, &device_domain_list);
+                       spin_unlock_irqrestore(&device_domain_lock, flags);
                }
-               spin_unlock_irqrestore(&device_domain_lock, flags);
        }

found_domain:

thanks,

Signature · 1 line
js