Skip to content
Permalink
Browse files
afs: Handle len being extending over page end in write_begin/write_end
With transparent huge pages, in the future, write_begin() and write_end()
may be passed a length parameter that, in combination with the offset into
the page, exceeds the length of that page.  This allows
grab_cache_page_write_begin() to better choose the size of THP to allocate.

Fix afs's functions to handle this by trimming the length as needed after
the page has been allocated.

Fixes: e1b1240 ("netfs: Add write_begin helper")
Reported-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-afs@lists.infradead.org
  • Loading branch information
dhowells authored and intel-lab-lkp committed Jun 17, 2021
1 parent 7058521 commit d5cb85d0ca85764a811baaf4baca5f1890476434
Showing 1 changed file with 7 additions and 4 deletions.
@@ -25,7 +25,8 @@ int afs_set_page_dirty(struct page *page)
}

/*
* prepare to perform part of a write to a page
* Prepare to perform part of a write to a page. Note that len may extend
* beyond the end of the page.
*/
int afs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
@@ -52,7 +53,8 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
return ret;

index = page->index;
from = pos - index * PAGE_SIZE;
from = offset_in_thp(page, pos);
len = min_t(size_t, len, thp_size(page) - from);
to = from + len;

try_again:
@@ -103,15 +105,16 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
}

/*
* finalise part of a write to a page
* Finalise part of a write to a page. Note that len may extend beyond the end
* of the page.
*/
int afs_write_end(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied,
struct page *page, void *fsdata)
{
struct afs_vnode *vnode = AFS_FS_I(file_inode(file));
unsigned long priv;
unsigned int f, from = pos & (thp_size(page) - 1);
unsigned int f, from = offset_in_thp(page, pos);
unsigned int t, to = from + copied;
loff_t i_size, maybe_i_size;

0 comments on commit d5cb85d

Please sign in to comment.