Skip to contentSkip to conversation

rbd: turn off interrupts for open/remove locking

PATCH In review Alex Elder 2 participants 2 messages Feb 5, 2013 – Feb 8, 2013

Subsystems (2)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 rbd: turn off interrupts for open/remove locking

This commit:
bc7a62ee5 rbd: prevent open for image being removed
added checking for removing rbd before allowing an open, and used the same request spinlock for protecting that and updating the open count as is used for the request queue.

However it used the non-irq protected version of the spinlocks. Fix that.

---
 drivers/block/rbd.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/block/rbd.c +0 -0
index 14a6967..91983a60 100644
@@ -394,12 +394,12 @@ static int rbd_open(struct block_device *bdev,

fmode_t mode)
if ((mode & FMODE_WRITE) && rbd_dev->mapping.read_only)
return -EROFS;

- spin_lock(&rbd_dev->lock);
+ spin_lock_irq(&rbd_dev->lock);
if (test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags))
removing = true;
else
rbd_dev->open_count++;
- spin_unlock(&rbd_dev->lock);
+ spin_unlock_irq(&rbd_dev->lock);
if (removing)
return -ENOENT;

@@ -416,9 +416,9 @@ static int rbd_release(struct gendisk *disk, fmode_t mode)
struct rbd_device *rbd_dev = disk->private_data; unsigned long open_count_before;

- spin_lock(&rbd_dev->lock);
+ spin_lock_irq(&rbd_dev->lock);
open_count_before = rbd_dev->open_count--;
- spin_unlock(&rbd_dev->lock);
+ spin_unlock_irq(&rbd_dev->lock);
rbd_assert(open_count_before > 0);

mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
@@ -4099,12 +4099,12 @@ static ssize_t rbd_remove(struct bus_type *bus,
goto done;
}

- spin_lock(&rbd_dev->lock);
+ spin_lock_irq(&rbd_dev->lock);
if (rbd_dev->open_count)
ret = -EBUSY;
else
set_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags);
- spin_unlock(&rbd_dev->lock);
+ spin_unlock_irq(&rbd_dev->lock);
if (ret < 0)
goto done;

Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 62 lines · Alex Elder

This commit:
bc7a62ee5 rbd: prevent open for image being removed
added checking for removing rbd before allowing an open, and used the same request spinlock for protecting that and updating the open count as is used for the request queue.

However it used the non-irq protected version of the spinlocks. Fix that.

---
  drivers/block/rbd.c |   12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/block/rbd.c +4 -4
index 14a6967..91983a60 100644
@@ -394,12 +394,12 @@ static int rbd_open(struct block_device *bdev,
 fmode_t mode)
  	if ((mode & FMODE_WRITE) && rbd_dev->mapping.read_only)
  		return -EROFS;
 
-	spin_lock(&rbd_dev->lock);
+	spin_lock_irq(&rbd_dev->lock);
  	if (test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags))
  		removing = true;
  	else
  		rbd_dev->open_count++;
-	spin_unlock(&rbd_dev->lock);
+	spin_unlock_irq(&rbd_dev->lock);
  	if (removing)
  		return -ENOENT;
@@ -416,9 +416,9 @@ static int rbd_release(struct gendisk *disk, fmode_t
 mode)
  	struct rbd_device *rbd_dev = disk->private_data;
  	unsigned long open_count_before;
 
-	spin_lock(&rbd_dev->lock);
+	spin_lock_irq(&rbd_dev->lock);
  	open_count_before = rbd_dev->open_count--;
-	spin_unlock(&rbd_dev->lock);
+	spin_unlock_irq(&rbd_dev->lock);
  	rbd_assert(open_count_before > 0);
 
  	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
drivers/block/rbd.c +2 -2
@@ -4099,12 +4099,12 @@ static ssize_t rbd_remove(struct bus_type *bus,
  		goto done;
  	}
 
-	spin_lock(&rbd_dev->lock);
+	spin_lock_irq(&rbd_dev->lock);
  	if (rbd_dev->open_count)
  		ret = -EBUSY;
  	else
  		set_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags);
-	spin_unlock(&rbd_dev->lock);
+	spin_unlock_irq(&rbd_dev->lock);
  	if (ret < 0)
  		goto done;