| Message ID | 20220318135013.43934-3-jlayton@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ceph/libceph: add support for sparse reads to msgr2 crc codepath | expand |
On 3/18/22 9:50 PM, Jeff Layton wrote: > When the OSD sends back a sparse read reply, it contains an array of > these structures. Define the structure and add a couple of helpers for > dealing with them. > > Also add a place in struct ceph_osd_req_op to store the extent buffer, > and code to free it if it's populated when the req is torn down. > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > --- > include/linux/ceph/osd_client.h | 31 ++++++++++++++++++++++++++++++- > net/ceph/osd_client.c | 13 +++++++++++++ > 2 files changed, 43 insertions(+), 1 deletion(-) > > diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h > index 3122c1a3205f..00a5b53a6763 100644 > --- a/include/linux/ceph/osd_client.h > +++ b/include/linux/ceph/osd_client.h > @@ -29,6 +29,17 @@ typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *); > > #define CEPH_HOMELESS_OSD -1 > > +/* > + * A single extent in a SPARSE_READ reply. > + * > + * Note that these come from the OSD as little-endian values. On BE arches, > + * we convert them in-place after receipt. > + */ > +struct ceph_sparse_extent { > + u64 off; > + u64 len; > +} __attribute__((packed)); > + > /* > * A given osd we're communicating with. > * > @@ -104,6 +115,8 @@ struct ceph_osd_req_op { > u64 offset, length; > u64 truncate_size; > u32 truncate_seq; > + int sparse_ext_len; To be more readable, how about s/sparse_ext_len/sparse_ext_cnt/ ? -- Xiubo
On Mon, 2022-03-21 at 15:57 +0800, Xiubo Li wrote: > On 3/18/22 9:50 PM, Jeff Layton wrote: > > When the OSD sends back a sparse read reply, it contains an array of > > these structures. Define the structure and add a couple of helpers for > > dealing with them. > > > > Also add a place in struct ceph_osd_req_op to store the extent buffer, > > and code to free it if it's populated when the req is torn down. > > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > --- > > include/linux/ceph/osd_client.h | 31 ++++++++++++++++++++++++++++++- > > net/ceph/osd_client.c | 13 +++++++++++++ > > 2 files changed, 43 insertions(+), 1 deletion(-) > > > > diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h > > index 3122c1a3205f..00a5b53a6763 100644 > > --- a/include/linux/ceph/osd_client.h > > +++ b/include/linux/ceph/osd_client.h > > @@ -29,6 +29,17 @@ typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *); > > > > #define CEPH_HOMELESS_OSD -1 > > > > +/* > > + * A single extent in a SPARSE_READ reply. > > + * > > + * Note that these come from the OSD as little-endian values. On BE arches, > > + * we convert them in-place after receipt. > > + */ > > +struct ceph_sparse_extent { > > + u64 off; > > + u64 len; > > +} __attribute__((packed)); > > + > > /* > > * A given osd we're communicating with. > > * > > @@ -104,6 +115,8 @@ struct ceph_osd_req_op { > > u64 offset, length; > > u64 truncate_size; > > u32 truncate_seq; > > + int sparse_ext_len; > > To be more readable, how about > > s/sparse_ext_len/sparse_ext_cnt/ ? > > -- Xiubo > Sure, I'll make that change.
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 3122c1a3205f..00a5b53a6763 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -29,6 +29,17 @@ typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *); #define CEPH_HOMELESS_OSD -1 +/* + * A single extent in a SPARSE_READ reply. + * + * Note that these come from the OSD as little-endian values. On BE arches, + * we convert them in-place after receipt. + */ +struct ceph_sparse_extent { + u64 off; + u64 len; +} __attribute__((packed)); + /* * A given osd we're communicating with. * @@ -104,6 +115,8 @@ struct ceph_osd_req_op { u64 offset, length; u64 truncate_size; u32 truncate_seq; + int sparse_ext_len; + struct ceph_sparse_extent *sparse_ext; struct ceph_osd_data osd_data; } extent; struct { @@ -507,6 +520,8 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *, u32 truncate_seq, u64 truncate_size, bool use_mempool); +int ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op, int len); + extern void ceph_osdc_get_request(struct ceph_osd_request *req); extern void ceph_osdc_put_request(struct ceph_osd_request *req); @@ -562,5 +577,19 @@ int ceph_osdc_list_watchers(struct ceph_osd_client *osdc, struct ceph_object_locator *oloc, struct ceph_watch_item **watchers, u32 *num_watchers); -#endif +/* Find offset into the buffer of the end of the extent map */ +static inline u64 ceph_sparse_ext_map_end(struct ceph_osd_req_op *op) +{ + struct ceph_sparse_extent *ext; + + /* No extents? No data */ + if (op->extent.sparse_ext_len == 0) + return 0; + + ext = &op->extent.sparse_ext[op->extent.sparse_ext_len - 1]; + + return ext->off + ext->len - op->extent.offset; +} + +#endif diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 1e8842ef6e63..9fec258e1f8d 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -378,6 +378,7 @@ static void osd_req_op_data_release(struct ceph_osd_request *osd_req, case CEPH_OSD_OP_READ: case CEPH_OSD_OP_WRITE: case CEPH_OSD_OP_WRITEFULL: + kfree(op->extent.sparse_ext); ceph_osd_data_release(&op->extent.osd_data); break; case CEPH_OSD_OP_CALL: @@ -1141,6 +1142,18 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, } EXPORT_SYMBOL(ceph_osdc_new_request); +int ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op, int len) +{ + op->extent.sparse_ext_len = len; + op->extent.sparse_ext = kmalloc_array(len, + sizeof(*op->extent.sparse_ext), + GFP_NOFS); + if (!op->extent.sparse_ext) + return -ENOMEM; + return 0; +} +EXPORT_SYMBOL(ceph_alloc_sparse_ext_map); + /* * We keep osd requests in an rbtree, sorted by ->r_tid. */
When the OSD sends back a sparse read reply, it contains an array of these structures. Define the structure and add a couple of helpers for dealing with them. Also add a place in struct ceph_osd_req_op to store the extent buffer, and code to free it if it's populated when the req is torn down. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- include/linux/ceph/osd_client.h | 31 ++++++++++++++++++++++++++++++- net/ceph/osd_client.c | 13 +++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-)