2023-01-18 10:41:19

by Christoph Hellwig

Subject: [PATCH 1/9] mm: don't look at xarray value entries in split_huge_pages_in_file

split_huge_pages_in_file never wants to do anything with the special
value enties. Switch to using filemap_get_folio to not even see them.

Signed-off-by: Christoph Hellwig <[email protected]>
---
mm/huge_memory.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 1d6977dc6b31ba..a2830019aaa017 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -3100,11 +3100,10 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,
mapping = candidate->f_mapping;

for (index = off_start; index < off_end; index += nr_pages) {
- struct folio *folio = __filemap_get_folio(mapping, index,
- FGP_ENTRY, 0);
+ struct folio *folio = filemap_get_folio(mapping, index);

nr_pages = 1;
- if (xa_is_value(folio) || !folio)
+ if (!folio)
continue;

if (!folio_test_large(folio))
--
2.39.0

2023-01-18 14:13:28

by Matthew Wilcox

Subject: Re: [PATCH 1/9] mm: don't look at xarray value entries in split_huge_pages_in_file

On Wed, Jan 18, 2023 at 10:43:21AM +0100, Christoph Hellwig wrote:
> split_huge_pages_in_file never wants to do anything with the special
> value enties. Switch to using filemap_get_folio to not even see them.
>
> Signed-off-by: Christoph Hellwig <[email protected]>

Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>