ceph: drop special-casing for ITER_PIPE in ceph_sync_read
PATCH 1/1 ceph: drop special-casing for ITER_PIPE in ceph_sync_read
From: John Hubbard <[email protected]>
This special casing was added in 7ce469a53e71 (ceph: fix splice read for no Fc capability case). The confirm callback for ITER_PIPE expects that the page is Uptodate or a pagecache page and and returns an error otherwise.
A simpler workaround is just to use the Uptodate bit, which has no meaning for anonymous pages. Rip out the special casing for ITER_PIPE and just SetPageUptodate before we copy to the iter.
--- fs/ceph/file.c | 71 +++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-)
fs/ceph/file.c +24 -47
@@ -863,6 +863,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,size_t page_off;u64 i_size;bool more; +int idx; +size_t left; req = ceph_osdc_new_request(osdc, &ci->i_layout, ci->i_vino, off, &len, 0, 1,
@@ -876,29 +878,13 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, more = len <iov_iter_count (to); -if (unlikely (iov_iter_is_pipe (to))) { - ret =iov_iter_get_pages_alloc (to, &pages, len, - &page_off); -if (ret <=0 ) { -ceph_osdc_put_request (req); - ret = -ENOMEM ; -break ; - } - num_pages =DIV_ROUND_UP (ret + page_off,PAGE_SIZE ); -if (ret < len) { - len = ret; -osd_req_op_extent_update (req,0 , len); - more = false; - } - }else { - num_pages =calc_pages_for (off, len); - page_off = off & ~PAGE_MASK ; - pages =ceph_alloc_page_vector (num_pages,GFP_KERNEL ); -if (IS_ERR (pages)) { -ceph_osdc_put_request (req); - ret =PTR_ERR (pages); -break ; - } + num_pages =calc_pages_for (off, len); + page_off = off & ~PAGE_MASK ; + pages =ceph_alloc_page_vector (num_pages,GFP_KERNEL ); +if (IS_ERR (pages)) { +ceph_osdc_put_request (req); + ret =PTR_ERR (pages); +break ; } osd_req_op_extent_osd_data_pages(req, 0, pages, len, page_off,
@@ -929,32 +915,23 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, ret += zlen; } -if (unlikely (iov_iter_is_pipe (to))) { -if (ret >0 ) { -iov_iter_advance (to, ret); - off += ret; - }else { -iov_iter_advance (to,0 ); - } -ceph_put_page_vector (pages, num_pages, false); - }else { -int idx =0 ; -size_t left = ret >0 ? ret :0 ; -while (left >0 ) { -size_t len, copied; - page_off = off & ~PAGE_MASK ; - len =min_t (size_t, left,PAGE_SIZE - page_off); - copied =copy_page_to_iter (pages[idx++], - page_off, len, to); - off += copied; - left -= copied; -if (copied < len) { - ret = -EFAULT ; -break ; - } + idx =0 ; + left = ret >0 ? ret :0 ; +while (left >0 ) { +size_t len, copied; + page_off = off & ~PAGE_MASK ; + len =min_t (size_t, left,PAGE_SIZE - page_off); +SetPageUptodate (pages[idx]); + copied =copy_page_to_iter (pages[idx++], + page_off, len, to); + off += copied; + left -= copied; +if (copied < len) { + ret = -EFAULT ; +break ; } -ceph_release_page_vector (pages, num_pages); } +ceph_release_page_vector (pages, num_pages);if (ret <0 ) {if (ret == -EBLACKLISTED )
Signature · 1 line
2.26.2
Quoted 2 lines · Jeff Layton
From: John Hubbard <[email protected]>
I think that's meant to be, "From: Jeff Layton <[email protected]>". This looks much nicer than what I came up with. :)
Quoted 31 lines
This special casing was added in
7ce469a53e71(ceph: fix splice read for no Fc capability case). The confirm callback forITER_PIPEexpects that the page is Uptodate or a pagecache page and and returns an error otherwise.A simpler workaround is just to use the Uptodate bit, which has no meaning for anonymous pages. Rip out the special casing for
ITER_PIPEand just SetPageUptodate before we copy to the iter.Cc "Yan, Zheng" <[email protected]>Cc John Hubbard <[email protected]>Signed-off-by Jeff Layton <[email protected]>Suggested-by Al Viro <[email protected]>--- fs/ceph/file.c | 71 +++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-)fs/ceph/file.c +2
-0@@ -863,6 +863,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,size_t page_off;u64 i_size;bool more; +int idx; +size_t left; req = ceph_osdc_new_request(osdc, &ci->i_layout, ci->i_vino, off, &len, 0, 1,
fs/ceph/file.c static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, · line 881
Quoted 6 lines
fs/ceph/file.c +0
-3@@ -876,29 +878,13 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, more = len <iov_iter_count (to); -if (unlikely (iov_iter_is_pipe (to))) { - ret =iov_iter_get_pages_alloc (to, &pages, len, - &page_off);
+1 for removing a call to iov_iter_get_pages_alloc()! My list is shorter now.
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Quoted 5 lines · John Hubbard
Quoted 2 lines · Jeff Layton
From: John Hubbard <[email protected]>
I think that's meant to be, "From: Jeff Layton <[email protected]>".
Yeah, sorry -- artifact from squashing patches together. I noticed this after I sent it out. It's fixed in tree though.
Quoted 34 lines
This looks much nicer than what I came up with. :)
Quoted 32 lines
This special casing was added in
7ce469a53e71(ceph: fix splice read for no Fc capability case). The confirm callback forITER_PIPEexpects that the page is Uptodate or a pagecache page and and returns an error otherwise.A simpler workaround is just to use the Uptodate bit, which has no meaning for anonymous pages. Rip out the special casing for
ITER_PIPEand just SetPageUptodate before we copy to the iter.Cc "Yan, Zheng" <[email protected]>Cc John Hubbard <[email protected]>Signed-off-by Jeff Layton <[email protected]>Suggested-by Al Viro <[email protected]>--- fs/ceph/file.c | 71 +++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-)fs/ceph/file.c +2
-0@@ -863,6 +863,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,size_t page_off;u64 i_size;bool more; +int idx; +size_t left; req = ceph_osdc_new_request(osdc, &ci->i_layout, ci->i_vino, off, &len, 0, 1,@@ -876,29 +878,13 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,
Quoted 8 lines
fs/ceph/file.c static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, · line 881
Quoted 5 lines
fs/ceph/file.c +0
-3more = len <iov_iter_count (to); -if (unlikely (iov_iter_is_pipe (to))) { - ret =iov_iter_get_pages_alloc (to, &pages, len, - &page_off);+1 for removing a call to
iov_iter_get_pages_alloc()! My list is shorter now.
Yep, and we got rid of some special-casing in ceph to boot. Thanks for bringing it to our attention!
Signature · 1 line
Jeff Layton <[email protected]>