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 DAC5BC8302F for ; Mon, 30 Jun 2025 13:01:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BCC66B0092; Mon, 30 Jun 2025 09:01:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56D226B00BE; Mon, 30 Jun 2025 09:01:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 435A76B00BF; Mon, 30 Jun 2025 09:01:16 -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 32C1C6B0092 for ; Mon, 30 Jun 2025 09:01:16 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 018F8C02C7 for ; Mon, 30 Jun 2025 13:01:15 +0000 (UTC) X-FDA: 83612077752.11.39A28FF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id B3C8C20026 for ; Mon, 30 Jun 2025 13:01:13 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jHiANXhm; spf=pass (imf13.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=1751288473; 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=oFoZ+ZWQ3WhLHAA9oaT1biVSgyM158tXM490LDGSwpg=; b=dCOyC09538O9Balh9iT1xtDrEw6xn8jdJCYhp6r6LaFIu9tJFpUzlVJSC3l6wAQ+rDsVvt REm2jUhdttKtAc8YkUY/2L1dhn9KZHTz65NSRQqynfrbyApXUG1+9NFyxVLrCNVqIuF9EH 4IlZj4v3EQEl19mXsSUCZZBFXPAro+c= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jHiANXhm; spf=pass (imf13.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288473; a=rsa-sha256; cv=none; b=wLjtyGcBFXgXfQxWvoLlUfTxwpOovWFe3WvXRWGUXZIznLGPKO0z/EX88r47ALgQICpbUf +l99yXoMFxGIYz5d09z1gsILFYIL6R3jYpWx1ANnKzaT8wIyjnPa6Jfv4k1C5Iqitsi1PB OwHR3DEcOX84hQZV/cCBli21fU2VODA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288473; 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=oFoZ+ZWQ3WhLHAA9oaT1biVSgyM158tXM490LDGSwpg=; b=jHiANXhmbhMgOZtRdOp0DkhXr+LDavOpn7YLKJwS5qY3fS326sJKVNQj555xczbrhf68yA ty9IuA+BZxYiYkhtaw8uMVVQEGPe+GpbCJoyatwiUcj2gKUuJNsSyXVFr6qHeVumaFzbLg SyF5D7neF/c6ozHXjZKDSf50aC/PKG4= 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-388-P9qEh47cNIa6CCVjsHC7jA-1; Mon, 30 Jun 2025 09:01:10 -0400 X-MC-Unique: P9qEh47cNIa6CCVjsHC7jA-1 X-Mimecast-MFC-AGG-ID: P9qEh47cNIa6CCVjsHC7jA_1751288469 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4f7f1b932so1198407f8f.2 for ; Mon, 30 Jun 2025 06:01:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288469; x=1751893269; 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=oFoZ+ZWQ3WhLHAA9oaT1biVSgyM158tXM490LDGSwpg=; b=WV4oTHtZJLTvPRDQEFZahvdHBkudotMCyynYDM7W5JMVNYYzPJVafQKuZPqogY9xve UnhzL+8VlYoe7dLlok9Z14ROGHFgHCE4FWi5M11pYiP4xD6P+pShM9O7b73vXX8j+PvQ 5w8DV7Euc8WHLHwR5SbFYFVyxCrK4z64bOWnjz9Jcw2eQiK29/uf3uQc0h6XdRPhrAQn PtQjcIoG0rDMYRBPadyZZr/bdlyNnjAMxqGM2Ez8BXG/gKopQsONaFuxbjbmKffM063v N0Qble9tK79xijpHgKlsjwBeKYjpSG4k2wC2VOeyq1JhwOS5b/uor7mIr9zNqny2F4II Psbg== X-Gm-Message-State: AOJu0Yy3ZIVwZX/rFl4K8qJ4XzbkwI4IFzBWdt1MvjI7WOUpf/KMlMqv GE5W75IcIun78S2dpBtvBUlPGVBj58uX8/KEFWGCmfPp55EaUAhMp7wsZAxp5gugYWycGRq8AQi LJKGXt8h+tdp7bKxxd6Z60tiXqxEreL4weKVauor/cQRnN7z+wOPN X-Gm-Gg: ASbGncunEA6gxEWx4Eu4zhPpf2k0rI22+LOGPHZYqn+nSNXOQivbOOC8NLc3rWFXjz9 lr+EekMSnCRcyd/bgK5KxjnY7l5c3PviAEU+Di7N/OlNGT8bvpgbIoyn/GTGZXGhEVU6MF4mc6o QaNlvIPtTMmZz2Xc4Y7ffdut3IfA70SQYY6aymsaYVvEEvRixpXjeCXqlMbSBCi6l5qktTLuOff obDA2DgLy6bc4C5xGkqAJpoL9cYvAR+erwak2Mhr+hiQvHa5YxAXLHNHpkEWFnycrwvU3q5w3br /eNePmkUe7C30STqn23FfH0Fu7+rEkXq28lZfYoLU7HtPxy77IxcZylz1eYbcCyyysLkIrHOXWb rqeM0u6s= X-Received: by 2002:adf:b301:0:b0:3a6:e1e7:2a88 with SMTP id ffacd0b85a97d-3a8ff05093dmr8389672f8f.57.1751288469101; Mon, 30 Jun 2025 06:01:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5PkTKThngrkuXzEjagSlsXbjs5Ldlq7ssFfZO6/XI6tZJegQpsM73QRMndkrSs09mr6FuKQ== X-Received: by 2002:adf:b301:0:b0:3a6:e1e7:2a88 with SMTP id ffacd0b85a97d-3a8ff05093dmr8389609f8f.57.1751288468412; Mon, 30 Jun 2025 06:01:08 -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-3a892e52c23sm10479813f8f.52.2025.06.30.06.01.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:07 -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 19/29] mm: stop storing migration_ops in page->mapping Date: Mon, 30 Jun 2025 15:00:00 +0200 Message-ID: <20250630130011.330477-20-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: vXQmjgcUM5D3coHO8i9nVhdRuZzm7xJd4ttei0fy_1o_1751288469 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: rspam06 X-Rspamd-Queue-Id: B3C8C20026 X-Stat-Signature: mrqmpkaw9pcxeb7nmuhjqnpfuf41niad X-HE-Tag: 1751288473-474700 X-HE-Meta: U2FsdGVkX1///cfWyMoW1sqIuIy4gcONGhi4jTrvhpjJPHBSayeozjVB0sc2HziouyJqOKEPF6ds8bg4cIipPrEL+1H8fdnDKF8M89CcY5GwA7U60c6kzzMjSmxRaa3gVKED1ei9SF10MnGx5LZ/p1GcxK9fI7pSprJu5o19EtdDW164VpK2Zw84EPjatEiLEiOmaRharG1rk1223PwBSaPGpM8apOxdrTQFBahTnwbqqZWH3W4HGmIiav6TuZoOJ6ibxsWDO0WpQThTUo1jpn5jbXYxq9v5F/wBuA7P0YKNCMN5ocUb7eXxek2yTh9pjIbHc/a+lnIQID9Q9+43mSFG6d8mAkNGMuxKUJa4haL8cHE0nPhIQCCvj7LKaFDUVcnRgaXXmqMGzsKr+g5Emczdns54kxtfNU5E+caJuEo9klHxK2BHZpT6Jw19IhVdMZ98uzgRap0mDxow7dQjK2Ngzx9+Qi5LXLeabFdZHSO7XttdpAjty8CSNUf86xI4VHBuzvJGFbdZT9665ujo+CIU5h119d4Rh1uqwPIf1mSV9GcnS3qFRyt8N4GK3SQbibWxnWKGOO+YoUuZIoaABSM4TmDmK8/oc9DfV4l4AAWcWEmzFLN8SbvDH3/6brnXa7g10CVmXDSYn7S6xHrkgtJeSlApFF1QUj8Zy7A2SU1f022H2TffOdczsN0atVpcrp4CeRK3VaggAbPuxB2hBWSVa2D2yFr+CrXysLeQtqETTd4epitFTa+k1JNkMcE9u/86t0PO1gPxywJDc8oS0OiTctd3TJt5I0pNAK6W7u+0XO1jPrZ/BKS2phRnxDvyeNiYvz7oEy3QIHXZZCyUr0HsM3fKjTF6Mku9PuoPtK9pxJIBtATXkKf7/LdMFOPhytg2iBD+c480fxyd1EjfnNOUAcVkGBTLPA/9EUDKfEhpbUas0Pd/KsclVaOPv1UGMRYL9eCWB8G6kd8iFRy czldJsB7 LsArRZfFGqOUW4K02R4V0XWj82jrInh2WdESw1mGMT8omb213KfhJTgGMB1Fihn4IP2PZlB9MzIgT/bYuYNdr209A7E5QaeVIyPptbh4zQo8UJ6A2Uc3AymtO1DlqARoTz1IhtYNSXn+eC0bWNgVKhEwtO5SGb/OxJzgu8pwo8zlK+dWUjzH17xX9CywI/KyYug4FU2OOA25gIOAMPyaYfSjE5K2WOY0bCcrSMHWW3fggckVzP0qCs3UwXJzMHXbU+ulV1k864IfwiwqXf+uUA4J96J8nr83/cFTGLbrB7mLZZFj0KKAe/rRBSRdh6GqQiNnAHXck+vqF2hcrmbv5Mq5qzjoXN+Sj2j/6Rc8V/Li+VC/dt0GrJn1sXUFsZilIYqdozMcAe00+EpdfrG7PV+hSMtKmOijKKYnAUwns9qqNEuhGGf5cBQsBiVSsgmGi0uIzefasrEtLzUq7uYfzaXI2vfKxQojxL3Ku7/lS/Uqdv22lzojOFX+lxMaUBBiyBGinyLY39P5BvNZPWpUGlSCOoDI6pdmTDXdcvsVt5R1VbRzW3lacdpCJTQxg9xvwXY7wOkE54Vp7jQ5BiUll7QWkjZfe+/m50nRMZMciPn2OQdPlzA9GNXUM19roOONzb6Hqxeiu8P8RzbhREmEXr2tgkXdm9eFi+gQo0n9UEOPP827WcFiI5P5hBw== 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, look them up statically based on the page type. Maybe in the future we want a registration interface? At least for now, it can be easily handled using the two page types that actually support page migration. The remaining usage of page->mapping is to flag such pages as actually being movable (having movable_ops), which we will change next. Reviewed-by: Zi Yan Signed-off-by: David Hildenbrand --- include/linux/balloon_compaction.h | 2 +- include/linux/migrate.h | 14 ++------------ include/linux/zsmalloc.h | 2 ++ mm/balloon_compaction.c | 1 - mm/compaction.c | 5 ++--- mm/migrate.c | 23 +++++++++++++++++++++++ mm/zpdesc.h | 5 ++--- mm/zsmalloc.c | 8 +++----- 8 files changed, 35 insertions(+), 25 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 9bce8e9f5018c..a8a1706cc56f3 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, &balloon_mops); + __SetPageMovable(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 e04035f70e36f..6aece3f3c8be8 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -104,23 +104,13 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, #endif /* CONFIG_MIGRATION */ #ifdef CONFIG_COMPACTION -void __SetPageMovable(struct page *page, const struct movable_operations *ops); +void __SetPageMovable(struct page *page); #else -static inline void __SetPageMovable(struct page *page, - const struct movable_operations *ops) +static inline void __SetPageMovable(struct page *page) { } #endif -static inline -const struct movable_operations *page_movable_ops(struct page *page) -{ - VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); - - return (const struct movable_operations *) - ((unsigned long)page->mapping - PAGE_MAPPING_MOVABLE); -} - #ifdef CONFIG_NUMA_BALANCING int migrate_misplaced_folio_prepare(struct folio *folio, struct vm_area_struct *vma, int node); diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 13e9cc5490f71..f3ccff2d966cd 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -46,4 +46,6 @@ void zs_obj_read_end(struct zs_pool *pool, unsigned long handle, void zs_obj_write(struct zs_pool *pool, unsigned long handle, void *handle_mem, size_t mem_len); +extern const struct movable_operations zsmalloc_mops; + #endif diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index e4f1a122d786b..2a4a649805c11 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -253,6 +253,5 @@ const struct movable_operations balloon_mops = { .isolate_page = balloon_page_isolate, .putback_page = balloon_page_putback, }; -EXPORT_SYMBOL_GPL(balloon_mops); #endif /* CONFIG_BALLOON_COMPACTION */ diff --git a/mm/compaction.c b/mm/compaction.c index 41fd6a1fe9a33..348eb754cb227 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -114,11 +114,10 @@ static unsigned long release_free_list(struct list_head *freepages) } #ifdef CONFIG_COMPACTION -void __SetPageMovable(struct page *page, const struct movable_operations *mops) +void __SetPageMovable(struct page *page) { VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE((unsigned long)mops & PAGE_MAPPING_MOVABLE, page); - page->mapping = (void *)((unsigned long)mops | PAGE_MAPPING_MOVABLE); + page->mapping = (void *)(PAGE_MAPPING_MOVABLE); } EXPORT_SYMBOL(__SetPageMovable); diff --git a/mm/migrate.c b/mm/migrate.c index 15d3c1031530c..c6c9998014ec8 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include @@ -51,6 +53,27 @@ #include "internal.h" #include "swap.h" +static const struct movable_operations *page_movable_ops(struct page *page) +{ + VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); + + /* + * If we enable page migration for a page of a certain type by marking + * it as movable, the page type must be sticky until the page gets freed + * back to the buddy. + */ +#ifdef CONFIG_BALLOON_COMPACTION + if (PageOffline(page)) + /* Only balloon compaction sets PageOffline pages movable. */ + return &balloon_mops; +#endif /* CONFIG_BALLOON_COMPACTION */ +#if defined(CONFIG_ZSMALLOC) && defined(CONFIG_COMPACTION) + if (PageZsmalloc(page)) + return &zsmalloc_mops; +#endif /* defined(CONFIG_ZSMALLOC) && defined(CONFIG_COMPACTION) */ + return NULL; +} + /** * isolate_movable_ops_page - isolate a movable_ops page for migration * @page: The page. diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 5763f36039736..6855d9e2732d8 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -152,10 +152,9 @@ static inline struct zpdesc *pfn_zpdesc(unsigned long pfn) return page_zpdesc(pfn_to_page(pfn)); } -static inline void __zpdesc_set_movable(struct zpdesc *zpdesc, - const struct movable_operations *mops) +static inline void __zpdesc_set_movable(struct zpdesc *zpdesc) { - __SetPageMovable(zpdesc_page(zpdesc), mops); + __SetPageMovable(zpdesc_page(zpdesc)); } static inline void __zpdesc_set_zsmalloc(struct zpdesc *zpdesc) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 72c2b7562c511..7192196b9421d 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1684,8 +1684,6 @@ static void lock_zspage(struct zspage *zspage) #ifdef CONFIG_COMPACTION -static const struct movable_operations zsmalloc_mops; - static void replace_sub_page(struct size_class *class, struct zspage *zspage, struct zpdesc *newzpdesc, struct zpdesc *oldzpdesc) { @@ -1708,7 +1706,7 @@ static void replace_sub_page(struct size_class *class, struct zspage *zspage, set_first_obj_offset(newzpdesc, first_obj_offset); if (unlikely(ZsHugePage(zspage))) newzpdesc->handle = oldzpdesc->handle; - __zpdesc_set_movable(newzpdesc, &zsmalloc_mops); + __zpdesc_set_movable(newzpdesc); } static bool zs_page_isolate(struct page *page, isolate_mode_t mode) @@ -1815,7 +1813,7 @@ static void zs_page_putback(struct page *page) { } -static const struct movable_operations zsmalloc_mops = { +const struct movable_operations zsmalloc_mops = { .isolate_page = zs_page_isolate, .migrate_page = zs_page_migrate, .putback_page = zs_page_putback, @@ -1878,7 +1876,7 @@ static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) do { WARN_ON(!zpdesc_trylock(zpdesc)); - __zpdesc_set_movable(zpdesc, &zsmalloc_mops); + __zpdesc_set_movable(zpdesc); zpdesc_unlock(zpdesc); } while ((zpdesc = get_next_zpdesc(zpdesc)) != NULL); } -- 2.49.0