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 A4700C7115D for ; Wed, 18 Jun 2025 17:41:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CB186B00C1; Wed, 18 Jun 2025 13:41:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2546C6B00C0; Wed, 18 Jun 2025 13:41:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0595C6B00C1; Wed, 18 Jun 2025 13:41:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DA9666B00BF for ; Wed, 18 Jun 2025 13:41:13 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A03D9807B7 for ; Wed, 18 Jun 2025 17:41:13 +0000 (UTC) X-FDA: 83569237626.13.5E3DB93 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 726A1140011 for ; Wed, 18 Jun 2025 17:41:11 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UmUUxJwE; spf=pass (imf23.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=1750268471; 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=DzfM28AXUPw/AfYpLS1hZTUERIY8AF/rsj6KIsT8/ZY=; b=b3glUqLtgvy7P8Fn3VevJV58//Zdcl7FcghyjYU3BCgwGxQtD9XqfYKcpQJq7d9NMOpUck 7wYxEms2vkcNA45kxus2Q/27osOb1IXvxEtrhlJ++T4LzTJJFLhlJ/5KORcPzpXeejw3PV c++ePTdBIrCP0bgvlpveU65bhO6oa/0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UmUUxJwE; spf=pass (imf23.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=1750268471; a=rsa-sha256; cv=none; b=AH1+m5ZPVGyWNF671mtgE59j5QyQYtUQjJwUnZqyJ1BLT2uAbz9nT8aQxT/41TvxZUsuqf Xa1gwE/R56hX4czZ/fhm9qoREzwpU5nmc6rHkT4MVPq7yYcyKFJd8WiofnAjA8pqfOlYRJ j0mLs41Ujrs+pKoVzBci68IXdzFWmu0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268470; 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=DzfM28AXUPw/AfYpLS1hZTUERIY8AF/rsj6KIsT8/ZY=; b=UmUUxJwEo14MtFYNyV54DH7tqoF1trgHIO1TUwvsti+ezA7ppcyVD4E4ZKIhUpjiYac+B5 ZvUnZDnYWAnZ+CDfmi2LTKepaCh3TM/nzuBIHWO3GjsOHzn1aFWhFY2v9lzOV0piBApkY9 anpBEU7rdMby8NvN2Z9hql1OQdXjZJ4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-641-FQze5jvQPXurkItjjJMB3A-1; Wed, 18 Jun 2025 13:41:09 -0400 X-MC-Unique: FQze5jvQPXurkItjjJMB3A-1 X-Mimecast-MFC-AGG-ID: FQze5jvQPXurkItjjJMB3A_1750268468 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-450d290d542so43198115e9.1 for ; Wed, 18 Jun 2025 10:41:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268468; x=1750873268; 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=DzfM28AXUPw/AfYpLS1hZTUERIY8AF/rsj6KIsT8/ZY=; b=B5DOMj/Ivihm06HdYvRVrZzTe78EcRm3juwnPevCuEzeT+PHp24Qys8HkbOg+gEqh7 X0U7GmPIzICjHQigU329hbSIrsNgWP4+PsOMOuhEnVmSa0/+JybSgWxiVRaIEB06faHU Iv/W7uCVmLp+Xj7Epuz/3YFR2mhLYFcbYCFvqOyf/6CWSwMrmcsKqhJW5GYJcJ2JUn1y s2xuihcu3uDbux4geHuXzqNgXITeS2LOyywU098d7L7518z8Ipezg1Sm39Ib6gMdG/Gg +JQxe7qhPlXKJkxCb7eKS1HwgeAD1L1HBOIQMc5WGWisUpYofML2uqtY5KmsWFI5mUQa tE3A== X-Gm-Message-State: AOJu0Yz5zfGALcMHZazgcG+mofVDg96TiVBYgo/v0mI++djEpfAKbrAA gEzeIJyop8/g5BA5Oku6Hnrk3ux+EPdIcbQjEevcH2kpKLqJmmkJ8wibM+KqcrYgAyskIty1Crp bOMI79h2Et1c/+u1LR9ZkdsdT5rKDeCT7GGd3Dbo+jwayMubFqJ3n X-Gm-Gg: ASbGncvnk0glvB/xu9jWyvsf1sALDZQDqSaVUljeLs7AVnQL8L2flGOVhj9dGw6mUyA xIJ7E8cdZ66SyhG3a9i/j5bpF6Ujo5WT6yEUvNEnjzijIFvdHAdjI8KJqpkNJ6ZcyCD8dA2laR9 h9qW2SLlho0qpMWFmItyJ7Rko2Qm6MxEJL1RQJ7+EuwrrG2Ye0c4R5VwDQeg+oBRt12VbSNu5kL +jIr6/oJBQBa66hPDDTwSwIAU727Jo+CU74xa8S8/L8+EL1fsYZfxBbTvtOc2VMR10MlR2s+L9Y z32RgQsg+Xj9EsBBHDFGQWFMwP8sKiBRvcmUSaBhJjQBJoBQ19pRL2swLEAKFU/Mv9WI2G6m2N6 Qriem5Q== X-Received: by 2002:a05:600c:820c:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-4533caa2186mr184242805e9.17.1750268468352; Wed, 18 Jun 2025 10:41:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKEjDqAoZjEM/lQyE0UXotydmkpa81gpxxIPt+zLIqzN6Ot9NSYzqnSxIiiN03uF8vCn5Ghw== X-Received: by 2002:a05:600c:820c:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-4533caa2186mr184242395e9.17.1750268467893; Wed, 18 Jun 2025 10:41:07 -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-3a568b087b4sm17884528f8f.51.2025.06.18.10.41.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:41: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 RFC 19/29] mm: stop storing migration_ops in page->mapping Date: Wed, 18 Jun 2025 19:40:02 +0200 Message-ID: <20250618174014.1168640-20-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: e0ivRv4Z731U-G0omXyve8IN_ix_eZCOwaliNAnBC_8_1750268468 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 726A1140011 X-Stat-Signature: pzpyimbtpsit1psmggc15p8fudqwyx9o X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1750268471-206759 X-HE-Meta: U2FsdGVkX1/NsbLj3G3ddA5L8bQeOxY5re0mpO0bQl/F3BL0oCle7YJertnY+CfmfRxC49EMGd29vtzRPCCJHIv80lQtayIvA15RYy4IipkTR1D3/SdMfCo20UKaSiTSCZ0XiCq6b36wbGPlvAE+6gy30axLF0tWnEzEV/JdV4Qu+5p3qf2ELMoJj1Qa5nkEOR/7qfZcdsewP/syfz/Vx1yhMFp6E39zO0jytzqMmIJfwY36+EfDlPpD0myQl6yAYJ/IYOcoEekkkAaV9bxT6IvH51Oo7KU3bMgpquiwjFgKLTocLbm3Gp3yCL1RTwfhcqPZ7lXTqboE5F0szSGWqJaoBxCNzNn9pu2wZnFuW7SpyxufERaHXGy/VyJ5e6Or28A9vHK28pcnoQKC0ggceks0VvUY2q49I0dgkiulvJthdsZKgg071eE+j20D5UYYp2hGQwQ+p+MldJWKYzoP3YY1rcP+P50vhyr8K3P+lwXkbQOZzy2BDnE6HtGOkh8Va0UVVCoAVudAQcpbmr4/ygztsNq9fQh8EmjV481MuV2F+dHLiLmQrHTUs9YQjwum4n/A/zt8gA3ssGDTmke7WRaYLRoQ4PrxvGJXKcCqbSSjpd4O7QVtserRHyLSnZgRa/bMfft3YxDALbG5Zk64DqyPgDVY7DDoVyzn/puCQjFpfLNN3WfCWxLuq7hB/7PFOWHhbVjdid8nEG47rG74+xZWr5Qeo7ObN0NSU67dGecJvNjKpINxb3ZyLtFdXNwCwIdvYBi3IGPilVIgwomIAV+9x6pLRdGmrFJvf72URVLqOBBqSv/uNCiQOTpIWbhfyV+I2+BdVKTQ2pnjQOKkjG+NPZrbGCPtD9di/mpfEvucuoNfF+/6gr4iPj+nJ+wg28DXTJNiZd2L4EGvPzeb6ZnOcQCxAorR25XyaocpZZhrGAz2hBZQHNsXvKSIGXI5qCRKmS0l88TMCmsOt5x I+eSNKF0 OjTEamxh20faO4CtzvlDvd3i6cVEQ9+VqWxYBadpfVI90wFgDHcVZ9r7lgPFmKi2kmvtbJuEh5SXF49ScTwBvZe2Q3bP6ldqyKDpBTL4NIx/MkUMCV+YVP7QDQdHmsnYOdHqkTySIeTq/eIjZaBxVWv9BZjWxKaX+8FahVxG5A7QBbLhBsPdk8QaYApHTqQ68if+WkC7jc7Z+IU8HHHeFSetObSgkS9PNLnCIUcnR1iyvX5xd6ToXoLSB9MbAu3s6ENwCdqPGwz2VGbogg+bgx+2X27c8QBODd1OTmvkT8T7cb/YqNC5xeraFekUofVgHAMTa8BF743SYc5R5y9PT4F6iEhm9lZs5IfxymkIIszOdNpIx9Af/bBHsbVrtsDnurtPUyBXnUzVdIGYk6b68WgCFlt5f5A2OABVPBIOt//aq3uCs2PGEhZnAJpwTdLw5dOjgik8r1QipFvFi51TfNqiyqtMlHk5oXThpdXQZEoZ/cgeX91HnArg3cB6+wSbWhyT/GN7Dd4TSqa4naZmF6Y/TkQ75W3bYOSS9JV+w7zcor3w0/VxxeWPbfjqWMhDF3oQa3etK9DpAnLwfaNgInzXmpcDiWoTN88bT 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. 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 c575778456f97..64639dab92b91 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_BUG_ON(!page_has_movable_ops(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 f8b7c09e2e48c..a10f23df9396e 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 37e722fbfee70..a36030de94f30 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 */ +#ifdef CONFIG_ZSMALLOC + if (PageZsmalloc(page)) + return &zsmalloc_mops; +#endif /* CONFIG_ZSMALLOC */ + 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