mm-hugetlb-change-to-return-bool-for-isolate_hugetlb.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 20, 2023

Share & tools

Andrew Morton

author tree notice Applied

2023-02-20 20:47 UTC #0 lore raw

The quilt patch titled
Subject: mm: hugetlb: change to return bool for isolate_hugetlb()
has been removed from the -mm tree. Its filename was
mm-hugetlb-change-to-return-bool-for-isolate_hugetlb.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Baolin Wang <[email protected]>
Subject: mm: hugetlb: change to return bool for isolate_hugetlb()
Date: Wed, 15 Feb 2023 18:39:36 +0800

Now the isolate_hugetlb() only returns 0 or -EBUSY, and most users did not care about the negative value, thus we can convert the isolate_hugetlb() to return a boolean value to make code more clear when checking the hugetlb isolation state. Moreover converts 2 users which will consider the negative value returned by isolate_hugetlb().

No functional changes intended.

[[email protected]: shorten locked section, per SeongJae Park]

Link https://lkml.kernel.org/r/12a287c5bebc13df304387087bbecc6421510849.1676424378.git.baolin.wang@linux.alibaba.com open here

Signed-off-by Baolin Wang <[email protected]>

Acked-by David Hildenbrand <[email protected]>

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

Reviewed-by Mike Kravetz <[email protected]>

Acked-by Linus Torvalds <[email protected]>

Reviewed-by SeongJae Park <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-change-to-return-bool-for-isolate_hugetlb +3 -3

@@ -171,7 +171,7 @@ bool hugetlb_reserve_pages(struct inode
 						vm_flags_t vm_flags);
 long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
 						long freed);
-int isolate_hugetlb(struct folio *folio, struct list_head *list);
+bool isolate_hugetlb(struct folio *folio, struct list_head *list);
 int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);
 int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 				bool *migratable_cleared);

@@ -413,9 +413,9 @@ static inline pte_t *huge_pte_offset(str
 	return NULL;
 }
 
-static inline int isolate_hugetlb(struct folio *folio, struct list_head *list)
+static inline bool isolate_hugetlb(struct folio *folio, struct list_head *list)
 {
-	return -EBUSY;
+	return false;
 }
 
 static inline int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison)

mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-change-to-return-bool-for-isolate_hugetlb +8 -5

@@ -2925,12 +2925,15 @@ retry:
 		 */
 		goto free_new;
 	} else if (folio_ref_count(old_folio)) {
+		bool isolated;
+
 		/*
 		 * Someone has grabbed the folio, try to isolate it here.
 		 * Fail with -EBUSY if not possible.
 		 */
 		spin_unlock_irq(&hugetlb_lock);
-		ret = isolate_hugetlb(old_folio, list);
+		isolated = isolate_hugetlb(old_folio, list);
+		ret = isolated ? 0 : -EBUSY;
 		spin_lock_irq(&hugetlb_lock);
 		goto free_new;
 	} else if (!folio_test_hugetlb_freed(old_folio)) {

@@ -3005,7 +3008,7 @@ int isolate_or_dissolve_huge_page(struct
 	if (hstate_is_gigantic(h))
 		return -ENOMEM;
 
-	if (folio_ref_count(folio) && !isolate_hugetlb(folio, list))
+	if (folio_ref_count(folio) && isolate_hugetlb(folio, list))
 		ret = 0;
 	else if (!folio_ref_count(folio))
 		ret = alloc_and_dissolve_hugetlb_folio(h, folio, list);

@@ -7251,15 +7254,15 @@ __weak unsigned long hugetlb_mask_last_p
  * These functions are overwritable if your architecture needs its own
  * behavior.
  */
-int isolate_hugetlb(struct folio *folio, struct list_head *list)
+bool isolate_hugetlb(struct folio *folio, struct list_head *list)
 {
-	int ret = 0;
+	bool ret = true;
 
 	spin_lock_irq(&hugetlb_lock);
 	if (!folio_test_hugetlb(folio) ||
 	    !folio_test_hugetlb_migratable(folio) ||
 	    !folio_try_get(folio)) {
-		ret = -EBUSY;
+		ret = false;
 		goto unlock;
 	}
 	folio_clear_hugetlb_migratable(folio);

mm/memory-failure.c renamed from mm/memory-failure.c~mm-hugetlb-change-to-return-bool-for-isolate_hugetlb +1 -1

@@ -2508,7 +2508,7 @@ static bool isolate_page(struct page *pa
 	bool isolated = false;
 
 	if (PageHuge(page)) {
-		isolated = !isolate_hugetlb(page_folio(page), pagelist);
+		isolated = isolate_hugetlb(page_folio(page), pagelist);
 	} else {
 		bool lru = !__PageMovable(page);

mm/mempolicy.c renamed from mm/mempolicy.c~mm-hugetlb-change-to-return-bool-for-isolate_hugetlb +1 -1

@@ -609,7 +609,7 @@ static int queue_folios_hugetlb(pte_t *p
 	if (flags & (MPOL_MF_MOVE_ALL) ||
 	    (flags & MPOL_MF_MOVE && folio_estimated_sharers(folio) == 1 &&
 	     !hugetlb_pmd_shared(pte))) {
-		if (isolate_hugetlb(folio, qp->pagelist) &&
+		if (!isolate_hugetlb(folio, qp->pagelist) &&
 			(flags & MPOL_MF_STRICT))
 			/*
 			 * Failed to isolate folio but allow migrating pages

mm/migrate.c renamed from mm/migrate.c~mm-hugetlb-change-to-return-bool-for-isolate_hugetlb +3 -4

@@ -2095,6 +2095,7 @@ static int add_page_for_migration(struct
 	struct vm_area_struct *vma;
 	struct page *page;
 	int err;
+	bool isolated;
 
 	mmap_read_lock(mm);
 	err = -EFAULT;

@@ -2126,13 +2127,11 @@ static int add_page_for_migration(struct
 
 	if (PageHuge(page)) {
 		if (PageHead(page)) {
-			err = isolate_hugetlb(page_folio(page), pagelist);
-			if (!err)
-				err = 1;
+			isolated = isolate_hugetlb(page_folio(page), pagelist);
+			err = isolated ? 1 : -EBUSY;
 		}
 	} else {
 		struct page *head;
-		bool isolated;
 
 		head = compound_head(page);
 		isolated = isolate_lru_page(head);

Patches currently in -mm which might be from [email protected] are