ceph: fix write_begin optimization when write is beyond EOF
Subsystems (2)
PATCH 1/1 ceph: fix write_begin optimization when write is beyond EOF
It's not sufficient to skip reading when the pos is beyond the EOF. There may be data at the head of the page that we need to fill in before the write. Only elide the read if the pos is beyond the last page in the file.
--- fs/ceph/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Note to stable maintainers: This is needed in v5.10.z - v5.12.z. In v5.13, we've moved to using the new netfs_read_helper code so this isn't necessary there.
I also now have a simple testcase for this that I'll submit to xfstests early next week.
fs/ceph/addr.c +2 -2
@@ -1353,11 +1353,11 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,/* * In some cases we don't need to read at all: * - full page write -* - write that lies completely beyond EOF +* - write that lies in a page that is completely beyond EOF * - write that covers the the page from start to EOF or beyond it */ if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || + (index > (i_size_read (inode) /PAGE_SIZE )) || (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) {zero_user_segments (page,0 , pos_in_page, pos_in_page + len,PAGE_SIZE );
Signature · 1 line
2.31.1
fs/ceph/addr.c static int ceph_write_begin(struct file *file, struct address_space *mapping, · line 1360
Quoted 3 lines · Jeff Layton
fs/ceph/addr.c +1
-1if ((pos_in_page == 0 && len == PAGE_SIZE) || - (pos >= i_size_read(inode)) || + (index > (i_size_read(inode) / PAGE_SIZE)) ||
I think that wants to be ((i_size_read(inode) - 1) / PAGE_SIZE)
If your file is 4096 bytes long, that means bytes 0-4095 contain data. Except that i_size can be 0, so ...
if ((offset == 0 && len == PAGE_SIZE) || i_size == 0 || (index > (i_size - 1) / PAGE_SIZE) || (offset == 0 && pos + len >= i_size))
zero_user_segments(page, 0, pos_in_page,
pos_in_page + len, PAGE_SIZE);
Quoted 7 lines · Matthew Wilcox
fs/ceph/addr.c static int ceph_write_begin(struct file *file, struct address_space *mapping, · line 1360
Quoted 3 lines · Jeff Layton
fs/ceph/addr.c +1
-1if ((pos_in_page == 0 && len == PAGE_SIZE) || - (pos >= i_size_read(inode)) || + (index > (i_size_read(inode) / PAGE_SIZE)) ||I think that wants to be ((
i_size_read(inode)- 1) /PAGE_SIZE)
Quoted 9 lines
If your file is 4096 bytes long, that means bytes 0-4095 contain data. Except that
i_sizecan be 0, so ...if ((offset == 0 && len == PAGE_SIZE) || i_size == 0 || (index > (i_size - 1) / PAGE_SIZE) || (offset == 0 && pos + len >= i_size))zero_user_segments(page, 0,
pos_in_page,
pos_in_page+ len,PAGE_SIZE);
Oh, right -- I'll fix that and send a v2. Sorry for the noise!
Signature · 1 line
Jeff Layton <[email protected]>
PATCH v2 1/1 ceph: fix write_begin optimization when write is beyond EOF
In reply to Jeff LaytonIt's not sufficient to skip reading when the pos is beyond the EOF. There may be data at the head of the page that we need to fill in before the write. Only elide the read if the pos is beyond the last page in the file.
--- fs/ceph/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
This version fixes the one-off bug that Willy pointed out in v1.
Note that v5.13 has been converted to use the new netfs read helper lib,xi so this fix is for v5.10.z through v5.12.z.
fs/ceph/addr.c +2 -2
@@ -1353,11 +1353,11 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,/* * In some cases we don't need to read at all: * - full page write -* - write that lies completely beyond EOF +* - write that lies in a page that is completely beyond EOF * - write that covers the the page from start to EOF or beyond it */ if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || + (index > (i_size_read (inode) -1 ) /PAGE_SIZE ) || (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) {zero_user_segments (page,0 , pos_in_page, pos_in_page + len,PAGE_SIZE );
Signature · 1 line
2.31.1
fs/ceph/addr.c static int ceph_write_begin(struct file *file, struct address_space *mapping, · line 1361
Quoted 4 lines · Jeff Layton
fs/ceph/addr.c +1
-1if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || + (index > (i_size_read (inode) -1 ) /PAGE_SIZE ) || (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) {
You missed the (i_size == 0) case. And I really would factor out reading i_size into a local variable.
Quoted 5 lines
fs/ceph/addr.c +0
-0zero_user_segments (page,0 , pos_in_page, pos_in_page + len,PAGE_SIZE );Signature · 1 line
2.31.1
PATCH v3 1/1 ceph: fix write_begin optimization when write is beyond EOF
It's not sufficient to skip reading when the pos is beyond the EOF. There may be data at the head of the page that we need to fill in before the write.
Add a new helper function that corrects and clarifies the logic.
--- fs/ceph/addr.c | 60 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 13 deletions(-)
Willy pointed out that I had missed the i_size == 0 case in my earlier patch. Also, the whole condition was getting a bit messy. This factors it out into a new helper (and we can maybe copy this helper into netfs code).
fs/ceph/addr.c +47 -13
@@ -1302,6 +1302,51 @@ ceph_find_incompatible(struct page *page)return NULL ; } +/** +* prep_noread_page - prep a page for writing without reading first +* @page: page being prepared +* @pos: starting position for the write +* @len: length of write +* +* In some cases we don't need to read at all: +* - full page write +* - file is currently zero-length +* - write that lies in a page that is completely beyond EOF +* - write that covers the the page from start to EOF or beyond it +* +* If any of these criteria are met, then zero out the unwritten parts +* of the page and return true. Otherwise, return false. +*/ +static bool prep_noread_page (struct page *page,loff_t pos,unsigned int len) +{ +struct inode *inode = page->mapping->host; +loff_t i_size =i_size_read (inode); +pgoff_t index = pos /PAGE_SIZE ; +int pos_in_page = pos & ~PAGE_MASK ; + +/* full page write */ +if (pos_in_page ==0 && len ==PAGE_SIZE ) + goto zero_out; + +/* zero-length file */ +if (i_size ==0 ) + goto zero_out; + +/* position beyond last page in the file */ +if (index > ((i_size -1 ) /PAGE_SIZE )) + goto zero_out; + +/* write that covers the the page from start to EOF or beyond it */ +if (pos_in_page ==0 && (pos + len) >= i_size) + goto zero_out; + +return false; +zero_out: +zero_user_segments (page,0 , pos_in_page, + pos_in_page + len,PAGE_SIZE ); +return true; +} +/* * We are only allowed to write into/dirty the page if the page is * clean, or already dirty within the same snap context.
@@ -1315,7 +1360,6 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct ceph_snap_context *snapc;struct page *page =NULL ;pgoff_t index = pos >>PAGE_SHIFT ; -int pos_in_page = pos & ~PAGE_MASK ;int r =0 ;dout ("write_begin file %p inode %p page %p %d~%d\n" , file, inode, page, (int )pos, (int )len);
@@ -1350,19 +1394,9 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,break ; } -/* -* In some cases we don't need to read at all: -* - full page write -* - write that lies completely beyond EOF -* - write that covers the the page from start to EOF or beyond it -*/ -if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || - (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) { -zero_user_segments (page,0 , pos_in_page, - pos_in_page + len,PAGE_SIZE ); +/* No need to read in some cases */ +if (prep_noread_page (page, pos, len))break ; - }/* * We need to read it. If we get back -EINPROGRESS, then the page was
Signature · 1 line
2.31.1
Quoted 12 lines · Jeff Layton
fs/ceph/addr.c +11
-0+/** +* prep_noread_page - prep a page for writing without reading first +* @page: page being prepared +* @pos: starting position for the write +* @len: length of write +* +* In some cases we don't need to read at all: +* - full page write +* - file is currently zero-length +* - write that lies in a page that is completely beyond EOF +* - write that covers the the page from start to EOF or beyond it
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1325
Quoted 10 lines
fs/ceph/addr.c +10
-0+* +* If any of these criteria are met, then zero out the unwritten parts +* of the page and return true. Otherwise, return false. +*/ +static bool prep_noread_page (struct page *page,loff_t pos,unsigned int len) +{ +struct inode *inode = page->mapping->host; +loff_t i_size =i_size_read (inode); +pgoff_t index = pos /PAGE_SIZE ; +int pos_in_page = pos & ~PAGE_MASK ;
Like the helper. A couple of minor tweaks ...
size_t offset = offset_in_page(pos);
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1329
Quoted 3 lines
fs/ceph/addr.c +3
-0+/* full page write */ +if (pos_in_page ==0 && len ==PAGE_SIZE ) + goto zero_out;
At some point, we're going to need to pass the full len to ->write_begin, so that we can decide whether it's worth allocating more than a single page. Could you make 'len' here size_t, and check for len >= PAGE_SIZE?
(with the current code, the offset of 0 is a redundant check, but I'd rather see this future-proofed).
PATCH v4 1/1 ceph: fix write_begin optimization when write is beyond EOF
It's not sufficient to skip reading when the pos is beyond the EOF. There may be data at the head of the page that we need to fill in before the write.
Add a new helper function that corrects and clarifies the logic.
--- fs/ceph/addr.c | 63 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 13 deletions(-)
This version just has a couple of future-proofing tweaks that Willy suggested.
fs/ceph/addr.c +50 -13
@@ -1302,6 +1302,54 @@ ceph_find_incompatible(struct page *page)return NULL ; } +/** +* prep_noread_page - prep a page for writing without reading first +* @page: page being prepared +* @pos: starting position for the write +* @len: length of write +* +* In some cases we don't need to read at all: +* - full page write +* - file is currently zero-length +* - write that lies in a page that is completely beyond EOF +* - write that covers the the page from start to EOF or beyond it +* +* If any of these criteria are met, then zero out the unwritten parts +* of the page and return true. Otherwise, return false. +*/ +static bool prep_noread_page (struct page *page,loff_t pos,size_t len) +{ +struct inode *inode = page->mapping->host; +loff_t i_size =i_size_read (inode); +pgoff_t index = pos /PAGE_SIZE ; +size_t offset =offset_in_page (pos); + +/* clamp length to end of the current page */ +if (len >PAGE_SIZE ) + len =PAGE_SIZE - offset; + +/* full page write */ +if (offset ==0 && len ==PAGE_SIZE ) + goto zero_out; + +/* zero-length file */ +if (i_size ==0 ) + goto zero_out; + +/* position beyond last page in the file */ +if (index > ((i_size -1 ) /PAGE_SIZE )) + goto zero_out; + +/* write that covers the the page from start to EOF or beyond it */ +if (offset ==0 && (pos + len) >= i_size) + goto zero_out; + +return false; +zero_out: +zero_user_segments (page,0 , offset, offset + len,PAGE_SIZE ); +return true; +} +/* * We are only allowed to write into/dirty the page if the page is * clean, or already dirty within the same snap context.
@@ -1315,7 +1363,6 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct ceph_snap_context *snapc;struct page *page =NULL ;pgoff_t index = pos >>PAGE_SHIFT ; -int pos_in_page = pos & ~PAGE_MASK ;int r =0 ;dout ("write_begin file %p inode %p page %p %d~%d\n" , file, inode, page, (int )pos, (int )len);
@@ -1350,19 +1397,9 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,break ; } -/* -* In some cases we don't need to read at all: -* - full page write -* - write that lies completely beyond EOF -* - write that covers the the page from start to EOF or beyond it -*/ -if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || - (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) { -zero_user_segments (page,0 , pos_in_page, - pos_in_page + len,PAGE_SIZE ); +/* No need to read in some cases */ +if (prep_noread_page (page, pos, len))break ; - }/* * We need to read it. If we get back -EINPROGRESS, then the page was
Signature · 1 line
2.31.1
Quoted 41 lines · Jeff Layton
It's not sufficient to skip reading when the pos is beyond the EOF. There may be data at the head of the page that we need to fill in before the write.
Add a new helper function that corrects and clarifies the logic.
Cc <[email protected]> # v5.10+Cc Matthew Wilcox <[email protected]>Fixes 1cc1699070bd ("ceph: fold ceph_update_writeable_page into ceph_write_begin")Reported-by Andrew W Elble <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/ceph/addr.c | 63 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 13 deletions(-)This version just has a couple of future-proofing tweaks that Willy suggested.
fs/ceph/addr.c +15
-0@@ -1302,6 +1302,54 @@ ceph_find_incompatible(struct page *page)return NULL ; } +/** +* prep_noread_page - prep a page for writing without reading first +* @page: page being prepared +* @pos: starting position for the write +* @len: length of write +* +* In some cases we don't need to read at all: +* - full page write +* - file is currently zero-length +* - write that lies in a page that is completely beyond EOF +* - write that covers the the page from start to EOF or beyond it +* +* If any of these criteria are met, then zero out the unwritten parts +* of the page and return true. Otherwise, return false. +*/
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1329
Quoted 10 lines
fs/ceph/addr.c +10
-0+static bool prep_noread_page (struct page *page,loff_t pos,size_t len) +{ +struct inode *inode = page->mapping->host; +loff_t i_size =i_size_read (inode); +pgoff_t index = pos /PAGE_SIZE ; +size_t offset =offset_in_page (pos); + +/* clamp length to end of the current page */ +if (len >PAGE_SIZE ) + len =PAGE_SIZE - offset;
Actually, I think this should be:
len = min(len, PAGE_SIZE - offset);
Otherwise, len could still go beyond the end of the page.
Quoted 56 lines
fs/ceph/addr.c +25
-13+ +/* full page write */ +if (offset ==0 && len ==PAGE_SIZE ) + goto zero_out; + +/* zero-length file */ +if (i_size ==0 ) + goto zero_out; + +/* position beyond last page in the file */ +if (index > ((i_size -1 ) /PAGE_SIZE )) + goto zero_out; + +/* write that covers the the page from start to EOF or beyond it */ +if (offset ==0 && (pos + len) >= i_size) + goto zero_out; + +return false; +zero_out: +zero_user_segments (page,0 , offset, offset + len,PAGE_SIZE ); +return true; +} +/* * We are only allowed to write into/dirty the page if the page is * clean, or already dirty within the same snap context. @@ -1315,7 +1363,6 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,struct ceph_snap_context *snapc;struct page *page =NULL ;pgoff_t index = pos >>PAGE_SHIFT ; -int pos_in_page = pos & ~PAGE_MASK ;int r =0 ;dout ("write_begin file %p inode %p page %p %d~%d\n" , file, inode, page, (int )pos, (int )len);@@ -1350,19 +1397,9 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,break ; } -/* -* In some cases we don't need to read at all: -* - full page write -* - write that lies completely beyond EOF -* - write that covers the the page from start to EOF or beyond it -*/ -if ((pos_in_page ==0 && len ==PAGE_SIZE ) || - (pos >=i_size_read (inode)) || - (pos_in_page ==0 && (pos + len) >=i_size_read (inode))) { -zero_user_segments (page,0 , pos_in_page, - pos_in_page + len,PAGE_SIZE ); +/* No need to read in some cases */ +if (prep_noread_page (page, pos, len))break ; - }/* * We need to read it. If we get back -EINPROGRESS, then the page was
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 9 lines · Jeff Layton
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1329
Quoted 3 lines
fs/ceph/addr.c +3
-0+/* clamp length to end of the current page */ +if (len >PAGE_SIZE ) + len =PAGE_SIZE - offset;Actually, I think this should be:
len = min(len, PAGE_SIZE - offset);Otherwise, len could still go beyond the end of the page.
I don't understand why you want to clamp length instead of just coping with len being > PAGE_SIZE.
Quoted 4 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1333
Quoted 4 lines
fs/ceph/addr.c +4
-0+ +/* full page write */ +if (offset ==0 && len ==PAGE_SIZE ) + goto zero_out;
That becomes >=.
Quoted 11 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1345
Quoted 11 lines
fs/ceph/addr.c +11
-0+/* zero-length file */ +if (i_size ==0 ) + goto zero_out; + +/* position beyond last page in the file */ +if (index > ((i_size -1 ) /PAGE_SIZE )) + goto zero_out; + +/* write that covers the the page from start to EOF or beyond it */ +if (offset ==0 && (pos + len) >= i_size) + goto zero_out;
That doesn't need any change.
Quoted 3 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1349
Quoted 3 lines
fs/ceph/addr.c +3
-0+return false; +zero_out: +zero_user_segments (page,0 , offset, offset + len,PAGE_SIZE );
That also doesn't need any change.
Quoted 35 lines · Matthew Wilcox
Quoted 9 lines · Jeff Layton
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1329
Quoted 3 lines
fs/ceph/addr.c +3
-0+/* clamp length to end of the current page */ +if (len >PAGE_SIZE ) + len =PAGE_SIZE - offset;Actually, I think this should be:
len = min(len, PAGE_SIZE - offset);Otherwise, len could still go beyond the end of the page.
I don't understand why you want to clamp length instead of just coping with len being >
PAGE_SIZE.Quoted 4 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1333
Quoted 4 lines
fs/ceph/addr.c +4
-0+ +/* full page write */ +if (offset ==0 && len ==PAGE_SIZE ) + goto zero_out;That becomes >=.
Quoted 11 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1345
Quoted 11 lines
fs/ceph/addr.c +11
-0+/* zero-length file */ +if (i_size ==0 ) + goto zero_out; + +/* position beyond last page in the file */ +if (index > ((i_size -1 ) /PAGE_SIZE )) + goto zero_out; + +/* write that covers the the page from start to EOF or beyond it */ +if (offset ==0 && (pos + len) >= i_size) + goto zero_out;That doesn't need any change.
Quoted 6 lines
Quoted 3 lines
fs/ceph/addr.c ceph_find_incompatible(struct page *page) · line 1349
Quoted 3 lines
fs/ceph/addr.c +3
-0+return false; +zero_out: +zero_user_segments (page,0 , offset, offset + len,PAGE_SIZE );That also doesn't need any change.
Won't it though? offset+len will could be beyond the end of the page at that point. Hmm I guess zero_user_segments does this:
if (start2 >= end2)
start2 = end2 = 0;...so that makes the second segment copy a no-op.
Ok, fair enough -- I'll get rid of the clamping and just allow len to be longer than PAGE_SIZE in the checks.
Thanks,
Signature · 1 line
Jeff Layton <[email protected]>