On Tue, 2007-07-17 at 13:29 +0200, Jens Axboe wrote:
> On Mon, Jul 16 2007, James Bottomley wrote:
> > lockdep noticed that with ATA support the port->dev_list_lock was
> > entangled at irq context, so it now needs to become IRQ safe
> >
> > ---
> > This applies against the aic94xx-sas-2.6 tree
> >
> > James
> >
> > diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
> > index a18c0f6..ce3385c 100644
> > --- a/drivers/scsi/libsas/sas_discover.c
> > +++ b/drivers/scsi/libsas/sas_discover.c
> > @@ -292,9 +292,9 @@ static int sas_get_port_device(struct asd_sas_port *port)
> > port->disc.max_level = 0;
> >
> > dev->rphy = rphy;
> > - spin_lock(&port->dev_list_lock);
> > + spin_lock_irqsave(&port->dev_list_lock, flags);
> > list_add_tail(&dev->dev_list_node, &port->dev_list);
> > - spin_unlock(&port->dev_list_lock);
> > + spin_unlock_irqrestore(&port->dev_list_lock, flags);
> >
> > return 0;
> > }
>
> already uses GFP_KERNEL, so spin_lock_irq() suffices.
>
> > @@ -688,12 +688,14 @@ static void sas_discover_domain(struct work_struct *work)
> > }
> >
> > if (error) {
> > + unsigned long flags;
> > +
> > sas_rphy_free(dev->rphy);
> > dev->rphy = NULL;
> >
> > - spin_lock(&port->dev_list_lock);
> > + spin_lock_irqsave(&port->dev_list_lock, flags);
> > list_del_init(&dev->dev_list_node);
> > - spin_unlock(&port->dev_list_lock);
> > + spin_unlock_irqrestore(&port->dev_list_lock, flags);
> >
> > kfree(dev); /* not kobject_register-ed yet */
> > port->port_dev = NULL;
>
> process context, no need to save flags here either.
OK, you caught me ... I was just doing the fastest thing I could to get
lockdep to shut up. By the way, it dumps about 120KB of logs so it's
fun to get an actual trace of this...
I'll make the fixes and resubmit
James
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
