From: Josh Durgin <josh.durgin@inktank.com>
To: Alex Elder <elder@inktank.com>
Cc: "ceph-devel@vger.kernel.org" <ceph-devel@vger.kernel.org>
Subject: Re: [PATCH 11/12, v2] rbd: implement sync method with new code
Date: Tue, 29 Jan 2013 03:10:22 -0800 [thread overview]
Message-ID: <5107AE1E.4020505@inktank.com> (raw)
In-Reply-To: <510162FB.7060400@inktank.com>
With the version parameter removed now or in a later patch:
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
On 01/24/2013 08:36 AM, Alex Elder wrote:
> Reimplement synchronous object method calls using the new request
> tracking code. Use the name rbd_obj_method_sync()
>
> Signed-off-by: Alex Elder <elder@inktank.com>
> ---
> drivers/block/rbd.c | 111
> +++++++++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 94 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 48650d1..5ad2ac2 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1413,6 +1413,7 @@ static void rbd_osd_req_callback(struct
> ceph_osd_request *osd_req,
> case CEPH_OSD_OP_WRITE:
> rbd_osd_write_callback(obj_request, op);
> break;
> + case CEPH_OSD_OP_CALL:
> case CEPH_OSD_OP_NOTIFY_ACK:
> case CEPH_OSD_OP_WATCH:
> rbd_osd_trivial_callback(obj_request, op);
> @@ -1903,6 +1904,81 @@ done:
> return ret;
> }
>
> +/*
> + * Synchronous osd object method call
> + */
> +static int rbd_obj_method_sync(struct rbd_device *rbd_dev,
> + const char *object_name,
> + const char *class_name,
> + const char *method_name,
> + const char *outbound,
> + size_t outbound_size,
> + char *inbound,
> + size_t inbound_size,
> + u64 *version)
You can get rid of the version parameter. It's not useful to any
current or planned rbd code that I can think of.
> +{
> + struct rbd_obj_request *obj_request;
> + struct ceph_osd_client *osdc;
> + struct ceph_osd_req_op *op;
> + struct page **pages;
> + u32 page_count;
> + int ret;
> +
> + /*
> + * Method calls are ultimately read operations but they
> + * don't involve object data (so no offset or length).
> + * The result should placed into the inbound buffer
> + * provided. They also supply outbound data--parameters for
> + * the object method. Currently if this is present it will
> + * be a snapshot id.
> + */
> + page_count = (u32) calc_pages_for(0, inbound_size);
> + pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);
> + if (IS_ERR(pages))
> + return PTR_ERR(pages);
> +
> + ret = -ENOMEM;
> + obj_request = rbd_obj_request_create(object_name, 0, 0, obj_req_pages);
> + if (!obj_request)
> + goto out;
> +
> + obj_request->pages = pages;
> + obj_request->page_count = page_count;
> +
> + op = rbd_osd_req_op_create(CEPH_OSD_OP_CALL, class_name,
> + method_name, outbound, outbound_size);
> + if (!op)
> + goto out;
> + obj_request->osd_req = rbd_osd_req_create(rbd_dev, false,
> + obj_request, op);
> + rbd_osd_req_op_destroy(op);
> + if (!obj_request->osd_req)
> + goto out;
> +
> + osdc = &rbd_dev->rbd_client->client->osdc;
> + ret = rbd_obj_request_submit(osdc, obj_request);
> + if (ret)
> + goto out;
> + ret = rbd_obj_request_wait(obj_request);
> + if (ret)
> + goto out;
> +
> + ret = obj_request->result;
> + if (ret < 0)
> + goto out;
> + ret = ceph_copy_from_page_vector(pages, inbound, 0,
> + obj_request->xferred);
> + if (version)
> + *version = obj_request->version;
Here too
> +out:
> + if (obj_request)
> + rbd_obj_request_put(obj_request);
> + else
> + ceph_release_page_vector(pages, page_count);
> +
> + return ret;
> +}
> +
> static void rbd_request_fn(struct request_queue *q)
> {
> struct rbd_device *rbd_dev = q->queuedata;
> @@ -2753,11 +2829,12 @@ static int _rbd_dev_v2_snap_size(struct
> rbd_device *rbd_dev, u64 snap_id,
> __le64 size;
> } __attribute__ ((packed)) size_buf = { 0 };
>
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + (void) rbd_req_sync_exec; /* Avoid a warning */
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_size",
> (char *) &snapid, sizeof (snapid),
> (char *) &size_buf, sizeof (size_buf), NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> return ret;
>
> @@ -2788,14 +2865,14 @@ static int rbd_dev_v2_object_prefix(struct
> rbd_device *rbd_dev)
> if (!reply_buf)
> return -ENOMEM;
>
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_object_prefix",
> NULL, 0,
> reply_buf, RBD_OBJ_PREFIX_LEN_MAX, NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> goto out;
> - ret = 0; /* rbd_req_sync_exec() can return positive */
> + ret = 0; /* rbd_obj_method_sync() can return positive */
>
> p = reply_buf;
> rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p,
> @@ -2826,12 +2903,12 @@ static int _rbd_dev_v2_snap_features(struct
> rbd_device *rbd_dev, u64 snap_id,
> u64 incompat;
> int ret;
>
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_features",
> (char *) &snapid, sizeof (snapid),
> (char *) &features_buf, sizeof (features_buf),
> NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> return ret;
>
> @@ -2882,11 +2959,11 @@ static int rbd_dev_v2_parent_info(struct
> rbd_device *rbd_dev)
> }
>
> snapid = cpu_to_le64(CEPH_NOSNAP);
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_parent",
> (char *) &snapid, sizeof (snapid),
> (char *) reply_buf, size, NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> goto out_err;
>
> @@ -2953,7 +3030,7 @@ static char *rbd_dev_image_name(struct rbd_device
> *rbd_dev)
> if (!reply_buf)
> goto out;
>
> - ret = rbd_req_sync_exec(rbd_dev, RBD_DIRECTORY,
> + ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY,
> "rbd", "dir_get_name",
> image_id, image_id_size,
> (char *) reply_buf, size, NULL);
> @@ -3059,11 +3136,11 @@ static int rbd_dev_v2_snap_context(struct
> rbd_device *rbd_dev, u64 *ver)
> if (!reply_buf)
> return -ENOMEM;
>
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_snapcontext",
> NULL, 0,
> reply_buf, size, ver);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> goto out;
>
> @@ -3128,11 +3205,11 @@ static char *rbd_dev_v2_snap_name(struct
> rbd_device *rbd_dev, u32 which)
> return ERR_PTR(-ENOMEM);
>
> snap_id = cpu_to_le64(rbd_dev->header.snapc->snaps[which]);
> - ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
> + ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> "rbd", "get_snapshot_name",
> (char *) &snap_id, sizeof (snap_id),
> reply_buf, size, NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> goto out;
>
> @@ -3720,14 +3797,14 @@ static int rbd_dev_image_id(struct rbd_device
> *rbd_dev)
> goto out;
> }
>
> - ret = rbd_req_sync_exec(rbd_dev, object_name,
> + ret = rbd_obj_method_sync(rbd_dev, object_name,
> "rbd", "get_id",
> NULL, 0,
> response, RBD_IMAGE_ID_LEN_MAX, NULL);
> - dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
> + dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
> if (ret < 0)
> goto out;
> - ret = 0; /* rbd_req_sync_exec() can return positive */
> + ret = 0; /* rbd_obj_method_sync() can return positive */
>
> p = response;
> rbd_dev->spec->image_id = ceph_extract_encoded_string(&p,
>
next prev parent reply other threads:[~2013-01-29 11:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 22:25 [PATCH 00/12] rbd: new request tracking code Alex Elder
2013-01-22 22:28 ` [PATCH 01/12] " Alex Elder
2013-01-24 14:08 ` [PATCH 01/12, v2] " Alex Elder
2013-01-24 16:22 ` Alex Elder
2013-01-24 16:32 ` [PATCH 02/12, v2] rbd: kill rbd_rq_fn() and all other related code Alex Elder
2013-01-29 10:44 ` Josh Durgin
2013-01-24 16:32 ` [PATCH 03/12, v2] rbd: kill rbd_req_coll and rbd_request Alex Elder
2013-01-29 10:44 ` Josh Durgin
2013-01-24 16:33 ` [PATCH 04/12, v2] rbd: implement sync object read with new code Alex Elder
2013-01-29 10:48 ` Josh Durgin
2013-01-24 16:33 ` [PATCH 05/12, v2] rbd: get rid of rbd_req_sync_read() Alex Elder
2013-01-29 10:48 ` Josh Durgin
2013-01-24 16:33 ` [PATCH 06/12, v2] rbd: implement watch/unwatch with new code Alex Elder
2013-01-29 10:53 ` Josh Durgin
2013-01-24 16:34 ` [PATCH 07/12, v2] rbd: get rid of rbd_req_sync_watch() Alex Elder
2013-01-29 10:54 ` Josh Durgin
2013-01-24 16:34 ` [PATCH 08/12, v2] rbd: use new code for notify ack Alex Elder
2013-01-29 10:58 ` Josh Durgin
2013-01-24 16:35 ` [PATCH 09/12, v2] rbd: get rid of rbd_req_sync_notify_ack() Alex Elder
2013-01-29 10:59 ` Josh Durgin
2013-01-24 16:35 ` [PATCH 10/12, v2] rbd: send notify ack asynchronously Alex Elder
2013-01-29 11:01 ` Josh Durgin
2013-01-24 16:36 ` [PATCH 11/12, v2] rbd: implement sync method with new code Alex Elder
2013-01-29 11:10 ` Josh Durgin [this message]
2013-01-24 16:36 ` [PATCH 12/12, v2] rbd: get rid of rbd_req_sync_exec() Alex Elder
2013-01-29 11:10 ` Josh Durgin
2013-01-29 10:43 ` [PATCH 01/12, v2] rbd: new request tracking code Josh Durgin
2013-01-30 0:34 ` Alex Elder
2013-01-22 22:28 ` [PATCH 02/12] rbd: kill rbd_rq_fn() and all other related code Alex Elder
2013-01-22 22:29 ` [PATCH 03/12] rbd: kill rbd_req_coll and rbd_request Alex Elder
2013-01-22 22:29 ` [PATCH 04/12] rbd: implement sync object read with new code Alex Elder
2013-01-22 22:29 ` [PATCH 05/12] rbd: get rid of rbd_req_sync_read() Alex Elder
2013-01-22 22:29 ` [PATCH 06/12] rbd: implement watch/unwatch with new code Alex Elder
2013-01-22 22:30 ` [PATCH 07/12] rbd: get rid of rbd_req_sync_watch() Alex Elder
2013-01-22 22:30 ` [PATCH 08/12] rbd: use new code for notify ack Alex Elder
2013-01-22 22:30 ` [PATCH 09/12] rbd: get rid of rbd_req_sync_notify_ack() Alex Elder
2013-01-22 22:30 ` [PATCH 10/12] rbd: send notify ack asynchronously Alex Elder
2013-01-22 22:31 ` [PATCH 11/12] rbd: implement sync method with new code Alex Elder
2013-01-22 22:31 ` [PATCH 12/12] rbd: get rid of rbd_req_sync_exec() Alex Elder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5107AE1E.4020505@inktank.com \
--to=josh.durgin@inktank.com \
--cc=ceph-devel@vger.kernel.org \
--cc=elder@inktank.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.