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 784C0C8302F for ; Mon, 30 Jun 2025 13:02:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4366F6B00CE; Mon, 30 Jun 2025 09:01:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40DC56B00CF; Mon, 30 Jun 2025 09:01:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AF986B00D0; Mon, 30 Jun 2025 09:01:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 17C776B00CE for ; Mon, 30 Jun 2025 09:01:58 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D08E51404BE for ; Mon, 30 Jun 2025 13:01:57 +0000 (UTC) X-FDA: 83612079474.24.6C572B0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 4E989C001A for ; Mon, 30 Jun 2025 13:01:54 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LuunnHHi; spf=pass (imf22.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=1751288515; 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=BiKNy1Je5I/aSf6ESo6pQ+N6U0Nvk4b2III6Kq4QTYQ=; b=h/vB/s/Q0mCyjRFPTwsL46Q13JFNF50gs7M3Bgq4kKz9Jk15PmFZdHTSTnZPLcQ8+/l6Ge b2Znb193z2lmdyXcCmvDBGVynSEcsq01I7BHerfFVEyK2GhiPJhDwNnJvSRCSjzonE+r60 xtEvTKTpOkdvkaqJ64+J08bXeUombc0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288515; a=rsa-sha256; cv=none; b=4TBNGe/kPqbv6h0gGH9eKWtf/3/axisle+iH/VDYro8ldwkxgMZEZ27fmQQ1z2u//tg4eT 4ewCwSK1i3P71yliQdwgiQz/RinKFpugo5SkJnrKOLR7vYv/6KKn/kc6pwUZYZ44ZlaQZF MCvV8D2G7MXWm+8FsE/2ErFrWeNIxFo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LuunnHHi; spf=pass (imf22.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288513; 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=BiKNy1Je5I/aSf6ESo6pQ+N6U0Nvk4b2III6Kq4QTYQ=; b=LuunnHHiTnrUcvmkTf82Q856wddIV+9YskLHeSj/BRqELMAJ/o7o/CmRw6pftHOqCAK81g ceX1lYZZxrurc9+XfSINLirP0B5Ok/Dg4vZ8nsPtkmP26E6SlnnTPnrAkC3i90YAVTbc62 Jx9+mUUlLuKi2JCgasQtBTtzhzx2mGk= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-HlfLKom9PQSZpxCniMbCcQ-1; Mon, 30 Jun 2025 09:01:45 -0400 X-MC-Unique: HlfLKom9PQSZpxCniMbCcQ-1 X-Mimecast-MFC-AGG-ID: HlfLKom9PQSZpxCniMbCcQ_1751288503 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450d244bfabso18182925e9.0 for ; Mon, 30 Jun 2025 06:01:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288495; x=1751893295; 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=BiKNy1Je5I/aSf6ESo6pQ+N6U0Nvk4b2III6Kq4QTYQ=; b=Cn5VpFO/qlf4U1uukduLnmJocUF6ejk3VW/4S7Daomht+wkmdvogv7TKtAMDpmCRjQ ++AitwGYZ17qMS6yKtD/lW/NawwmCruVuqt5v2d7lI0NI+UoVamXyxGFc6L4MAtIXD7Z yCTGeQ+gWHIZFzZ7s75j5dTkDaPWT1fGF+xtgK79E9Kpcay5OwVqqC+KTtxySeVm2sum m3jEuIoVdXy4emol6JUYzrq71unLUK3LnBuGg9ytN4MgjfBPCl+0hZcnjJRmq7Af4pJm WzwcjwZxScKXwsZcGaJAzJZcDw6SnmWsp/IAAw+CKOtao9BGrVMR/2v9dv6bt4n3QlH8 NtxQ== X-Gm-Message-State: AOJu0Yy93hEWeslDoBp/gZIHvVmF2t5Cvq7fgZwOJX0vVJHKYjPxtaVk HsBzRTrOGPJoaj+vO9bHHSen475bEI9guR8RE6UFAQglqzov36Nu2bvqHmx9ndBIDnG4JEFtZWv +wyklEOrdU4WhkelmCZmB0JbFvkvjduRTn0zslu+m6RLrk6XEkGOoORvpSvV87gk= X-Gm-Gg: ASbGncuzYFmILsZNwSQ67OYbGRez7aayuBCqKfhRnSz5U3FNdJnfXeNidiVJe8skymo ViIMZeel8FsBmferuj0J69ThH5OQigJtoxGNFAE4MehvhUtfOJvqxcOAGMJPhfghigfPMrdgWH9 NtnQ90mxHYdV7YGOHJWVMDi1mSJ5zDCOe162DmyqMDruAZQMAmBtEPDdQBTJfdkIGYl/hsPtb9V G+vMltVZ+nmqXf6k1zEy7BxFg/ArEKwDNruZP63eRI8z3wLph28OCLGeFJcBm8L2yAaoTThm6LV ocoCzfEbx/SWIYfHBAoqQFdPM6+ttzWADMFTj47B3VxaC1te0FHZzYFmYdPZ2oFYp9aYSJrVZ3J 5giy5byU= X-Received: by 2002:a05:600c:4589:b0:453:6ca:16b1 with SMTP id 5b1f17b1804b1-4538ee8c469mr119764215e9.26.1751288493786; Mon, 30 Jun 2025 06:01:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiJmwoKLZcCxWychQade1/84yFZ9EU0gll620+fxkzbn8N5oVEpXl6i+ceDpg9b8O44fsYZg== X-Received: by 2002:a05:600c:4589:b0:453:6ca:16b1 with SMTP id 5b1f17b1804b1-4538ee8c469mr119763175e9.26.1751288492802; Mon, 30 Jun 2025 06:01:32 -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-453823b6fa2sm165793365e9.27.2025.06.30.06.01.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:32 -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 26/29] mm: rename PAGE_MAPPING_* to FOLIO_MAPPING_* Date: Mon, 30 Jun 2025 15:00:07 +0200 Message-ID: <20250630130011.330477-27-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: vFSb_aCJ14D9IQdqQrdom9BY_4O9fjPyqpcaXxI6rDI_1751288503 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: 4E989C001A X-Stat-Signature: ymk7ikitdjx9et41hxm9fdu1muaibnfm X-HE-Tag: 1751288514-7220 X-HE-Meta: U2FsdGVkX1/PcbWpCkS37UxwRcMylouh/K6QAiLw5HccJ+/nrajW/GwzPgitiIGW2K+zSzPT3LuYjawcf8zsEI0aAPwiz5JvnP10+xZHQTLfsbO1fPWBG/Txcl3Rq39xKQktf4xBGKvCsUGVBpUHRE+vcIG1mHbyA2UUqu7D3RCWxhgKydEk+d2vEdsngPMyZ6jzWCCm9tAOZaMA3UHoIYuaCcXBllxJ4SeCOsKU1gaTFIOfve4ZvW/H/mHy6p3wMW/QX4xkGqPVGyuHtz8v50nqRDzED4/f6ZlXtmS+WzKg0sNqUX73G4cdPYeu4xjg92v3NYhrpz3m3laLoDGlEscJIgJoOVTcOwqh83LsAUXXdnbljvs8YrzICAlvKNJBkUrGXO4kZxydVsXMNxFImieSGR1dBmOp00WoepirmuXBoONPeK+0xzEGInMo9LDlzGm6M5D27u8RZOPIABd/iHG5ymLD5YnnMBNTLGugce+mV+mNbmDHani2PiLQr19Xwk4PY7ZtIXyR7IbVd0eQaWNbh1zCQbufE5xmaf1jHNY50eUnZ2BCNtW4Bd/3ep6hZyv/Ce1+j/VEBqDzD80RZHIDhzLztPDI0HJxeAi5OFrcnEt7gPGPOcXUF/ndVGPEeZShpj9MO6El37va/IMSCP27AvbEOy+r2oPWbzJ1+Ghfdrr5u98G6WyZChQ2cNUFXvMu7a5qVOjalket/fqGQbrJSvN9LiVDYfXSODimbrqyPxVWZL0C0iKLIo+aEhlEIwdr9J8j+QCWHxiOmhbjpdIhLs24pmA+5Pz2dT31Z44IZ4/Zm9dg4cEoKorZYmKbfVNwi/Hi03Rz7YLr1jb/xmfx7sei65j6UGE3CMC2Mcmj30jpPyed9mbypvytJGgJHxmYiSCXFCWr+Pspe3zues1quVcWH3FUYEIjZg1b8pxBTKkfjUk4w935gZ5RIdQo29bgTiKqx/pgtLKbO1I 5cs6CeRt /00geYvqSlIsqZMYDl7Gfoe7NFaKNdRK3Ja7NvsN9oGfl5KYCgoduRt2GpDM7VlOcHlqTq+CQsKu7gj7xd12HAQfDBToYdrQnK0PKOu/Jtj7zKZIAb8/LGPIA1SxDoRr4zI5/Zfi/arHAwKD8OYfEEJFCQt8m0KrADMeX+lG6UK6WeM7Uv9RwAszbQ0XKRRioo0mdLHBblcA7+rHCu84ABA1b+oCMljfVsySLuN3NsASHO7AZl1QpYjyZvLVUgeMqXqGwBrn4Audreht2NHxaRHFdp/Ofu7uPeKQYaPV9HBRCalZsGq15U8/2CRYRlgFoekW+EA9T69IGJ0Sj8VZmvQHuBYI9xaID45rFoSixI1FS4rPVh9aByWzmCE/1j28UwfGPCsR8jFGuYOzNTvA1pqiMwIy56grqiDj5Cao+oZy/LAppVPMfgYkIBFSVg/1cjDNq7gP/5bQPtIEDQmrD9GyEVk4lkKBHBG6u8qKtzB4iz2oHHBi1gpF+/M0kwAFiPrx1aa95gF30iDwlgW9CeAEF6h14P5HPPKfoMxG7NmefP7CnnuNNti4Yr/Cvcwp1SMzNG1VY+KWuFFCMf6/ulMiGgaLAKzxXzaiEtDdEhvF6L453y1Jck6byOejBR9MOKc39xl2TG4DLC3ZaJ1eUwxjvDzwraslO9h5JWSKLFYpSVZ1PWVmjkIswHQ== 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: Now that the mapping flags are only used for folios, let's rename the defines. Reviewed-by: Zi Yan Signed-off-by: David Hildenbrand --- fs/proc/page.c | 4 ++-- include/linux/fs.h | 2 +- include/linux/mm_types.h | 1 - include/linux/page-flags.h | 20 ++++++++++---------- include/linux/pagemap.h | 2 +- mm/gup.c | 4 ++-- mm/internal.h | 2 +- mm/ksm.c | 4 ++-- mm/rmap.c | 16 ++++++++-------- mm/util.c | 6 +++--- 10 files changed, 30 insertions(+), 31 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 999af26c72985..0cdc78c0d23fa 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -149,7 +149,7 @@ u64 stable_page_flags(const struct page *page) k = folio->flags; mapping = (unsigned long)folio->mapping; - is_anon = mapping & PAGE_MAPPING_ANON; + is_anon = mapping & FOLIO_MAPPING_ANON; /* * pseudo flags for the well known (anonymous) memory mapped pages @@ -158,7 +158,7 @@ u64 stable_page_flags(const struct page *page) u |= 1 << KPF_MMAP; if (is_anon) { u |= 1 << KPF_ANON; - if (mapping & PAGE_MAPPING_KSM) + if (mapping & FOLIO_MAPPING_KSM) u |= 1 << KPF_KSM; } diff --git a/include/linux/fs.h b/include/linux/fs.h index c68c9a07cda33..9b0de18746815 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -526,7 +526,7 @@ struct address_space { /* * On most architectures that alignment is already the case; but * must be enforced here for CRIS, to let the least significant bit - * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON. + * of struct folio's "mapping" pointer be used for FOLIO_MAPPING_ANON. */ /* XArray tags, for tagging dirty and writeback pages in the pagecache. */ diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 804d269a4f5e8..1ec273b066915 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -105,7 +105,6 @@ struct page { unsigned int order; }; }; - /* See page-flags.h for PAGE_MAPPING_FLAGS */ struct address_space *mapping; union { pgoff_t __folio_index; /* Our offset within mapping. */ diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index b42986a578b71..23b1e458dfeda 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -695,10 +695,10 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) /* * On an anonymous folio mapped into a user virtual memory area, * folio->mapping points to its anon_vma, not to a struct address_space; - * with the PAGE_MAPPING_ANON bit set to distinguish it. See rmap.h. + * with the FOLIO_MAPPING_ANON bit set to distinguish it. See rmap.h. * * On an anonymous folio in a VM_MERGEABLE area, if CONFIG_KSM is enabled, - * the PAGE_MAPPING_ANON_KSM bit may be set along with the PAGE_MAPPING_ANON + * the FOLIO_MAPPING_ANON_KSM bit may be set along with the FOLIO_MAPPING_ANON * bit; and then folio->mapping points, not to an anon_vma, but to a private * structure which KSM associates with that merged folio. See ksm.h. * @@ -713,21 +713,21 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) * false before calling the following functions (e.g., folio_test_anon). * See mm/slab.h. */ -#define PAGE_MAPPING_ANON 0x1 -#define PAGE_MAPPING_ANON_KSM 0x2 -#define PAGE_MAPPING_KSM (PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM) -#define PAGE_MAPPING_FLAGS (PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM) +#define FOLIO_MAPPING_ANON 0x1 +#define FOLIO_MAPPING_ANON_KSM 0x2 +#define FOLIO_MAPPING_KSM (FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM) +#define FOLIO_MAPPING_FLAGS (FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM) static __always_inline bool folio_test_anon(const struct folio *folio) { - return ((unsigned long)folio->mapping & PAGE_MAPPING_ANON) != 0; + return ((unsigned long)folio->mapping & FOLIO_MAPPING_ANON) != 0; } static __always_inline bool PageAnonNotKsm(const struct page *page) { unsigned long flags = (unsigned long)page_folio(page)->mapping; - return (flags & PAGE_MAPPING_FLAGS) == PAGE_MAPPING_ANON; + return (flags & FOLIO_MAPPING_FLAGS) == FOLIO_MAPPING_ANON; } static __always_inline bool PageAnon(const struct page *page) @@ -743,8 +743,8 @@ static __always_inline bool PageAnon(const struct page *page) */ static __always_inline bool folio_test_ksm(const struct folio *folio) { - return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) == - PAGE_MAPPING_KSM; + return ((unsigned long)folio->mapping & FOLIO_MAPPING_FLAGS) == + FOLIO_MAPPING_KSM; } #else FOLIO_TEST_FLAG_FALSE(ksm) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e63fbfbd5b0f3..10a222e68b851 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -502,7 +502,7 @@ static inline pgoff_t mapping_align_index(struct address_space *mapping, static inline bool mapping_large_folio_support(struct address_space *mapping) { /* AS_FOLIO_ORDER is only reasonable for pagecache folios */ - VM_WARN_ONCE((unsigned long)mapping & PAGE_MAPPING_ANON, + VM_WARN_ONCE((unsigned long)mapping & FOLIO_MAPPING_ANON, "Anonymous mapping always supports large folio"); return mapping_max_folio_order(mapping) > 0; diff --git a/mm/gup.c b/mm/gup.c index 30d320719fa23..adffe663594dc 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2804,9 +2804,9 @@ static bool gup_fast_folio_allowed(struct folio *folio, unsigned int flags) return false; /* Anonymous folios pose no problem. */ - mapping_flags = (unsigned long)mapping & PAGE_MAPPING_FLAGS; + mapping_flags = (unsigned long)mapping & FOLIO_MAPPING_FLAGS; if (mapping_flags) - return mapping_flags & PAGE_MAPPING_ANON; + return mapping_flags & FOLIO_MAPPING_ANON; /* * At this point, we know the mapping is non-null and points to an diff --git a/mm/internal.h b/mm/internal.h index e84217e27778d..c29ddec7ade3d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -149,7 +149,7 @@ static inline void *folio_raw_mapping(const struct folio *folio) { unsigned long mapping = (unsigned long)folio->mapping; - return (void *)(mapping & ~PAGE_MAPPING_FLAGS); + return (void *)(mapping & ~FOLIO_MAPPING_FLAGS); } /* diff --git a/mm/ksm.c b/mm/ksm.c index ef73b25fd65a6..2b0210d41c553 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -893,7 +893,7 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node, unsigned long kpfn; expected_mapping = (void *)((unsigned long)stable_node | - PAGE_MAPPING_KSM); + FOLIO_MAPPING_KSM); again: kpfn = READ_ONCE(stable_node->kpfn); /* Address dependency. */ folio = pfn_folio(kpfn); @@ -1070,7 +1070,7 @@ static inline void folio_set_stable_node(struct folio *folio, struct ksm_stable_node *stable_node) { VM_WARN_ON_FOLIO(folio_test_anon(folio) && PageAnonExclusive(&folio->page), folio); - folio->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); + folio->mapping = (void *)((unsigned long)stable_node | FOLIO_MAPPING_KSM); } #ifdef CONFIG_SYSFS diff --git a/mm/rmap.c b/mm/rmap.c index 34311f654d0c2..de14fb6963c24 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -503,12 +503,12 @@ struct anon_vma *folio_get_anon_vma(const struct folio *folio) rcu_read_lock(); anon_mapping = (unsigned long)READ_ONCE(folio->mapping); - if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + if ((anon_mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON) goto out; if (!folio_mapped(folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON); + anon_vma = (struct anon_vma *) (anon_mapping - FOLIO_MAPPING_ANON); if (!atomic_inc_not_zero(&anon_vma->refcount)) { anon_vma = NULL; goto out; @@ -550,12 +550,12 @@ struct anon_vma *folio_lock_anon_vma_read(const struct folio *folio, retry: rcu_read_lock(); anon_mapping = (unsigned long)READ_ONCE(folio->mapping); - if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + if ((anon_mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON) goto out; if (!folio_mapped(folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON); + anon_vma = (struct anon_vma *) (anon_mapping - FOLIO_MAPPING_ANON); root_anon_vma = READ_ONCE(anon_vma->root); if (down_read_trylock(&root_anon_vma->rwsem)) { /* @@ -1334,9 +1334,9 @@ void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma) VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_VMA(!anon_vma, vma); - anon_vma += PAGE_MAPPING_ANON; + anon_vma += FOLIO_MAPPING_ANON; /* - * Ensure that anon_vma and the PAGE_MAPPING_ANON bit are written + * Ensure that anon_vma and the FOLIO_MAPPING_ANON bit are written * simultaneously, so a concurrent reader (eg folio_referenced()'s * folio_test_anon()) will not see one without the other. */ @@ -1367,10 +1367,10 @@ static void __folio_set_anon(struct folio *folio, struct vm_area_struct *vma, /* * page_idle does a lockless/optimistic rmap scan on folio->mapping. * Make sure the compiler doesn't split the stores of anon_vma and - * the PAGE_MAPPING_ANON type identifier, otherwise the rmap code + * the FOLIO_MAPPING_ANON type identifier, otherwise the rmap code * could mistake the mapping for a struct address_space and crash. */ - anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; + anon_vma = (void *) anon_vma + FOLIO_MAPPING_ANON; WRITE_ONCE(folio->mapping, (struct address_space *) anon_vma); folio->index = linear_page_index(vma, address); } diff --git a/mm/util.c b/mm/util.c index 0b270c43d7d12..20bbfe4ce1b8b 100644 --- a/mm/util.c +++ b/mm/util.c @@ -670,9 +670,9 @@ struct anon_vma *folio_anon_vma(const struct folio *folio) { unsigned long mapping = (unsigned long)folio->mapping; - if ((mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + if ((mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON) return NULL; - return (void *)(mapping - PAGE_MAPPING_ANON); + return (void *)(mapping - FOLIO_MAPPING_ANON); } /** @@ -699,7 +699,7 @@ struct address_space *folio_mapping(struct folio *folio) return swap_address_space(folio->swap); mapping = folio->mapping; - if ((unsigned long)mapping & PAGE_MAPPING_FLAGS) + if ((unsigned long)mapping & FOLIO_MAPPING_FLAGS) return NULL; return mapping; -- 2.49.0