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 E54A9C83F03 for ; Fri, 4 Jul 2025 10:26:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E0D16B8032; Fri, 4 Jul 2025 06:26:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5919B6B800A; Fri, 4 Jul 2025 06:26:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 459AB6B8032; Fri, 4 Jul 2025 06:26:26 -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 24FBF6B800A for ; Fri, 4 Jul 2025 06:26:26 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E6F5EB7DB6 for ; Fri, 4 Jul 2025 10:26:25 +0000 (UTC) X-FDA: 83626202730.30.FA90060 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id C44CE20008 for ; Fri, 4 Jul 2025 10:26:23 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oa6NsqoE; spf=temperror (imf03.hostedemail.com: error in processing during lookup of dhildenb@redhat.com: DNS error) 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=1751624783; 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=oECXrV5Dx+HlyT4DmzhVSvU+dpZiU/Jf4ByqsPae79M=; b=kXLT36i2+b7n2ps7o6g4jqQMGH0cMrCz4/7hngWS6/4o/33vtKqzntPohoNcZFwyCiOSxa mT/gBCAcPyZfOTxnks1M3V1y9c6eLmF8BYepUQ/0NXgrPF0x8V3ipaba6MgVzxrcyySJJF ruNGo2OtOMYXlWBnYzqb7yJVtt+0UgE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oa6NsqoE; spf=temperror (imf03.hostedemail.com: error in processing during lookup of dhildenb@redhat.com: DNS error) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624783; a=rsa-sha256; cv=none; b=hBcCwYl4STDqgXawJCyhrIv/tHCM9xbz7CF4L0Fa1EuaDM+GbXviktRuzf30KdJk9Ku2mk ly8zfMGHO84YZEKCGhTmkbdeejWOUKAYyCBeJaJXZwa69B/zrJTKrUUmEAlW1rlBfFPvet hWvUn6rh4DeD0Y+J/415+D0qa3+0XIw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624783; 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=oECXrV5Dx+HlyT4DmzhVSvU+dpZiU/Jf4ByqsPae79M=; b=Oa6NsqoEwoY2fFOWeMzDQmDCw5xPJ3WQr89ILSJ7CZ9CkSQXrTUnrHwhU5fv70qaKtLCQb i0gQJYGuNlhZsACiy2nULuPArkEI/4uDM8tmSnlS69JfGS+RBBy27kGV9q5GVViUCPawF2 J618Ky8CTDIC5h+FE+owXlsXlTDA9fA= 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-652-xfdN3E4sNz27iCeqgXSrOw-1; Fri, 04 Jul 2025 06:26:22 -0400 X-MC-Unique: xfdN3E4sNz27iCeqgXSrOw-1 X-Mimecast-MFC-AGG-ID: xfdN3E4sNz27iCeqgXSrOw_1751624781 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-453018b4ddeso4616175e9.3 for ; Fri, 04 Jul 2025 03:26:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624781; x=1752229581; 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=oECXrV5Dx+HlyT4DmzhVSvU+dpZiU/Jf4ByqsPae79M=; b=ZvZO9a0eHwtixDyyUrAPb5ByALToHvhIgrn1PVhHeBX+LXz6jUo3gouc1cUI3pLaYD ljHn3UWuytOJGnuG9iw9wp8pErlSrpICPayXCed3Xedr8YrtOisUZVVAUnEXSzP8jdTu XD6DxUillS5D0DdkM2ghKtN3ATZFnyl0fwxyZ6dfHztVSfv7nzDf4rJKgctkGkKLNZcs ZDXTQKCB+yrZZsVaUr5t6AHfjSiXI+g984WtA33zVKLJ/6C7tLFExaWme5sh1A5S5Zaq wo1oOzIZN+oiMG9rN2aHcadvFa6KKENZhlH0zLI6yEMi5iOeTIVpPHZRPtb0OVzmjaQA HyCQ== X-Gm-Message-State: AOJu0Yyp7WGj8Ctp5o83rIBPJAPGcnMPy4eb+cBE7b8onG+k1DlBpzbp l9gA03DU7IR9qaTAax40KD1Tg4n7PfdzsqubWihutZoN8IyKSkTxV2Oc3M6zfH+EKVsRo3qht5/ WvnkozT69zSwim/b62fmfphRVUtj/5f46aT3APeYThH3D30BUHAZb X-Gm-Gg: ASbGncvmIaCU1drUE+ffCRDVxrB0NprCcj5EMaAGiXF+/gacxpSfaTKvCl7MY+Q8CHv zjoZFMGFqqe2q4HXjDb5YDK+xVbUbeqeHGSSaK8mJvI9QR2SBPig09t+G6ovzitvbMaKz9aVWtN X4lCaQwcBA3CDR2nezpI19TfczvJWqbQ6n3eZlXXYvYmwh4YBz4hY5tDvvN8nxQYhBIiuT7W/Ga wNfDcalgSin6xYf72L0+ItGOgu+P5UNkSW+9bnPrIXQhCdEEwYaqVTtV22G/3vPeRe39cb7TNpm hFYjk3LZTBc64rELmejvxwUX7dosmz2Arhy39IsaKd7r3JoelEebOvNpoC+X655JCUcRlUebYs8 t7OkeMw== X-Received: by 2002:a05:6000:18a3:b0:3a4:cf10:28f with SMTP id ffacd0b85a97d-3b4965fa4b0mr1306232f8f.31.1751624780773; Fri, 04 Jul 2025 03:26:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbtvCxrQrQrYrJp00fZP6RxGB4BHMLsK8k2E+KsEE1fK7HT/hfJLD1aXJjlmgOs0fjfm/CXw== X-Received: by 2002:a05:6000:18a3:b0:3a4:cf10:28f with SMTP id ffacd0b85a97d-3b4965fa4b0mr1306179f8f.31.1751624780162; Fri, 04 Jul 2025 03:26:20 -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 ffacd0b85a97d-3b4708d0ae0sm2166343f8f.33.2025.07.04.03.26.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:19 -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 18/29] mm: remove __folio_test_movable() Date: Fri, 4 Jul 2025 12:25:12 +0200 Message-ID: <20250704102524.326966-19-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: 7jkPekXb9oWflmDyMPME9sGV0XVoWDyF8OwQMBpN1II_1751624781 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: udn8ya896bfn9h6aeq5bh57hi4cttqf1 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C44CE20008 X-HE-Tag: 1751624783-256032 X-HE-Meta: U2FsdGVkX19Valf4Ba8zKcLZg5WpUHePaPWwcnAv35A97YwetfAZj7ToSL2zOY0jf2IVvOd5XGNq5OeWMaLgBld44mbpAl3b7m4OiG0nTOA6Fj/m/zCHIWu+TtBw0sH2hw6tMkeF9uHo9YATD5zoI0xr7qmOv5ZhUoY/qNGqNl8lCamS3gPV0MD180bt//XQQQrYp2jkwubJK7tBZQ3QrXpVuVq79ixqzUgHcIJ4ijucjtbppGysFFlQdzlE34gXxdc8fGK1Hz/nW0aKQbpOxAfQfHoEZ4V6hWf+tNW875+BVQMTptIUzC4qoO4VxL4QNIta5kqOTYy7QlnHgAUk3p0BApRHeRj1J4NuT9/x1oAh+2auSvY9ZocARDzD15v91vk4CrUrslHgcuqV4Qr/sVo4lbwJNZ0es7Z8g2hW4TR+3qoNbXJhaq37jJNvmUo1uEERelkIpsssYGcL4IMPvodJY3PWPGeSARIbu3XxF22IDFAEmHS7okNde19+O43PCnRbG0aomBrCnkPff6wT7lxtWLTPhABjQ/1apoelReze0H4a7YQ4q6sKSlQpqk5S5hMqvZQ5QrtMU5zfXfqrnR5crK10LgIsbIvLKSzZulodaFK7BZxwyKnip6jV2IbGExq4Sllw58dEWfG8ULcNAowouXbcZ6OFRx7iTvp4HJh9d3XV/yJGvJiT5gqoiuJMKxLBHrNXlIWoQjeIDKdg8LIUSwhIo2b2jTXb1fMyWzCO1+C2ucEeh+suc6d5eo7IG8/86lBvjlLQ/qoKiY5WqAeZ1OZam9RPDWVzrCCqkk/pC/xewlBXUdPDYIDTehHDAH1gxSts359CnX9enBUfbcJHURdhjbZqE3Y1GAMuj2svI5dV3H7bVIYh46bdzczf19bPXVXbd8M0VbKTTFj71B+n9lYAb6mH7htcvs7DI+ABR9XvbC/JF64tsngX4FxmSc5IEBX4gFSU1dNZrv8 Lv/Ve6u0 AtObpZy2WOSLNZqbgJ9vJaOtostXccYNajl88YJa5Z0Af2K5kR/qUSxB3UIoWA8yPrQS1949eOliwKGMnc1cJQw25QzXUQkAsvPYockHBowspeoJY8xruKY8Glgnq/N0itW4OTaj126ow9Y0p2cZ65SyDib3aKQzSVUy1vuMd/v79u4iIVTfwfizhGJ1K23nTg4ezDph1Grv/v8ZPef+oWWOMejY6ApklOMD8jsOpGJQeadhpwIYs6oGrW6qx448yrWZR0va2l0AxD/JrFXXdpSPNURTCSzvf7oqVeWdY00uGMxoLz+trW5O7+U4aKq7/CAeJXIrOvxB4jJriCoyBQh8R/HAwpyUwMUy4Eqld7tkJIMlWl8VFUVRX7/7yFVfPUwLI5HAkECULySzziB7KKCPeS+SkKaGj64+deBijA3uhVoYN40ta0JexAaJ98mhvfDKkUUDfOehQNORzgE/kNWunfYER3lF+yeCGSvFMEZ/psRmg5SNDaJW80nGMrXb4MfBjCJLWOPGMo7aiGt6ek8z781uZX56SEa0lEKzhfHovYaAjGQQUeXSdWi0E7nYBntkeqkimruecogR9i55aiPyMb8mQMFovHd1mFXW56yPBp1g8d6all+UmbsqSp/d+YhonN06qfAZPnubgV0d9KqYOoL9OeyHHG2fsc5g0O8K0tuwVaf9rDPt9NR7QpnS9MdrX6YmawPE7iOs= 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: Convert to page_has_movable_ops(). While at it, cleanup relevant code a bit. The data_race() in migrate_folio_unmap() is questionable: we already hold a page reference, and concurrent modifications can no longer happen (iow: __ClearPageMovable() no longer exists). Drop it for now, we'll rework page_has_movable_ops() soon either way to no longer rely on page->mapping. Wherever we cast from folio to page now is a clear sign that this code has to be decoupled. Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Signed-off-by: David Hildenbrand --- include/linux/page-flags.h | 6 ------ mm/migrate.c | 43 ++++++++++++-------------------------- mm/vmscan.c | 6 ++++-- 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index c67163b73c5ec..4c27ebb689e3c 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -744,12 +744,6 @@ static __always_inline bool PageAnon(const struct page *page) return folio_test_anon(page_folio(page)); } -static __always_inline bool __folio_test_movable(const struct folio *folio) -{ - return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) == - PAGE_MAPPING_MOVABLE; -} - static __always_inline bool page_has_movable_ops(const struct page *page) { return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) == diff --git a/mm/migrate.c b/mm/migrate.c index 3be7a53c13b66..e307b142ab41a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -219,12 +219,7 @@ void putback_movable_pages(struct list_head *l) continue; } list_del(&folio->lru); - /* - * We isolated non-lru movable folio so here we can use - * __folio_test_movable because LRU folio's mapping cannot - * have PAGE_MAPPING_MOVABLE. - */ - if (unlikely(__folio_test_movable(folio))) { + if (unlikely(page_has_movable_ops(&folio->page))) { putback_movable_ops_page(&folio->page); } else { node_stat_mod_folio(folio, NR_ISOLATED_ANON + @@ -237,26 +232,20 @@ void putback_movable_pages(struct list_head *l) /* Must be called with an elevated refcount on the non-hugetlb folio */ bool isolate_folio_to_list(struct folio *folio, struct list_head *list) { - bool isolated, lru; - if (folio_test_hugetlb(folio)) return folio_isolate_hugetlb(folio, list); - lru = !__folio_test_movable(folio); - if (lru) - isolated = folio_isolate_lru(folio); - else - isolated = isolate_movable_ops_page(&folio->page, - ISOLATE_UNEVICTABLE); - - if (!isolated) - return false; - - list_add(&folio->lru, list); - if (lru) + if (page_has_movable_ops(&folio->page)) { + if (!isolate_movable_ops_page(&folio->page, + ISOLATE_UNEVICTABLE)) + return false; + } else { + if (!folio_isolate_lru(folio)) + return false; node_stat_add_folio(folio, NR_ISOLATED_ANON + folio_is_file_lru(folio)); - + } + list_add(&folio->lru, list); return true; } @@ -1140,12 +1129,7 @@ static void migrate_folio_undo_dst(struct folio *dst, bool locked, static void migrate_folio_done(struct folio *src, enum migrate_reason reason) { - /* - * Compaction can migrate also non-LRU pages which are - * not accounted to NR_ISOLATED_*. They can be recognized - * as __folio_test_movable - */ - if (likely(!__folio_test_movable(src)) && reason != MR_DEMOTION) + if (likely(!page_has_movable_ops(&src->page)) && reason != MR_DEMOTION) mod_node_page_state(folio_pgdat(src), NR_ISOLATED_ANON + folio_is_file_lru(src), -folio_nr_pages(src)); @@ -1164,7 +1148,6 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, int rc = -EAGAIN; int old_page_state = 0; struct anon_vma *anon_vma = NULL; - bool is_lru = data_race(!__folio_test_movable(src)); bool locked = false; bool dst_locked = false; @@ -1265,7 +1248,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, goto out; dst_locked = true; - if (unlikely(!is_lru)) { + if (unlikely(page_has_movable_ops(&src->page))) { __migrate_folio_record(dst, old_page_state, anon_vma); return MIGRATEPAGE_UNMAP; } @@ -1330,7 +1313,7 @@ static int migrate_folio_move(free_folio_t put_new_folio, unsigned long private, prev = dst->lru.prev; list_del(&dst->lru); - if (unlikely(__folio_test_movable(src))) { + if (unlikely(page_has_movable_ops(&src->page))) { rc = migrate_movable_ops_page(&dst->page, &src->page, mode); if (rc) goto out; diff --git a/mm/vmscan.c b/mm/vmscan.c index 331f157a6c62a..935013f73fff6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1658,9 +1658,11 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, unsigned int noreclaim_flag; list_for_each_entry_safe(folio, next, folio_list, lru) { + /* TODO: these pages should not even appear in this list. */ + if (page_has_movable_ops(&folio->page)) + continue; if (!folio_test_hugetlb(folio) && folio_is_file_lru(folio) && - !folio_test_dirty(folio) && !__folio_test_movable(folio) && - !folio_test_unevictable(folio)) { + !folio_test_dirty(folio) && !folio_test_unevictable(folio)) { folio_clear_active(folio); list_move(&folio->lru, &clean_folios); } -- 2.49.0