summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidhartha Kumar <sidhartha.kumar@oracle.com>2023-01-25 09:05:31 -0800
committerAndrew Morton <akpm@linux-foundation.org>2023-02-13 15:54:28 -0800
commit91a2fb956ad993f3cbcfc632611e17e3699fb652 (patch)
treef0ac68d4cad45caeff0c97e9005638e298a34766
parentea4c353df37750d170dc0dcbfa8c47c984779733 (diff)
downloadlinux-stable-91a2fb956ad993f3cbcfc632611e17e3699fb652.tar.gz
linux-stable-91a2fb956ad993f3cbcfc632611e17e3699fb652.tar.bz2
linux-stable-91a2fb956ad993f3cbcfc632611e17e3699fb652.zip
mm/hugetlb: convert hugetlbfs_pagecache_present() to folios
Refactor hugetlbfs_pagecache_present() to avoid getting and dropping a refcount on a page. Use RCU and page_cache_next_miss() instead. Link: https://lkml.kernel.org/r/20230125170537.96973-3-sidhartha.kumar@oracle.com Suggested-by: Matthew Wilcox <willy@infradead.org> Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: John Hubbard <jhubbard@nvidia.com> Cc: kernel test robot <lkp@intel.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Muchun Song <songmuchun@bytedance.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/hugetlb.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b246f2b4d0bd..a0d486ed5411 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5651,17 +5651,15 @@ out_release_old:
static bool hugetlbfs_pagecache_present(struct hstate *h,
struct vm_area_struct *vma, unsigned long address)
{
- struct address_space *mapping;
- pgoff_t idx;
- struct page *page;
+ struct address_space *mapping = vma->vm_file->f_mapping;
+ pgoff_t idx = vma_hugecache_offset(h, vma, address);
+ bool present;
- mapping = vma->vm_file->f_mapping;
- idx = vma_hugecache_offset(h, vma, address);
+ rcu_read_lock();
+ present = page_cache_next_miss(mapping, idx, 1) != idx;
+ rcu_read_unlock();
- page = find_get_page(mapping, idx);
- if (page)
- put_page(page);
- return page != NULL;
+ return present;
}
int hugetlb_add_to_page_cache(struct page *page, struct address_space *mapping,