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 7CDCDC8302F for ; Mon, 30 Jun 2025 13:01:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87B8E6B00C1; Mon, 30 Jun 2025 09:01:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 803BC6B00C2; Mon, 30 Jun 2025 09:01:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CC136B00C3; Mon, 30 Jun 2025 09:01:20 -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 515B96B00C1 for ; Mon, 30 Jun 2025 09:01:20 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2B80C1A050F for ; Mon, 30 Jun 2025 13:01:20 +0000 (UTC) X-FDA: 83612077920.12.F123194 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id C59BE40005 for ; Mon, 30 Jun 2025 13:01:17 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N8zTC3l+; spf=pass (imf01.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=1751288477; 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=5CWZGmTCKoL1hvQ/VyDOYb4tfyG8bAvHTQtdKrki7q8=; b=nsG1+NTibWeGy+RQIzuB7yuS6FhjzGD6qF7QoGdNI7YdXLM/iFAEe9Q6mzqBI2ss/E41X+ FXyccp7EbsNXW+qXgKgKEYQM/VngUQcloOjOu7f+099nL3+RhfJkLZdxD45mRWcnLTJdCj snqYQTUkEpf+AmgmHgAa1aBwOYbrOCA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N8zTC3l+; spf=pass (imf01.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=1751288477; a=rsa-sha256; cv=none; b=xoFxapd5IoEVMUwXKxKRhauWgPEIfcRWzI/KJGkafpsNQ7RMtmm+seAZZR8rIDG6hvjSYd oUcU94kmOQlza1zgns7zzIq8JxF/UdYBPNLBhgwSWkebRfTbSzvs6suz98D84zTyqIlNN7 4MxzLzJg2s+NmoO9f0+G7OTOMOQQ0/A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288477; 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=5CWZGmTCKoL1hvQ/VyDOYb4tfyG8bAvHTQtdKrki7q8=; b=N8zTC3l+8QHDSP9bDRIP2LLo0VbilUKIRbY/tza19eHx9dqVufFrMx15WKa099irGN5MtF VuQqYQ/8FN5WR23C3/sS+TGu4B41abjwgY21quVrDBnw13edaXvMXXcpFRUZ9h8aMokImz 785n2A6K7JOu7TniW53shHcpmd9JYtQ= 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-355-le5Mc1iVMae_GS8XWaS_jw-1; Mon, 30 Jun 2025 09:01:15 -0400 X-MC-Unique: le5Mc1iVMae_GS8XWaS_jw-1 X-Mimecast-MFC-AGG-ID: le5Mc1iVMae_GS8XWaS_jw_1751288474 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4f55ea44dso802654f8f.1 for ; Mon, 30 Jun 2025 06:01:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288474; x=1751893274; 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=5CWZGmTCKoL1hvQ/VyDOYb4tfyG8bAvHTQtdKrki7q8=; b=LJ27EYzqSeEQoSLuHVntb2qTQmhFX7kzI0/xPEokX3p0jLHxtmrOTFbAXSHMtW8Sd+ QVf++ffP+QHwBAovjLbjOxCFT4JeRVJv/784Y5ObfQynd2yCzVEL8Ji5q+hhEKU82ioC TNt0BkDflPgR3Mcg2C2U/V2cqYzIiyTLnFZCaY0iALV0aGAiOgVF69VcFn3CrQ1JnJFy syDZXmiFjP2AfahmoZqGOHQ+HZoLc74KhasZm08rUR2UXXnPI8tEoPYRAOVdBLCaY2q0 OcLGLXCmxLGvo072kdIhllvD37rGqZfiqJJ+pWcad4ToNpo6FQ7jZX+mILhXAjcp0pzc GOrA== X-Gm-Message-State: AOJu0YzzutqOQ5j59P8xrXoaXCkduUUzzemiMvXOa3BXX7oUtKa2KlDo KX8sk3IRUXA37Kb24t5qCBaKB6ZYe/cXtvpF8YEm9wPc+/kiDqkQtM4bprkPt7j0NKKNmE/n45m 0v1aOuAFvzJy+pcoIyJ6AEkc0YO1Zw6Z1KIN6/tFoWtro6MXn8Ljp X-Gm-Gg: ASbGncviDmnoc3NaBxm0Clqiv1KoubUjwc6uYZagMBP/whLss1rcRijvhX6XKRz/G2e teqfHqwOHTvkm9K8TZ1Zt0t8xHJu63u1MH0sbOBYEV8mX3gy0HcJgf4mVDLI8nNQVNVHNk4pAZO 9Shw85YQu39JvTuzglDIeLVg/eO/nB8pOlkZaEBfg93A/mqqrp4czyolTI2hTWfsSjxD+pe7hef BTI07SRnXtET8PuK0c2RiUnR7kCVu876rQ2cl0Wb40xUm+YrR5D9Sdc4XCdrKMZuor5mirfYlTr gU+wZufrnDSBqamwaI2xP2NjLHgh/WgPDtB4xd5mmU/zY49y+QluifZVrleFFA5AQ/ivgyTQZ5T WBAERY0Y= X-Received: by 2002:a05:6000:2389:b0:3a4:e54c:adf2 with SMTP id ffacd0b85a97d-3a8f577fdc6mr12847927f8f.5.1751288473244; Mon, 30 Jun 2025 06:01:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJ/9NZM6h/Hx4c51fxjBgSM5e1fSGf05yUg5gzNhGMoVHxQHOqc17Ov8/o/Ak8l4p0X+gKZQ== X-Received: by 2002:a05:6000:2389:b0:3a4:e54c:adf2 with SMTP id ffacd0b85a97d-3a8f577fdc6mr12847789f8f.5.1751288472235; Mon, 30 Jun 2025 06:01:12 -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 5b1f17b1804b1-4538a3fe592sm131954105e9.21.2025.06.30.06.01.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:11 -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 20/29] mm: convert "movable" flag in page->mapping to a page flag Date: Mon, 30 Jun 2025 15:00:01 +0200 Message-ID: <20250630130011.330477-21-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: 0lP7iWzBv0sBK-hggiY84aYx1yw6U2Nj8vI7XVCZFlw_1751288474 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: b768y85qhpy9kwsewe1qin6yb45n479i X-Rspamd-Queue-Id: C59BE40005 X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751288477-302939 X-HE-Meta: U2FsdGVkX1/jJwzfuxrvy8Ac5XafFl+8z65TnoTQBs+bzHTBV0EsSiZKUHHg7RJT39Wte/ThKviMQK2z8CIc+nIVnQYq7+fgcmQbybgX9tVvDgBhuUJxM04CpYh0nsALOALN6FiJkJkBlyhaqlEgeu+nvTOsjbdRwRLxNhGRhDEbItPnWr180dzZOC1rmp+DICOVq+TQfdUiNK2FzLE/PpVlWG+OQrCbEigKFuHw/mO+nzwyvRWGJ5bpZ3+wf5GbMoWEa7kvm+N5Pb64aIaKPqG41fXqPpbEwaMh8B6J0rdPp3OF8lQjxtG/2Orfp8cDlSWx1YiAcHc6NPb/QZyPrOpO9HoF4ebcb7vhTl+SdKmqFgkaZWD00q712+8kHxvsXu/DZTLcQSo0Lt7Afvb9D0KPuTcI2sKM/yptDywUi7A6tw7d3t7WAYzKqYR1zYFR3dISf6lAW0pdBD/3oyYLgolkCGuyx/JLIwzLPCSuN3ssqtH9px2dvOa/lPMaurMeT3F9QV2eHrMqZMvjsILJZTprHa7toEG7NsarJF0tg1GH4FY6oxf1ST3eGsWylR/aJgG5VadvLw69s7lIYPeAXBCO7CRePDAmYvXTOOoQmyt1TI8a2pRDaC+yVi3ue5P5WOJJoIhEpLMMh7ZXU1DKyfXjV3FnvLAgzf2i5hYWLUCtNJ9lDX9ZEVNKfBg/FF3tg4RWuOK/GiV0USjrVfZxSN0X5zKP4VciddwyToYK2V8f84g07tYRdxVvonjaOKa0rs0YlFpuB/Wvw5l1RI4Y0pDPPEY0C5ZFBbkCCGxrQjlKYl9T61pcCe6CpyWJVFdSqIOcDFjvA6D8cxUQ+tisvFOg9/Y2hUeHwi9Nkgx3B7bEwfKBvkoi6fPm1hb150qslmdNV6y0Jzh5F0yn3GSRIf4PNCPgbCxg1mX7UX8GjAuj9CU2rB05tgOYgDvYeDdehzPqezQZTB8Aaej1gDf 9092xJB5 4Wezxxv5ImXZ/uddS/RnO4841yZHWo33pOzVtJtRAhGJEXXYTCBMkDk23cdYK4oQ+Hkjw/tGo2Y9T87MgDOyNmyrWAZ9sUz3Tnm3/cGMQcrKnpz5obWvAKUuh/P/YMXmLXpIzHA4p2E1T+olDwm4qX9oVPuCdlW891PlcQueP9oBjdI9hfAmWVBSzYXN8fNuQ8eilo7Hm9HzCOVjfOYJ6Et0uffpvPnBrdg8Sm+jF52v8Ti08C7hdHdeNnNJ/oAIvWu0bEs/8A2RIhJTIVRNjCVDIjvp8KztVcaPos7z4JGeToeS0O104ynrWeZHICHPapbl3nt6Lj25bjK1O28nWf+9VrXLAagoRXLy+9z9boTmNBhXbJzgvdT5FD+rwtNbrNfxAqByePn/G9qsbVbsE5zMHHOK6/wiLRcsThDAARcAcZMq6cTmPABLCLJIQakG9acom62V/3RFvZZxhfrx7HUFW/3vXUnLfGawE0XgRYOiqxy4Oe2ntTMRVsrUQ1EJQy1ZttjLF0n+HBfyHYVl1cnZqFH8v66wIUYQKop3KzZRceCLsUuK6dDdN3r0pyAf/xyZnkWodLybSWw/5G2fng92Tj24bTow2C1U8WmsIXexdbRNyOirymV2VYkvYTH1xFlNHMMRaST5w6Y8= 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: Instead, let's use a page flag. As the page flag can result in false-positives, glue it to the page types for which we support/implement movable_ops page migration. The flag reused by PageMovableOps() might be sued by other pages, so warning in case it is set in page_has_movable_ops() might result in false-positive warnings. Reviewed-by: Zi Yan Signed-off-by: David Hildenbrand --- include/linux/balloon_compaction.h | 2 +- include/linux/migrate.h | 8 ----- include/linux/page-flags.h | 52 ++++++++++++++++++++++++------ mm/compaction.c | 6 ---- mm/zpdesc.h | 2 +- 5 files changed, 44 insertions(+), 26 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index a8a1706cc56f3..b222b0737c466 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -92,7 +92,7 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, struct page *page) { __SetPageOffline(page); - __SetPageMovable(page); + SetPageMovableOps(page); set_page_private(page, (unsigned long)balloon); list_add(&page->lru, &balloon->pages); } diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 6aece3f3c8be8..acadd41e0b5cf 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -103,14 +103,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, #endif /* CONFIG_MIGRATION */ -#ifdef CONFIG_COMPACTION -void __SetPageMovable(struct page *page); -#else -static inline void __SetPageMovable(struct page *page) -{ -} -#endif - #ifdef CONFIG_NUMA_BALANCING int migrate_misplaced_folio_prepare(struct folio *folio, struct vm_area_struct *vma, int node); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 4c27ebb689e3c..016a6e6fa428a 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -170,6 +170,11 @@ enum pageflags { /* non-lru isolated movable page */ PG_isolated = PG_reclaim, +#ifdef CONFIG_MIGRATION + /* this is a movable_ops page (for selected typed pages only) */ + PG_movable_ops = PG_uptodate, +#endif + /* Only valid for buddy pages. Used to track pages that are reported */ PG_reported = PG_uptodate, @@ -698,9 +703,6 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) * bit; and then folio->mapping points, not to an anon_vma, but to a private * structure which KSM associates with that merged page. See ksm.h. * - * PAGE_MAPPING_KSM without PAGE_MAPPING_ANON is used for non-lru movable - * page and then folio->mapping points to a struct movable_operations. - * * Please note that, confusingly, "folio_mapping" refers to the inode * address_space which maps the folio from disk; whereas "folio_mapped" * refers to user virtual address space into which the folio is mapped. @@ -743,13 +745,6 @@ static __always_inline bool PageAnon(const struct page *page) { return folio_test_anon(page_folio(page)); } - -static __always_inline bool page_has_movable_ops(const struct page *page) -{ - return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) == - PAGE_MAPPING_MOVABLE; -} - #ifdef CONFIG_KSM /* * A KSM page is one of those write-protected "shared pages" or "merged pages" @@ -1133,6 +1128,43 @@ bool is_free_buddy_page(const struct page *page); PAGEFLAG(Isolated, isolated, PF_ANY); +#ifdef CONFIG_MIGRATION +/* + * This page is migratable through movable_ops (for selected typed pages + * only). + * + * Page migration of such pages might fail, for example, if the page is + * already isolated by somebody else, or if the page is about to get freed. + * + * While a subsystem might set selected typed pages that support page migration + * as being movable through movable_ops, it must never clear this flag. + * + * This flag is only cleared when the page is freed back to the buddy. + * + * Only selected page types support this flag (see page_movable_ops()) and + * the flag might be used in other context for other pages. Always use + * page_has_movable_ops() instead. + */ +PAGEFLAG(MovableOps, movable_ops, PF_NO_TAIL); +#else +PAGEFLAG_FALSE(MovableOps, movable_ops); +#endif + +/** + * page_has_movable_ops - test for a movable_ops page + * @page The page to test. + * + * Test whether this is a movable_ops page. Such pages will stay that + * way until freed. + * + * Returns true if this is a movable_ops page, otherwise false. + */ +static inline bool page_has_movable_ops(const struct page *page) +{ + return PageMovableOps(page) && + (PageOffline(page) || PageZsmalloc(page)); +} + static __always_inline int PageAnonExclusive(const struct page *page) { VM_BUG_ON_PGFLAGS(!PageAnon(page), page); diff --git a/mm/compaction.c b/mm/compaction.c index 348eb754cb227..349f4ea0ec3e5 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -114,12 +114,6 @@ static unsigned long release_free_list(struct list_head *freepages) } #ifdef CONFIG_COMPACTION -void __SetPageMovable(struct page *page) -{ - VM_BUG_ON_PAGE(!PageLocked(page), page); - page->mapping = (void *)(PAGE_MAPPING_MOVABLE); -} -EXPORT_SYMBOL(__SetPageMovable); /* Do not skip compaction more than 64 times */ #define COMPACT_MAX_DEFER_SHIFT 6 diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 6855d9e2732d8..25bf5ea0beb83 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -154,7 +154,7 @@ static inline struct zpdesc *pfn_zpdesc(unsigned long pfn) static inline void __zpdesc_set_movable(struct zpdesc *zpdesc) { - __SetPageMovable(zpdesc_page(zpdesc)); + SetPageMovableOps(zpdesc_page(zpdesc)); } static inline void __zpdesc_set_zsmalloc(struct zpdesc *zpdesc) -- 2.49.0