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 B96E6C71157 for ; Wed, 18 Jun 2025 17:40:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A77A6B00AD; Wed, 18 Jun 2025 13:40:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0338A6B00AE; Wed, 18 Jun 2025 13:40:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DECBD6B00AF; Wed, 18 Jun 2025 13:40:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C7A786B00AD for ; Wed, 18 Jun 2025 13:40:41 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9715E1D3A09 for ; Wed, 18 Jun 2025 17:40:41 +0000 (UTC) X-FDA: 83569236282.27.0A7E918 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 739C22000E for ; Wed, 18 Jun 2025 17:40:39 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hHIK51nr; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750268439; a=rsa-sha256; cv=none; b=Bu4JfB8Pddn7Oo5RJZHjuXddVudJQHzfCsMSrQkXxaxlcMCvGfR8bqzXTcuSBb+nB3LlJ+ C485VSMwczxMbryR8Dm82zd2a2bslJwBaGKpgdEv7OtKonk4SrOhL40lBp/lWsEyaipD96 0xyB5azveQiTSRtirZPOVlXkNo3uSBQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hHIK51nr; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750268439; 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=cYycAi7wypL2i/sUXw4R4ObGitZAt3xcPvEHBQISmjY=; b=7Hg0uDlIkrEAXVRSJp0oiwqdLptFRS/VjRGgOBD/R3Gy4/QNu83geLPJVpkEEs0W+uj692 gHclJGbeGeKHd4RD7XWggc/RKBU1azHfg+lAabnMfoz/8G50/q6jd4vkBb/mTdChAVu4Q5 f66Y2Axw/ttAoygr4Tl3pdTIq75dYVU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268438; 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=cYycAi7wypL2i/sUXw4R4ObGitZAt3xcPvEHBQISmjY=; b=hHIK51nrN48PhQZG49G1D40X2E5/kfctRrq5w8Hb8nXf16n7M5/+27PtTt5j/GEf35mk6E yhOk3lWPdpH56zkpVE7M7Yxc1jAY2ZyX0kQwohXDs144oEjA72yNr4tavjcnhBCaJcG765 WLT0C6OejVkT0L1TOZgIqgKJNEufl6I= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-448-1Tu3B-3lNhC9Jo_hr53lHA-1; Wed, 18 Jun 2025 13:40:37 -0400 X-MC-Unique: 1Tu3B-3lNhC9Jo_hr53lHA-1 X-Mimecast-MFC-AGG-ID: 1Tu3B-3lNhC9Jo_hr53lHA_1750268436 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-450eaae2934so59169995e9.2 for ; Wed, 18 Jun 2025 10:40:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268436; x=1750873236; 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=cYycAi7wypL2i/sUXw4R4ObGitZAt3xcPvEHBQISmjY=; b=KM5zRhYSjY3KZ04ME6AitJuCuhlK/y63v/UZxDbZgx6JMneBwY/7J+GetI1FRlsPVg 21a/sxXm9qwPgOBYvyPLG72wnMqR4abRAQcjmJUpchKFuTDQ9ajLvnqAE/pWfwSr04Nr eGhuYQdCvJYWZNvLs24ZxUUNxU61R549WGFvYdTtGNOVZwRX5fTQE1SRu4Wd3InbEhqy a6/S6NLFfOQ4JZcSbp5J3kdI3WgW188B8DZj0kb9frTVecoE+ajKVhrDAePgyz7z358t cqxlY82oIUoeP2/LUl8XZ7aedpRkHeRg00uRYU699f7s3zkhtn7U7u3BqhgHimJLuhek npYQ== X-Gm-Message-State: AOJu0Yy0DPbGo+iShyW8XhcYdGcbs+A8LkZSXeGI4eYzX9/dL5g6W2aO 5KHdhZ9WDAEAxFKZiBCO9mVXTQ6cgMKSnlQHMOIe1gK5WFs3mQQ4D47gBVTQqN65LBr/9TATsbm h+4EBGlduZ7I9TgfRWyI487FPeFJjpuTarGc++6FkkyjnerHtskq/ X-Gm-Gg: ASbGncv6qkiPtzYY4WVfd6HmqjVePy9KWcM0gQJOaTXcSVyh4CkQzF7pmC8xdZte5/0 FIY8w8XLkjZKqw2riWIMY2EhpaLqi+U7QwBZ0mZrY6x4AiYtuOSgrTbuLayMagdXWFhkW1yqtKN FoV38HafXdXyF3gc+Hyc2sJeUFF+RZKuwL+8qqW95BD2/j4Btu8r85RXVredySOQUsfF9ZPbxlO 0Wnfjbwu4WZZqe5qTeSuNaRck9ovZBEumXt1E/zZ0pKxxWk8q8L+QqIJrINPt72hz7bJvDchA5z ivVsEC2vRA7TVRS5G4TTeqU0bD4GcWtw/+MhToM0Yif6/KM4f6gKa8FWMKsUHaQhSNX3LDmIo5A iy2MFwg== X-Received: by 2002:a05:600c:1c8d:b0:453:dbe:7574 with SMTP id 5b1f17b1804b1-4535018683amr106187635e9.12.1750268435860; Wed, 18 Jun 2025 10:40:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUDiWgwWbQgJVHFyRRixono5bEyE4cqQlAJV7lYOWhJt5afQ5kfI4WOQTfix7X+TWBj4ApqA== X-Received: by 2002:a05:600c:1c8d:b0:453:dbe:7574 with SMTP id 5b1f17b1804b1-4535018683amr106187035e9.12.1750268435264; Wed, 18 Jun 2025 10:40:35 -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-4535e98b4bbsm3633515e9.15.2025.06.18.10.40.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:34 -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 07/29] mm/migrate: rename isolate_movable_page() to isolate_movable_ops_page() Date: Wed, 18 Jun 2025 19:39:50 +0200 Message-ID: <20250618174014.1168640-8-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: gQUfHLEDsmoHQ9OQK9Z7XRi8ltJKCqBFFt3L3I9sSgQ_1750268436 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: 4tx96ea8fso3buhcze8iu7sux18p6zjo X-Rspamd-Queue-Id: 739C22000E X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1750268439-411853 X-HE-Meta: U2FsdGVkX1/4a39SBBB/MNjv9VGnvjKqlzMyj9n2bCEBm5i5ruieIAzkhesyh6PmMWjkmJlmX0aANqOfJWdL2VTiF0eXNDdrkd0pdv+afFIbZLPHF3IbZwH6ftDR1R9SyTsV6ETzg1L5YLXpuhsNwAHY5Q5na/ixGBUlyARTLVlyh90XbVKl/8wqpY9vNhsoVsrHU8ILnwLbrUvdRsc10h0Mqw/9DDqp/N8/HB9g/lt1Gy3D3uc7BcuBgJgQkiP3JKLDiNE8qYciJUWDhlUbSkUu1iB2Kk0lW/mE8dmPuRW3zXIOXPB/FDDwvY7ueqf+PgNnoY6s2MssJLAbqDRnINKcX4xYaJb49uN8OIBxZ7xxT25MMSlozgAub+aeO1g5cSZ6PMcMmbRUMaqAN+fID65/BVCYfgY6Hb3XA4frRX04nHKKyvvB65blEvKMhsVrHI094yvCz1+dRTOqFKkext1VGP/ZG5kSWurfS2QAMWhX9La8732BsZoJxHioouHoUeJcSSqDYO2no4lQfeE6awNIOZVf5bK8TsyjclJl2v4QFsfuG1XoMDVKYOESFmFVn1hL8/qcBWVnwBAydYqPPxhInPXuPSmAy8Y3lgHwTvWNHsSy/rE+YF/dOyG+n+iUQPhM40wDGE8rWmZ+DMgIoZ/Yb8k0K1n2YWSKGWTZVeQFcrB4IKXKfvE2rbBS+EigjPwRgkVj563rSzIaCWq1Dlk7YnKPGt6eMJHoQkwNZxpYZmWaXBbQR5u8GUm35PvM7mS6FMghmNLFXx7Knt9CGn/f+zMQGyEcVzYJS53cX+dueKvR7bm898uUpPxc4zDTVnvX5GCuz7eo3oZjBh+D9qNlVJpVyPSLbc9ICVolTgKOaVL7O2wxoV4mwCkiQb/khS/28EtJHaO+uIarNL20xEH4IZKSYtmWtdWynQ1GSWZIqDx8p8JoRBeHo1kotB2+NLKuWgZQigbz6C7P9GP S8r7Fl4g Hl7AIWoeMvbIg1TW3VtjT00L6SLJt027SkChXkkUOJO339Ta9nG6PvbVoYDPUHtYQnl36zUHJesvD/1LuIRqYFjaSFhp50Gvr9WlSyAziH1kGMPFM6T2zuQ6FPCFWbcTEgqVOBUFBCZ12eZI3YJNMKbbTx+44+lujeKv8CV5ej29A/HATLU20JVQ0ztBFXT3j5lnMH7m+gdaLyb4qk+qUmy4HBwpjT3jIISyTsoD+ildHKmoA3w7nyQfCcboOdPw8aZGh0vgN28HLlDuVFU3+SvMKxxN1zzPQkaA2xq+81ClGglJViAcoKgZpvy67juI19M6rx2tkwRxTyQ+FwDLP1ElLElLMPTuYx3CnU/l7qz1P2aR3K8sSJz9si6ozwqAbZbG4UZOD/21kwiuwYfvGQ+tpXNcE8Rw55Gwf/XOdW7dP8m6YUySXpNosFRbmyQOymi8PSx3pSrXnlkA6sjNbyUsK9sgsvTzjZBl/O8OfeoqWmDXM+1WvWDV/p9spD1HzWRPCWJWzDOrKd19JulpR42O2KhvnGFkuTZ9/20mawNolCvYx6xQCdQHu43sjie5+onFj8B7p2zofewa5r6NJgF3h+z5IW3mjTlkO 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: ... and start moving back to per-page things that will absolutely not be folio things in the future. Add documentation and a comment that the remaining folio stuff (lock, refcount) will have to be reworked as well. While at it, convert the VM_BUG_ON() into a WARN_ON_ONCE() and handle it gracefully (relevant with further changes), and convert a WARN_ON_ONCE() into a VM_WARN_ON_ONCE_PAGE(). Signed-off-by: David Hildenbrand --- include/linux/migrate.h | 4 ++-- mm/compaction.c | 2 +- mm/migrate.c | 39 +++++++++++++++++++++++++++++---------- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index aaa2114498d6d..c0ec7422837bd 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -69,7 +69,7 @@ int migrate_pages(struct list_head *l, new_folio_t new, free_folio_t free, unsigned long private, enum migrate_mode mode, int reason, unsigned int *ret_succeeded); struct folio *alloc_migration_target(struct folio *src, unsigned long private); -bool isolate_movable_page(struct page *page, isolate_mode_t mode); +bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode); bool isolate_folio_to_list(struct folio *folio, struct list_head *list); int migrate_huge_page_move_mapping(struct address_space *mapping, @@ -90,7 +90,7 @@ static inline int migrate_pages(struct list_head *l, new_folio_t new, static inline struct folio *alloc_migration_target(struct folio *src, unsigned long private) { return NULL; } -static inline bool isolate_movable_page(struct page *page, isolate_mode_t mode) +static inline bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) { return false; } static inline bool isolate_folio_to_list(struct folio *folio, struct list_head *list) { return false; } diff --git a/mm/compaction.c b/mm/compaction.c index 3925cb61dbb8f..17455c5a4be05 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1093,7 +1093,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, locked = NULL; } - if (isolate_movable_page(page, mode)) { + if (isolate_movable_ops_page(page, mode)) { folio = page_folio(page); goto isolate_success; } diff --git a/mm/migrate.c b/mm/migrate.c index ea8c74d996592..6bbb455f8b593 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -51,8 +51,26 @@ #include "internal.h" #include "swap.h" -bool isolate_movable_page(struct page *page, isolate_mode_t mode) +/** + * isolate_movable_ops_page - isolate a movable_ops page for migration + * @page: The page. + * @mode: The isolation mode. + * + * Try to isolate a movable_ops page for migration. Will fail if the page is + * not a movable_ops page, if the page is already isolated for migration + * or if the page was just was released by its owner. + * + * Once isolated, the page cannot get freed until it is either putback + * or migrated. + * + * Returns true if isolation succeeded, otherwise false. + */ +bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) { + /* + * TODO: these pages will not be folios in the future. All + * folio dependencies will have to be removed. + */ struct folio *folio = folio_get_nontail_page(page); const struct movable_operations *mops; @@ -73,7 +91,7 @@ bool isolate_movable_page(struct page *page, isolate_mode_t mode) * we use non-atomic bitops on newly allocated page flags so * unconditionally grabbing the lock ruins page's owner side. */ - if (unlikely(!__folio_test_movable(folio))) + if (unlikely(!__PageMovable(page))) goto out_putfolio; /* @@ -90,18 +108,19 @@ bool isolate_movable_page(struct page *page, isolate_mode_t mode) if (unlikely(!folio_trylock(folio))) goto out_putfolio; - if (!folio_test_movable(folio) || folio_test_isolated(folio)) + if (!PageMovable(page) || PageIsolated(page)) goto out_no_isolated; - mops = folio_movable_ops(folio); - VM_BUG_ON_FOLIO(!mops, folio); + mops = page_movable_ops(page); + if (WARN_ON_ONCE(!mops)) + goto out_no_isolated; - if (!mops->isolate_page(&folio->page, mode)) + if (!mops->isolate_page(page, mode)) goto out_no_isolated; /* Driver shouldn't use the isolated flag */ - WARN_ON_ONCE(folio_test_isolated(folio)); - folio_set_isolated(folio); + VM_WARN_ON_ONCE_PAGE(PageIsolated(page), page); + SetPageIsolated(page); folio_unlock(folio); return true; @@ -175,8 +194,8 @@ bool isolate_folio_to_list(struct folio *folio, struct list_head *list) if (lru) isolated = folio_isolate_lru(folio); else - isolated = isolate_movable_page(&folio->page, - ISOLATE_UNEVICTABLE); + isolated = isolate_movable_ops_page(&folio->page, + ISOLATE_UNEVICTABLE); if (!isolated) return false; -- 2.49.0