rbd: enforce parent overlap
Subsystems (2)
PATCH 1/1 rbd: enforce parent overlap
(This patch is available in branch "review/wip-overlap" of the ceph-client git repository.)
A clone image has a defined overlap point with its parent image. That is the byte offset beyond which the parent image has no defined data to back the clone, and anything thereafter can be viewed as being zero-filled by the clone image.
This is needed because a clone image can be resized. If it gets resized larger than the snapshot it is based on, the overlap defines the original size. If the clone gets resized downward below the original size the new clone size defines the overlap. If the clone is subsequently resized to be larger, the overlap won't be increased because the previous resize invalidated any parent data beyond that point.
This resolves:
http://tracker.ceph.com/issues/4724
--- drivers/block/rbd.c | 64 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 10 deletions(-)
drivers/block/rbd.c +0 -0
@@ -1437,20 +1437,20 @@ static void rbd_osd_trivial_callback(struct
rbd_obj_request *obj_request)
static void rbd_osd_read_callback(struct rbd_obj_request *obj_request) {
struct rbd_img_request *img_request = NULL;
+ struct rbd_device *rbd_dev = NULL;
bool layered = false;
if (obj_request_img_data_test(obj_request)) {
img_request = obj_request->img_request;
layered = img_request && img_request_layered_test(img_request);
- } else {
- img_request = NULL;
- layered = false;
+ rbd_dev = img_request->rbd_dev;
}
dout("%s: obj %p img %p result %d %llu/%llu\n", __func__,
obj_request, img_request, obj_request->result, obj_request->xferred, obj_request->length);
- if (layered && obj_request->result == -ENOENT)
+ if (layered && obj_request->result == -ENOENT &&
+ obj_request->img_offset < rbd_dev->parent_overlap)
rbd_img_parent_read(obj_request);
else if (img_request)
rbd_img_obj_request_read_callback(obj_request);
@@ -2166,6 +2166,16 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request)
length = (u64)1 << rbd_dev->header.obj_order;
/*
+ * There is no defined parent data beyond the parent
+ * overlap, so limit what we read at that boundary if
+ * necessary.
+ */
+ if (img_offset + length > rbd_dev->parent_overlap) {
+ rbd_assert(img_offset < rbd_dev->parent_overlap);
+ length = obj_request->offset - obj_request->img_offset;
+ }
+
+ /*
* Allocate a page array big enough to receive the data read
* from the parent.
*/
@@ -2325,21 +2335,28 @@ out:
static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) {
struct rbd_img_request *img_request;
+ struct rbd_device *rbd_dev;
bool known;
rbd_assert(obj_request_img_data_test(obj_request));
img_request = obj_request->img_request;
rbd_assert(img_request);
+ rbd_dev = img_request->rbd_dev;
/*
- * Only layered writes need special handling. If it's not a
- * layered write, or it is a layered write but we know the
- * target object exists, it's no different from any other
- * object request.
+ * Only writes to layered images need special handling.
+ * Reads and non-layered writes are simple object requests.
+ * Layered writes that start beyond the end of the overlap
+ * with the parent have no parent data, so they too are
+ * simple object requests. Finally, if the target object is
+ * known to already exist, its parent data has already been
+ * copied, so a write to the object can also be handled as a
+ * simple object request.
*/
if (!img_request_write_test(img_request) ||
!img_request_layered_test(img_request) ||
+ rbd_dev->parent_overlap <= obj_request->img_offset ||
((known = obj_request_known_test(obj_request)) &&
obj_request_exists_test(obj_request))) {
@@ -2386,14 +2403,41 @@ static int rbd_img_request_submit(struct rbd_img_request *img_request)
static void rbd_img_parent_read_callback(struct rbd_img_request*img_request)
{
struct rbd_obj_request *obj_request;
+ struct rbd_device *rbd_dev;
+ u64 obj_end;
rbd_assert(img_request_child_test(img_request));
obj_request = img_request->obj_request;
- rbd_assert(obj_request != NULL);
+ rbd_assert(obj_request);
+ rbd_assert(obj_request->img_request);
+
obj_request->result = img_request->result;
- obj_request->xferred = img_request->xferred;
+ if (obj_request->result)
+ goto out;
+ /*
+ * We need to zero anything beyond the parent overlap
+ * boundary. Since rbd_img_obj_request_read_callback()
+ * will zero anything beyond the end of a short read, an
+ * easy way to do this is to pretend the data from the
+ * parent came up short--ending at the overlap boundary.
+ */
+ rbd_assert(obj_request->img_offset < U64_MAX - obj_request->length);
+ obj_end = obj_request->img_offset + obj_request->length;
+ rbd_dev = obj_request->img_request->rbd_dev;
+ if (obj_end > rbd_dev->parent_overlap) {
+ u64 xferred = 0;
+
+ if (obj_request->img_offset < rbd_dev->parent_overlap)
+ xferred = rbd_dev->parent_overlap -
+ obj_request->img_offset;
+
+ obj_request->xferred = min(img_request->xferred, xferred);
+ } else {
+ obj_request->xferred = img_request->xferred;
+ }
+out:
rbd_img_obj_request_read_callback(obj_request); rbd_obj_request_complete(obj_request);
}
Signature · 1 line
1.7.9.5
Quoted 59 lines · Alex Elder
(This patch is available in branch "review/wip-overlap" of the ceph-client git repository.)
A clone image has a defined overlap point with its parent image. That is the byte offset beyond which the parent image has no defined data to back the clone, and anything thereafter can be viewed as being zero-filled by the clone image.
This is needed because a clone image can be resized. If it gets resized larger than the snapshot it is based on, the overlap defines the original size. If the clone gets resized downward below the original size the new clone size defines the overlap. If the clone is subsequently resized to be larger, the overlap won't be increased because the previous resize invalidated any parent data beyond that point.
This resolves:
http://tracker.ceph.com/issues/4724Signed-off-by Alex Elder <[email protected]>---
drivers/block/rbd.c| 64
+++++++++++++++++++++++++++++++++++++++++++--------1 file changed, 54 insertions(+), 10 deletions(-)drivers/block/rbd.c +4
-4@@ -1437,20 +1437,20 @@ static void rbd_osd_trivial_callback(struct rbd_obj_request *obj_request)static void rbd_osd_read_callback (struct rbd_obj_request *obj_request) {struct rbd_img_request *img_request =NULL ; +struct rbd_device *rbd_dev =NULL ;bool layered = false;if (obj_request_img_data_test (obj_request)) { img_request = obj_request->img_request; layered = img_request &&img_request_layered_test (img_request); - }else { - img_request =NULL ; - layered = false; + rbd_dev = img_request->rbd_dev; }dout ("%s: obj %p img %p result %d %llu/%llu\n" , __func__, obj_request, img_request, obj_request->result, obj_request->xferred, obj_request->length); -if (layered && obj_request->result == -ENOENT ) +if (layered && obj_request->result == -ENOENT && + obj_request->img_offset < rbd_dev->parent_overlap)rbd_img_parent_read (obj_request);else if (img_request)rbd_img_obj_request_read_callback(obj_request);drivers/block/rbd.c +0
-0@@ -2166,6 +2166,16 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request)
drivers/block/rbd.c static int rbd_img_obj_parent_read_full(struct · line 2176
Quoted 10 lines
drivers/block/rbd.c +7
-0length = (u64 )1 << rbd_dev->header.obj_order;/* +* There is no defined parent data beyond the parent +* overlap, so limit what we read at that boundary if +* necessary. +*/ +if (img_offset + length > rbd_dev->parent_overlap) { +rbd_assert (img_offset < rbd_dev->parent_overlap); + length = obj_request->offset - obj_request->img_offset;
This doesn't look right. I think we want the length to be rbd_dev->parent_overlap - img_offset.
Quoted 62 lines
drivers/block/rbd.c +3
-0+ } + +/* * Allocate a page array big enough to receive the data read * from the parent. */drivers/block/rbd.c +0
-0@@ -2325,21 +2335,28 @@ out:static int
rbd_img_obj_request_submit(struct rbd_obj_request *obj_request){ struct rbd_img_request *img_request;drivers/block/rbd.c +1
-0+struct rbd_device *rbd_dev;bool known; rbd_assert(obj_request_img_data_test(obj_request)); img_request = obj_request->img_request; rbd_assert(img_request);drivers/block/rbd.c +1
-0+ rbd_dev = img_request->rbd_dev;/*drivers/block/rbd.c +8
-4-* Only layered writes need special handling. If it's not a -* layered write, or it is a layered write but we know the -* target object exists, it's no different from any other -* object request. +* Only writes to layered images need special handling. +* Reads and non-layered writes are simple object requests. +* Layered writes that start beyond the end of the overlap +* with the parent have no parent data, so they too are +* simple object requests. Finally, if the target object is +* known to already exist, its parent data has already been +* copied, so a write to the object can also be handled as a +* simple object request. */ if (!img_request_write_test(img_request) || !img_request_layered_test(img_request) ||drivers/block/rbd.c +1
-0+ rbd_dev->parent_overlap <= obj_request->img_offset ||((known = obj_request_known_test(obj_request)) && obj_request_exists_test(obj_request))) {drivers/block/rbd.c +0
-0@@ -2386,14 +2403,41 @@ static int rbd_img_request_submit(struct rbd_img_request *img_request)static void
rbd_img_parent_read_callback(struct rbd_img_request *img_request){ struct rbd_obj_request *obj_request;drivers/block/rbd.c +2
-0+struct rbd_device *rbd_dev; +u64 obj_end;rbd_assert(img_request_child_test(img_request)); obj_request = img_request->obj_request;drivers/block/rbd.c +3
-1-rbd_assert (obj_request !=NULL ); +rbd_assert (obj_request); +rbd_assert (obj_request->img_request); +obj_request->result = img_request->result;drivers/block/rbd.c +3
-1- obj_request->xferred = img_request->xferred; +if (obj_request->result) + goto out; +/*
drivers/block/rbd.c
Quoted 10 lines
drivers/block/rbd.c +10
-0+* We need to zero anything beyond the parent overlap +* boundary. Since rbd_img_obj_request_read_callback() +* will zero anything beyond the end of a short read, an +* easy way to do this is to pretend the data from the +* parent came up short--ending at the overlap boundary. +*/ +rbd_assert (obj_request->img_offset <U64_MAX - obj_request->length); + obj_end = obj_request->img_offset + obj_request->length; + rbd_dev = obj_request->img_request->rbd_dev; +if (obj_end > rbd_dev->parent_overlap) {
Shouldn't this be >=, since the overlap is a size?
Quoted 14 lines
drivers/block/rbd.c +11
-0+u64 xferred =0 ; + +if (obj_request->img_offset < rbd_dev->parent_overlap) + xferred = rbd_dev->parent_overlap - + obj_request->img_offset; + + obj_request->xferred =min (img_request->xferred, xferred); + }else { + obj_request->xferred = img_request->xferred; + } +out:rbd_img_obj_request_read_callback(obj_request); rbd_obj_request_complete(obj_request); }
Quoted 11 lines · Josh Durgin
Quoted 9 lines · Alex Elder
(This patch is available in branch "review/wip-overlap" of the ceph-client git repository.)
A clone image has a defined overlap point with its parent image. That is the byte offset beyond which the parent image has no defined data to back the clone, and anything thereafter can be viewed as being zero-filled by the clone image.
. . .
Quoted 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -2166,6 +2166,16 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request) length = (u64)1 << rbd_dev->header.obj_order;
Quoted 11 lines
Review static int rbd_img_obj_parent_read_full(struct · line 2176
Quoted 8 lines
(quoted diff) +7
-0/* + * There is no defined parent data beyond the parent + * overlap, so limit what we read at that boundary if + * necessary. + */ + if (img_offset + length > rbd_dev->parent_overlap) { + rbd_assert(img_offset < rbd_dev->parent_overlap); + length = obj_request->offset - obj_request->img_offset;This doesn't look right. I think we want the length to be
rbd_dev->parent_overlap-img_offset.
You are correct. I'm glad you spotted that.
The assertion above it was right, I must have forgotten to fix the actual assignment.
Is that the only problem you see? I can repost, but if I agree to fix it as you describe, is that sufficient?
-Alex
Quoted 5 lines
Quoted 5 lines
(quoted diff) +3
-0+ } + + /* * Allocate a page array big enough to receive the data read * from the parent.
Quoted 31 lines · Alex Elder
Quoted 11 lines · Josh Durgin
Quoted 9 lines · Alex Elder
(This patch is available in branch "review/wip-overlap" of the ceph-client git repository.)
A clone image has a defined overlap point with its parent image. That is the byte offset beyond which the parent image has no defined data to back the clone, and anything thereafter can be viewed as being zero-filled by the clone image.
. . .
Quoted 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -2166,6 +2166,16 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request) length = (u64)1 << rbd_dev->header.obj_order;Quoted 11 lines
Review static int rbd_img_obj_parent_read_full(struct · line 2176
Quoted 8 lines
(quoted diff) +7
-0/* + * There is no defined parent data beyond the parent + * overlap, so limit what we read at that boundary if + * necessary. + */ + if (img_offset + length > rbd_dev->parent_overlap) { + rbd_assert(img_offset < rbd_dev->parent_overlap); + length = obj_request->offset - obj_request->img_offset;This doesn't look right. I think we want the length to be
rbd_dev->parent_overlap-img_offset.
Quoted 7 lines
You are correct. I'm glad you spotted that.
The assertion above it was right, I must have forgotten to fix the actual assignment.
Is that the only problem you see? I can repost, but if I agree to fix it as you describe, is that sufficient?
There's the > vs >= later too. If we agree on both, there's no need to repost.
Josh
Quoted 6 lines · Josh Durgin
Review
Quoted 6 lines
(quoted diff) +6
-0+ * We need to zero anything beyond the parent overlap + * boundary. Since rbd_img_obj_request_read_callback() + * will zero anything beyond the end of a short read, an + * easy way to do this is to pretend the data from the + * parent came up short--ending at the overlap boundary. + */
Sorry, I missed this one.
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ rbd_assert(obj_request->img_offset < U64_MAX - obj_request->length); + obj_end = obj_request->img_offset + obj_request->length; + rbd_dev = obj_request->img_request->rbd_dev; + if (obj_end > rbd_dev->parent_overlap) {Shouldn't this be >=, since the overlap is a size?
Does the overlap define the maximum byte offste included in the overlap, or does it define the first offset not included?
If it's the former, then I agree with you (and it's not what I thought).
-Alex
Quoted 8 lines
Quoted 8 lines
(quoted diff) +8
-0+ u64 xferred = 0; + + if (obj_request->img_offset < rbd_dev->parent_overlap) + xferred = rbd_dev->parent_overlap - + obj_request->img_offset; + + obj_request->xferred = min(img_request->xferred, xferred); + } else {
Quoted 15 lines · Alex Elder
Quoted 6 lines · Josh Durgin
Review
Quoted 6 lines
(quoted diff) +6
-0+ * We need to zero anything beyond the parent overlap + * boundary. Since rbd_img_obj_request_read_callback() + * will zero anything beyond the end of a short read, an + * easy way to do this is to pretend the data from the + * parent came up short--ending at the overlap boundary. + */Sorry, I missed this one.
Quoted 5 lines
Quoted 4 lines
(quoted diff) +4
-0+ rbd_assert(obj_request->img_offset < U64_MAX - obj_request->length); + obj_end = obj_request->img_offset + obj_request->length; + rbd_dev = obj_request->img_request->rbd_dev; + if (obj_end > rbd_dev->parent_overlap) {
Quoted 7 lines
Quoted 1 line
Shouldn't this be >=, since the overlap is a size?
Does the overlap define the maximum byte offste included in the overlap, or does it define the first offset not included?
If it's the former, then I agree with you (and it's not what I thought).
It's the latter. Now I see that obj_end is the first offset not included, so it's correct in your patch.
Quoted 10 lines
-Alex
Quoted 8 lines
Quoted 8 lines
(quoted diff) +8
-0+ u64 xferred = 0; + + if (obj_request->img_offset < rbd_dev->parent_overlap) + xferred = rbd_dev->parent_overlap - + obj_request->img_offset; + + obj_request->xferred = min(img_request->xferred, xferred); + } else {