Skip to contentSkip to conversation

rbd: avoid dropping extra reference in rbd_free_disk()

PATCH In review Alex Elder 2 participants 3 messages Apr 26, 2013 – Apr 29, 2013

Subsystems (2)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 rbd: avoid dropping extra reference in rbd_free_disk()

I found during some failure injection testing that the call to rbd_free_disk() in the error path of rbd_dev_probe_finish() was dropping an extra reference to the disk queue. The problem occurred when put_disk tried to drop a reference to the disk's queue. A call to blk_cleanup_queue() just prior to that will have also dropped a reference to the queue.

The problem is that the reference dropped by put_disk() is assumed to have been taken by add_disk(). Our code has error paths that can occur after the disk and its queue are initialized, but before the call to add_disk(), and in those paths we won't have that extra reference.

The fix is easy though. In rbd_free_disk() we're already checking the disk's GENHD_FL_UP flag. That flag is an indication that add_disk() has been called, so just call blk_cleanup_queue() conditional on that flag being set.

This resolves:

    http://tracker.ceph.com/issues/4800
---
 drivers/block/rbd.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/block/rbd.c +0 -0
index dcd8e58..9e38967 100644
@@ -2844,10 +2844,12 @@ static void rbd_free_disk(struct rbd_device

*rbd_dev)
if (!disk)
return;

- if (disk->flags & GENHD_FL_UP)
+ rbd_dev->disk = NULL;
+ if (disk->flags & GENHD_FL_UP) {
del_gendisk(disk);
- if (disk->queue)
- blk_cleanup_queue(disk->queue);
+ if (disk->queue)
+ blk_cleanup_queue(disk->queue);
+ }
put_disk(disk);
}

Signature · 1 line
1.7.9.5
author
#1 lore raw

This patch, and the series of 4 that I also just posted, are available in the "review/wip-rbd-cleanup-1" branch of the ceph-client git repository. That branch is based on the branch "review/wip-rbd-cleanup".

-Alex

Reviewed-by on v1 1/1
#2 lore raw
In reply to Alex Elder
Quoted 47 lines · Alex Elder

I found during some failure injection testing that the call to rbd_free_disk() in the error path of rbd_dev_probe_finish() was dropping an extra reference to the disk queue. The problem occurred when put_disk tried to drop a reference to the disk's queue. A call to blk_cleanup_queue() just prior to that will have also dropped a reference to the queue.

The problem is that the reference dropped by put_disk() is assumed to have been taken by add_disk(). Our code has error paths that can occur after the disk and its queue are initialized, but before the call to add_disk(), and in those paths we won't have that extra reference.

The fix is easy though. In rbd_free_disk() we're already checking the disk's GENHD_FL_UP flag. That flag is an indication that add_disk() has been called, so just call blk_cleanup_queue() conditional on that flag being set.

This resolves:

     http://tracker.ceph.com/issues/4800
---
  drivers/block/rbd.c |    8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/block/rbd.c +5 -3
index dcd8e58..9e38967 100644
@@ -2844,10 +2844,12 @@ static void rbd_free_disk(struct rbd_device
 *rbd_dev)
  	if (!disk)
  		return;
 
-	if (disk->flags & GENHD_FL_UP)
+	rbd_dev->disk = NULL;
+	if (disk->flags & GENHD_FL_UP) {
  		del_gendisk(disk);
-	if (disk->queue)
-		blk_cleanup_queue(disk->queue);
+		if (disk->queue)
+			blk_cleanup_queue(disk->queue);
+	}
  	put_disk(disk);
  }