From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42D6EC83F03 for ; Fri, 4 Jul 2025 10:26:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7675C6B8031; Fri, 4 Jul 2025 06:26:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 718106B800A; Fri, 4 Jul 2025 06:26:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E0BC6B8031; Fri, 4 Jul 2025 06:26:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 43F5E6B800A for ; Fri, 4 Jul 2025 06:26:25 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 114A080283 for ; Fri, 4 Jul 2025 10:26:25 +0000 (UTC) X-FDA: 83626202730.28.26EDEA0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 1CE9C80011 for ; Fri, 4 Jul 2025 10:26:22 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="gh0g5H/X"; spf=pass (imf30.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751624783; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0BL6qvlJKb8bmxpRl18Ncv/RX/ffBcxhvATfsQs5MSw=; b=FJ4zUNYbnkWjDlRGy6RtfjsdkYGWhG1zxlg2KejZ9tKUh5+MqX0UqTayTfZ1RLLDJxSDqi F8O9j2lhoRB+I9y7WSR3rMRsa6typr1eJpBvCOCP/Zr61SQqgi8mRRPC0Rf0oXRHfbNFx4 9O/RjkftCeLkPBdFU7O8918SUjKRO2g= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="gh0g5H/X"; spf=pass (imf30.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624783; a=rsa-sha256; cv=none; b=ovr/nok7AjAhA/HQQs4BJXgPwyvRcPtyvKVkqAf2xL6Wp8DliHCchi66fllzdrr11u9JO4 1DDRQ6WoICYqhU9xauKiEkXglrbOKaUotc64W02/RzTNUbRafpNXF3Xmb7PsN2cCi+4ltL tZnhZ1rJW2FoS18XNNnpabqr5tqr8nU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0BL6qvlJKb8bmxpRl18Ncv/RX/ffBcxhvATfsQs5MSw=; b=gh0g5H/XrHTb8SQGzaEakuRNJKrJjTDxjl/ut5rZXKE2f9sat9j6I/uD88XuAkooBX0lEO 5dE4Kyh46JzyCF6VlCSqPqHVSyCLvkVbTch6Mw1zWRy/trv0TNUT76fUmjS9A5uEtWLOQw 3PFaE74mgdxMXrcJ1zkk1jeK8HzQF+s= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-584-FX2d_EKTOom8JJTrarMgpA-1; Fri, 04 Jul 2025 06:26:16 -0400 X-MC-Unique: FX2d_EKTOom8JJTrarMgpA-1 X-Mimecast-MFC-AGG-ID: FX2d_EKTOom8JJTrarMgpA_1751624775 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a50049f8eeso366314f8f.3 for ; Fri, 04 Jul 2025 03:26:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624775; x=1752229575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0BL6qvlJKb8bmxpRl18Ncv/RX/ffBcxhvATfsQs5MSw=; b=F+EzD/KNufYafOdPfAOGFlrhbDbDVAG3dfB8tRdO3D4L5dnUNijj59cWHITCoHJkg8 AitgpskakL/kjFMhbFdxeFQK8Tlzu4Eu+rxZxyGQMj22/hbH0dydVpuchZICmjPi8ih1 fwmb1nt9D0jYJA8NYPtHeKH8rAQi1U6uJTB+FGMgqZ7i91KLe9giiEJqphnt5iFShS6w LBovBycUOMUvbmnp9XZGHib5b3L7j7EjfRYECdbISprKRzasc71rwAX+YUDDitPSASJN XE0Hd3SQNetcWundkb8rSC9wA5fwOiVhdQZgiNmVEXhgsbybAUvueDYkS5a8/Vqoo0QK PKkg== X-Gm-Message-State: AOJu0YxeuhEMih45gjz2pAYM3ymD71MG3eYVpfwEO3YtEwS7hq6/2X2s hp2C8XwsIj8RrCrbYOCVCiiDXjDf7cLn3unMQKXYonQGoZFmqzWXaMqO0ROsK6JcySzFEWl4XAF pCqEKuBeNpg7N6tddj6iA9sd1pvd4yu4r9kw7wNlG0sszbBSaxrRK X-Gm-Gg: ASbGncv24voR8B7jLRswueZ5SnZZ3rxAn/NRv+hRrYUKS+fRZhBw7yURRd659nc0npi MpcPvlcLLbkGUKgJ31TG/Q5sAjH2qNUiXE0m+10AmgG3u5qZvcR718T2DXDlk6bzLEN7AqnWFZ9 LgfeEDSfsj5ZUmbspWQ8lr/y5muiGxqZ2IdCIuI/tuVCDtAVUFgc3LeIwjClu/bZgLwRcsf6fLq KPCu0iPshzkXmmJPtBVXduNuZote9FKxaMOQ8oKuG13ClC1YkquxoqMdLlVXwjSB2jSF+7GhH8c 92ZCuEvEssga8EroNpIU5k02Gzr4eE2a69yfKFjQg+S697KFPfY+UBUkRFwDghy9zcMWw5mjs1q dileQQA== X-Received: by 2002:a5d:5f04:0:b0:3a5:7991:ff6 with SMTP id ffacd0b85a97d-3b4964bc845mr1662780f8f.1.1751624775090; Fri, 04 Jul 2025 03:26:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGm2OJrY/VRHhz8rrdEvEy9XnpRFVoifs27nJth9wopnF7vUfEB7/wKIPCCX3g/OmgYPHMZeA== X-Received: by 2002:a5d:5f04:0:b0:3a5:7991:ff6 with SMTP id ffacd0b85a97d-3b4964bc845mr1662735f8f.1.1751624774556; Fri, 04 Jul 2025 03:26:14 -0700 (PDT) Received: from localhost (p200300d82f2c5500098823f9faa07232.dip0.t-ipconnect.de. [2003:d8:2f2c:5500:988:23f9:faa0:7232]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b4708d0ed9sm2154538f8f.38.2025.07.04.03.26.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:13 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux.dev, linux-fsdevel@vger.kernel.org, David Hildenbrand , Andrew Morton , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Jerrin Shaji George , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Viro , Christian Brauner , Jan Kara , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , "Matthew Wilcox (Oracle)" , Minchan Kim , Sergey Senozhatsky , Brendan Jackman , Johannes Weiner , Jason Gunthorpe , John Hubbard , Peter Xu , Xu Xin , Chengming Zhou , Miaohe Lin , Naoya Horiguchi , Oscar Salvador , Rik van Riel , Harry Yoo , Qi Zheng , Shakeel Butt Subject: [PATCH v2 16/29] mm: rename __PageMovable() to page_has_movable_ops() Date: Fri, 4 Jul 2025 12:25:10 +0200 Message-ID: <20250704102524.326966-17-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250704102524.326966-1-david@redhat.com> References: <20250704102524.326966-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jP3qk0rPbaC1c_h9RP77KRg98h_favYG8OuvGTGoWqA_1751624775 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 1CE9C80011 X-Stat-Signature: uajic4ift1cu7dbbpy3uimfpc5yexkmk X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1751624782-268776 X-HE-Meta: U2FsdGVkX1/u67LgxkXOUZapceYygXXTkobIROEkbXi9BHzL17Rg0rHWe67Z0n7KtFX/3WeaU48wrfqnzriReM9TNAanZfG/yFZalryUGIKHk/vUvIpuGdhIw4QRwk7nNTsNqhBGKWbbdEsHEdJ0XgKkx8N9qSckbLTui3I8BFOxrXGomBryPuUMtBjhwqr5zEDE34Rx959sKFbK5bfKOtUgNbZhtbaZGAqXqFqwgKlzzgC6CvrGXliRxgKUyLfBsjOm+hwrWgzG7Tk9oRgkzEMR7HYm4N4miyCwJsA4trQ102grNuKOoX6wcnzFsigTe1L1eWEpN0FuqOaBqvUs5309agYnQp5ShwpTN+9suT795jEiNsPmMvIlQbMz+QCEv3nGPhYFhp80LW6Oh8KgxlsfLnQ1yIJw/TwjQt5kt88dlawTtkbEfmrBw2Xla40GAsEpeYLXVrZMoSkzvE0prOPjqLAk0l/lqhBHcNyXInm5hNO+IohWcW0wCDvQKAor0x2dJQQo8TWGQ+6uGyNPtshWpDfi86d3gJiCSPFx3nBRHKYim+ymeOH2L46NPPEtu403uOljWCtCuiWbwA6oJlctwpmlMRZQ4lqUQS3zS0X3nnkiesy8GKud6oDsNEMv8JR3EiQloTjSZ80xuSRPNlhSeWXcwZfPJWx3lqU9So+0fC8pKVrzyI+LCgjdH1FzqAdH7ihgkh744puo+qYs5eVz4yoN1T9pjwITxI9nxDnhbOSEuHvUJrM6ifpfgL1/tJ7nUUnGtR6zpXA+eqI/Sk4w7k67tMytJObtmMSqLx1DC1aWpA3v+Amej6/ejup2NIeSoRhThpI225YVvtaLY/SGIk8FVYVrwVySRYMW2seE0LHRuGo0dgiWxt7wrxBeVbZ1/lRkkywVx2mUD2aZVutGGl1/DNNmq0I9U5XVnKOQY6Qbofdbe7xTG6YEC90pzr/xZeqgANRDanENHfs gknP6rls tHMrW56S7nx/m7ypoBHm0nvCdzex40lBFZlEr5bjZJ2x/dgq1NjmfJMkmJqZ5GbsEPX3BKkj+w5lWY2P/QDglfiAsTvbMbDOA9s8XXKjWs81qhImechlt7Ew1eqgU3J6rUef72VzJ6TgRB/2ww3k2gX7W/ra+g5tSDeWcAQnR0E7G4ZErwZTQFLLie+DRBkSlN3j87V53hhlgVPK3eo3Qh9ewct97Yy3H9prki7DPKMY4tPR3oNTfcB/tQBdmtK7E4QvFEWieG9/mpkOVImf+okWMY9/Av1on9Uyz X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Let's make it clearer that we are talking about movable_ops pages. While at it, convert a VM_BUG_ON to a VM_WARN_ON_ONCE_PAGE. Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Signed-off-by: David Hildenbrand --- include/linux/migrate.h | 2 +- include/linux/page-flags.h | 2 +- mm/compaction.c | 7 ++----- mm/memory-failure.c | 4 ++-- mm/memory_hotplug.c | 10 ++++------ mm/migrate.c | 8 ++++---- mm/page_alloc.c | 2 +- mm/page_isolation.c | 10 +++++----- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 25659a685e2aa..e04035f70e36f 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -115,7 +115,7 @@ static inline void __SetPageMovable(struct page *page, static inline const struct movable_operations *page_movable_ops(struct page *page) { - VM_BUG_ON(!__PageMovable(page)); + VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); return (const struct movable_operations *) ((unsigned long)page->mapping - PAGE_MAPPING_MOVABLE); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 4fe5ee67535b2..c67163b73c5ec 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -750,7 +750,7 @@ static __always_inline bool __folio_test_movable(const struct folio *folio) PAGE_MAPPING_MOVABLE; } -static __always_inline bool __PageMovable(const struct page *page) +static __always_inline bool page_has_movable_ops(const struct page *page) { return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) == PAGE_MAPPING_MOVABLE; diff --git a/mm/compaction.c b/mm/compaction.c index 5c37373017014..41fd6a1fe9a33 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1056,11 +1056,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * Skip any other type of page */ if (!PageLRU(page)) { - /* - * __PageMovable can return false positive so we need - * to verify it under page_lock. - */ - if (unlikely(__PageMovable(page)) && + /* Isolation code will deal with any races. */ + if (unlikely(page_has_movable_ops(page)) && !PageIsolated(page)) { if (locked) { unlock_page_lruvec_irqrestore(locked, flags); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b91a33fb6c694..9e2cff1999347 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1388,8 +1388,8 @@ static inline bool HWPoisonHandlable(struct page *page, unsigned long flags) if (PageSlab(page)) return false; - /* Soft offline could migrate non-LRU movable pages */ - if ((flags & MF_SOFT_OFFLINE) && __PageMovable(page)) + /* Soft offline could migrate movable_ops pages */ + if ((flags & MF_SOFT_OFFLINE) && page_has_movable_ops(page)) return true; return PageLRU(page) || is_free_buddy_page(page); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 62d45752f9f44..69a636e20f7bb 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1739,8 +1739,8 @@ bool mhp_range_allowed(u64 start, u64 size, bool need_mapping) #ifdef CONFIG_MEMORY_HOTREMOVE /* - * Scan pfn range [start,end) to find movable/migratable pages (LRU pages, - * non-lru movable pages and hugepages). Will skip over most unmovable + * Scan pfn range [start,end) to find movable/migratable pages (LRU and + * hugetlb folio, movable_ops pages). Will skip over most unmovable * pages (esp., pages that can be skipped when offlining), but bail out on * definitely unmovable pages. * @@ -1759,13 +1759,11 @@ static int scan_movable_pages(unsigned long start, unsigned long end, struct folio *folio; page = pfn_to_page(pfn); - if (PageLRU(page)) - goto found; - if (__PageMovable(page)) + if (PageLRU(page) || page_has_movable_ops(page)) goto found; /* - * PageOffline() pages that are not marked __PageMovable() and + * PageOffline() pages that do not have movable_ops and * have a reference count > 0 (after MEM_GOING_OFFLINE) are * definitely unmovable. If their reference count would be 0, * they could at least be skipped when offlining memory. diff --git a/mm/migrate.c b/mm/migrate.c index 63a8c94c165e2..3be7a53c13b66 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -94,7 +94,7 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) * Note that once a page has movable_ops, it will stay that way * until the page was freed. */ - if (unlikely(!__PageMovable(page))) + if (unlikely(!page_has_movable_ops(page))) goto out_putfolio; /* @@ -111,7 +111,7 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) if (unlikely(!folio_trylock(folio))) goto out_putfolio; - VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), page); + VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); if (PageIsolated(page)) goto out_no_isolated; @@ -153,7 +153,7 @@ static void putback_movable_ops_page(struct page *page) */ struct folio *folio = page_folio(page); - VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), page); + VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); VM_WARN_ON_ONCE_PAGE(!PageIsolated(page), page); folio_lock(folio); page_movable_ops(page)->putback_page(page); @@ -192,7 +192,7 @@ static int migrate_movable_ops_page(struct page *dst, struct page *src, { int rc = MIGRATEPAGE_SUCCESS; - VM_WARN_ON_ONCE_PAGE(!__PageMovable(src), src); + VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(src), src); VM_WARN_ON_ONCE_PAGE(!PageIsolated(src), src); rc = page_movable_ops(src)->migrate_page(dst, src, mode); if (rc == MIGRATEPAGE_SUCCESS) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b825f224af01f..4aefeb2ae927f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2006,7 +2006,7 @@ static bool prep_move_freepages_block(struct zone *zone, struct page *page, * migration are movable. But we don't actually try * isolating, as that would be expensive. */ - if (PageLRU(page) || __PageMovable(page)) + if (PageLRU(page) || page_has_movable_ops(page)) (*num_movable)++; pfn++; } diff --git a/mm/page_isolation.c b/mm/page_isolation.c index ece3bfc56bcd5..b97b965b3ed01 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -21,9 +21,9 @@ * consequently belong to a single zone. * * PageLRU check without isolation or lru_lock could race so that - * MIGRATE_MOVABLE block might include unmovable pages. And __PageMovable - * check without lock_page also may miss some movable non-lru pages at - * race condition. So you can't expect this function should be exact. + * MIGRATE_MOVABLE block might include unmovable pages. Similarly, pages + * with movable_ops can only be identified some time after they were + * allocated. So you can't expect this function should be exact. * * Returns a page without holding a reference. If the caller wants to * dereference that page (e.g., dumping), it has to make sure that it @@ -133,7 +133,7 @@ static struct page *has_unmovable_pages(unsigned long start_pfn, unsigned long e if ((mode == PB_ISOLATE_MODE_MEM_OFFLINE) && PageOffline(page)) continue; - if (__PageMovable(page) || PageLRU(page)) + if (PageLRU(page) || page_has_movable_ops(page)) continue; /* @@ -421,7 +421,7 @@ static int isolate_single_pageblock(unsigned long boundary_pfn, * proper free and split handling for them. */ VM_WARN_ON_ONCE_PAGE(PageLRU(page), page); - VM_WARN_ON_ONCE_PAGE(__PageMovable(page), page); + VM_WARN_ON_ONCE_PAGE(page_has_movable_ops(page), page); goto failed; } -- 2.49.0