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 082ECC8303D for ; Fri, 4 Jul 2025 10:26:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 013656B802E; Fri, 4 Jul 2025 06:26:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F065C6B800A; Fri, 4 Jul 2025 06:26:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCEA26B802E; Fri, 4 Jul 2025 06:26:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9CFA16B800A for ; Fri, 4 Jul 2025 06:26:17 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6CE51B7DB6 for ; Fri, 4 Jul 2025 10:26:17 +0000 (UTC) X-FDA: 83626202394.07.A103E0D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 35320140011 for ; Fri, 4 Jul 2025 10:26:15 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=esK27rbE; spf=pass (imf26.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=1751624775; 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=pR0cJEJLX/Xckea5AegahrKaeIbiLpLeDpONSEjx7tI=; b=AR9E1+YwIXA9ktixLkehOeRX4xfmjGwsrgoZciT5RGPPERD0ZniFSww/I8bXd6eBbBY3R8 v2+OswYywyYIIWfYim30Bb5RHTzRkgwH9eqScRJKFHKrqb0MG18JtjVXbvG/ou3A00YxCg YHUZMqb83iC1u+wAkU3tenOqQVXdtRg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=esK27rbE; spf=pass (imf26.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=1751624775; a=rsa-sha256; cv=none; b=ADrL0V2LwM6am71Kc1CgsldxoC5racNKgLjpwgvu8IFTEIFlU2aLvvxOV6x5zYXT7F4wPZ Y3cjiGiRZK2CTMZDUtK5qBxoiaTdaPaXXRWkHN0PuhAyKuHF3rkrgCyO4VM/PhxRohAQxx cXYKJPOMdf1fKh3Tw0R5rdUzfNnbS8g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624774; 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=pR0cJEJLX/Xckea5AegahrKaeIbiLpLeDpONSEjx7tI=; b=esK27rbEF5n5USedE41bBZG7YI9IypXAI35wkkftvLzlbe5R4+m+HhavOW4tWGORqJtTbu gFd009bfRg986lcYxVIqYtSLsujA7/a1cjEloMBfewai14SoWVNHZYix+9xgY+Np7pnNgI sU3NjWBbrbH20q2aGtGrY/uCn6sNPOY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-402-a1C7Dyo_MKajeDfSVknong-1; Fri, 04 Jul 2025 06:26:13 -0400 X-MC-Unique: a1C7Dyo_MKajeDfSVknong-1 X-Mimecast-MFC-AGG-ID: a1C7Dyo_MKajeDfSVknong_1751624772 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4530c186394so3339635e9.0 for ; Fri, 04 Jul 2025 03:26:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624772; x=1752229572; 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=pR0cJEJLX/Xckea5AegahrKaeIbiLpLeDpONSEjx7tI=; b=biFMCnqJx7EzIVsmxhIcenRktIOQOnsatkdQiP3L3H1cLr3+acmQysECmZAxY+bqQV L5X0vwARPphnNdr875rO+Dl00toTNGB9pc4YYiYygk6odiOkYA3J52SAGOjslwZDF5vi EIEHJ86juVfiw936Zd06SfGvjIIzMDJz6f34l+U/idml0FekwKkg2EweMAmlhzapeAlm 6d9ayn4IETETp1B2yyAemhk9dzt9FmQnGRO3kEOxK4xZB2WjTCKUiKXHC/WwZpPL1dmF pgbOKAyaVfl279qODPBiBD8jBsXtE4utkTmQheOueJPKDEPqg5pz9KeutwlpVxNu10IR O+Sg== X-Gm-Message-State: AOJu0Yxk3Q0ujRr7z6j/sCIxisuwd+Qok9vXDLwVQf4rHVwC5Txl4uQw XxVIUZGtgje/ygofsGdXeSbipErTYXHEh/6nTwCHjs89rwgSVo2Pu1dgGU3Fy8W1Rt2Xe0XYU4C hYgKp28PeTh9zmamX5VZXb6vlZPqWLUNwGmRpfW8EUb/NWIEDc7At X-Gm-Gg: ASbGncvoOjcWn6lEjeKLbM6vlc4pD4rl1yYa/zY1MQz34y77IJM6gn58sAUFCRbDicN p15kCsRpIjQs3djIUirChvRHwR4rZhVKT3jicV+GCl9GgKZYYC2LgxqBic5iTaQPNHjMIemc6vI vKh9l5m1C5wKlpNm9WNCId1GlmI3YvnV8XjtGs87Us05EXeT4YbR4UxSlFQwYUFFAxIfvM4I1Qx z9kPQXK9khopn9dsVw3jeckbn0KZvs4YLIwEXzzogwK9to5V8UO+spv1EUt434dPKcJInwHRGmG efbz2qfkxvYOkvGl8jNBZygZibCCK087H12IBdaCNpounuXqYIByr2wiibWKPveohTLuQu4nTPL Tmk0ruA== X-Received: by 2002:a05:600c:502b:b0:450:ceb2:67dd with SMTP id 5b1f17b1804b1-454b3196658mr16377575e9.33.1751624771996; Fri, 04 Jul 2025 03:26:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEp08CEDtezTqVTL+O56wTX6rAd2DO6G5SD1z9P14Ak5Y4B7FcklsRB1svcNIkfJhaHfAdZdQ== X-Received: by 2002:a05:600c:502b:b0:450:ceb2:67dd with SMTP id 5b1f17b1804b1-454b3196658mr16377165e9.33.1751624771466; Fri, 04 Jul 2025 03:26:11 -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-454a1705ed5sm44913475e9.2.2025.07.04.03.26.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:10 -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 15/29] mm/migration: remove PageMovable() Date: Fri, 4 Jul 2025 12:25:09 +0200 Message-ID: <20250704102524.326966-16-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: Jx39gz9CaBRRq8QT4HGVYdfL74BpeU1QXB42T2flFds_1751624772 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: nres5i6y6hwows9prsz7ukyhjzwe6cc1 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 35320140011 X-HE-Tag: 1751624775-380511 X-HE-Meta: U2FsdGVkX19V8wTJSn0WCQyKB5p32xAIOqLVZ9V44s5KUHxaJM37Z1/h7A9YjDXg0jxDt4z46dsZAVE06NLmmf2hfqFTODzXGyUcmWOQpUHJx45tjavEZBto/e/h6QVeYY3Hm0jojwn15kd56ks0KfzuT6poG1QdktF6ZLA/VNRo92RNa5jyoDkKrS4WQkZroklTZjhNVybtYe3l6KAdXAHC1uA7TEABArJNsK2z6p3rIPLOD7nRDsJ2wbRzRX9wpjAcjJM0cZn9utHHtFk/D6kf1F3qVnFzfPf/0/12MBo7JtIJaTbmJfvpLhsaB92b71BwF3SdUCFUbRFZF+KF94gHCYiMyoCYkOMRAze6BpSMotZOqbFNoI5HMSC+6rdJG08PSyPeTFgNlXrVhis+NbWexTWEXGPazQLb6J3W5KpoIF6wNJa5XsfZ+7GRNhNY+4Znuh9upgYiHOXABg9u7VVPbuR31n1FwFmOyYqrdGWHXqSEFXo1s1IN7vhLnQZ5a+/YlP6w72xzR+7Jg7//YJQwvg+acB2+cVLLV8pWkckICoIWO8fPw5fu++AFeGm4j1AYJWE3J/qAenQBRIAoM7dNZnkziVmkIj6vxPbAnvLXraPXUmCGEDbj6kTsQWq+1Xe7BRjztEy+gMm8i4d21+T0C5aSbrDU7UTFnGh8K9iOa8qQ+LGL8fjSHyQAbbSJYOZ9sJDKoEr9XdOqUGi0ppG/E+JNwerUr95zevjB5dhHkIb9W7B6PdLTDFr4RLxPHJRKwaxjUplTl0reLZQiMwBXYIpzYuO7ZpOsb+kgUIs4D5heFIIAycRy/GX8iB9CD1T+bBc3M7u3+DtLmwm23nLO8qv1Y2ZcCcHXa+JQOoVDBIyVdtBajmO63+O5uFts/A1vdDpCzm1uQ+LBVuc8o+zN3/9q9B10T1MilBOIrAlzlgn6F/LzrVRLXNweKzfrq2osO40D1B9/cSabFQb q0gh4qES kSxlmGOMmuz36T7L61nZ0AMlemiwahwoDANJORalZHx0hGSe2PMW0CQezvNAErcuTzQB1xc6Rm6qsy6rhaXmdPPmigrEeBzDP3UReS2qA9YY0w98vfLUTzdR7S/l+79r2JvMFkvQw2JPNB3xIwyZ1ctRMh9zWQjrZSrdtuU0ibR/j+O/QoiYbM81bS/zyP4mwoO330fWHspX+8X8tKXttY4G1snLOMaqydKD8qnBaXyuPnsTvQLLRCCzheaDWSiAlhHfVacOS+xb+vX+/770ZJ8gDq05XaxFRgo0tANldVVrAOwqx9w42S6BU+vHYts69OJASHcMcdZKpg9UptxV8tDEoUkA6wme4oBAMdpIWtkJ4AvUeQHujyHwp3bs2L7fwM8wpCu/hHSzjkvh17zBe7doymac9O5SEoSUTw6Yny6uOXkltwHJse8ilJ9ENIwK4TeXwakzhETLjc6oF7c+cRLPVo6KXGi0o926JDUynRl7h0pZkEXUB7OJAA7qocRTnwxUsV+t2fR51Pih2UBZdsXubXELAkYyB4kyPJSKO1Ugr4Z9F6ziwsdBTwNklus2K8+9Lr+/Gr3FcVjVk5zekxc2um6qRU3H8BIMqMHRQgLURNxQM/3M/Y6E8nUIrbsCBsgP0lcUC8us9oRQRRMJziIob6TFS44EFUPbB 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: Previously, if __ClearPageMovable() were invoked on a page, this would cause __PageMovable() to return false, but due to the continued existence of page movable ops, PageMovable() would have returned true. With __ClearPageMovable() gone, the two are exactly equivalent. So we can replace PageMovable() checks by __PageMovable(). In fact, __PageMovable() cannot change until a page is freed, so we can turn some PageMovable() into sanity checks for __PageMovable(). Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Signed-off-by: David Hildenbrand --- include/linux/migrate.h | 2 -- mm/compaction.c | 15 --------------- mm/migrate.c | 18 ++++++++++-------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 6eeda8eb1e0d8..25659a685e2aa 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -104,10 +104,8 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, #endif /* CONFIG_MIGRATION */ #ifdef CONFIG_COMPACTION -bool PageMovable(struct page *page); void __SetPageMovable(struct page *page, const struct movable_operations *ops); #else -static inline bool PageMovable(struct page *page) { return false; } static inline void __SetPageMovable(struct page *page, const struct movable_operations *ops) { diff --git a/mm/compaction.c b/mm/compaction.c index 889ec696ba96a..5c37373017014 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -114,21 +114,6 @@ static unsigned long release_free_list(struct list_head *freepages) } #ifdef CONFIG_COMPACTION -bool PageMovable(struct page *page) -{ - const struct movable_operations *mops; - - VM_BUG_ON_PAGE(!PageLocked(page), page); - if (!__PageMovable(page)) - return false; - - mops = page_movable_ops(page); - if (mops) - return true; - - return false; -} - void __SetPageMovable(struct page *page, const struct movable_operations *mops) { VM_BUG_ON_PAGE(!PageLocked(page), page); diff --git a/mm/migrate.c b/mm/migrate.c index 9a63bd338d30b..63a8c94c165e2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -87,9 +87,12 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) goto out; /* - * Check movable flag before taking the page lock because + * Check for movable_ops pages before taking the page lock because * we use non-atomic bitops on newly allocated page flags so * unconditionally grabbing the lock ruins page's owner side. + * + * Note that once a page has movable_ops, it will stay that way + * until the page was freed. */ if (unlikely(!__PageMovable(page))) goto out_putfolio; @@ -108,7 +111,8 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) if (unlikely(!folio_trylock(folio))) goto out_putfolio; - if (!PageMovable(page) || PageIsolated(page)) + VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), page); + if (PageIsolated(page)) goto out_no_isolated; mops = page_movable_ops(page); @@ -149,11 +153,10 @@ static void putback_movable_ops_page(struct page *page) */ struct folio *folio = page_folio(page); + VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), 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); + page_movable_ops(page)->putback_page(page); ClearPageIsolated(page); folio_unlock(folio); folio_put(folio); @@ -189,10 +192,9 @@ static int migrate_movable_ops_page(struct page *dst, struct page *src, { int rc = MIGRATEPAGE_SUCCESS; + VM_WARN_ON_ONCE_PAGE(!__PageMovable(src), src); VM_WARN_ON_ONCE_PAGE(!PageIsolated(src), src); - /* If the page was released by it's owner, there is nothing to do. */ - if (PageMovable(src)) - rc = page_movable_ops(src)->migrate_page(dst, src, mode); + rc = page_movable_ops(src)->migrate_page(dst, src, mode); if (rc == MIGRATEPAGE_SUCCESS) ClearPageIsolated(src); return rc; -- 2.49.0