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 BF633C83F03 for ; Fri, 4 Jul 2025 10:26:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7402B6B8026; Fri, 4 Jul 2025 06:25:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71A6B6B800A; Fri, 4 Jul 2025 06:25:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B90B6B8026; Fri, 4 Jul 2025 06:25:57 -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 465916B800A for ; Fri, 4 Jul 2025 06:25:57 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C09301601DB for ; Fri, 4 Jul 2025 10:25:56 +0000 (UTC) X-FDA: 83626201512.10.14A9F5D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 98F391C0015 for ; Fri, 4 Jul 2025 10:25:54 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W1srpfHS; spf=pass (imf18.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=1751624754; 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=OVyour2UNFNS7aNaSR0hE5hzdL3B1bhwCvX/GUFQiSw=; b=Sk1NsQ5TmaQOmkAC/tGAgcC9FZIW7+xsKmEzLiCpeJhaLkZMt5wQlV4s0doNFQw+sYPRg1 pYNsMpQdONoDN+0O8tpawHKv+oT/313dpamJJBWMDgMyNV1XjCcJxSge00vAl4yQNF3zT8 Bxr8dr8iPO29L/80t+iWTDzEeDXFl4Q= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W1srpfHS; spf=pass (imf18.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624754; a=rsa-sha256; cv=none; b=wSz+YaKaB7Ziym0aOiOP0YVUCSk1EyK62wAfGO3LkR4b3axBARVzOfw0UvDllLp+liTA+j f1ycS0mxgatdUidr3ajcBZmB6iEXfF4wuRZiSaV/+1t0lwL4Iy0sXgpWHucql5E4kNeEG7 SaAicoVk5y3IFp5hr5wIUP9Wt3btsUY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624754; 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=OVyour2UNFNS7aNaSR0hE5hzdL3B1bhwCvX/GUFQiSw=; b=W1srpfHSaPp5GZ/pMVWBJJdydFMIBbZiCZSqpTnGCok1GU3kFUwBYxmYltMs6qxKpa1MYm nbCZF71b/pXb+X1w5FD1QwKFoNvtu+EOLOSlq7sGRbwMerOmCbHb2YgMXAsVMEFvf66atR Zlh/z/BeLbzHeOmojYlnFKQCIa02T7w= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-wZKirXR4OqupWuB53cUu6g-1; Fri, 04 Jul 2025 06:25:52 -0400 X-MC-Unique: wZKirXR4OqupWuB53cUu6g-1 X-Mimecast-MFC-AGG-ID: wZKirXR4OqupWuB53cUu6g_1751624752 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-454acc74f22so5102625e9.2 for ; Fri, 04 Jul 2025 03:25:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624751; x=1752229551; 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=OVyour2UNFNS7aNaSR0hE5hzdL3B1bhwCvX/GUFQiSw=; b=obh6RsEJJd5cLCoXgH4iFixAl5LlQBHzIR1dyE+Qgk09t90tcAf1LxN/HGV+afSuji K/0nDp3GQaEbg9GZAqwdJbKTe4EmX8SEl55TjIx8mrCsBpGiQwtWKC0M82RkJakqHUMk AG7EYKTPmqO8HG+wppaQ9i8Ya1vSWwtsrLtWvpXPlwSQOF2zfCogIt2FoqkIpbKiilaT 6PIPZLrc7EALrhuod4xZLIlCeoxlQ7x4Ty6UydkvP15nPvwzvmJxMb8agMPS7oA7EX7A Kv2W+bKyelZYvhuG7ZQp2HzRp12NPldG5KpkqnDFhmFnIEDAvPxErPfc4LcOqhvAVR+G JVtQ== X-Gm-Message-State: AOJu0YxeK8sLisTosDei5oMd9UjO+sl+x4Ca917ht1oZqNNPeVPyVESv L86wYWPBjTNA43I3JHLeEk4eWjEBcGVFzV3yPJ9uMDSUbGkNiI3Bj+759OcO16ejnWZtg3b7OL4 /y+TKvQlEeGSKeyNbrzwKKvGTWhkCW4s/8TfnDN647kwCbkSoehN6 X-Gm-Gg: ASbGncuq1yyt7BqQ2QzKp+99pOEM1aU1Qat7QDDZJ5/u4UPlLuTK3AefXTYmBIcigTq v1rvREwzcwe6E2L1ZuGSuiiWBpqIa3toZA8r2/2lxz75HerLrhjX1PiH6SO4NGjWfHKW+D7eZFm qgtiIgmOgTUoQ5P9CUQBRK+d+liHljI2ZNoVfZrSusueQQh+KZVKiutD4LlCtvfpg1dcBQfa4kO mgcuFFMRVUAerfjuSymFWwOCQgmE57CVcLImC3Qv5N7I1YpQSaG4JIYbpVXZwNZtwoKYxR32HHF 7/cpqqe0rD9cXRSRcXmIUV6EYoSOrnmQERk6vvwv59O/NqkMvK5uXP/gV/WppsWj5axh/LRLHai 8ClAmWQ== X-Received: by 2002:a05:600c:4f07:b0:43b:cc42:c54f with SMTP id 5b1f17b1804b1-454b835631bmr1455725e9.14.1751624751433; Fri, 04 Jul 2025 03:25:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2Rez8KVGPQFiDbU29hzAgNjBI7xFdtw4twkMv/+PHLeFt8+nZnPGBAy1buVfR9Z9nLRQVCg== X-Received: by 2002:a05:600c:4f07:b0:43b:cc42:c54f with SMTP id 5b1f17b1804b1-454b835631bmr1455215e9.14.1751624750855; Fri, 04 Jul 2025 03:25:50 -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-454b1634b0fsm22804075e9.17.2025.07.04.03.25.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:25:49 -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 08/29] mm/migrate: rename putback_movable_folio() to putback_movable_ops_page() Date: Fri, 4 Jul 2025 12:25:02 +0200 Message-ID: <20250704102524.326966-9-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: tvmgZ4ZbBUydzvzKsj7QzBvPYRSE0RMKYWFCChMGy-s_1751624752 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 98F391C0015 X-Stat-Signature: xryhzmk9fi93urzqf53xym6feo7okjtp X-Rspam-User: X-HE-Tag: 1751624754-707854 X-HE-Meta: U2FsdGVkX1+TbNAF3kyaDKClKJxmTWhgV/2nTQUeFDsFJeI26MVPpUH7+/NnLWYWPvyongHr+BR0/pFhk7zn4lZcVVPCo5+mXJDpsA/YDe/iCwkpsGHumWQ7A0GCx9x/KRbwFVXHPWGNGvLK6Hydl/Wn+IgfR56+J0fgmg0gayEUUHqKY3D5Lk8IT6xNKLAZwSl9quNqm5daJwUTkqDldFbv11up2balmthb7Gi5i2A7hqsutjHHUMiUBmHT69WwZf+mFbqsemcpqlxIzmk7kAK/i+K+ONJBojQyVZUZTGqN1vUFrb49IiMI9OmZk+AONi7x6yesMK4HpztcHgQrXwk39FH0CQ2niScppzg9Hfg6qV4ZUYnDzeJQYq89/BSZF+sd+4PuxlPwHGhS4FYJhuRa7P7njTryk9v9ggRAdlZVrCPBPuPlcJqMqe/GbVo9M7cUET4UsMEfJ/2cfgskgkKGQFOkBZuD0ox6rjuW6RvXaxlzLyDUHlkODSAz5kuhoLQVFUDDidMcKqWbEZJo85FjEYZMLtNKmOZH/U/B3XqKe6L5EL3Qs0lhAf5qRTgwKnPRTQadwiLp6C7xokZ7P88qqaYNVfPNz1X/WuiUTxhhTG0NqMqol5HWcx5kWv46K8C7kCACiseS/uACfLLGMzUmy7A1CBPWJ7BWRtKK7IB4Xt5vRn6AHg1ogFqqsnSEIkzNDh8qR43wEaOct5dPCZ1ZT9Bf7iQzEX1eUaQre6p0Ahvpz+bNHZIOQegIGikoZdW1ZovFL2Z5DvedzLG7+FgiLoOYEUWhixrxBfM91eoOAcwdLjMMA810d0GX6qe15ypKl1seb5cRILjgxRFddKRl1f531m7TdUeS9dBq3K59oWGhgwSmBsb0Il93fgddmDQwZhyJmgjXDq6v3FfkhslOkv9wI+lR5jo6bCJ1bGrfqK8uohmXR+FqpziIjgDhvwL0hNvuyzMIG0xjrL9 3wl8wlvv Jy9LKzBBJ4ctpsaKfsfqXeeCWxspBuJedvBEMMjaU63LM6V+3SG8nOufPtTS5r5Nl3vANE4K19/RNzJMYTthamW5llRW+UjAhu3Tor8i3mbqcmuwlx+RMdFjUphVIEns1GEUPRfPz5IKeFZQ4sIZmAqayQu7oZBU/bwFUoQm7WfHlw2YLzTKDnE+Mzf4JB4bX3nOAQqUcMStbl8JW105Ty0EucmLjni6OLy818VLfGfjmxCmj4JpVw/ABJm5vd3PObsjKA1W4aJnNDJXj9t+N78MVnSEayiMqAqohCWqxN9wQW6DKcBCyb3+abvQi3AmCpMAjxXVL2zCCZcisgGWGk69hXOL/2CroZDnfm1INAhNshI+8Ulzi/Ok41JxDfvvmYyvkr+dIGCr3BgQEovEanRaU02PXeLWiY77bbYcjku7ezvEaxePeJlZkNSpLBsI//lZ6FaAlXv+rBXH1lXdXrp/M36UkopUp/rzJCK93ahcqPNLkhNb+P/ZTQjKqHsqevNumbUoxQGXRBcxN9rdzIx4CZZeChq+gk5TVaYRp42Wt57lDkKR1wPYaqVHHF1JhvGugzyFNr85EG02LAjQjrZchsmRuH1UPu66xMXulEGG593V9TtP2G/9xFuMlINmnTDSAHLWIHOu7LYielMggz72Lq4dPnER9DSKu2naALTsoDfhmF1ETXO3l7gVT4kv+EIhKA3b7yWdm67A= 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(). Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Reviewed-by: Zi Yan 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 2e648d75248e4..c3cd66b05fe2f 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