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 9A133C8302D for ; Mon, 30 Jun 2025 13:01:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 482BA6B00BB; Mon, 30 Jun 2025 09:01:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 459F76B00BC; Mon, 30 Jun 2025 09:01:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 370546B00BD; Mon, 30 Jun 2025 09:01:07 -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 27F406B00BB for ; Mon, 30 Jun 2025 09:01:07 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CBCD6C053A for ; Mon, 30 Jun 2025 13:01:06 +0000 (UTC) X-FDA: 83612077332.22.3212196 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 2F14E180016 for ; Mon, 30 Jun 2025 13:01:04 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=I+dO8Lbz; spf=pass (imf24.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1751288464; 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=02uSef5lp6Y5cEfWyIGZlJA9ZbaH5mB3gdVPjlakXLo=; b=vqS7qQEn/5jdaZlUXiqt5X58C9v8mwlcMCC89rpHsiWbsaaVy5OO5yGHxGWPAe6+vcM8Bq GzMkN0iXdxKgmgHWPvpqzeXsnI81kJvSXY5dl+7X/YH6LKY8UdfLk+FJGyqT5WhluPg6oc JlROS+ex0gG5FYXxPsaOL1/sub+f2Q8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=I+dO8Lbz; spf=pass (imf24.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1751288464; a=rsa-sha256; cv=none; b=LXA/TmVC4RzV7bFbfQY7YgtpNdDIMdVw+jU4xs1OIWfy0jvo1Gz/eLr8/yRz70kkxard5p TGHOfkLxKiJnfi+oBV522MghArDPdgRSeWCDS/ZkNToPAs8ccZx8aucxn4uolkENruldoq upM7L6I8BVMImmMBnJbrAdHpIG7WhTk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288463; 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=02uSef5lp6Y5cEfWyIGZlJA9ZbaH5mB3gdVPjlakXLo=; b=I+dO8LbzmGTUCc7Ozbe559B35OxcZXfTxcmBiyRTPPWYQnx4c4ql1OkCBiouvh9ZCpPCso sxHP0KjyCaNGlxyU5xY4x3GDwM//gV1xM09a2BzZXvuJTZRtAI9rqke9/+Ex8C/UXtbrGC nl1ogj9DFxtKtRNMmxQLtDTAS1/HXSI= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-169-kiS0d-kMNt-pkkz10dIhCw-1; Mon, 30 Jun 2025 09:01:00 -0400 X-MC-Unique: kiS0d-kMNt-pkkz10dIhCw-1 X-Mimecast-MFC-AGG-ID: kiS0d-kMNt-pkkz10dIhCw_1751288459 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4530ec2c87cso13616945e9.0 for ; Mon, 30 Jun 2025 06:01:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288459; x=1751893259; 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=02uSef5lp6Y5cEfWyIGZlJA9ZbaH5mB3gdVPjlakXLo=; b=EsGFhnmRRXA8UMnnc64L87/js4/sySYCNJWIMqVFkeA2E6AbVicQT/ONI8c8PT+ude Cp6V9KhIETpb2ErX8m7/+j8l6Lfuq03XLJY0NgHbmItN12K8K/UsOwp3l/Hlm0F8aJM1 zp15GRKMTwPxRyhIk8bILrcvO4+eLHGAWD5kt17zsgEwhT5Vj3OuEnUfc9q8EMoDAan/ +0SoWm5IQy8J91fBjBkv9yj7htN3IuKvkklzxRunXkR8htAYkyiByd5cHUK2j2m5tTOC YOMJ3AiYIA1FoZ9tchvJ+CVbz0Q1kNqn2LPaw00piVbNYgOHaGLwA5NhBKdx+iO7EA72 nziA== X-Gm-Message-State: AOJu0YzuZjqRSJ7aHdke8Ukq/k9JcyfXdsx2e4yt0dIplYAtgYrbM7jr DbNSATTTadgy+a3PsNtH+K2C/LTszpB1vDBdrXydI5RcZWw3nOpzSH7An1Jv1uO6mpCGEY7i6qq Gcpv/cpQ4ygdN68tlz6Jx0QVJp6Tn+goBbaJzpLYZ02XD+bQ0gYg+ X-Gm-Gg: ASbGncvnElxyVgMon/MlyH7W3PiR4F1ZCQb+HzfrigFJpBDh1FKhzAaZqH7MtMl4L8l En9GqrpCYD32CKV3oaxiz2D0W8vZAPHld2Q5I8rF7AxqbuCz+2GL1eosxUSxNLB0Z6stV/bJs+P rhKssMc/KZ3ynDU0Y7GW0IeJz/LdXjRF4Q28Iljm7zCtf82VEys3O2AsJ8UdgJefJAZ5HXrcw1C Q7/lX6hm+YWWivY+T/Udzun09qfR5gqrF1TwfQD4kWo8xnrsPa0L1UUecEWUQSq6erBC6BR5jHI 5KiNkwGuYaICIh6svSATGbkoQELUz+MqcBl5E3k2LcKLCtBumZp7Wwa1wdrv5IFZZx67uVziaqH dxvVpKEc= X-Received: by 2002:a05:600c:a46:b0:44d:a244:4983 with SMTP id 5b1f17b1804b1-4539726acc1mr92868505e9.3.1751288457967; Mon, 30 Jun 2025 06:00:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCs0m13Yqq4GukWpM+4uHJmOOd6amI/nvHYcsB4z72aw1swyUlytQ8Ivx43yHYvtcBEII8eg== X-Received: by 2002:a05:600c:a46:b0:44d:a244:4983 with SMTP id 5b1f17b1804b1-4539726acc1mr92865605e9.3.1751288455974; Mon, 30 Jun 2025 06:00:55 -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-3a892e5f8absm10554612f8f.95.2025.06.30.06.00.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00:55 -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 15/29] mm/migration: remove PageMovable() Date: Mon, 30 Jun 2025 14:59:56 +0200 Message-ID: <20250630130011.330477-16-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: 6H0l0kFlCKySV070tAMr5DAzA45obZWVdmRRP1rqC04_1751288459 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: 6ngztpr3mo8d84o1q1h5erysrumskwsi X-Rspamd-Queue-Id: 2F14E180016 X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751288464-478169 X-HE-Meta: U2FsdGVkX1+Y82iWLtTlJcXP1LPTlfBTQ+RMGQ9bVoqePFE90diC+p9BoCcMf4rwdVp7ch92WrS9cq4Q5WqBIZDtw6+nF6XpL7tTeYlBB3UIW9HwPNeg29asqqf05QxcagsXs2KkE0By6m3zCEaF3JkowPto7ZGhoNQGZF/9bzhisoP6fCa40SOtYbXSuuUajJLugCI6T1qm2Lqq2Mg5DUzJ/hBRGGjy8mX6Kyy6NCXu3Nc9aZb1I867966UIGxvNe7Owrjpz4W16RmgEClSIf3+aBmD90y1T3BtYdogT6NLzQ+CC0lOcDr8dXgOM+2Vr652ScTMyD+GUCpedLwajqbkX0mODlJNY2CC7jJnaNoUpOBEPmTSh+uD1txxMExiCubxbezkqyP7gBS4q6vo3tE2ArzxErcHYDJLovAsQmCUG2WXvmvA4AmA4slYmORhg2PIagUoJXURe8R9IxmKxXV6JPl1X4huDo0IptqnEJwbhufZ34YEgnVIE7TGvRtN70JaChnLLGJLI8iDoLgv8p7E3GU0WSCPA3sR13nZKdvnkXWHNaT+TESvGor9WvNRny9858Url8DGykxB+bG8e6iPApKwR5pkosmkunDwm2XS6bajzgLSJBrdJaPNS9mtVz0ZXiW3+k48tIeY+q3HooJfJonSww4ZryAL2fDYnDjJKLwLqwuemng2xy37vTVHsEQEWrizLPdD9YmFKM+ucUNUkHpDwZuVGixpB24WsPtXdcVzgt3ryipALMmhD4XlUSwW3AvrhWzLMS6+M2TiFz+1fhfm+i5ZZv8nF43pEkht/cQKfODvrzheQkfZkot0F8Sh/jrkCyWG3YGeEpnZfygr1ICMzKwJNMlNByCkADEG3ELU5X9mv37lImNzrAinTcH+auBDzq6xiJfBRDysMzuIWuZL8JtmLHqXyzBD7Bypcalht5rEpCixa66ekpR9w3hT/Ef1ft+30DvAumo WaHGEbfW kBOar3vJA2VoNqX3Llxpz/1BalsrFzY3v0PYXc+PhegbaFm9wD/Sco6yeAlCBKFkLccC+GZFVKsPxxzNYsVvrKPaQNFQzqeXVBDs4ZKm93qqaHhCpZvKcFBlCQYv+ShcJ3IRzxVpqRU987vijOc8+iTJMT2KdFKSdA+5lObL/ICtMPWU3UlHZi3eShx/yveIy3xwUFFwK50DG3uGL6L+yj6mQPkTRt7mu/8cVEtydAe9cUIDxSDVrHEpAhuw4pg1WLOz1GxIDl97KtyLbkR6+qRqovnD8kSseTe2XsaZaSG3w4wHjV0ZhMK79IxfmKgO3MW6yF80rgxNKaqghEggNk8RQZhibBRXD8G2EIJpI2LTQvUFbY8S1ZoDvijz+g/iqCr0eTUHTPfW5yw2vatQu+HO5aOgoy3uYC7PdFATVeMzTqa/8mzsZyUcNxyEuVElIxheQjzysSS+lodmBtcHE1zYcCLkMm5tC0D10zFtzbyDwmfGBUcg76sLOazqgwgOgE9UQ86jcKoYfXfeR6TPmUIOv9J0kYAICc6+qNSCRObXbHHXGK1fCe96feTOpEPsZ04fn2fnrFw4g10OL9U+fdiZpzTYvDkKde4o1m/IJMoQ+4eWYtuCkxRS8sHoJml5PWPU9HCVD20RlDEY= 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: As __ClearPageMovable() is gone that would have only made PageMovable()==false but still __PageMovable()==true, now PageMovable() == __PageMovable(). 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 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 22c115710d0e2..040484230aebc 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