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 C0FCEC8302F for ; Mon, 30 Jun 2025 13:01:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67E846B00BC; Mon, 30 Jun 2025 09:01:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 657E26B00BD; Mon, 30 Jun 2025 09:01:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5453A6B00BE; Mon, 30 Jun 2025 09:01:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 463686B00BC for ; Mon, 30 Jun 2025 09:01:08 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EC4AC1D7429 for ; Mon, 30 Jun 2025 13:01:07 +0000 (UTC) X-FDA: 83612077374.22.5CDE2EC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 3A17516000B for ; Mon, 30 Jun 2025 13:01:05 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bi+Pyfai; spf=pass (imf08.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=1751288465; 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=j9ZRLOTZa5PZrqGG8BB7XlQvd09DIcXAeCmmDpWukIA=; b=AoMLwcLXjoMWgQWpPAAFMSwH9hw87dnAu82MEQfMSLPWrPMw74sj/+Q5yVlnho05s/mRYt 4Yjb4Q5tVjeO3xRe+GRFXBJ4TkqvKWt5LTn2N5uIveTD023YMu+QpSsNUJLqSaxUGkXCwv Fwdb9pFClFrGbs4g8KNBHuXkbcH+THA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bi+Pyfai; spf=pass (imf08.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=1751288465; a=rsa-sha256; cv=none; b=Ll1uPpdqqiV/WeyH0E04sLrHk1FAita2+/JTwhmE5ah+SZ79fYII9o5glAk43dIDvh3kxe mHCY5QaClEGrLzNTbszdH5wCcssNYQDEzK1vs5/2hxYvoZyR4Q2SSuCxdqOAfRNnEw7VJd 2pGPQI7Xtp4yzdy9kgpi1wI2hAZ4B9M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288464; 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=j9ZRLOTZa5PZrqGG8BB7XlQvd09DIcXAeCmmDpWukIA=; b=bi+PyfaiuzpMdY8r2DTl82JC2SAaKXyowljm01BxOuI5uqDTaIbLswEPtQ0sviVtla6dDl RYxgNrVMw35dEVDvJH9cgUyM+E1k3rLZU8tKS6wAfRBQP7aU5iYlZ3btDokl/5/HIR3X+M 2gUOTx29pagB+HSQHJbAvgGu3ZWMJ0E= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-261-Fd76FRuFO36wJqIOe9_b4A-1; Mon, 30 Jun 2025 09:01:03 -0400 X-MC-Unique: Fd76FRuFO36wJqIOe9_b4A-1 X-Mimecast-MFC-AGG-ID: Fd76FRuFO36wJqIOe9_b4A_1751288462 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a5058f9ef4so1983489f8f.2 for ; Mon, 30 Jun 2025 06:01:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288462; x=1751893262; 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=j9ZRLOTZa5PZrqGG8BB7XlQvd09DIcXAeCmmDpWukIA=; b=bM4ykxKBuHGOIEVfjMMnbbobo6iUmQp6uiLtEnQEJroUS33wJ0lu1KerR5WF9JgIIg l86LqzwvWACviJ/6DriXt8q6bPb2lHkGK0YQk++URhgSY+M4mjDT7QjbUHkQ9ES0VVfn XBEiUOEnIAnYaPlIaFy2759PK+WhJVxizKoUCkhkKFmgbYB/gD0+paV5XhtNA/kPo0qY ub0v1F6Q9GydEu3M3tw4I/XnMSpA8fH8GajsbBaoOP7KYKko6Ie6/bOT1zWP6xN5RDb1 ehmfmg5nsh+fm5lhPQrZRWYB233xon32RmnEHMpwV6hMu/dqTw7bKxMMNkf6UXLuKmBv cR0g== X-Gm-Message-State: AOJu0Yy7j4nZr/d53v/rVfeX6juZtEVoc6WvL6yzM7ZSS7iPmL9PB0oE qgp6ZrL5FCHuongRVXh5VjBO/Pp5Mg/8kp4ltc2+0w6CyegBZVElKqh0hLEOLvYX/etzhyhrL6P 8vgOFI4N4DMLg6xCvYSCOMvOyF9mojxcSqFJPGDKBR6kRnAtinGAZ X-Gm-Gg: ASbGnctof+e8WeagM3jWb6pEHwyqbAAAxC0cJDKsipwXqt5pzX/lR+MDidt8nEDc3Xw MpoGeD8wzAZPIiVUCLK7TOPmzOO5OS89t9MxO3I1WCwHdh+Q8k297s/DJS+0UEMhWzI0U2XB/Zu p+QixifXBSUZfwXQsWqdbEUZrQnZvDC9GBOYybqymcXSpL/IkgT+aB1PnNqjLsWbCt0rt7x5qx9 0I2t4m7r8USAuSbApLgXYQyJRWxKLasvP49xqSjLCGEO9u4StgpzbbwioZH+aUoDDFuO5iwPTTf rBAFJXDRlwrf1qMaRZT04CxiyU5xP31HT1hdDq18RcQzf3uT2GOU+WuysCZ2+vceA9Hp6AmC9tH G34yRYaQ= X-Received: by 2002:adf:e050:0:b0:3a5:2182:bd17 with SMTP id ffacd0b85a97d-3a8fe4bc79dmr6795148f8f.19.1751288461160; Mon, 30 Jun 2025 06:01:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHX2/qdHEQ8JHXpMdU+ERIflh/WNh5UuVnHM8RS5ZiXb7uiqYANr4p4OCvKgXi6OG7WHmrLuA== X-Received: by 2002:adf:e050:0:b0:3a5:2182:bd17 with SMTP id ffacd0b85a97d-3a8fe4bc79dmr6795028f8f.19.1751288460150; Mon, 30 Jun 2025 06:01:00 -0700 (PDT) Received: from localhost (p200300d82f40b30053f7d260aff47256.dip0.t-ipconnect.de. [2003:d8:2f40:b300:53f7:d260:aff4:7256]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a892e5979dsm10337527f8f.75.2025.06.30.06.00.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00: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 v1 16/29] mm: rename __PageMovable() to page_has_movable_ops() Date: Mon, 30 Jun 2025 14:59:57 +0200 Message-ID: <20250630130011.330477-17-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250630130011.330477-1-david@redhat.com> References: <20250630130011.330477-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: X_Bd8kOUG38uWWRdUd0E7IooMjIrO1QyHXwzYay7SQk_1751288462 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: gzkx37jnd9uhji98tf3qwjyzh8n46iud X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3A17516000B X-Rspam-User: X-HE-Tag: 1751288465-944240 X-HE-Meta: U2FsdGVkX18xjLmtCPrUHhK+3ZIEY0sawnTUC+POuy7z0DvcKpQCThcEsxHkcc9MBW0GvkT4smPVbVtMyVSBot62pu/2QZ2he3MWYcK1YPDVLdxClE0+HZQWolmo1RqzWN8D966tAWhaUDijQG/07GD2Zi1CkizlT2RcWfBkEjb4SPd/OVKdYwNac3dZyr7q27lFmW8OT+JixIQwNMZN5Wl2XvJuc1UEeMNnx0sKp/uylOmRPLqiAqvz4TBjcl5S/P3QGGtPcF8rBFs56S70bcusCnoT2xQ/iNmKApn1KY04aF0gPzcFVMEFXbZh8SBLOg3Nj26NkXwxRU4WlyjEzGmWrebW47fXnTs6zF/588Q4ICI0FfAbnoYH1FoNxpFkxib0aIcZWvphL7X5N3muH/BLDucQRrlCvL6zZjclzQSeWeGcWEuj9vRNjsI2lsUlQkGQPPQjoArWumMCcRW8ycRqI4rq0TKYjGdtVJ7nBthDI44i/Yoxll5Gp0YinqpDbgl1ymeIUvevsiwwhM/s6ZnhAca8KWSsZZX/LiRMOwnv5ECaM/FwuqOn5p1DUQRnloAmtitqUce9vGJ3tFCZDPUeUwqEyIjMBtHmx5QKbZ595OZiDQoY9nKoGSkoMnf5Qi04wazv6Bd+7JQQwFGDPSM9gMYPZDakPeYmOLNZ/AcIEqgion2pu88t0Ly5SE1cJwJzSqr/aTAVIA90RzNtRkzNbcGhWU8Kk6w/41LR9Auj6M9Gs9z3CXRlhkfBuc5xq5gLarXXGOjyiEkTOpxlzio6EQEG40RSxY+zIy8UwbLyx0ikGr+mahHV8I2r1tGQBUZgSDdLScBtVggm8rYHLrt+jjeJeosPEzeP8AEl55FiJQjggyhY4AKvneSqPMEiAiZG38bMGvr6U4sMh9PfVfVUnLEAEX0mlL+VwdOb3D2Ac9tsJA50viJ0Kv2yBx4wjgkrlq+CXoYeAPAw/Ne JqbNeQyO FaIG6Scrd+CwJ1GwxHl+DLp4tbV7POrb1sY+ZS5L5pOXvhXqfXuw/QGhHZZf+2fLylzln194RAaIzfaBcTg1KCZNGv+bQmqxjtbBGSHRNefybyIFZAEWsukiP//9ZTkQ37TvPeCU7Ei3Ax5ajscRUKooY5kMVzTEb8rLw5WG3bWaA3l/Rcnm15KSt7mZh2e9iLHIziyupxNJBvdZimuNFFDI/bgxwBbfc6wFZ5sfxmiW9DCl4rC8b3UQkZVLV/WubtvvDVXNIq4eA2Na+m7O0RLMhM1n+sZ9UoU9M54sWVSQifsiFevIvHIUXRiJR8qJg7hL3LxNtt1/es7OoOsUmlCJrsk98bFwBA4WpoQkjVmDv7+kprX/+uxOiHsgXnsZGwVCzRym9DPpOT/v/wgedmDHqdMbjsJLpa5x/ms9s1tb8/wbPlXdU4XfNxdK6NiK8NUWn3t6wj+w6LGfznLg9qUCzjLkASnG0ICT1KhAA87oO5P5zyIoCM6qwnXHuVPTVzpiK6K4p7l8g1/A68xklZPsW+6jxGiFZKGFxzs8BBUfVo64RYDpgeXUibPwxTzzU4Ml9NEtZynssb/b/bsjzHM+BiLHfBh/U/wDVNRF+6nqLrJnw/5b1sJvMXhYUfeI5JIiErMKdjcXKbij6XzkIoTFtrHkGVNvEz1+AUrzKWt5ed3d4G2IbXRScbA== 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 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 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..5fad126949d08 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 040484230aebc..587af35b7390d 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