From nobody Wed Oct 8 11:01:59 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A592428FFCF for ; Mon, 30 Jun 2025 13:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288478; cv=none; b=R5ihnUQmrHeEgUX+bP57HUs+Wn7x0bqPGgIgwGXlzPQLy08bpusZwUfsVpkW8+Q03cvzRFc33zBPPx2yVh4CH++yfmSUo9HeBIgIdWcEYjbDDPIGUyE3hrWGSM6YnPN5mR5/Xa61/OpAyz4rOpW4W/QZAUlq9MGfEiGmgRDfEFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288478; c=relaxed/simple; bh=JYH/x/ortLB+OYxymb8gQIrEBsMUH0D5wYAFvvj+W2Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gTkIXYnnBBp/Oa4bEfhgUBdZRrRzhAIdffKLCGkMxasI/Yv5RgiwLTEYH0ddUYZbw0DvbPHbHt55u8qR0ZdUMlevmvmFAYTDpmsU8ljK4EymJvUPLFX4a040joIcS4MqF8fw+ZhWg43yfMVvxV2/cwvq94z9vnXKH07gr4BDxx4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=aDXFOMAj; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aDXFOMAj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7h0E3JSTi0/tTXxhJU2J3wMLvxjdNIbt9+WrjT2dUzo=; b=aDXFOMAj4rNVeDo7xXLg/bSBPQfBIZyZK9eMIzQvqR78u+eQPHxRAaWd0Xe+g56NE5m7pq RduyngMk5Wl0JxjN0jfd2kvDmX+JZY/LZuvqKzVJ2VCtCOkXePPFW/2WWxtmR2Sqzjvfqz F1fVKjNeUKDE0Uf61XVBIaA0mZUqmIY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-71lSeK8QMOCKoEnqD8VoTg-1; Mon, 30 Jun 2025 09:01:09 -0400 X-MC-Unique: 71lSeK8QMOCKoEnqD8VoTg-1 X-Mimecast-MFC-AGG-ID: 71lSeK8QMOCKoEnqD8VoTg_1751288468 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a50816cc58so2335385f8f.3 for ; Mon, 30 Jun 2025 06:01:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288468; x=1751893268; 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=7h0E3JSTi0/tTXxhJU2J3wMLvxjdNIbt9+WrjT2dUzo=; b=tf38hLR91yZc1TOS+NmmCjsJnbkzsZbdcnOGUjm4Sn6Mtda5DOFoAc8pMuf3Dx5Kjm gP1GSmNuQ9egD0qVc81s8bMrEOIzrVafjZYhG4/sTDzMEL8Mgsa4XjFFxbmFy6Fo83Nm t/IRGEDHYvizWf6PXgWxf0VX+Ib3bExhj/bSC4o6xHy32br4ub8KTtHbDO71+xwmuI/T rimS95hJa26T3S1B1mWaipIyyjjGrsWNFmy2HdLoMw4kcKys8I99Qq1Y5qrfdZjL4L1z GQG9taprC23M2eABqz7AU/ANQCP49+Qjm4GSKC20/a45cEjlFVrhI+0CN+Aof3OihR7i Ut7A== X-Gm-Message-State: AOJu0YysrCZZASMDtRnq5VzZU4dJNelSW/OoTwGSUASGGXjhR0Vg2RNJ x9Aey3DaVNNi3YtzTmvIWTYpzxeecUzmMb44l8xRri3Iq4axq8rghfbj2E9gQ7KV8ICW/GuMT9P 9ZX1gYfXFK+5CA/3c/IHHOQbyyvj+T240zCotW56CoMwMybk8vRYb+7t8c0CiYID2GpgELasBXC SGavK0zBxM2HUT/+wXlV8CjifhEwp+UVHBBsK37LXfqSD/IgxY X-Gm-Gg: ASbGncuCLrJXKm96wUQrKGWt+VWgKZmA7dLNZesr3w9qOyhdnBVljeRVyjYo9LDKoNH amtiXtfFCosjYjKPIfy2gbWTjATRpa38gdAe+45mwQTxArPK8O8jG+SccST9X6M6dSGF4KvtIjZ WGqkqyCbuyVWCDQFvAucEZGYh1nJI96PYpYB7PDXlHtBgJTfUtJ964g/xRspS81Pgp1I4n9d+cy RB/PVBIuF6wjYE9YdqpX95JhtmmWymz72nxJ6+QqWQ+RoBL0+Te95R2T54pfXKzT2G9s9+uJ36E eWBVrQ1eqbGllC7F89V9rzuHeDQUjTFbmTU309ANyNfm3o2JomwSiM/Yvbq+UWmCv4+bEinzN1m SRA7omjw= X-Received: by 2002:a05:6000:1789:b0:3a4:dbdf:7154 with SMTP id ffacd0b85a97d-3a90be88de8mr11746796f8f.54.1751288467344; Mon, 30 Jun 2025 06:01:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJi8Mvk9HNQG/V6DvaTdZ9vax3u5pZXK1PzboQ8KoLkq4f/Yx4ezN8OGoebh91nmBSeSp6MQ== X-Received: by 2002:a05:6000:1789:b0:3a4:dbdf:7154 with SMTP id ffacd0b85a97d-3a90be88de8mr11746576f8f.54.1751288465725; Mon, 30 Jun 2025 06:01:05 -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-3a892e52a26sm10500359f8f.51.2025.06.30.06.01.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:05 -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 18/29] mm: remove __folio_test_movable() Date: Mon, 30 Jun 2025 14:59:59 +0200 Message-ID: <20250630130011.330477-19-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: David Hildenbrand Reviewed-by: Harry Yoo Reviewed-by: Lorenzo Stoakes --- 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)); } =20 -static __always_inline bool __folio_test_movable(const struct folio *folio) -{ - return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) =3D=3D - PAGE_MAPPING_MOVABLE; -} - static __always_inline bool page_has_movable_ops(const struct page *page) { return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) =3D=3D diff --git a/mm/migrate.c b/mm/migrate.c index 587af35b7390d..15d3c1031530c 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); =20 - lru =3D !__folio_test_movable(folio); - if (lru) - isolated =3D folio_isolate_lru(folio); - else - isolated =3D 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; } =20 @@ -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 !=3D MR_DEMOTION) + if (likely(!page_has_movable_ops(&src->page)) && reason !=3D MR_DEMOTION) mod_node_page_state(folio_pgdat(src), NR_ISOLATED_ANON + folio_is_file_lru(src), -folio_nr_pages(src)); =20 @@ -1164,7 +1148,6 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, int rc =3D -EAGAIN; int old_page_state =3D 0; struct anon_vma *anon_vma =3D NULL; - bool is_lru =3D data_race(!__folio_test_movable(src)); bool locked =3D false; bool dst_locked =3D false; =20 @@ -1265,7 +1248,7 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, goto out; dst_locked =3D true; =20 - 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_fo= lio, unsigned long private, prev =3D dst->lru.prev; list_del(&dst->lru); =20 - if (unlikely(__folio_test_movable(src))) { + if (unlikely(page_has_movable_ops(&src->page))) { rc =3D migrate_movable_ops_page(&dst->page, &src->page, mode); if (rc) goto out; diff --git a/mm/vmscan.c b/mm/vmscan.c index 098bcc821fc74..103dfc729a823 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1658,9 +1658,11 @@ unsigned int reclaim_clean_pages_from_list(struct zo= ne *zone, unsigned int noreclaim_flag; =20 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); } --=20 2.49.0