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 6894AC8303D for ; Fri, 4 Jul 2025 10:25:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FED56B8025; Fri, 4 Jul 2025 06:25:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0602B6B800A; Fri, 4 Jul 2025 06:25:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6B636B8025; Fri, 4 Jul 2025 06:25:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D357D6B800A for ; Fri, 4 Jul 2025 06:25:53 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8D62A124900 for ; Fri, 4 Jul 2025 10:25:53 +0000 (UTC) X-FDA: 83626201386.06.2283BC0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 59CB210000A for ; Fri, 4 Jul 2025 10:25:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D8z/cyO4"; spf=pass (imf14.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=1751624751; 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=2hFW2iBTC0y3bbUq+s26fylaJsmqdGOzvykr6tgw4lA=; b=0RNOZ6FixB18uQTUERxN57LazoyLoxeJOSCIwjPofcdi9faE047XSDstXwJIx0KsgzniBq XYVEuIrrRL1fGIJSEoSP7C+yZQDYwT4F79LSP+9f4HM37ZamvMwDAO7boNgV4ZjQeoPDPz DmvKmC2/wnJ7G2270PBZmXAkyY1nW0Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624751; a=rsa-sha256; cv=none; b=vzqSgxN9ZpRAa5OpsKHUCO9AgtKdqjarBFWBMc8u4gPD00vYbT6dg3b1uIAT59Q8yJBl26 jSOZFQvHGv9NG3GTv8wr7wh8uuNd64SZT0Z9jY0RDx0rx0FD58Aq8nBtZmMNwlNa74ZyEX HYJgb0vjIcEbf6zU8mjBZkxISYyMDi8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D8z/cyO4"; spf=pass (imf14.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624750; 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=2hFW2iBTC0y3bbUq+s26fylaJsmqdGOzvykr6tgw4lA=; b=D8z/cyO4UMSFfw6LZj3xBFeQXbGEGIzzBonbU8GJCu3EDOzzdNAqp/REvcNdzZLWobAaVt O5O3FnRXUZFobdM/O59vKpmCYEoTeT8iqreuBhp8cXj3AakwD+sr23iLZHfAnQrt5Fu3fK C88F0da84C4m9TYQKHN4f8lOgPxpYmE= 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-126-g0K0lfROM5qXblKpaukorA-1; Fri, 04 Jul 2025 06:25:49 -0400 X-MC-Unique: g0K0lfROM5qXblKpaukorA-1 X-Mimecast-MFC-AGG-ID: g0K0lfROM5qXblKpaukorA_1751624748 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-45320bfc18dso3885575e9.1 for ; Fri, 04 Jul 2025 03:25:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624748; x=1752229548; 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=2hFW2iBTC0y3bbUq+s26fylaJsmqdGOzvykr6tgw4lA=; b=lGMwP5JoT5CP6u59bkZW5A2r4rT22ORr2X+OYycwW1azju+6dkISudOZ8hycsAqnah suYYi3AooS2KLY81AD5+aMQLbNMcrY3Wge+iaplkRF/2Ln8WrcWJ+9Vyj5WuykSVqF9m lNiBPzeVnOLL4Qd+b/EC2rDdeetVL1/OKUKQJxj0oWrKJ/rxmHCQ5Mlea4ZtZnXA2mFA +TwEFq6m7I511ul2CccQRYHbmi1rsE6hqYHh0kCDvFn21T+6iYdHjfouUJg2UJM8YzO0 9S5NvcyS/1vrocCWl6vXNW4MOXDR1lstFzDEQMx0fCDp2JBMb7OhPkuXs0oH0ybwk6jW p3gw== X-Gm-Message-State: AOJu0Yx/T42fZ7O/KaSGMlx7wsBgbDuCH0D011Aq1sSa5IP6klfgzJY8 lHPe4jbcCrD6XSlebhL2exzHra4hH7ET+/bDQdNvjTzNpbWs2M8rgQ3y2eKXNoBIWdZEhMQcgIB JFM7pOuUM8zLmMbULFVs5GD5mLPHIMoog4UhlVgRGBLdoy7aY33we X-Gm-Gg: ASbGncuxSHp5b4tA0BXBr0iRkA+c2AiDA0YsohqGK2BmllW55UiVpYktTvKFvOj9V5T MTRDCA6yWwoHMtaGHTKyN7PhA8ezkzQl+3u2DYDWu4cNak1afL8LEeGTM8dMZvRW0qZj8mdaC2c AMXZ0A9QVuTVh5FXpwekjc6XcARIzE52O7YVeJ3heVCMEMOfh7XarzST+lhPIl5rQZWi1wgqU5s C6DDf1n8zxme3zPWZ34Nr9oF+PaL89eIhHL9bzUYlbEov/QF7T3RBi5i5Van4EWGK+wO0OW41Ev kMW3e+wy1Qyu/uoAl12JsWm1qq69vD5Gc0W5aqLXQ/DlUAOP2wxiUYn1oun8FDIJmJ94TgxYS8L O12Inkw== X-Received: by 2002:a05:600c:4fc9:b0:439:4b23:9e8e with SMTP id 5b1f17b1804b1-454b3ab874dmr19032885e9.3.1751624748195; Fri, 04 Jul 2025 03:25:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYcpd9SFcoaWfQeqRe14xBG83tSrWUHlht+bCd9eNO7YiXJuE62xvkx/e2Wc1s4dDi7NCxDg== X-Received: by 2002:a05:600c:4fc9:b0:439:4b23:9e8e with SMTP id 5b1f17b1804b1-454b3ab874dmr19032085e9.3.1751624747587; Fri, 04 Jul 2025 03:25:47 -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 5b1f17b1804b1-454a9bcef22sm52038125e9.19.2025.07.04.03.25.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:25:46 -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 07/29] mm/migrate: rename isolate_movable_page() to isolate_movable_ops_page() Date: Fri, 4 Jul 2025 12:25:01 +0200 Message-ID: <20250704102524.326966-8-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: OoPUiQ9qBi0_PfyzxJX5bzV3ri-XTkCxIWGF65sTs5Q_1751624748 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 59CB210000A X-Stat-Signature: fs6ieindr774xmdz71ey1a6jtwjrtaih X-HE-Tag: 1751624751-699936 X-HE-Meta: U2FsdGVkX1+soA+e2cIidL444dmp8i1BfXFr38uOkOTmzh5dPaSFiHzw2GQnsyoUcMf2YMdqqhpyLUMgz88nMF13OSSOvKD//5bha6oh5ShxrDMKtnY7cqwKX6a7oHwD9cZ3535Xrq5a9ZA88a6DoexvFTB1u+4LCp3/DDqSNS8Hj+9ULZm6U/wuz57avXCoiV6QKXPjq9hatWf0RllGvmPd5+7rKoaxIs0OzUmVvZ25cfX3L5CNioUz1oGofqHC0+OfFh1LAjIx7E84JdwZm0l67Nt4YWodaZLbcssKcAQk37Hny2X2KXv05fiaROCVuQ9WnohBL3FRLA11JTPuvo8OseAnuXMV1aYZRjtJ6Sw2TCA1Egjt6fPHgDXYtrIzhq9Awi3uZGeqRZ44DtqrIsZeHDCMWiZ3ryltC07KuJ89Toj68oYSohJVuLGTLdfNQ632Ji9GeQAttd8xkcX41WYpYN04gX36GFk0pSUWCNQPtGONhAIOf8G/xd5n2juSG6JWipkQEsfK3sOgtoG2Fz8Wo6JXg6gjlr2ESby0WjuCY1Tsu9fVzWYvvW+HV5VNen06HDUxp0w0ppp70wKNIOfu4wSRM9KJKHoHNe/hgV1zQJVeH4B3xi6HCo9SUBie3BIxupNonOKsGp5M22DHJJPS/a9joZxQmU6dp3257+T+Y6cFLvu65wBRAP5yPJSdYrCyqGm23FJIKeRfS5/3BVDZYIFpCcOf8MdcJQkOORvc3ve9uSBhLyGFz2a1xu8tbfgDQKdVaQpqCPupFO0lUen2tqGtB0Jf5k6x0Ndttl4xVUvRSI0MdN4FTKMgII+B9M1fAAq0cAKYPOd1YSIPu0OGRPuD7hYdPKBBAGqR/a7SwV5UFCvdo25ZSxBzlQVQMbMghutq8a+21Xzx0lkUe4aaWbZrjRLdhoQDFUZCDGcbswWuS5wrnyQozT2E0mMuAbyMuR7nj31+H+R8dbt 9trjWhfq v/k8Kek/HWcAmBpZ/A2qmvF5ZiOltanSZFosHhBBqKBr012vsrHXyK7grmc1lSWywo1c89mlyC/tLyHyYuf/H9biTWEgfRTCINZ2m6lILfW7jfzk4V4JOuCW65UmKn2SYuhdRARpUqWTBdV/fl8i86LDvBfsxJPt1hwczfnxqUAFgtb6aKUmywMN6i3pyZgiQwII6r15qJEXFXyvQ1osi22aC8Ej8T54EDRXzAFsZOx1vAUB3j8++y8SxOXdoTUQR58lEEKLaPSrPSZp6qm7V53d/50TrKokmUyfta11B7tgAhd6xAbhCCD6iGUWn3rKZQ5IxyO38mipQKcv+yZSVLU8SnZWxndbFzF/wKzh8HiG7VqP94DzVitn+EXBvze82Hpx2tQsRcspd1UfiC0pOf6Lz/ibA5T4HjVyR3ajrUrCcD8C8sxqA6vyUQNzvZ2NpxV/oI2q/wsor1YKJ12RO50Y4DlpWAnLaZ0boVqM7mHnB+oxRsMWA3ho6VsIUPO3gaL+N2oan302/f5ro7fEra/jvLUeSPewNAC6vZF7IymjeXCwWp7mzQHcj/BZbKWDwldP+asa/mgesXsJlm27Vs2FDBhc8PkyWaqmyZmzbbRZSHDxZr5W2S7oPKg4stI+WdoDuxF8eG2YnypDfjVJwU6WfOOdtspFG70T0sF9pI3XbOpbf7Llyy3kNCfV/Ffh8MGURD4mGCHfv894= 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 Reviewed-by: Lorenzo Stoakes 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 208d2d4a2f8d4..2e648d75248e4 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