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 EFF5AC7115D for ; Wed, 18 Jun 2025 17:40:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 896B36B00AF; Wed, 18 Jun 2025 13:40:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F8A36B00B2; Wed, 18 Jun 2025 13:40:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 672776B00B1; Wed, 18 Jun 2025 13:40:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4F4DB6B00AF for ; Wed, 18 Jun 2025 13:40:46 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 16BFA1604E3 for ; Wed, 18 Jun 2025 17:40:46 +0000 (UTC) X-FDA: 83569236492.10.CDE933F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id E8E4818000E for ; Wed, 18 Jun 2025 17:40:42 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CppTbSKY; spf=pass (imf16.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=1750268443; 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=5rGfc3zUjh7F4hWUWCipVozVPKyNvGr3sO3WbBx9inE=; b=uu0Ze3orEcmKIERW76PL7d3jOBXNcIuYxwikHLTNoRLdKsDxEEhI4hcHu3uV9q79vuXfpk NVLv7rjemOS4DqFXJQe/K8z87zt6u0ppq+c59jSVq0ZbijiyoAMdOAFtHju90MafD+/Tqh alhjGf9CSI/DXybnBgGj4CpAH9LRlGs= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CppTbSKY; spf=pass (imf16.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=1750268443; a=rsa-sha256; cv=none; b=6Kr6SRLnF5ZcMcPhIZbRGXEtBc/oANfiQp47Q9sQm3Vry3Y8ucO8D12X/Q9KkZWJDXfVyd YJjisuW0kxidpPRgoxoevOSzY4okIwvZA0gF6Ovrw3BQbLiEuMrZSTNIUjThRamF0KqkyM V2cdUyj3ufNXIogf3wYWBWAmT46e+cA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268442; 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=5rGfc3zUjh7F4hWUWCipVozVPKyNvGr3sO3WbBx9inE=; b=CppTbSKYVFMZK6SzpRCHx9gHLIcl3rKVYYRRy29CCXG+WCYSW5NTWcwzHF8GOzQ4cvTrLW dJ60VNXYu0fNoLowV7RlrD4VimYYO2GbQkqbgXYc/Qt3lmhGCoQA2GnHc4iSWh4UjIoUSL AOU46I5Dr6B9pLQGHmSJyw/jg5dQcbI= 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-252-jASgJUTVPpi479YIw1tjsA-1; Wed, 18 Jun 2025 13:40:40 -0400 X-MC-Unique: jASgJUTVPpi479YIw1tjsA-1 X-Mimecast-MFC-AGG-ID: jASgJUTVPpi479YIw1tjsA_1750268439 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4eec544c6so2846368f8f.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=1750268439; x=1750873239; 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=gSt+EIsP2IFe7dVRI0UR+9bPQ5niXvW4Y5Tjf+DiyRfLyaHSGAbGn7vW7fGrog09dr Jq734aa6mdmHyMFoLmiMkLzOHjfmj8G1m1tWkwFpsR0TtgtWQk+dMPOIc5l2jK9Z4MUQ Prmq6uFzR0CAmoRRJHu5VI/EWacx957hB+yd0P+ZxpR5VjKhNSPIsmymMC27pAJfK57n 40MMhC0ZhxDY/fg8aXdh3dcwUNAeLfDJlPpGnYcLJHnSOFLXz+fMmdJXZrmP4w98yI0p BNOFZthUp3Ti6GeiFL5zmb9kbdKqr4UsyW25mbzWR/YiVUTHHcfqvObG/xA4UYkaSVnr lJQg== X-Gm-Message-State: AOJu0YxE+6RxVkWkotQRsbQqOuCR8MGO707zR5UbjRPQJ2GTA1pdfuhe 2J6O5Fn8GGRkn5t29nXWFsIrQlb0beAygIU35KdE1ncpaPVWrVqmJBEtK7ey/Xq99jG79WNOkLC iluBySY02hLEIpqk60zbJFul4t3ZUg+t29NSWvcGmcm53MD7OZYLc X-Gm-Gg: ASbGncs3VaAbGIqgpcvOagS/RuIvCWG01SHO2pzLNSdM+9x+AuSSpkxo8XTgSZ94JVq VZUeXWGMXR10Lhp9v5PTyPcuhXF+ICav4MQz7PsdVr6UGKY/izj2acWZc8X9ZICDTjCpWtHVWzD 4oebeKsrgnum4ry5TCygAsDP6ALPttWXymwfuyvYYu2A0QSzIX9rl3TD+NxDgxgKirIabRZzEW/ KYu1vf0ii1hP+F1wlWaq+giiVsUeBua2wRY629qcXz3Ft9c7Gv6sKfIE6qWKg22HvMK2oZ5J2FK sWMJQ8Ak0HMf/Mjp/WfXN0KMZM1YjA7KnqvPnwHhWR9zxRESqDByCkNiNELEvO07LNPCGQA1HR0 fWNjmXw== X-Received: by 2002:a05:6000:144f:b0:3a3:7ba5:93a5 with SMTP id ffacd0b85a97d-3a57237c9a7mr17230295f8f.26.1750268438559; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uFXae3B0o0pK1qfpT2QA0Cb_bOz6Bg9HKzNt9VMSIR4_1750268439 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: E8E4818000E X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: w6zodtnrwsyrbhmuan1iotnze1to3a9s X-HE-Tag: 1750268442-473748 X-HE-Meta: U2FsdGVkX1/jP8y8gIQtnyjxw3T2QNMmlk33z4Zf/zaofuxONBx7KWI01rdUnMIPvYRLNLDrR42aFv1xPv+ueGUfZgHQDHkMitgOmifJO2alD8qh1LAQwJMcAttvvAo6LnzbRt6S+Qq3PdreVolYGWZYfEmffcoSM82y0gxdCMMIbnrxrpvTxjA/+1krnpJFynwl0B1i0znFMd2BTgRImlboMpxJOrrREVNne7NANB3ZG0nPWrlLFt0RS5YBcnBqR46Kx0s9IxtD6Kq9I8kFMiwWrdtJzglmXdEmKOtAUMjLHogzu2OZlnKDp/8szma/SVeWMZEIHg1eO1cUmbn+LJrAjYwTXhbnzuRCiEvsAfU3emjAp73Pk3EF+AJkR+1asLgtV/efzadiuneGoLWUXg6wmZqm1fgcXzYETNNQNfRoI8pJ6wUuHAFewDU1pq8Gt3ddXOrtpCOgIOxpYNF7Dn5B/Npnk08a8LdGpnepx2RTAzPXkCRvM4iG3WGJLqkFG6692UHr/1l70gOZzAPkAHO9RarhNjIsLBZHw69JmQwmJZW0qhomENKeFu9xLF2zqqB1QnSIk5FUaUqE+1Z6pNw1mmNa2y7cBkLw32zSsRIRqJcUoPU1FVziICQjcrJW2MKUgkoPOz8n+7J1Tu5lZUKNNQHWq+k2p3Tu38R0ONglvRn5DwFiFqVYT/kRf/tm5DBDzQxkTfa4CTcIxvj63DAqQlMRJAUXkuxIZ/TY6ZGnBgzticshy9d3CZK63U9MbWht+5QzNBGaef/iTEYdIoxthuL4OJxftnHLCNG6s6K+D8NRKcOKMdBv6FTkGknNhotydV8MqZEwJhLRAaT/vykDtoToeAHZ6phyNtIwSZpP+dK+QCFP2j5WQj7up2B52voNTj5lAZ3O7EFn0TisC6gMJe+nM0uii6pK5lzysTvK1zJtyb864LesHqoSGuguoLd0IyqCbFyKTErxotH Y0Jg4Jd/ STgBwx+OdRikU0GKJzjNElGeFGLG4R++VeLdBCHIb7knwD7kcay9nnOYBzZnuPYDPa72DqQNf7Me7dS42v9pZkbDNo9PDO+OqWhkxGYOJPtSjnvozLdxIyxJxmrtX7LLb60SgMro3LYcB6XkdUG+wWiYmzneLfFmuQmVVVfI1PZIXO4h2QFbSLpROF4nUe1Rj1cQxb+jYGXvBfCaUENMusRCztkPAgD82j4OX6RxtdSAFSTxdQCPaXWpMqFxYUp9GKT8I6Ls4TcwuCV2lHWTWyyNpDmf49yKwGzU499DRvqhwds9DSGTkKtY2m3jqMmlQIWrUDDPNoBhxVkT1qXyFdC6dcfBONpY6iZ9KwEqLadWzOZC7/F9xA0bEPBDzwQ0hWCh7ztwP7JoRrmjmOZW6zlXYsHhzStiBxs5tB40y7k8ctAaiV69iX5rYouyDY59GBW7mzWAuoRJFj2Mh7W6OJLOkJxYIiIN7gUzX/Vd2xWCsHyiybOAhoH4+AVUpKH/addD0jfHPOjNbwybGmqfcKMQq823VHlnuAI1DFU4rxulKkGm1mlf1RU3GDV9wnh4vjjNjVUftVT19rBfaMDPe4bhm9tvSaxW7l4cx 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 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