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 C9B8CC8302F for ; Mon, 30 Jun 2025 13:01:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 631356B0096; Mon, 30 Jun 2025 09:01:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60A826B0099; Mon, 30 Jun 2025 09:01:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 51E066B00C2; Mon, 30 Jun 2025 09:01:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 400046B0096 for ; Mon, 30 Jun 2025 09:01:23 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 060BC1D732E for ; Mon, 30 Jun 2025 13:01:23 +0000 (UTC) X-FDA: 83612078046.25.9C5369C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 8AC0B1C0018 for ; Mon, 30 Jun 2025 13:01:20 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U26hZ4U7; spf=pass (imf18.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=1751288480; 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=7h0E3JSTi0/tTXxhJU2J3wMLvxjdNIbt9+WrjT2dUzo=; b=j3zbapKJ3LIJA549VvlLU3qpz+8e8yohMFcKKjUphPefzKJ1HfqJmNYSX1TtYezOKIC441 wwGPyvBxKAy1AGCHcuOrRU8pQjNOX3zHLeK2Mb+ZvwI0SWeUmjYfdLu8nLgk7EBK4OweKo VFNtD+k8eqgcCHwoGo2RzfLjPsyWFRo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288480; a=rsa-sha256; cv=none; b=njiFR8F53+nKVtpjK/6UGZASFCz1nLnZ2tPFE7/IY24x48/P+YVS/8g9WC2ZPUuEPbdvsb R6ySO0eWsor6yAY5N2NA5ryW39+wcl6g3QdgepvxqSpCtoTnzjhzowgoBmhlSh7knjIR+7 frTMNnEzuVgmExkIWk2Y0oiV3MvQ32s= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U26hZ4U7; spf=pass (imf18.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288479; 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=7h0E3JSTi0/tTXxhJU2J3wMLvxjdNIbt9+WrjT2dUzo=; b=U26hZ4U7loO3OejXswGhA5h4fMorGMdDayvy3/uTps+k+EZJ5FR/oWfc78q5CEohU7Ppfe m3oGlmPIXAidip5d2eWDraSV9bREU6G8qKICpBUh2mSxq0MOFH4kJDucm+cO5NWuuCoKks qrUHiCc5HjJNHEP/4RlbGKqaPHgDLvk= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-156-Sp62r1iZNXaAOSlHzeADtw-1; Mon, 30 Jun 2025 09:01:13 -0400 X-MC-Unique: Sp62r1iZNXaAOSlHzeADtw-1 X-Mimecast-MFC-AGG-ID: Sp62r1iZNXaAOSlHzeADtw_1751288468 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4f7ebfd00so2208276f8f.2 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=ewq/cAT0R1JR7cnkyV75mwnqRyH0qK6TTNpuBbAXWE/xzy2bBewvUB8NFBn3aQfYC/ 4jTXx0ZiXP0vuYgKYIk09WboRsG248PG9NXkzmeqkKnTPqWJ3s9ZQ3+sAXilaBRAjB6C P/kdi8h8PAkP3plQR/vIlmrHJ/OKcmKbIJxpDkQToqI8dMnhN+AfiESCpQHUy0n7DiYk e5bV7WHFxJlNu7GzmqssZs0vS0a4HSdVjLYEFvZwIbjp9iI20OiEcQHHaR77R13yR20D 70Yxo0/+vShnXxNVrnWuzP5s83MdA92zLvNmTLYsH7n63qkttC2gY0ox9fPJDUGuPVH3 ZthQ== X-Gm-Message-State: AOJu0YzH56NFqTf+JJ/Wmvo0QOGV8rXq6V4QHgJDpGJw831mFvJ5PPUy 0vJDJCEoOGSKbdQtpyGTLF8N7cR44UO7d30OIMJEH/AdbK2KTfByS5gvyyvnGJoVe7tcPfJDLbR u8AxxJO00d/d1iVQMwnta4ag43CXzZM6Dyr+WeVW9AW76udyOaFfw X-Gm-Gg: ASbGncuMPbEMx/sat2gjMwXF24yzzPOXZid0/NMyqKlLg/EM0Wxgxjccq+VzNj5OcVH 0QuqaknRKu6gc/V+2b01PAoIA+0JiYBMuAS3+VxiTE3A/BlmUeJdWhAHxNiQgyOIX0pU2stLc0d Is7R81vzP0D+Y1hbbB9hUjv4HzDf1mRwF/9KIlDNmtfilfoO9PD+IEvUrMLKDqgQ6jnvLGcQ+0u qroejrybXAf7Nv5KtitOXSD1Bws6AR+tQ3VPNMiyFnasq3UCR4bRAhiEvJObpA4sUelkzGBosUp O5N3MPNK6uYuH2PmGJxWa18pq0vfkxh7lPfHzD1Pho/1/sRl8HdHx+xAOXqQUm8/SFqrWzRnrZY ewhIAkQg= X-Received: by 2002:a05:6000:1789:b0:3a4:dbdf:7154 with SMTP id ffacd0b85a97d-3a90be88de8mr11746731f8f.54.1751288466990; Mon, 30 Jun 2025 06:01:06 -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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lyvgvu4lPZpMMcSO1WIFP5pgOiwmwuYlaIb5L8I64hQ_1751288468 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8AC0B1C0018 X-Stat-Signature: rndifu3e4hs7ie3qhoxdjpg8z6tq7sgq X-HE-Tag: 1751288480-812497 X-HE-Meta: U2FsdGVkX190OPa5H/EJql7tMQVcwZYLr4W9rgKwhvdLEjE9FCflY19SvHOLwVhBI+JCb/wHjgVJBaxbQfPP2hpj3spIoC/SPdeNaUcue5x35ohAKaY+5adAru7rAWQcE52Igm2ojExN+3Tk2gL0RRiSUs1756yyLY9oYJmB7WuAoEZsIb98DHp2+WjAkqbIrIdD9eCY/dg3gyMmhr0noMaWtLPGpk3WG3LB0rNbxmLltzUjGBgCKUjJtqDA7tGI0sCcvoQ1DKHDJumGJW7Fcl+1ZUEw+RNOhkKP+sOSO9JsaJ+3hcwiMIqQBalR2wRlEImPHNzyA1vN64bFyMA15Ynsfy31nf1c9TSxMbmk4+XPe71rl7+Qf1ntA8HYTL6MTbxPfoWVAK8edJ2tkTDzVX35HhTgNgzQY8aCD7fI3lBwgZegHNZpWB+SBUbA3mCGaELfpX8uvQV4MgNfqBCogzaG7uQFglcbU+TV5AWAAMeCU7GVmdX/x37WGsuD26I5MtFESiDSFaKJIPE7qQtHrKiBDImeMzlrk0h8n5k9J+VIJ4hmOS0tRmITWysWyt9hAvkGG/pnmKpR4ElCBXRcorv+RTRBT5xrIwmXrlkIZ9Ou06tel8Fjck/DdktNNgifWpKnShozSqUcOzq4spA4Z0qkxez7nIE0LUodF7vz2KnTja44RvlZp3Z6kFZ0huZyfITazbNP88oikfqToDdxAOt5Zjk/KRZI2wiJgSDHp8uX7aFh2P1zwbRC44S79vsr2O2Wq6RsFIA5bLgHvvfSn9HgVuNBz5pNZleTI/RLc3bbO4i08Mnr3s2g9Glgf73NmxhOxrJyJBFmg0+UR9Y7BYLCr0gXMJ2bWLBNr+iFLwzFdp+Z2ptxG9925llABfOzIKhjIUl458S8ayb0LE01qBWSMvDSOIvlx9aUJQb9VIWTmgM/wLXVNa8I5Q67sqOYM7h0WLgkhIsftE+Z+U+ qlbT2gPx d1BI1zMizzDD6dFwbQMZm7D6OsPVVI4Tw/+4qFDb33GQT9bKwiWMe/tSj2iD+DIIPI5EC7vbGwjQS3olqWDFPSwj7JtQKW6Gdiqe9PKTGcVL/vf7Ma6z91wqoktTkHP273ADgpEvZ01z+pjT/VDtwakoSAiEssqc0KucK6JZHsazQrKEMzwSybXOA04ATnqXfrQhZrOoFt/PsPY/B9S10a2qObopzLMksyzNZdwVVdnvtF8zntxCTmRT2HDBvJ6tq3fKVyp0yRPL/MZANysh9X25NMI5JGbfBQ3i0 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 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 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); - 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 098bcc821fc74..103dfc729a823 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