Sfoglia il codice sorgente

[SCSI] libsas: fix lockdep issue with ATA

lockdep noticed that with ATA support the port->dev_list_lock was
entangled at irq context, so it now needs to become IRQ safe

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
James Bottomley 18 anni fa
parent
commit
9d720d82dc
2 ha cambiato i file con 10 aggiunte e 10 eliminazioni
  1. 4 4
      drivers/scsi/libsas/sas_discover.c
  2. 6 6
      drivers/scsi/libsas/sas_expander.c

+ 4 - 4
drivers/scsi/libsas/sas_discover.c

@@ -304,9 +304,9 @@ static int sas_get_port_device(struct asd_sas_port *port)
 	port->disc.max_level = 0;
 	port->disc.max_level = 0;
 
 
 	dev->rphy = rphy;
 	dev->rphy = rphy;
-	spin_lock(&port->dev_list_lock);
+	spin_lock_irq(&port->dev_list_lock);
 	list_add_tail(&dev->dev_list_node, &port->dev_list);
 	list_add_tail(&dev->dev_list_node, &port->dev_list);
-	spin_unlock(&port->dev_list_lock);
+	spin_unlock_irq(&port->dev_list_lock);
 
 
 	return 0;
 	return 0;
 }
 }
@@ -703,9 +703,9 @@ static void sas_discover_domain(struct work_struct *work)
 		sas_rphy_free(dev->rphy);
 		sas_rphy_free(dev->rphy);
 		dev->rphy = NULL;
 		dev->rphy = NULL;
 
 
-		spin_lock(&port->dev_list_lock);
+		spin_lock_irq(&port->dev_list_lock);
 		list_del_init(&dev->dev_list_node);
 		list_del_init(&dev->dev_list_node);
-		spin_unlock(&port->dev_list_lock);
+		spin_unlock_irq(&port->dev_list_lock);
 
 
 		kfree(dev); /* not kobject_register-ed yet */
 		kfree(dev); /* not kobject_register-ed yet */
 		port->port_dev = NULL;
 		port->port_dev = NULL;

+ 6 - 6
drivers/scsi/libsas/sas_expander.c

@@ -677,9 +677,9 @@ static struct domain_device *sas_ex_discover_end_dev(
 
 
 		child->rphy = rphy;
 		child->rphy = rphy;
 
 
-		spin_lock(&parent->port->dev_list_lock);
+		spin_lock_irq(&parent->port->dev_list_lock);
 		list_add_tail(&child->dev_list_node, &parent->port->dev_list);
 		list_add_tail(&child->dev_list_node, &parent->port->dev_list);
-		spin_unlock(&parent->port->dev_list_lock);
+		spin_unlock_irq(&parent->port->dev_list_lock);
 
 
 		res = sas_discover_sata(child);
 		res = sas_discover_sata(child);
 		if (res) {
 		if (res) {
@@ -701,9 +701,9 @@ static struct domain_device *sas_ex_discover_end_dev(
 		child->rphy = rphy;
 		child->rphy = rphy;
 		sas_fill_in_rphy(child, rphy);
 		sas_fill_in_rphy(child, rphy);
 
 
-		spin_lock(&parent->port->dev_list_lock);
+		spin_lock_irq(&parent->port->dev_list_lock);
 		list_add_tail(&child->dev_list_node, &parent->port->dev_list);
 		list_add_tail(&child->dev_list_node, &parent->port->dev_list);
-		spin_unlock(&parent->port->dev_list_lock);
+		spin_unlock_irq(&parent->port->dev_list_lock);
 
 
 		res = sas_discover_end_dev(child);
 		res = sas_discover_end_dev(child);
 		if (res) {
 		if (res) {
@@ -816,9 +816,9 @@ static struct domain_device *sas_ex_discover_expander(
 	sas_fill_in_rphy(child, rphy);
 	sas_fill_in_rphy(child, rphy);
 	sas_rphy_add(rphy);
 	sas_rphy_add(rphy);
 
 
-	spin_lock(&parent->port->dev_list_lock);
+	spin_lock_irq(&parent->port->dev_list_lock);
 	list_add_tail(&child->dev_list_node, &parent->port->dev_list);
 	list_add_tail(&child->dev_list_node, &parent->port->dev_list);
-	spin_unlock(&parent->port->dev_list_lock);
+	spin_unlock_irq(&parent->port->dev_list_lock);
 
 
 	res = sas_discover_expander(child);
 	res = sas_discover_expander(child);
 	if (res) {
 	if (res) {