On 09/11/2012 06:52 AM, Alex Elder wrote:
On 09/10/2012 05:05 PM, Josh Durgin wrote:
Looking closer, I don't think we need to protect this section at all.
The device isn't initialized yet, so nothing else can access the
rbd_dev->header. It'd be good to have a comment to that effect.
Josh
For the most part that's true.
However as soon as it's possible to refresh the header, the
lock should be held. And in the code as of this point that
happens as soon as rbd_bus_add_dev() gets called. In that
respect this change fixes a bug, because the header refresh
could have been initiated before the header had even been
read yet.
Upcoming patches rearrange the order of this stuff quite a
bit though, which was why I just grabbed the lock immediately
and held onto it until everything is set up, for simplicity.
After all of these are in place I can reduce the range over
which the lock is held during initialization. But as I
said in the commit commit, it doesn't really hurt to hold
it. I will add a comment in the code to that effect before
I commit.
-Alex
OK, I see what you mean now. I'd forgotten about the possible manual
refresh via sysfs.
Reviewed-by: Josh Durgin <josh.durgin@xxxxxxxxxxx>
On 09/07/2012 07:50 AM, Alex Elder wrote:
Expand the region of code in rbd_add() protected by the header
semaphore to include the complete initialization sequence. It may
not be strictly necessary, but it doesn't hurt. And with the
upcoming changes to the order of steps here this offers easy
protection.
Signed-off-by: Alex Elder <elder@xxxxxxxxxxx>
---
drivers/block/rbd.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 214c937..6af09f1 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2553,6 +2553,8 @@ static ssize_t rbd_add(struct bus_type *bus,
INIT_LIST_HEAD(&rbd_dev->snaps);
init_rwsem(&rbd_dev->header_rwsem);
+ down_write(&rbd_dev->header_rwsem);
+
/* generate unique id: find highest unique id, add one */
rbd_dev_id_get(rbd_dev);
@@ -2598,18 +2600,17 @@ static ssize_t rbd_add(struct bus_type *bus,
/* contact OSD, request size info about the object being mapped */
rc = rbd_read_header(rbd_dev, &rbd_dev->header);
if (rc)
- goto err_out_bus;
+ goto err_out_unlock;
- /* no need to lock here, as rbd_dev is not registered yet */
rc = rbd_dev_snap_devs_update(rbd_dev);
if (rc)
- goto err_out_bus;
+ goto err_out_unlock;
- down_write(&rbd_dev->header_rwsem);
rc = rbd_header_set_snap(rbd_dev, snap_name);
- up_write(&rbd_dev->header_rwsem);
if (rc)
- goto err_out_bus;
+ goto err_out_unlock;
+
+ up_write(&rbd_dev->header_rwsem);
/* Set up the blkdev mapping. */
@@ -2630,6 +2631,8 @@ static ssize_t rbd_add(struct bus_type *bus,
return count;
+err_out_unlock:
+ up_write(&rbd_dev->header_rwsem);
err_out_bus:
/* this will also clean up rest of rbd_dev stuff */
@@ -2649,6 +2652,7 @@ err_put_id:
kfree(rbd_dev->pool_name);
}
rbd_dev_id_put(rbd_dev);
+ up_write(&rbd_dev->header_rwsem);
err_nomem:
kfree(rbd_dev);
kfree(options);
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
