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 3A69CC8302F for ; Mon, 30 Jun 2025 13:00:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 349446B00B1; Mon, 30 Jun 2025 09:00:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 323136B00B2; Mon, 30 Jun 2025 09:00:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2113F6B00B3; Mon, 30 Jun 2025 09:00:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0E3696B00B1 for ; Mon, 30 Jun 2025 09:00:45 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CD565C04F5 for ; Mon, 30 Jun 2025 13:00:44 +0000 (UTC) X-FDA: 83612076408.22.B3926BF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 31B1C100021 for ; Mon, 30 Jun 2025 13:00:41 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GfwPh7FM; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.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=1751288442; 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=G4HyaliWLgvplqkgqKCCNJ5/P2ZKVlm1Wsjs2FxXnxE=; b=b8Z+41jaq7UBX2WPxI7QiK11YyLSJH18SEV8OyqL2Nn5xe2f43fiXLDGBDiGTtcFFPwGNI b6A7KppIVy1c3erGY/HbRCkg4bmA3SkvYKjDXGs6mcmDrat7mjSOlThZJo6YikH3cDL7oP cA7buthaFq4WEvwDGyeVIbRCbCBpXW0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288442; a=rsa-sha256; cv=none; b=KDrIRyj5WnSxJqfI2c4PR22DT0bpKTPBaT1vPJecmvEvqcgF/RgsuTG+sC/wGmrUV7akMj tDwA7DGcXW52nfdYpJmxG+p5lUDhZrggnV8C8Yn8sU/R7Ncxrq9u6l6W0ORUun3zC9E6qO crEp0LA29zjMKhZwjDvb2XDsIx1pRnk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GfwPh7FM; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.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=1751288441; 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=G4HyaliWLgvplqkgqKCCNJ5/P2ZKVlm1Wsjs2FxXnxE=; b=GfwPh7FMkcJC4HBlqp9YYlLdPFQkN9lE5jaHc+Zy70uAX7AbCGNkoAJ6Zw274+OaDeRwrI 8iHFnplc5DpVwZxWnk6/1MfuDQY/jJNSHtY10OJRZJiR6mcBj/XwHJG0Pa7/qgXpK91wCl 7UJcjtQtHWuHx8NWZl8D2f2M4FmGUoU= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-sPreAeaCMn6QgYGPz0MvVg-1; Mon, 30 Jun 2025 09:00:38 -0400 X-MC-Unique: sPreAeaCMn6QgYGPz0MvVg-1 X-Mimecast-MFC-AGG-ID: sPreAeaCMn6QgYGPz0MvVg_1751288438 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4eeed54c2so1643151f8f.3 for ; Mon, 30 Jun 2025 06:00:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288437; x=1751893237; 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=G4HyaliWLgvplqkgqKCCNJ5/P2ZKVlm1Wsjs2FxXnxE=; b=EVgJ/W/oag38YiqfbrTh2S0nH4PNmCU8rNp/iVz4JYGllpYNM/sc9gXaPLTAZMMQHm LqIgBok5cOAo6YUFF/8IJ+2KGfeW7qInBoWPqjrP0nPndZ8etyE7T4voRxwh1YoVRZbR w2qco4P4K2VHKN1tMNGAt07UeC3YM+Dh0EAUFmqTFLBJA65X18ABIt8ASE5Mpj6NRfw4 YTsxzPGhCE/S6t5C5XkeMNJNcb1Q2FQ7aMQDqAXP/AOymhwhlRvEk/ckiVm1uG6fJIf9 S8ME2EmnaJDnTAMUr4s6gCipVqjY0pywr2Opl290/9/NIhBp6s9z+s/aDyTfe251KZ53 ssLg== X-Gm-Message-State: AOJu0YwvjBxz9sQDDA5H6z1XWTZMRb7FOLHRlfw7fqJgKkY2sfCizL6B GN8iPRNfErallKRvx/QrQYobMw/09eMuy930uwjIEM6fjieGG0S9FVM0ZRH5kXYqXI+ITXbQzm/ esWBTvO+YZK82pL7zB/uRD7gl+QJ3V/U4aldmV7H+uNXifl703sf6 X-Gm-Gg: ASbGncsJUZyjkk28siL6YcKTh9HFAke7o0lORhDxi4L5XGOWVI+L0OR7SG6IdZPayGI 2VTSzFXX/1ogA4ztmz8tK+aHLXV3cWZI7kMY5RUFM7hyV+lJONa/vQnzCjMuORI3GYK5jhWP2zx lJcKY/5aI8jJc96VXZKLPYFuT/VbvMaBN69jR7F2DUmuUNTc2U1jaj6U1COkdOARtNTnUAxZTx2 djLTcwAu9ljENhhZ2seJRPagOuGnBrUEPDfKjDF7oj+RU9puAYi6fretnEmHED4eGkDuueR2mhv FiAKojZagfdEEjePT9be5Cel6Cxx5Kx0fbsyPFQ49KsF2ACKDWetZ+gA16wAlrk9EaUPL8XsOqd DEOMgdR8= X-Received: by 2002:adf:b649:0:b0:3a4:cf40:ff37 with SMTP id ffacd0b85a97d-3a8f45494cdmr9830760f8f.6.1751288437414; Mon, 30 Jun 2025 06:00:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEehlYPXkAQhWmsU6NKWbFkXt51tuHaEnt5gEo+HlKa0FWalrdKbSodH+fk72qwn9YuXcO6g== X-Received: by 2002:adf:b649:0:b0:3a4:cf40:ff37 with SMTP id ffacd0b85a97d-3a8f45494cdmr9830683f8f.6.1751288436787; Mon, 30 Jun 2025 06:00:36 -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-3a892e5b2a7sm10408982f8f.69.2025.06.30.06.00.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00:36 -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 08/29] mm/migrate: rename putback_movable_folio() to putback_movable_ops_page() Date: Mon, 30 Jun 2025 14:59:49 +0200 Message-ID: <20250630130011.330477-9-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: YkPPiNWb8bNynXPit7u23FOhT8UMjA0_tMwsJg-IN8w_1751288438 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: gejrsxxjcxrpgpq7rhnuwfamb7ydikh5 X-Rspamd-Queue-Id: 31B1C100021 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751288441-253434 X-HE-Meta: U2FsdGVkX18n0zAP3YbU0+kpRQKxOoO5GU1ShC05igiasnykytvHAlvFBb98+EcFCPgYwQvccytAyV08Z+pkRzmblVqCfcvl951X0l6au1UIkAyjx0FJMbHbVmgO5udzZt8QuHg14iRMT1ArkLXuhsLBbsM3Beay6Ib5U1CmQXriGEdw/SZrO71MqTtNmY7iuZVQTR/aLMPkZUGvfbiNO6QpAt9AyDPgs5AR78hmfHoD8Wf6qUeIx3KbeqhC2KlLqddmi7Ovdy20htyzJyHoMSLfkOo2wB2OxbEKFyVi9iLmAPh4Ie2Khy6TowhbpyfWoprPIOx8AO9Xqs0DE4grVizGl+H8YumiilsJuY4ASKVI1LkzGd9Q8nWN2GkXQBaIq6ECqVXnDitxAC688f2KR+2EEhwsRmLoAMDE8z7l6yIXSeHwn05YWjLAF6LgRCYTXDUnbJYKUtd7N2o5tMLq2QU5lvOPmihsILgs8+586h3bDtZeZSJT/KMT6bwnG4IbX630OKeupUamNwkheDdJcKwXK/N70UGbiUYjTnpjyiq0HYaDDsn9PLuNlgkFt870NldAl4yBI1Owg/qRUa/iEf4004Ob36pWAFVn0KTaWwUFshw23Trp8bHlnbXYQEkZx2hRdkRXmsTZBQqZMVimzjAwH4eMTq1wa9nD3SkaDpPzvd7g9GNtijRW6ZrTCFcRgL6yne/lZ01l7o/KuQPOwu+D242evClbvD1ArnPPmWALk6b00punL3GdEdool3jPNtjPzo+3r9geuBYGrSNtCZgPvvV924tn73lEX1Nln7g7H1MYX4moNYNbLH7AWuTMRKf4Qgm2UzVUZ9qqcVVyq2RtgtS1Sz4+BZzy29aOZ0vvAhdoD1NVs7wzk3rJLXf+YIJm1vS/9TjxnezW5CMMo4LcSmUiSQiYkcbkoW9QN4G01XVgpsvKWfz0qxohMovHUEokkGwJ2Iwau/G8ilC IY/Mybzu Xed5i2MjlxV07C7/EY9UtHSUAF7H4u3GdzMlKw7xAfL7jPQnYagNAiOpexQ/5UnzGJ9htq4H7mQmQjBMtWJ7e0mREhpNKuOV+FHSeXrbxi7biTe3BIuqgycD+01ppbJtf+KgRJtHk2X5XpYJ+JKvRWx2+5tFefz5teZzchVBP4Q31MK7LNmQOFLsNbe9iHpW/3UfhZ+jrUhCzAeBhPUW8rOd8hckguPVKyHYPRmLzYGG8MEwUFWOJfntqKzrIgdI8Ehkt2ehdleQFa/12ceShxiK6g5TUf6lxoe/iva5eZvMALniTPCDLJsiQH1G2B0rEaV552vT7TuFETQP25s1xusJlA/RfTqYPUMktl0wYtJsR5bzMh5IFeUij24flAeOvlP3qz4FMw0mCfE5jw5wH4FwFz6/rMyoLt3ktAMPrd1z1eGKdnHf89Cp8Kbip2B4hCDVwXk30rWryifOKZQK0i+uMeppe8BuznsMrFNJ9fu4jFLhygBXT22XAkWLNdXnPJ60ZjBX7oA8AFdEhIecOg+kcwTqPemBJOig+hZRGfPGBKmLnAXAUc2WxoNf0kt41Yuem/ywtPNJDpZfOqg0X02ldtUoQqX4LY57N9XGuJ1TzFXcvnucMWblENYBpzUPdCnToQGi2fx7V8sFpsAvdN4wFYL53RFSCYAmi 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 factor the complete handling of movable_ops pages out. Convert it similar to isolate_movable_ops_page(). While at it, convert the VM_BUG_ON_FOLIO() into a VM_WARN_ON_PAGE(). Signed-off-by: David Hildenbrand --- mm/migrate.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index d4b4a7eefb6bd..d97f7cd137e63 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -133,12 +133,30 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) return false; } -static void putback_movable_folio(struct folio *folio) +/** + * putback_movable_ops_page - putback an isolated movable_ops page + * @page: The isolated page. + * + * Putback an isolated movable_ops page. + * + * After the page was putback, it might get freed instantly. + */ +static void putback_movable_ops_page(struct page *page) { - const struct movable_operations *mops = folio_movable_ops(folio); - - mops->putback_page(&folio->page); - folio_clear_isolated(folio); + /* + * TODO: these pages will not be folios in the future. All + * folio dependencies will have to be removed. + */ + struct folio *folio = page_folio(page); + + VM_WARN_ON_ONCE_PAGE(!PageIsolated(page), page); + folio_lock(folio); + /* If the page was released by it's owner, there is nothing to do. */ + if (PageMovable(page)) + page_movable_ops(page)->putback_page(page); + ClearPageIsolated(page); + folio_unlock(folio); + folio_put(folio); } /* @@ -166,14 +184,7 @@ void putback_movable_pages(struct list_head *l) * have PAGE_MAPPING_MOVABLE. */ if (unlikely(__folio_test_movable(folio))) { - VM_BUG_ON_FOLIO(!folio_test_isolated(folio), folio); - folio_lock(folio); - if (folio_test_movable(folio)) - putback_movable_folio(folio); - else - folio_clear_isolated(folio); - folio_unlock(folio); - folio_put(folio); + putback_movable_ops_page(&folio->page); } else { node_stat_mod_folio(folio, NR_ISOLATED_ANON + folio_is_file_lru(folio), -folio_nr_pages(folio)); -- 2.49.0