[PATCH] mm/huge_memory: do not drop the original folio during truncate.

[Zi Yan]

The caller expects to handle the original folio itself.

also make __split_unmapped_folio() never fail, per discussion with David
Hildenbrand.

Signed-off-by: Zi Yan <ziy@xxxxxxxxxx>
---
 mm/huge_memory.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 2eda2a9ec8fc..87cb62c81bf3 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -3292,16 +3292,12 @@ bool can_split_folio(struct folio *folio, int calle=
r_pins, int *pextra_pins)
  * It splits @folio into @new_order folios and copies the @folio metadata =
to
  * all the resulting folios.
  */
-static int __split_folio_to_order(struct folio *folio, int new_order)
+static void __split_folio_to_order(struct folio *folio, int new_order)
 {
-	int curr_order =3D folio_order(folio);
 	long nr_pages =3D folio_nr_pages(folio);
 	long new_nr_pages =3D 1 << new_order;
 	long index;
=20
-	if (curr_order <=3D new_order)
-		return -EINVAL;
-
 	/*
 	 * Skip the first new_nr_pages, since the new folio from them have all
 	 * the flags from the original folio.
@@ -3396,8 +3392,6 @@ static int __split_folio_to_order(struct folio *folio=
, int new_order)
=20
 	if (!new_order)
 		ClearPageCompound(&folio->page);
-
-	return 0;
 }
=20
 /*
@@ -3491,7 +3485,6 @@ static int __split_unmapped_folio(struct folio *folio=
, int new_order,
 		int old_order =3D folio_order(folio);
 		struct folio *release;
 		struct folio *end_folio =3D folio_next(folio);
-		int status;
=20
 		/* order-1 anonymous folio is not supported */
 		if (folio_test_anon(folio) && split_order =3D=3D 1)
@@ -3524,12 +3517,7 @@ static int __split_unmapped_folio(struct folio *foli=
o, int new_order,
 		split_page_owner(&folio->page, old_order, split_order);
 		pgalloc_tag_split(folio, old_order, split_order);
=20
-		status =3D __split_folio_to_order(folio, split_order);
-
-		if (status < 0) {
-			stop_split =3D true;
-			ret =3D -EINVAL;
-		}
+		__split_folio_to_order(folio, split_order);
=20
 after_split:
 		/*
@@ -3567,8 +3555,10 @@ static int __split_unmapped_folio(struct folio *foli=
o, int new_order,
 				     folio_test_swapcache(origin_folio)) ?
 					     folio_nr_pages(release) : 0));
=20
-			if (release !=3D origin_folio)
-				lru_add_page_tail(origin_folio, &release->page,
+			if (release =3D=3D origin_folio)
+				continue;
+		=09
+			lru_add_page_tail(origin_folio, &release->page,
 						lruvec, list);
=20
 			/* Some pages can be beyond EOF: drop them from page cache */
--=20
2.47.2


--=_MailMate_31522DB3-C8E7-4FAD-A0F3-FE8FCE819C13_=--