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 65A6CC83F03 for ; Fri, 4 Jul 2025 10:26:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 459F36B8029; Fri, 4 Jul 2025 06:26:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 409A46B800A; Fri, 4 Jul 2025 06:26:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D2216B8029; Fri, 4 Jul 2025 06:26:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0E1E36B800A for ; Fri, 4 Jul 2025 06:26:06 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CBE271073DC for ; Fri, 4 Jul 2025 10:26:05 +0000 (UTC) X-FDA: 83626201890.01.1874BDD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 8FE194000C for ; Fri, 4 Jul 2025 10:26:03 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hvf6N3yC; spf=pass (imf11.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=1751624763; 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=bNuyprjgbIdX6AHgfTXgzVcFKi/kDd27yjboz7bS+HY=; b=N5vUPZJmocGaVqfK8aSnOiY53mEwBOefk3d5TLcfptZB221ckzPwZP7ZoqBFcFlw3pnrQZ J+FGV3WYuEHbwJ39aiVCYC5c3LCUsLKMPv5sUOOJI4mSYUP/VInuS4mQ24T7Ca91cS5B3l meNu7+qtKFsaO/JLucrwlmxQWK1iPrw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624763; a=rsa-sha256; cv=none; b=qhkyVU/RqhOsZaFJ1qu/UhgXkAFQ2wwC9YZbqHJfP5h/0M2OK8f9aPv5qR7foloZu3eosb x4fk/Nyvr6yr6jgFx5nhe8h9aOXdAVVIqFonBz/vbvIcwlu3O5l2/Ql9OCisM6PbxYYER8 EcS0gIxWzX/BWf+vlvzjp91pqG605EQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hvf6N3yC; spf=pass (imf11.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=1751624763; 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=bNuyprjgbIdX6AHgfTXgzVcFKi/kDd27yjboz7bS+HY=; b=Hvf6N3yC91gYoP2tUU49XiPBgzGG/L7VW6AdD2JBioeb7P2zJXcDT9Rysyh6RPXmsKf5Z6 Pp1q3FJ/WC582x8U46Al8RZsJA+CU6pHtstqBzvYps6ErRqt2QvKNk+0mN2wf2zqgX2uyi 5emTAxUerg3yzcg16NderkvxCz7RVZA= 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-272-2AHI4vNuM4ur14w4_-Wb6g-1; Fri, 04 Jul 2025 06:26:01 -0400 X-MC-Unique: 2AHI4vNuM4ur14w4_-Wb6g-1 X-Mimecast-MFC-AGG-ID: 2AHI4vNuM4ur14w4_-Wb6g_1751624761 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4539b44e7b1so5193155e9.1 for ; Fri, 04 Jul 2025 03:26:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624761; x=1752229561; 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=bNuyprjgbIdX6AHgfTXgzVcFKi/kDd27yjboz7bS+HY=; b=UI6Gsx/4tn8HujmMfzOxkPgyAnehTP3AmLeY3F+0NozENwRY4Qe3Ert1cmSY6fZYU8 TXtBrvDDoxSh3ixUUc9RTKNg5cTO9767wpFcAg7lohHvy/94zUxXBd0QzMJtqp0zaDQQ tt41DmW3kKb7LEWxzDk5IiNBX3DLCF1rjn03jd6/MHKV3twuto3dnXMEOWfHoZz+PDAw JDg3XZg1YtyHVhoh1w2eHBlsydyjG6tu3MXFDJs3oBMmYR9j7LrEUCoJItJ/+Yjv3rmQ DEe8tDM/VjghVQfXDunACnETGUFA4HcCa1PMedupdXZlc+t1RXdvSBD7z1WQkxQhyZEA h03g== X-Gm-Message-State: AOJu0YzE2Wzw02JVtbmTmQknQnIjI61TuS2VHC2ebKYQCbrwb8rH8LEZ 0flPd3djj8tfEKwYV4YbKKolkvN5cRrpmZANVf5r7XhgpAcrErDLyTO6Mf9K8NLjkMFRktI13xo Y5FvapkZgSOLFa7f8xTCejrQyKBSu9ne/g6eo0s2zO7/SiANEKTQp X-Gm-Gg: ASbGnct/lKsjj2fpocR/Q+zO9NBKZ8zpibkzayhO6ifCXmVgSVXlMq4ZdZ7LKVB/8Ua C8Zpl6RC6QoOK2jaaf8f2RNG+fs+0f+9JvaxYyVt5fmC0l3+h5jkZ/C5D1EtOQsUl0AS1RFj15L hSDSZpS5w5latoaJ20ZU3xOfx4RcWI0vQJcnrb2iDpTEigSACCvtxaBMkmXK41eD/wbsnOYduD/ x5xr3g6V/tkJJlTjVEclEB7ejvEO/2vNakrxGy9VzXXJM2h9M1dENwZvQc08DcchU1DGK4A/qTf RvS37u/BIe3nUDqVid+02d8eTRQBsA6HtJx8PuUxB9HAgbMf1y3q65rdmWbY6zcdWYpjK54Q+8z GzGps/Q== X-Received: by 2002:a05:600c:8214:b0:450:d568:909b with SMTP id 5b1f17b1804b1-454b4e74957mr16128005e9.14.1751624760477; Fri, 04 Jul 2025 03:26:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8vCOgrvNVf6Wu0EKSuY1xmeHKjerawOF5tOLzHfBQzCNUvjojZFchXxtXOEn9U9CGQYVIhQ== X-Received: by 2002:a05:600c:8214:b0:450:d568:909b with SMTP id 5b1f17b1804b1-454b4e74957mr16127045e9.14.1751624759877; Fri, 04 Jul 2025 03:25:59 -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 ffacd0b85a97d-3b47030bd42sm2093511f8f.5.2025.07.04.03.25.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:25: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 v2 11/29] mm/migrate: move movable_ops page handling out of move_to_new_folio() Date: Fri, 4 Jul 2025 12:25:05 +0200 Message-ID: <20250704102524.326966-12-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: 4FNCzv3IoYMT15peAw_NvRmehREanJCH9ONB-j3c0zU_1751624761 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: 8FE194000C X-Stat-Signature: n9f7zpdba61p78fypwpfziudq3rofoxs X-HE-Tag: 1751624763-195479 X-HE-Meta: U2FsdGVkX1/Ir1RrIRUNfWwEdaMmeCPib8idl3MAsc9aQX45qWb5vj5yelfXrhX2DXHjhlmWjGNFjloZ/TqjzsNx3zMMBF5P8XhSmG6Ni/WxqX1uDnGvXA4B4F7FCNhMz22K2cXar5zqiGTATiK6Q6/p3AQdLzekTJdbZljCe4Re+GnGxiE5vRULQjShUuNJbnaQuPctsvEsc9VfKZHwjQaVLi4OwN/CDJog0ukkBn7JZUo0i9Py+1ROqKk3ZxTpjumtVIDxj6v41EO1OmeJ5byyv60IslEbdPYEwPVHfPtDUA0pzB+GNyk8jIUVqFaUCnGebNsaiqb9sdM+1oFv7thjzh4diOrBBAkYeP3CRsh94gwaxFs+hmrr20MggU3gulrp97hIiKS0m2S/y5G8Zo3sAHbROzfaPG6wZRPpKAG7G4YbBw18wL2oIGPXwFSzzdrYo92EqdymQ1SriorlyCqs9htrfYwrMjcJEsGkF3Qg6KX8KybdFkY/5My1Hb5xKKEdPl1pWkCcwE7F1bzBqiTaNnstkXqrgx7ddf5+07SMqW/0iCPaehSLdFuju6h07FG+0SCB6iOdt7Kg0u+sVqN9q7soJ/tFwJY2D+wDEloUinsfC1XqOxVufFysYKqav+mH8pQEjx0Kr5OHHjCP6fgH6UANEnQ8D7QABWqrzzvMIaKayzlxg3zIww9N7NyeaKupJbNtubVlGQY71Dxw/4ODB6KRveW2fDy4DoNJjx8HeD2B3Szv0fvN9gt1m7IoKZ8eC6+/pt1CArFI+V73uIxgO/PBsCpIaX0+CCH5U7iF4f7IXvAe2+GjLJn0g5an1EwglxkkLbFxGHgTMfFa0wmWLIpuiWzBK5vyG7oKL7ARcyhfNz/mpUZKFLPmU8+Zl/b3WBs48lZiXynR9c0x0TVC4DROJFx2lVXGWFPvSibun0Uo9IiRKmtfUEKIN9uFZ7fR67WbDcVcOViV14Q IMH8+Foz TYe/H8AP+TV4/U5UO62ouiNW7a8WaFsjsnc6p2q0AmfyhnHPfXciq6L87CyNUiD9AtM7NOOw8JfuOBHZWTs7hD1hIX2UE0iWrTHtTPnQggOQJXzMB4qvQjtRXHCqRmVPwRGR3Qdqh+Ewf2wE7YUjLBrzUZD41a6OqCyayMcu+eOdX9QjBKcd3ArVHcfouAi7Eu+8rWVWPLyvnKrgYR8+29gFP5NQN4CjMcmZL6mHJy+K7SWZoKjcadIUAd2jsw9yboIGw2EKkX+80nai/Hsyx6oWUtd92aIZ74hO0f/fCVx7ft9qV0HkhJ1OulOguyLFGWXCkagfY+BT2U5m1GJriXNWYckWpdLBAJ2p1paKbQdo42FgMYu+Hq4QvPf06/I63ZmkwDLPYFnumQqRYCkP2r3mvMGD9X+yT41RCUGXPYrxkN+Rd4y1ujNclcDEy2S4cNTIajtf+oeBC0K9CpPauJB3K9KSufJU8y58a5YBDuP62q/wJJbqwNPtTJTzWoPdQ7wxmwjv3mY+OEY5lZOe5qGNv8ol+Lg7rrMOHC8Il9qozLi6Z4Ev1YGEKv/4NyRqNBdNOUCNoC6g8x41ieQIX0pYGUyY3TN5bEHxJZtuGJKaXgMm+r2AM+y8QeRyyjIQY2hDWqUKaDMcclTXqdXE6ZVsJ5cHBsIDvqz49dxfNXAfIgEY= 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 move that handling directly into migrate_folio_move(), so we can simplify move_to_new_folio(). While at it, fixup the documentation a bit. Note that unmap_and_move_huge_page() does not care, because it only deals with actual folios. (we only support migration of individual movable_ops pages) Reviewed-by: Zi Yan Reviewed-by: Harry Yoo Reviewed-by: Lorenzo Stoakes Signed-off-by: David Hildenbrand --- mm/migrate.c | 63 +++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index d66d0776036c3..9a63bd338d30b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1024,11 +1024,12 @@ static int fallback_migrate_folio(struct address_space *mapping, } /* - * Move a page to a newly allocated page - * The page is locked and all ptes have been successfully removed. + * Move a src folio to a newly allocated dst folio. * - * The new page will have replaced the old page if this function - * is successful. + * The src and dst folios are locked and the src folios was unmapped from + * the page tables. + * + * On success, the src folio was replaced by the dst folio. * * Return value: * < 0 - error code @@ -1037,34 +1038,30 @@ static int fallback_migrate_folio(struct address_space *mapping, static int move_to_new_folio(struct folio *dst, struct folio *src, enum migrate_mode mode) { + struct address_space *mapping = folio_mapping(src); int rc = -EAGAIN; - bool is_lru = !__folio_test_movable(src); VM_BUG_ON_FOLIO(!folio_test_locked(src), src); VM_BUG_ON_FOLIO(!folio_test_locked(dst), dst); - if (likely(is_lru)) { - struct address_space *mapping = folio_mapping(src); - - if (!mapping) - rc = migrate_folio(mapping, dst, src, mode); - else if (mapping_inaccessible(mapping)) - rc = -EOPNOTSUPP; - else if (mapping->a_ops->migrate_folio) - /* - * Most folios have a mapping and most filesystems - * provide a migrate_folio callback. Anonymous folios - * are part of swap space which also has its own - * migrate_folio callback. This is the most common path - * for page migration. - */ - rc = mapping->a_ops->migrate_folio(mapping, dst, src, - mode); - else - rc = fallback_migrate_folio(mapping, dst, src, mode); + if (!mapping) + rc = migrate_folio(mapping, dst, src, mode); + else if (mapping_inaccessible(mapping)) + rc = -EOPNOTSUPP; + else if (mapping->a_ops->migrate_folio) + /* + * Most folios have a mapping and most filesystems + * provide a migrate_folio callback. Anonymous folios + * are part of swap space which also has its own + * migrate_folio callback. This is the most common path + * for page migration. + */ + rc = mapping->a_ops->migrate_folio(mapping, dst, src, + mode); + else + rc = fallback_migrate_folio(mapping, dst, src, mode); - if (rc != MIGRATEPAGE_SUCCESS) - goto out; + if (rc == MIGRATEPAGE_SUCCESS) { /* * For pagecache folios, src->mapping must be cleared before src * is freed. Anonymous folios must stay anonymous until freed. @@ -1074,10 +1071,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src, if (likely(!folio_is_zone_device(dst))) flush_dcache_folio(dst); - } else { - rc = migrate_movable_ops_page(&dst->page, &src->page, mode); } -out: return rc; } @@ -1328,20 +1322,23 @@ static int migrate_folio_move(free_folio_t put_new_folio, unsigned long private, int rc; int old_page_state = 0; struct anon_vma *anon_vma = NULL; - bool is_lru = !__folio_test_movable(src); struct list_head *prev; __migrate_folio_extract(dst, &old_page_state, &anon_vma); prev = dst->lru.prev; list_del(&dst->lru); + if (unlikely(__folio_test_movable(src))) { + rc = migrate_movable_ops_page(&dst->page, &src->page, mode); + if (rc) + goto out; + goto out_unlock_both; + } + rc = move_to_new_folio(dst, src, mode); if (rc) goto out; - if (unlikely(!is_lru)) - goto out_unlock_both; - /* * When successful, push dst to LRU immediately: so that if it * turns out to be an mlocked page, remove_migration_ptes() will -- 2.49.0