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 03656C71157 for ; Wed, 18 Jun 2025 17:41:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 934746B00BC; Wed, 18 Jun 2025 13:41:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BE286B00BD; Wed, 18 Jun 2025 13:41:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 737736B00BE; Wed, 18 Jun 2025 13:41:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 59F0B6B00BC for ; Wed, 18 Jun 2025 13:41:07 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 21905BBDE3 for ; Wed, 18 Jun 2025 17:41:07 +0000 (UTC) X-FDA: 83569237374.18.44D0A8A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id D7C692000B for ; Wed, 18 Jun 2025 17:41:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eb98xZRQ; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1750268464; 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=pn7yGSPhSFiXpI5R4Bp6dvC2hmWGRnPce0Bw+h6ULBk=; b=YeHMCBOsKHJLH8K5Oc9yN0JJTrK7O1vn8oFA568nB7+71wQH8gpA62dEDCPmB4sHbmP3Cg WwLJ2srg9dFvyjEWvr0stjQ7qeGJUUmOMy5RarYJyullkOT1CzkP1L307MCHpztYwAF3QL ay5RE8q6cr1T/v0xCcDZKTAvVSM//gk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eb98xZRQ; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1750268464; a=rsa-sha256; cv=none; b=v7sOSnjcsYp0IpuIf7VpY14Qh/2XKbWj2K7P91QpxNwCL9XRK0dH6xhnCunekk9BikQVZp fG4oFPrQt140KpSnuCFjeIwcWDc1XGTZYQ9dgYztgENKa/ZMqrfsPAPl82noQ9+rVy1jzZ tsj9xbI9+TYCYvjrITZRZgM4l6dI+QA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268463; 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=pn7yGSPhSFiXpI5R4Bp6dvC2hmWGRnPce0Bw+h6ULBk=; b=eb98xZRQRU0ENgml0VahJGUXeZgvTij1YbpRMaMho+iCq/TDGdIFVU+jIiVLmQP8C6mvC6 C30ZKfGMU6tzwCbvJnbokhXDLGQDUp74VKMJgPxQeCfaWrKjLJqjcQRBUKWclAXVdWaNJa Ht6fyBBDRql4DXhW3I4Lo1eJas0BdcQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-265-N-AhVFx8PZap6PuK85tEKw-1; Wed, 18 Jun 2025 13:41:02 -0400 X-MC-Unique: N-AhVFx8PZap6PuK85tEKw-1 X-Mimecast-MFC-AGG-ID: N-AhVFx8PZap6PuK85tEKw_1750268461 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-451ac1b43c4so41421825e9.0 for ; Wed, 18 Jun 2025 10:41:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268461; x=1750873261; 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=pn7yGSPhSFiXpI5R4Bp6dvC2hmWGRnPce0Bw+h6ULBk=; b=AvZuQjhXgCGU0GXiecsSYT7pgJO139hAU/SHYJmH4H8qXLDL2B1GKqtjqPMgBHQfN3 Ua/Zzg+NnyAUwEFBK/qAf1QrXBbiCgPj7XAAtavT8tipSL5fntzM7R2sXQI+nzSt4aJS 4u2Tp8zYYGa5nx+M79aAwvTrAlp5mA9cnOvCuVspkZ666Be9vspdn/DnoUE2nuxINvcI 5BhyER/P2cx7huu6TWeBPNewK1ng5E9/wqHMnpeB4b1YZ9Kynp9QgefcXbmLtbGVhMoM Xw3UPEOwMOelPA9Kj4w8CAS/GCX1pfZ1r5nSenLKc/V6EF7HiJcmE9wsI/85uEFqHGNs uRpg== X-Gm-Message-State: AOJu0YzS4ysdRkKt0xrkA1XRFo1FxDD/I5fXpj0aXrStYprzQdQLK3fk hkduXhKiy76xV+8/br/rg6ysg6lcCJIS8cDGXcAw2N2RKQlGE33zXqwf0I7hgSRfT7/lvE6sfw0 UR3C5gVpW7jFqlnx+/f8LsO2XEeUqXZXVlga6HGUelNbjyBu7aacp X-Gm-Gg: ASbGnctwMtFQc4ET7mp4db4YSoyqYJ0JOvc8pkRDUFsJKvrUPC8+DDt1IEfyf6p8mM8 MJNUOI5X48iezteDampql/VH73Pmchv/oCRRnauSfNoVJg5Ad64WetMNtQKoCQnf/YY7qEZDbcw 3ECy3WkpGfuBZaXknSQsN2MX8mi763GPO3KYXCHEj+vQBR5WZLBfgynJh2k/S8WIQSJRXYtbmLZ azSbLHDrrVpF0H52TC+iPS50z8IlpDsGW3zRmRawIvdLJzNFiWKLkAVTZ8YgxUNpUEcKcNvc+At R1533DVZTO6971zt11njwDqRUVSSqKhm4CLq7B26oR0ap/ekcgL1ZZrPRKVXDtIkx5sIKymk93/ QQFg6KA== X-Received: by 2002:a05:600c:4e13:b0:43c:fe15:41dd with SMTP id 5b1f17b1804b1-4533ca7a5b4mr172426815e9.6.1750268460589; Wed, 18 Jun 2025 10:41:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPI4qnomtJiihDYZHrEYfWz3Hi6xPZWIy9RNeAMNhrydAHd5Ktr+DvLvfsdyiYBEhOo2Z7gg== X-Received: by 2002:a05:600c:4e13:b0:43c:fe15:41dd with SMTP id 5b1f17b1804b1-4533ca7a5b4mr172426335e9.6.1750268460017; Wed, 18 Jun 2025 10:41:00 -0700 (PDT) Received: from localhost (p200300d82f2d2400405203b5fff94ed0.dip0.t-ipconnect.de. [2003:d8:2f2d:2400:4052:3b5:fff9:4ed0]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4535e98b50csm3675535e9.22.2025.06.18.10.40.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:59 -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 RFC 16/29] mm: rename __PageMovable() to page_has_movable_ops() Date: Wed, 18 Jun 2025 19:39:59 +0200 Message-ID: <20250618174014.1168640-17-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618174014.1168640-1-david@redhat.com> References: <20250618174014.1168640-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: j5BRm9GsVepqyiR_mHfO55wCLgBbvTMXqqAbVTfCZYI_1750268461 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: D7C692000B X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: sg9jpcboj1agr34rfray4khnbigjpn4z X-HE-Tag: 1750268464-176060 X-HE-Meta: U2FsdGVkX1/7Lq9UIN2XiicguWjMz+s6xbBn1VIrN3D+BG/2NEJy+tDkn+pTwUgWtO6i42T4j5nn/hVzmItT/DwXgz5rDRdwWnGrE3pQZaRmUvGYZ7bMwLuwTsIk5fM1OSO+qw7QRKKjfBSLxNmr5tGcUndYjmXffpSGYIKKPTmEEfmwRPV6KigW8x02wCINycgNqb5G3FyYnoKVqanEZXqNmY8NqJqDx9VnMkburc7i1uz9iUtBPxzDO+BaYlU8ycrpXzLNCMUEhduN1iaePH5PMaJeqbP+mbh1bLInryoxM+Kh90hM97EBCeQm1pHJ/zu24hEN3QX9CH9Q/FNwRtP4/s8wMztLY2WME51RiD1sIdWfKZcwTXY+nCWZqiRiHkAkx+cnbwIgThpOxMBKpupdSiZV6j4I6xFyw01v00dhFgGpJixisHJCGcQo18f0C/om2atQf7vlq/eEbw+ZpKeZtw8qqNjZ6KNkQry+U1uFZjeh8Jww+SF525etgAtvYEOIfXtWw2j4bKjvOdN2mdOdAaou6nbqYJsebeAaOeH9eetJuPvpSor370GrJkIBxPofAW7FXrZvvbw5t8hVClS4BLREsOc8uQm/G6hq6oE3LL3s8OHwj8gseqNzdigv9bYaKchqV93HuiRThd8An6xvdCDDXuqnuIMtlIluP21k057YBXHRb1a5FdrlGW3B/1Psa1g4j64VLHw5JNn0TKgyJhVim+PlZ+d7LBF62aDp4GilB6DFMizunJbLAdjWMMs6rJjwViz7itL+pBe+ujFkhVztYhUJYcifYTIRljTWAyjtM+hcCvUDheQyhM0bxkqiLjf0M0LLcWAsVYC2Z56ZBiH0pxkByNkgvfD/NYwzjPOr+1cft9SjVvEq3LmRBAwDLv+7BIYWNknc3a5FSrlSbxYn10RhNdEx24Fw5kyP/wEstkyUViVwfqfZ9zyRaRs0Ki72/hG64rlaLve oq650K1G oZABemOj4vhIgaXQO6mMp0zBuMkybgROZbDYIPqcNYJvE/kYRVQ2erxV3rG9TE0zX7nZGCeYohkQ8Oy0W/NRBTwHkFOyS7/P8uRCYiydkUdF/2jeGUuS3wdgSM7NNaqGOaqgJTg0rik43aECviOyem15Qgn2Dy8A4h6ikSdk1fQDhG9wFKu86ubEUYP48jrTUFT2LRm4Ugo8w2XMDN0n+0BIcKOZ8nfM2PAU95sbM/LqFGwiijT+rxcssXS1P0AnutRhY22iYgsHCgRIj5jDJDSH7N2F6wnALsKcWV8ZTvQPMeF3PFN0b88FzPdYTOEoId8V/5G0YWoKhpQMVKy5juO1QnMbya9LGHzIS4pI66Gt3Ywp1wwe2+PpmUTgYf6GOLoHfZ3UcKCGH9KvnkKSD2zeA60x0HqhyfRcFLGnSrDvxt0yY4wTjiDZMn9bvokqbpML55Q2czfn6EgOoFCMwa/jeGc6aQQbD90MuKJfuFXb0xZBdfDBIw+TGOTNPIfoGtKukGKIWSm2p5GwCqyHgL5+c74TtIjzlZi4JR9kivX/6gZI/8duwTc1MYg3pCWZ44PGfIR0PCrZvoDqTLSamDGpeaMgqMOyY9WmK 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. 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 | 8 +++----- mm/migrate.c | 8 ++++---- mm/page_alloc.c | 2 +- mm/page_isolation.c | 10 +++++----- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 204e89eac998f..c575778456f97 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_BUG_ON(!page_has_movable_ops(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..f8b7c09e2e48c 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 will grab the page lock. */ + 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 4d864b4fb8916..1d4d0f093af29 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,9 +1759,7 @@ 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; /* diff --git a/mm/migrate.c b/mm/migrate.c index cf92075108f0c..5f97369eac2f9 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 44e56d31cfeb1..a134b9fa9520e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2005,7 +2005,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