From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB17A2FCFF4 for ; Wed, 18 Jun 2025 17:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750268454; cv=none; b=pmzxiM3GK/zCVRJuh4ZPck3q56YXIZ3ETEPFeizcH6df1/chZP0FTRjYnnbtrMxfeqcmfXgF5fcHuL/6buojkg0yIANgx4XW0sE9Ukt88uGX1PZyQgQwt8SIfClDoHyh1gr611rZR1NIAEu4obc4pn5xmKELnBlPAGy8DvfRwTw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750268454; c=relaxed/simple; bh=zbcjdtHnZ1BcawVRomdGBMsau7cooieEoCmjNLCJMWQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eZsOQ+c2wAptCOMg3fgh7CIm7vL5JbkLsAtjesw0wz2DdRYygoQTKIvZI5I26ydbG/CLoEsANyIOeHExMGkVl8HRBlGK9KW9xzsGNutenCeNsHO0mxlWG5XuQ5LZTKOcUpTi2PmyfyB0NotazfqsGt/3fX3FiJvMFm3YbwuvMfU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=L+vIxSO6; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="L+vIxSO6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5rGfc3zUjh7F4hWUWCipVozVPKyNvGr3sO3WbBx9inE=; b=L+vIxSO67pUK1lWSVltlBFj5C0iGa49m3z3IZ+OZjnL4dDQznrmRGIcx/c0vY/2HcFUa9y Pb0FP3Ay2+RBSty8gvIIIsat8MuUaRaDQEAkBApseYtvzU1iDLwGQpo4DHkvlwvGHWhefB 0jfs24fs8skSJIp8+T5qfeCSXde1K/w= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-1G7AYXnwNIyJuOf4Zos74g-1; Wed, 18 Jun 2025 13:40:41 -0400 X-MC-Unique: 1G7AYXnwNIyJuOf4Zos74g-1 X-Mimecast-MFC-AGG-ID: 1G7AYXnwNIyJuOf4Zos74g_1750268438 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4eec544c6so2846355f8f.0 for ; Wed, 18 Jun 2025 10:40:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268438; x=1750873238; 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=5rGfc3zUjh7F4hWUWCipVozVPKyNvGr3sO3WbBx9inE=; b=UGlkp7plbcuGZcDkTL1X92XVE6ctaRyrzgxcXshyjExd3PkNW8R1z5bdU9k843Myt8 66+5IkFKYNx7PHbs3EdwysGAahXVcIuJjNcWQp4oBl7mczzRTHUjOqo+iI7wWcahAoD0 7p83OiCPbvfJGbPdDaGyjNx5mRHZLjwhJ5cfmsnbU3ezvVw9xvY1tp5hBa8XISjqp9wc Op7IXMeOTsiJYofISYW5lt/DMT8+F5ccw20vIAvwYKZINOGx5wg2bnDJyXWjjnWpdKBX FknbLgFWirsAqnfCraSaTwqHymb72cJQEGOF0s6ztBhHjOIcLH2jXzrUf64YgeqPHf7s g0dA== X-Forwarded-Encrypted: i=1; AJvYcCUo9FtOWa4a2WzjheJyDr4/xT1arBsu4t7xbbJTVFPNI4yIon736AARt1PSMEY5MvRJduQ/SnCu+CWAcVe9@vger.kernel.org X-Gm-Message-State: AOJu0Yxs1fdSgcnhNuOPNvlBDGPxQE+ixoIWin7C7rUJBBQjaDFm9/9F kVKoaaPfxfAw+WdtI/45fBsPAI36jsEq+E3UDRZZqdYoIh18OdbyUb2ZrPoawGgMWScRfLicXjA Vh1TOmVS4gOcSXVeZctdO+tufPDN/FBekeVLtEM/jIZxGuifssazI9wf1kK+lLbCf3Gg= X-Gm-Gg: ASbGncv7/LIdxdtLNRefv6vF56qV8Bz/mtBpRQB5TXRYS5FP7g777QMCf9ffYX3qevS k9O4XMTjJvRDvArapgXUkGJhS0O81XLZyqR7rv5ktaA/nOwrDD5f0nWKvmijnSZI5w6PtLjJeZG AwPqinLFLdD0fK0hrAcNxuqzc/Phsa/TL6YBChL1Oy75cQyZSQt3eBeQ+fM0Py1ePMlxUnq8FRI qYw8/7bpau1pJX0baoejBxJdWK+EvnHX4wFvQDsHrNPkqOrVxRJQcu+dGHYn6SnkgRl0wvgvcG4 ZuD/eXLSwuTobyuaDsqSw0b0QjXi4xXB9BKsq0tIzDwH3FP/h13UlDyVLQDj0tLvRSLAwx3Eilu a9UniNg== X-Received: by 2002:a05:6000:144f:b0:3a3:7ba5:93a5 with SMTP id ffacd0b85a97d-3a57237c9a7mr17230263f8f.26.1750268438514; Wed, 18 Jun 2025 10:40:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGk4wH3M6h2T58ReQA5DPEIh/WOsy58XEgAZ0LBQTHsCj9tNbupSQVC4fwDx3ff0ep2cpGgew== X-Received: by 2002:a05:6000:144f:b0:3a3:7ba5:93a5 with SMTP id ffacd0b85a97d-3a57237c9a7mr17230239f8f.26.1750268438093; Wed, 18 Jun 2025 10:40:38 -0700 (PDT) Received: from localhost (p200300d82f2d2400405203b5fff94ed0.dip0.t-ipconnect.de. [2003:d8:2f2d:2400:4052:3b5:fff9:4ed0]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568a800d9sm17307416f8f.45.2025.06.18.10.40.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:37 -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 RFC 08/29] mm/migrate: rename putback_movable_folio() to putback_movable_ops_page() Date: Wed, 18 Jun 2025 19:39:51 +0200 Message-ID: <20250618174014.1168640-9-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618174014.1168640-1-david@redhat.com> References: <20250618174014.1168640-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ... 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 6bbb455f8b593..32e77898f7d6c 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