mm: use zone lock guard in put_page_back_buddy()

Use spinlock_irqsave zone lock guard in put_page_back_buddy() to replace
the explicit lock/unlock pattern with automatic scope-based cleanup.

Link: https://lore.kernel.org/b0fceedca37139da36aa626ac72eb9840b641021.1777462630.git.d@ilvokhin.com
Signed-off-by: Dmitry Ilvokhin <d@ilvokhin.com>
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f5ad74490c5d2c15bf08e1a934e90db68765812f..49711916703eaadc93eb26091eb69aaab1059d09 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7675,23 +7675,19 @@ bool take_page_off_buddy(struct page *page)
 bool put_page_back_buddy(struct page *page)
 {
        struct zone *zone = page_zone(page);
-       unsigned long flags;
-       bool ret = false;
 
-       spin_lock_irqsave(&zone->lock, flags);
+       guard(spinlock_irqsave)(&zone->lock);
        if (put_page_testzero(page)) {
                unsigned long pfn = page_to_pfn(page);
                int migratetype = get_pfnblock_migratetype(page, pfn);
 
                ClearPageHWPoisonTakenOff(page);
                __free_one_page(page, pfn, zone, 0, migratetype, FPI_NONE);
-               if (TestClearPageHWPoison(page)) {
-                       ret = true;
-               }
+               if (TestClearPageHWPoison(page))
+                       return true;
        }
-       spin_unlock_irqrestore(&zone->lock, flags);
 
-       return ret;
+       return false;
 }
 #endif