| Message ID | 20231024050039.231143-4-xiubli@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | libceph: sparse-read misc fixes | expand |
On Tue, 2023-10-24 at 13:00 +0800, xiubli@redhat.com wrote: > From: Xiubo Li <xiubli@redhat.com> > > For sparse reading the real length of the data should equal to the > total length from the extent array. > > URL: https://tracker.ceph.com/issues/62081 > Signed-off-by: Xiubo Li <xiubli@redhat.com> > --- > net/ceph/osd_client.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c > index 800a2acec069..7af35106acaf 100644 > --- a/net/ceph/osd_client.c > +++ b/net/ceph/osd_client.c > @@ -5921,6 +5921,13 @@ static int osd_sparse_read(struct ceph_connection *con, > fallthrough; > case CEPH_SPARSE_READ_DATA: > if (sr->sr_index >= count) { > + if (sr->sr_datalen && count) { > + pr_warn_ratelimited("sr_datalen %d sr_index %d count %d\n", > + sr->sr_datalen, sr->sr_index, > + count); > + WARN_ON_ONCE(sr->sr_datalen); > + } > + > sr->sr_state = CEPH_SPARSE_READ_HDR; > goto next_op; > } > @@ -5928,6 +5935,8 @@ static int osd_sparse_read(struct ceph_connection *con, > eoff = sr->sr_extent[sr->sr_index].off; > elen = sr->sr_extent[sr->sr_index].len; > > + sr->sr_datalen -= elen; > + > dout("[%d] ext %d off 0x%llx len 0x%llx\n", > o->o_osd, sr->sr_index, eoff, elen); > Seems like a reasonable sanity check. Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 800a2acec069..7af35106acaf 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -5921,6 +5921,13 @@ static int osd_sparse_read(struct ceph_connection *con, fallthrough; case CEPH_SPARSE_READ_DATA: if (sr->sr_index >= count) { + if (sr->sr_datalen && count) { + pr_warn_ratelimited("sr_datalen %d sr_index %d count %d\n", + sr->sr_datalen, sr->sr_index, + count); + WARN_ON_ONCE(sr->sr_datalen); + } + sr->sr_state = CEPH_SPARSE_READ_HDR; goto next_op; } @@ -5928,6 +5935,8 @@ static int osd_sparse_read(struct ceph_connection *con, eoff = sr->sr_extent[sr->sr_index].off; elen = sr->sr_extent[sr->sr_index].len; + sr->sr_datalen -= elen; + dout("[%d] ext %d off 0x%llx len 0x%llx\n", o->o_osd, sr->sr_index, eoff, elen);