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 4B43CC8302D for ; Mon, 30 Jun 2025 13:00:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E5906B00B0; Mon, 30 Jun 2025 09:00:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 370056B00B1; Mon, 30 Jun 2025 09:00:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E9DD6B00B2; Mon, 30 Jun 2025 09:00:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 022AE6B00B0 for ; Mon, 30 Jun 2025 09:00:43 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C652F1604CB for ; Mon, 30 Jun 2025 13:00:42 +0000 (UTC) X-FDA: 83612076324.03.3AD29F4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 6191540013 for ; Mon, 30 Jun 2025 13:00:40 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J3MwJPH3; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1751288440; 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=m9VQLTS9DDIxmZmB+neo2FcUhAnDYm//4qg3iAtoZVM=; b=BicVDq1w9rmaKIU+lWa3a8q0BcFESS/Lj4T+JyRnI/40oDOQPzqDwrfHLV8G8GIJU9EQnj PWGI6D0UHLMt39qhr41czodzCpFyx2ucdb9rOlwGG/7H+EBOS03A8kOp6sDHP/K8xnQyRq 08vZwDvE5HUs2FlanUWBITn7UwHnuW8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288440; a=rsa-sha256; cv=none; b=KO8Q3eTt57k2MuPj1Jqjypb7B7Idu+nPYHjQKgZqQmfYihHcBsEG48u7OjU7JHvWRI/j0E F/H2NUXOFg2zNDwJyDW7jrjpAUFM7zotUw6DKKwMziIMnSdbO+la2u1SvBEg/aX3/731jY LZb+9ylG6nNh6NIZM11s5qJ0eGMVBG4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J3MwJPH3; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288439; 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=m9VQLTS9DDIxmZmB+neo2FcUhAnDYm//4qg3iAtoZVM=; b=J3MwJPH3pKsFvc1tmvALWyj4VQiu7pxMfi1Qb7/ax8OwqS2vFbcujOaajSuL+JKge8Kxjv T91ZUXWLTcw7Sn/U1K2ttgXgJmP/loMjbbQltKvanLRbr0ljZzEE/sCkuRPAdjNV2WcXo+ 41mMfONhWQmEfpfgnZCsWUrkaqshC04= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-73MvEzRHPxOwryiOXkQuFw-1; Mon, 30 Jun 2025 09:00:37 -0400 X-MC-Unique: 73MvEzRHPxOwryiOXkQuFw-1 X-Mimecast-MFC-AGG-ID: 73MvEzRHPxOwryiOXkQuFw_1751288436 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43e9b0fd00cso23502125e9.0 for ; Mon, 30 Jun 2025 06:00:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288436; x=1751893236; 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=m9VQLTS9DDIxmZmB+neo2FcUhAnDYm//4qg3iAtoZVM=; b=phl9iiRL039dpf8FSYCX6dYvBsFSYhqvE81h7BpG6B3Dk8F+EmLeKQZnKU6v7e5reT TiOvof4EYz5sXEMGVuh/vxkX+iEhRYNUVyzWYz/9Qh7gFsyqrzMGkU6wv0lFFS34YQ4e r3LumqDZqgrjgif50zynI9IZpaMeRFiQjjwJ8s7oC6RtIL8iKiPbffCGcNPH1+9MVWeb Yf+JOjQxZ1N07BHfuH0ukMyKR/kglM5IUUY3bwKg/3SeB1IwCQ2aTwvSfIp7nub/0OCI My1N9dRGrP/4YS105hGlj0QsOliryoo4wYZfu6lvHUPSv6qfGxVAQiBMRdhhMMKV0ded S5Hw== X-Gm-Message-State: AOJu0Yzi63MXbSrBPmNJO7sH0LNNqIu/KLF4L3xbJAFOBgaZSn3kElNU 6JTgb9VepvWW9UDDjB1mXHGwtt74efnKP+3mtTDocSpGTZA1ch4h/vURg3X0qej/cJhRE1vnS6o ShPM8UXVV3391TF7M0ObJysjw33atdnJ4rWyOnSceFHc8T3kJMqnt X-Gm-Gg: ASbGnct8axmN6A9EapOYJdWEBWC6gZ79H5zt3jr1khC2u6qGhJKV93e1DCPwCtW4PSv y8o5OERIrOWGq7qAWSN9uJp9yFrD4Ombs1rPLSdrtXoOR5E4nMB7awV8zoubosQQl2tOE08fkeS BZGW87aZm3NFDgGUl8dmVUsZE0sMzpXD8qoVEL4jbsZ0HBF5b2Nk/lt2uUhxVX70Khio+fAG5Cd GqJZBxdOt5uxglbLKnXx9Kvp+zEfjf2fBJPH1cYwp7gn++9bKx9z18CHx3VUCZLQFwQTPylSxvZ J1FrvYvejStiu0b2Anpb1mzf9nlAnm2Euh/pkvSk2IK+Y3xWBju96OPwA122WeX31wOIolUTo73 FOgDF8K4= X-Received: by 2002:a05:600c:5251:b0:453:6c45:ce14 with SMTP id 5b1f17b1804b1-4538f2c6a5bmr116867485e9.4.1751288436057; Mon, 30 Jun 2025 06:00:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcKPudq4hAX3ZUQbBxj7a9OFNaExkIT0GfF2UdhGugpVpmsHfKtz6PBCtjyRSKpLMaHzgIYg== X-Received: by 2002:a05:600c:5251:b0:453:6c45:ce14 with SMTP id 5b1f17b1804b1-4538f2c6a5bmr116864905e9.4.1751288433794; Mon, 30 Jun 2025 06:00:33 -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 5b1f17b1804b1-4538a406489sm136741305e9.27.2025.06.30.06.00.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00:33 -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 07/29] mm/migrate: rename isolate_movable_page() to isolate_movable_ops_page() Date: Mon, 30 Jun 2025 14:59:48 +0200 Message-ID: <20250630130011.330477-8-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: 2nG9j2_yXJlm_iflUyVxtg3KHEG9k6gnxK8yBGeuMoo_1751288436 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: caa5qdfcpuo6cj1kpssmmsa4wfqp7kxf X-Rspamd-Queue-Id: 6191540013 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751288440-891928 X-HE-Meta: U2FsdGVkX1/rweNYLahhnaYD4OmV2p6bh/2lXSuWyP9psUIQ/8t7GmuRkbxdly6QbjKRXPGFA0SlwCMGgCCAbpuVE0Emnb1Qc/A8oruQyi+Fa1Jo8/I6jdjifv6UseJ/ZtQKD0AJHysz1iD/2pJdYDnT+/Y+i1tPyvIstC46EHSlgvV2uKJR560r3kl1vfePPbuRCjUfPU0iALxzVtDuJxVmWEcmg/JOOEeErLKIn0BJzNYzmI+v7VvoWr3bKpEgPitm1vQlI8aZcL70+Q7SNyVfoKeEpyg/wEqQGE1tBNi9pxdEUAkMR0dfQUkcKB632Zs0a8SZJO2ZbuyuIfNalqBh/HQi9BFu+uy6s/cuFho9wGdEj2e2fgrzGHoHjFCr2kaKxV7FfcoW946iOjslqVpmZsWMYY2I9yzlZnYmlOt0pwtvu1fiJRKON1/byqMV4Ec6NG6ccRcYPnv1qshgwyD9KlIhuqYPqYfcU+VvyWvYmJzljmVFMo10dGbWEfUwPGhEOz7/+MYOgfTfj5RqlXcIO5Mmgg/VEsjaiudPhpTztVqpc9hXzU5tO9AvfA71exVJTdZrlvBNSx0FR3fTAj2ajOUbyKc3bHORo7LVdHNqPGOJnvL5xitdfOGV98TMOtGk7ZhB1dUUaaZlspcDQ/jjgx83yPjDRUb0xFlXSn+DM8hNuobFlemLPbult/wGoFSwCltEk7F5ka2k/98k75T7UvU3aPK+/EjZkQotnAckIOHsXIVhYKEkjkhj0WCXC8dpyfz7Df8wGtxrgDL41hcoW5XQblpbOSrR8WszdJIhczKH8LzgHUbHBlXfrdwAzUXNFX5RGJDEX0YjhPhpzkieIYmIxe/j0rrEpBnxrzl962dpofSTtn2LcIJ+pMmhpKeXqM0nojllgzpSNWdDkUfrXYzivQM/ZQSjyqv++jDnJez6dHVlPqtkWXtz8soQEc3F6gdA7qGPsFWMOmZ Rncd2oLu +lxqV0Mo5H/TCDm92dzUik7fSnmFG6Dl4nfcTof+Lv09mMklOTcczObutaA5ako/XL063ZTimLEPgaFrB68zFc/1bdoScQSz0Vd+i+hJA6rAknlihFe99GhLal07Lj7YKJhHqMDbZ+zJxYd6AfuzbjvINRV/ICJvhvhEs79hT8vFqX5KKy0JnSw42kF1FGTsm53alMqOHjoWwmfJvH+CvkEyADQv7mFzLq/l1xrlOvrDdQg1RN9ITKsQijdZcKB17sKl0XtND6jFWpigRBJQtmGSYCPVzkTTQLyQb 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(). Note that we will leave anything that needs a rework (lock, refcount, ->lru) to be using folios for now: that perfectly highlights the problematic bits. Reviewed-by: Zi Yan Reviewed-by: Harry Yoo 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 767f503f08758..d4b4a7eefb6bd 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