| Message ID | 20220214200017.3150590-6-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Various fixes around invalidate_page() | expand |
On Mon, Feb 14, 2022 at 08:00:12PM +0000, Matthew Wilcox (Oracle) wrote: > Add kernel-doc and return the number of pages removed in order to > get the statistics right in __invalidate_mapping_pages(). Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
On 2022/2/15 4:00, Matthew Wilcox (Oracle) wrote: > Add kernel-doc and return the number of pages removed in order to > get the statistics right in __invalidate_mapping_pages(). > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> LGTM. Thanks. Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> > --- > fs/splice.c | 5 ++--- > include/linux/swap.h | 2 +- > mm/truncate.c | 2 +- > mm/vmscan.c | 23 ++++++++++++++--------- > 4 files changed, 18 insertions(+), 14 deletions(-) > > diff --git a/fs/splice.c b/fs/splice.c > index 23ff9c303abc..047b79db8eb5 100644 > --- a/fs/splice.c > +++ b/fs/splice.c > @@ -46,8 +46,7 @@ > static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe, > struct pipe_buffer *buf) > { > - struct page *page = buf->page; > - struct folio *folio = page_folio(page); > + struct folio *folio = page_folio(buf->page); > struct address_space *mapping; > > folio_lock(folio); > @@ -74,7 +73,7 @@ static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe, > * If we succeeded in removing the mapping, set LRU flag > * and return good. > */ > - if (remove_mapping(mapping, page)) { > + if (remove_mapping(mapping, folio)) { > buf->flags |= PIPE_BUF_FLAG_LRU; > return true; > } > diff --git a/include/linux/swap.h b/include/linux/swap.h > index e7cb7a1e6ceb..304f174b4d31 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -395,7 +395,7 @@ extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem, > unsigned long *nr_scanned); > extern unsigned long shrink_all_memory(unsigned long nr_pages); > extern int vm_swappiness; > -extern int remove_mapping(struct address_space *mapping, struct page *page); > +long remove_mapping(struct address_space *mapping, struct folio *folio); > > extern unsigned long reclaim_pages(struct list_head *page_list); > #ifdef CONFIG_NUMA > diff --git a/mm/truncate.c b/mm/truncate.c > index d67fa8871b75..8aa86e294775 100644 > --- a/mm/truncate.c > +++ b/mm/truncate.c > @@ -292,7 +292,7 @@ int invalidate_inode_page(struct page *page) > if (folio_has_private(folio) && !filemap_release_folio(folio, 0)) > return 0; > > - return remove_mapping(mapping, page); > + return remove_mapping(mapping, folio); > } > > /** > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 2965be8df713..7959df4d611b 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1335,23 +1335,28 @@ static int __remove_mapping(struct address_space *mapping, struct folio *folio, > return 0; > } > > -/* > - * Attempt to detach a locked page from its ->mapping. If it is dirty or if > - * someone else has a ref on the page, abort and return 0. If it was > - * successfully detached, return 1. Assumes the caller has a single ref on > - * this page. > +/** > + * remove_mapping() - Attempt to remove a folio from its mapping. > + * @mapping: The address space. > + * @folio: The folio to remove. > + * > + * If the folio is dirty, under writeback or if someone else has a ref > + * on it, removal will fail. > + * Return: The number of pages removed from the mapping. 0 if the folio > + * could not be removed. > + * Context: The caller should have a single refcount on the folio and > + * hold its lock. > */ > -int remove_mapping(struct address_space *mapping, struct page *page) > +long remove_mapping(struct address_space *mapping, struct folio *folio) > { > - struct folio *folio = page_folio(page); > if (__remove_mapping(mapping, folio, false, NULL)) { > /* > - * Unfreezing the refcount with 1 rather than 2 effectively > + * Unfreezing the refcount with 1 effectively > * drops the pagecache ref for us without requiring another > * atomic operation. > */ > folio_ref_unfreeze(folio, 1); > - return 1; > + return folio_nr_pages(folio); > } > return 0; > } >
diff --git a/fs/splice.c b/fs/splice.c index 23ff9c303abc..047b79db8eb5 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -46,8 +46,7 @@ static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe, struct pipe_buffer *buf) { - struct page *page = buf->page; - struct folio *folio = page_folio(page); + struct folio *folio = page_folio(buf->page); struct address_space *mapping; folio_lock(folio); @@ -74,7 +73,7 @@ static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe, * If we succeeded in removing the mapping, set LRU flag * and return good. */ - if (remove_mapping(mapping, page)) { + if (remove_mapping(mapping, folio)) { buf->flags |= PIPE_BUF_FLAG_LRU; return true; } diff --git a/include/linux/swap.h b/include/linux/swap.h index e7cb7a1e6ceb..304f174b4d31 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -395,7 +395,7 @@ extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem, unsigned long *nr_scanned); extern unsigned long shrink_all_memory(unsigned long nr_pages); extern int vm_swappiness; -extern int remove_mapping(struct address_space *mapping, struct page *page); +long remove_mapping(struct address_space *mapping, struct folio *folio); extern unsigned long reclaim_pages(struct list_head *page_list); #ifdef CONFIG_NUMA diff --git a/mm/truncate.c b/mm/truncate.c index d67fa8871b75..8aa86e294775 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -292,7 +292,7 @@ int invalidate_inode_page(struct page *page) if (folio_has_private(folio) && !filemap_release_folio(folio, 0)) return 0; - return remove_mapping(mapping, page); + return remove_mapping(mapping, folio); } /** diff --git a/mm/vmscan.c b/mm/vmscan.c index 2965be8df713..7959df4d611b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1335,23 +1335,28 @@ static int __remove_mapping(struct address_space *mapping, struct folio *folio, return 0; } -/* - * Attempt to detach a locked page from its ->mapping. If it is dirty or if - * someone else has a ref on the page, abort and return 0. If it was - * successfully detached, return 1. Assumes the caller has a single ref on - * this page. +/** + * remove_mapping() - Attempt to remove a folio from its mapping. + * @mapping: The address space. + * @folio: The folio to remove. + * + * If the folio is dirty, under writeback or if someone else has a ref + * on it, removal will fail. + * Return: The number of pages removed from the mapping. 0 if the folio + * could not be removed. + * Context: The caller should have a single refcount on the folio and + * hold its lock. */ -int remove_mapping(struct address_space *mapping, struct page *page) +long remove_mapping(struct address_space *mapping, struct folio *folio) { - struct folio *folio = page_folio(page); if (__remove_mapping(mapping, folio, false, NULL)) { /* - * Unfreezing the refcount with 1 rather than 2 effectively + * Unfreezing the refcount with 1 effectively * drops the pagecache ref for us without requiring another * atomic operation. */ folio_ref_unfreeze(folio, 1); - return 1; + return folio_nr_pages(folio); } return 0; }
Add kernel-doc and return the number of pages removed in order to get the statistics right in __invalidate_mapping_pages(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- fs/splice.c | 5 ++--- include/linux/swap.h | 2 +- mm/truncate.c | 2 +- mm/vmscan.c | 23 ++++++++++++++--------- 4 files changed, 18 insertions(+), 14 deletions(-)