system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-21 10:41:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/truncate: Split invalidate_inode_page() into mapping_evict_folio()

Browse source 
Some of the callers already have the address_space and can avoid calling
folio_mapping() and checking if the folio was already truncated.  Also
add kernel-doc and fix the return type (in case we ever support folios
larger than 4TB).

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-02-13 15:22:28 -05:00
parent 5100da38ef
commit d6c75dc22c
4 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/mm.h
View file

@ -1825,7 +1825,6 @@ extern void truncate_setsize(struct inode *inode, loff_t newsize);
void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to);
void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end);
int generic_error_remove_page(struct address_space *mapping, struct page *page);
int invalidate_inode_page(struct page *page);
#ifdef CONFIG_MMU
extern vm_fault_t handle_mm_fault(struct vm_area_struct *vma,

1
mm/internal.h
View file

@ -95,6 +95,7 @@ void filemap_free_folio(struct address_space *mapping, struct folio *folio);
int truncate_inode_folio(struct address_space *mapping, struct folio *folio);
bool truncate_inode_partial_folio(struct folio *folio, loff_t start,
loff_t end);
long invalidate_inode_page(struct page *page);
/**
* folio_evictable - Test whether a folio is evictable.

4
mm/memory-failure.c
View file

@ -2139,7 +2139,7 @@ static bool isolate_page(struct page *page, struct list_head *pagelist)
*/
static int __soft_offline_page(struct page *page)
{
int ret = 0;
long ret = 0;
unsigned long pfn = page_to_pfn(page);
struct page *hpage = compound_head(page);
char const *msg_page[] = {"page", "hugepage"};
@ -2196,7 +2196,7 @@ static int __soft_offline_page(struct page *page)
if (!list_empty(&pagelist))
putback_movable_pages(&pagelist);
pr_info("soft offline: %#lx: %s migration failed %d, type %pGp\n",
pr_info("soft offline: %#lx: %s migration failed %ld, type %pGp\n",
pfn, msg_page[huge], ret, &page->flags);
if (ret > 0)
ret = -EBUSY;

34
mm/truncate.c
View file

@ -273,18 +273,9 @@ int generic_error_remove_page(struct address_space *mapping, struct page *page)
}
EXPORT_SYMBOL(generic_error_remove_page);
/*
* Safely invalidate one page from its pagecache mapping.
* It only drops clean, unused pages. The page must be locked.
*
* Returns 1 if the page is successfully invalidated, otherwise 0.
*/
int invalidate_inode_page(struct page *page)
static long mapping_evict_folio(struct address_space *mapping,
struct folio *folio)
{
struct folio *folio = page_folio(page);
struct address_space *mapping = folio_mapping(folio);
if (!mapping)
return 0;
if (folio_test_dirty(folio) || folio_test_writeback(folio))
return 0;
/* The refcount will be elevated if any page in the folio is mapped */
@ -297,6 +288,27 @@ int invalidate_inode_page(struct page *page)
return remove_mapping(mapping, folio);
}
/**
* invalidate_inode_page() - Remove an unused page from the pagecache.
* @page: The page to remove.
*
* Safely invalidate one page from its pagecache mapping.
* It only drops clean, unused pages.
*
* Context: Page must be locked.
* Return: The number of pages successfully removed.
*/
long invalidate_inode_page(struct page *page)
{
struct folio *folio = page_folio(page);
struct address_space *mapping = folio_mapping(folio);
/* The page may have been truncated before it was locked */
if (!mapping)
return 0;
return mapping_evict_folio(mapping, folio);
}
/**
* truncate_inode_pages_range - truncate range of pages specified by start & end byte offsets
* @mapping: mapping to truncate