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 81468C71157 for ; Wed, 18 Jun 2025 17:41:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64DF06B00BE; Wed, 18 Jun 2025 13:41:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D7326B00BF; Wed, 18 Jun 2025 13:41:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4509A6B00C0; Wed, 18 Jun 2025 13:41:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 242566B00BE for ; Wed, 18 Jun 2025 13:41:11 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BED0E101195 for ; Wed, 18 Jun 2025 17:41:10 +0000 (UTC) X-FDA: 83569237500.16.1FB4027 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id C6B75C0010 for ; Wed, 18 Jun 2025 17:41:08 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NibJtOXw; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750268468; a=rsa-sha256; cv=none; b=cU5hh4ToRo0RvUWgslZvrjTN5zQnUbIOIX6bkv9Ho2OLPDEyAI6PdXQ0oeTn+p4Clr1Lgz NUqUAp6FwTiAHS8vefTnFaZSxsqtt+v6mu88kSlvhGd6vYLyf3KP87VzYoaCU3ZHmYTh9/ dKXI5BwIQjI1JR9ZbDiwx3MZtMMH/xY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NibJtOXw; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750268468; 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=XNETPXN7225Q+hZzTHNEAHzgtHhIrhZYYBe8I562/sc=; b=KB4dKmp0BrjA7jZ40Tgp+YWPk3i/SB5B2Ep3kliFvGLbhi/DuwNHv+ANjvDPPOqWc+lM/3 CqqsdY0IOmlQ0T+VzlEqewzNoKSEvK3/0RXNG8rEREsMFXX8ANu4yuB0ZhodfMgXLdPbML P6qrfVOk8qn5zTBO2q+rac4Lbtez/AE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268468; 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=XNETPXN7225Q+hZzTHNEAHzgtHhIrhZYYBe8I562/sc=; b=NibJtOXwCzRhp8Zj/ebc77NyKE7HKM9HtUenxN2QqszFaDDB01GWuVh6L5vSMWv4NEhCbQ u6+63qCAp99j3ybz3+fvclXh5siCFeIrX00pyqlF3JVsZVZrWQgkmSm61xlSRVgIXu84cB IsZDQI8zGhHf4OT0Y3riB7IW8QL8hNA= 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-292-u4KIucwYMIurT9MZY0-5zg-1; Wed, 18 Jun 2025 13:41:06 -0400 X-MC-Unique: u4KIucwYMIurT9MZY0-5zg-1 X-Mimecast-MFC-AGG-ID: u4KIucwYMIurT9MZY0-5zg_1750268466 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4f8fd1856so3532419f8f.2 for ; Wed, 18 Jun 2025 10:41:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268465; x=1750873265; 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=XNETPXN7225Q+hZzTHNEAHzgtHhIrhZYYBe8I562/sc=; b=TJyYPGNtAca0YQ3Cvx+EetMpYHCGRaI5kqze+wtwin8kVUxso5tzqG93zpHpE6Y4sY TSxZDKzhzeFNpZbV32R1pAnLV58FuBuHp2mBviX1FHROvhmaTsolaZilEhorJy4L6bYv 2Q/vs/ZcRw0Nlrcb4yln99znjAEK5aVHXesFi261TPHeKQsA3kvaHKR3wLS9NUmlTCyr bF6sJmTmhpdIVG8q9UjW8wu5QXVYh/kun6/C2nF48guJZQMq/xyzg1WoAfHJhutfzYjs 5ee3Z6JK5aFjAxBvXL/uJ2A+mNI55yG4UHzWbUFhLeBNKdKyVRzqmysVrFJVIhUr8tA4 JSfQ== X-Gm-Message-State: AOJu0YyerA5XQyDDkHYilnw/SMD4kmfUYtEG4kG2v+x37HcNlZF+g/EO QLHNZguVV1sCEe7ffdNQ92Qz+mwrxiEANp5q6Qx57c8J5kYcrp3Ks8VeeTak4+LY0NSWCJ7ws6k GU7+sBMn9z6copu6cawzOaWDW68+kV8I27NCPZtOz9GCkUrt4EEXy X-Gm-Gg: ASbGncul0Qf6WAa4fZ4m6nIqJjfUE1ioNh14HLvFLnCWT9j//hq/cb2AW+yoUO0Ac9K UZjHnV5BPC+4ehD40VOPuAjSLdLjCDRcg5D9fMBMXeiS4ehcfOSOF0VTw1/DtzxTt+lg9yyseF0 H5iccz1E9hD5zjtk+LKoS5Rh2umG6BqWRssDsNzkolnZ0tkBROSQKklJLIyRWlctry9fFchoDds +KNTjN0fLuoBrirVUanwBYTgg0UCqHR8c2SgmGHou0SNOa+zfZjzI8u4bF9c86RiZIhTLEJrxD/ CsTYjtK7ryHqFPrXInhllRSJJnxyucz56oLVJqhw1UpRpuFHfM4+qGTcWksSkM1xb1SJsLfqA4A aTaSoYg== X-Received: by 2002:a05:6000:2a84:b0:3a5:8934:b10d with SMTP id ffacd0b85a97d-3a58934b44emr4899255f8f.10.1750268465658; Wed, 18 Jun 2025 10:41:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGweIJH7UFdL4iF+vDHHDFBTBiRTPsGiwY+Mamaq8n4uKw+sdUC4NhASQWA8g0N93X4/5Zu1g== X-Received: by 2002:a05:6000:2a84:b0:3a5:8934:b10d with SMTP id ffacd0b85a97d-3a58934b44emr4899213f8f.10.1750268465236; Wed, 18 Jun 2025 10:41:05 -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-3a568b18f96sm17611143f8f.66.2025.06.18.10.41.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:41:04 -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 18/29] mm: remove __folio_test_movable() Date: Wed, 18 Jun 2025 19:40:01 +0200 Message-ID: <20250618174014.1168640-19-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: QLwq4GAdeHwpFIGUA_J6nymNxzTMvOd_AFhGv2Q5h9A_1750268466 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C6B75C0010 X-Stat-Signature: jrzmedbnzomspkmun5kc3o7s3xorkdg1 X-Rspam-User: X-HE-Tag: 1750268468-652113 X-HE-Meta: U2FsdGVkX1/58F2Qi+2nfx22vVnWAogYbETuj1p0OhMznoFuIKeLfl6FLlEQ17hVQvuQJKSEXRWtOdsZNrfNGd8BcuoeJ2NC6tFhL0AQ23EV2JVzIAaO16nR46xMelCF3TkbBG+jJtZ73I+rhvWDq1hsEnkrH8D7MyB2xBK1FS1uuySdcy1tW/UdW8u12VxqcaS3zjyZOq9L3R1cUwbeT433FUPs0zmfiTA9iiHl4BFZejKtQ6+rY1J7jIm5/LumQW6OtXTokLhiqb+O/mziPXcPaAt4gGJucc8RKmeM7mXiKrfxTZZn/57lWR03sgI8stxvA3X6gUJquv5pXeryKoofgw1Lo7s11lhTMBIsg2dVfX6cRXvS71Ou3T6hPsDVtpNjVs1gw+yvopmYcQS+8xfaAKq5+1i8VfuRPxqKgE3vk511jPQbHz4BF0pKt9NEC0oqBKKc0VIs7zl4tpuvZ83gky7cJ3P8IjZ6iolmczIvoaH3kP1iFOU/Py1pRpfR/uVr3Lv3DbIASbti30XfT8Kg4ggOX4vLsBm3QZ5pTxdTNvJYsrS1V6ZprPODLqSrCasYyoV8HuNAg1J9fEiDNQUzssSe0o43cWHKTEqAh1J/cYfXSIHCWadoDaiFvJYJe9Bi/8SZoe4o9yxaEB3n0/K0cQlZ88ZlraJKhthjENNEb3+2FNFE/jTNaDBVkK8hEAIOir5IuFUwAucjgcY328+0BjPFOHyaVH6FYVLVHBaEx7Ov4Vj6cMTdaZtwsPs5u0DSeR6m6RlSSmjwQNxPQuciI5nl18UyjN2TBfUYwkGHUcacyy8HC1fBFYOkiNKzhwxtZC2TqsqHJO1nuTVAmpYHWkaZWmY2BFuYLOoWTGcnze6dvc24UfDw3nOyIv7r/tL3pkvfOeh0/V2JPLIfY4J567TDueKozI7iMjtGIIFWQK++N/gU+xj1pLWl/a1p/+h0wzVBMuf4aWfFzJf yc40VOBv NvVdSk5x9xDONYKDsjoNPs65Zbc9Dj5GpRCdcgolIrrbAAxPDWqmusW6U7AEq5ssiXV20WOcfDXjMU4MyLlyxfP90R4EIASGEi/Gpwl6R53J1g6cVaXZq3ro6tyGIbp7VZRyTsrocZQdR10Jsf1udXoAXsAA51rXIrFxrmEy3jQZdXJdL+GSULKSdOMRrg4Kkp1fQRPIXB8PL19JFZbjw2sMSg6sehAErEwAdDZ35qiXsLMGBNkqNSYIkZZkYOtSGsEdR 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. 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 5f97369eac2f9..37e722fbfee70 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(&dst->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); goto out_unlock_both; } diff --git a/mm/vmscan.c b/mm/vmscan.c index efc818a0bbecb..e5d04c98af976 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1651,9 +1651,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