mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-27 12:21:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

hugetlb: convert adjust_range_hwpoison() to take a folio

Browse Source 
Remove a use of folio->page by passing the folio into
adjust_range_hwpoison().  We need to convert to a page eventually, but
that can happen inside adjust_range_hwpoison().

Link: https://lkml.kernel.org/r/20250226163131.3795869-2-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2025-02-26 16:31:30 +00:00
committed by Andrew Morton
parent fa17ad58f8
commit fcc09f5b56
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/hugetlbfs/inode.c
View File

@@ -193,19 +193,21 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
}
/*
* Someone wants to read @bytes from a HWPOISON hugetlb @page from @offset.
* Someone wants to read @bytes from a HWPOISON hugetlb @folio from @offset.
* Returns the maximum number of bytes one can read without touching the 1st raw
* HWPOISON subpage.
* HWPOISON page.
*
* The implementation borrows the iteration logic from copy_page_to_iter*.
*/
static size_t adjust_range_hwpoison(struct page *page, size_t offset, size_t bytes)
static size_t adjust_range_hwpoison(struct folio *folio, size_t offset,
size_t bytes)
{
struct page *page;
size_t n = 0;
size_t res = 0;
/* First subpage to start the loop. */
page = nth_page(page, offset / PAGE_SIZE);
/* First page to start the loop. */
page = folio_page(folio, offset / PAGE_SIZE);
offset %= PAGE_SIZE;
while (1) {
if (is_raw_hwpoison_page_in_hugepage(page))
@@ -278,10 +280,10 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
else {
/*
* Adjust how many bytes safe to read without
* touching the 1st raw HWPOISON subpage after
* touching the 1st raw HWPOISON page after
* offset.
*/
want = adjust_range_hwpoison(&folio->page, offset, nr);
want = adjust_range_hwpoison(folio, offset, nr);
if (want == 0) {
folio_put(folio);
retval = -EIO;