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 77C04C54E58 for ; Tue, 12 Mar 2024 09:42:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99A2B8D002C; Tue, 12 Mar 2024 05:41:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94EB98D000D; Tue, 12 Mar 2024 05:41:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C4DB8D002C; Tue, 12 Mar 2024 05:41:58 -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 612AD8D000D for ; Tue, 12 Mar 2024 05:41:58 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 403DD406A4 for ; Tue, 12 Mar 2024 09:41:58 +0000 (UTC) X-FDA: 81887895516.20.1DA7BD1 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by imf21.hostedemail.com (Postfix) with ESMTP id 933E01C0008 for ; Tue, 12 Mar 2024 09:41:56 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="R2H/L3Nu"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf21.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710236516; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9QtTxRX/inj0OtKTHCIe6FPb0V6jffrKP/nT087XKzU=; b=dVp6DDowZ885U/Uelv+LkEFtwd5ovT1Th0zY4KyPl01SDrX7wyt4CaRVrklBYOkxthfUAY oFprcWO6Cfjjibb0whG/41x03VmebUVvbAqClzVlz11T0olComGovvO7J0uRNQLLjMS2NR qIKVQpQGGu5Yr/PMBjSJSKxA64BaKFo= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="R2H/L3Nu"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf21.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710236516; a=rsa-sha256; cv=none; b=6zOlI5WXFjIE3/96kL6trQAFm8PB8o0mzJCmigsmDRfpkYDmp0RA40VuvkZWmY7S37HZRu I2FltypLLa34RlwwbPZJxtlk362XtpalAReN/h102CvBlg0N6ME0S9qzEZnI5diIuBnR9S DNWpd4Cp90WpOh34j0EidBhStzHVzA4= Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a44665605f3so743106466b.2 for ; Tue, 12 Mar 2024 02:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1710236515; x=1710841315; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9QtTxRX/inj0OtKTHCIe6FPb0V6jffrKP/nT087XKzU=; b=R2H/L3NuHziOMe7Y5ghqTy/LinMpZzikbVNoDXHD7M8CQiSeDiM2FO6fRnzZ73HStS u8VMy8mm5JucumgCMhAPt29VA7lT+U3Tw1lDhC+KFHr1/WDjObGWQELXPhcq5CTowcpt 2kTEz+0gFk3UKcAbKqkhxtI8gxoyVH3+sLlv+ZzTNaWxFhv2ykfx7SLr5TpyLWNf9eZW 8J5wVqbH38huIy1BtulpUItwOr/uOvVngjN2pKPKW9Ezeu5mlezuzO54nUpzyZpjE+4S UL+hZ0pwtchqGLBJFCTNXQfaMsmggQjxyw55NQzBhv+1V69qvHocak7EmyE5QpVndrel w+OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710236515; x=1710841315; 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=9QtTxRX/inj0OtKTHCIe6FPb0V6jffrKP/nT087XKzU=; b=BOgHY/wGCt+JHOAOk8hgh0Xeh38kSm5O0yUTsz0BbOVGd2kfv39gfEDLT5pPm283H4 6Mr9LKIBkhbxA0PIw7tf58AWXOjx4BvUaBNEB934DkozeBMUcBNooQwxeRfTHgxnK8S2 GYq7V5tQJ6Mip9/RYtoMs1FrMiMNQKiiEynFXGHhhTdqhN8iwikQhFXrKxo5aX65p09q 1BGpH/6eLMW/WVs0GOrwPaNe3XCkmI1C+Q70BDg8M99YbQCGCrumsFE7tjI9S6wTZsfr xxSbdCxBaQNnaC7B064Kvv8H4iiPzHEox0CeJaNoyWxYiCkG7TpTjDHcv6DDFrv9bKWr AJGQ== X-Forwarded-Encrypted: i=1; AJvYcCWU+vYq9jey/NFhTWl6K9zA4f2IAEBDBAc69/3zYS3eTq5duacsj/Essp2gh2ObrR2U8Xi1qieWOMnSAJfe0u2CiYQ= X-Gm-Message-State: AOJu0YxPpsr5W1l8YZ+Nm5/75vZyHXqAB+1fSwDmfJotRRYYvXmsbKiz FshX9Ez6FkRK2Kqqe/YbBI58J+KcgUn9a6CpELKEghYhzUh/eUOlCNaEE1YBV1oJoalLOOkOSyM Y X-Google-Smtp-Source: AGHT+IFns2Ypn2XVsNVNAKrCcBt1TN2yH+bK3v2AhDeQNnfgdKRGlRgshyozXFibXBgkrU0IXHzkGg== X-Received: by 2002:a17:906:234a:b0:a45:cdb2:b6db with SMTP id m10-20020a170906234a00b00a45cdb2b6dbmr5768531eja.46.1710236515272; Tue, 12 Mar 2024 02:41:55 -0700 (PDT) Received: from raven.blarg.de (p200300dc6f010900023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f01:900:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id jw22-20020a170906e95600b00a4623030893sm2091961ejb.126.2024.03.12.02.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 02:41:54 -0700 (PDT) From: Max Kellermann To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, sfr@canb.auug.org.au, Max Kellermann Subject: [PATCH v4 06/15] linux/mm.h: move page_address() and others to mm/page_address.h Date: Tue, 12 Mar 2024 10:41:24 +0100 Message-Id: <20240312094133.2084996-7-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312094133.2084996-1-max.kellermann@ionos.com> References: <20240312094133.2084996-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 933E01C0008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 6u1grjmaexo34r3qdgofp5p9f3mhp63u X-HE-Tag: 1710236516-884279 X-HE-Meta: U2FsdGVkX18HVmVO3nGF45xxVpmBVXGciITDS3/ye6u9tRolOjchdv85TP30LCUTPw1Vc2g/6k9C9cO6f2YzKD7q5LCb8Jre182x1XUwCAHGrHUE1ngZkvA/2J2pakD4BvMkFr04KGLTfqjEnbb1RT3k6hJTssYOcLDEmrWOPNPMMeZCPRTKiBXV57AkMfNa49zCTDd0YvQaKhV3OaRsHCg0FDiEW5SMu2S4VIWi/NmQijO9JW3PPbdliAoEiQu35R8WLfTUHeUzLT28i57jhvYDtJUygUE7C71V+5TWWev1FZb1OyZHnjOPC//ATbIrgsTzMtx5nhiO4aL+m4tGe73cEtvMqGdhHsO2h+4Dfminz7UiA312lCPC2Q5oc1MGPR/+gd0XdTVNjXIoWGGr6DiYo+eJD6oeWdh5tME4ot2bAi/UyvYg5p+jzGKpqyyz3qdmPvHyzS0mZJUPi30bUtr5DyRGC7v8CkGOhEZ/zXQ81nxwIT50JEWjp9LnvScQNi2gon2XmE/C+9iuoVob204HJSEofVQ7lGVo4fVvA0HlC4gGLXO32AFbb/W/HfevGhY0GvSHAB4o2MfzQNCvCn6XFum0i1dKpYona7wrj+jN3lbpaKeWrKjuCFO6VBHnQOZ5GlzBJQLNwX+NRF1oa9CDHIvpTZoZZ72D2JsrWV8SuevLj12knBg5lspDQSV9UjKxI5ORM7md1aJeCVIKy5jRwrGz+mpHObaPlLOn4oOyP17zVWO/EiERz33kCmCCtW5dXC0K6SqAwqeSVgzAIltEwzLsKQnhq6w2qIscQrUAa1naibQvKUBAHhVE0eJE/tVpu1tb4IvS9ZdKNFyKZbbaD1QXALa4D1cAMRqG02lZMixu5PVtMa4wLHyzvR31J2qHA/PQfK0pzrU+rTqQugbajq5+2K9x9s7G1HeDc+uEE24qgGzPKLRoU1AvoPfXoKo5FvE+KaGgSw2vJYC 3oov4lpB NhCaBoWr3doNzqUKoOZk73eJgaAE7JrcOUWWYrAQ1KcnyJW3koK18QwFecKUbYfAY1z8SJK133J+LENA2UTJtX96Apu6v+mdj8P2KjJOIqxD7uVHRD506TvJ8OHz7IE9F9KnhaSQnRDS08Mv1aQUPRR//wlLUSSKezQlu 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: Prepare to reduce dependencies on linux/mm.h. page_address() is used by the following popular headers: - linux/bio.h - linux/bvec.h - linux/highmem.h - linux/scatterlist.h - linux/skbuff.h Moving it to a separate lean header will allow us to avoid the dependency on linux/mm.h. Signed-off-by: Max Kellermann --- include/linux/mm.h | 56 +------------------------- include/linux/mm/page_address.h | 71 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 55 deletions(-) create mode 100644 include/linux/mm/page_address.h diff --git a/include/linux/mm.h b/include/linux/mm.h index 79c1f924d4b5..713cedc03b88 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2,7 +2,7 @@ #ifndef _LINUX_MM_H #define _LINUX_MM_H -#include +#include #include #include #include @@ -104,10 +104,6 @@ extern int mmap_rnd_compat_bits __read_mostly; #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0)) #endif -#ifndef page_to_virt -#define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x))) -#endif - #ifndef lm_alias #define lm_alias(x) __va(__pa_symbol(x)) #endif @@ -211,14 +207,6 @@ int overcommit_kbytes_handler(struct ctl_table *, int, void *, size_t *, int overcommit_policy_handler(struct ctl_table *, int, void *, size_t *, loff_t *); -#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) -#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) -#define folio_page_idx(folio, p) (page_to_pfn(p) - folio_pfn(folio)) -#else -#define nth_page(page,n) ((page) + (n)) -#define folio_page_idx(folio, p) ((p) - &(folio)->page) -#endif - /* to align the pointer to the (next) page boundary */ #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) @@ -2137,44 +2125,6 @@ static inline int arch_make_folio_accessible(struct folio *folio) */ #include -static __always_inline void *lowmem_page_address(const struct page *page) -{ - return page_to_virt(page); -} - -#if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL) -#define HASHED_PAGE_VIRTUAL -#endif - -#if defined(WANT_PAGE_VIRTUAL) -static inline void *page_address(const struct page *page) -{ - return page->virtual; -} -static inline void set_page_address(struct page *page, void *address) -{ - page->virtual = address; -} -#define page_address_init() do { } while(0) -#endif - -#if defined(HASHED_PAGE_VIRTUAL) -void *page_address(const struct page *page); -void set_page_address(struct page *page, void *virtual); -void page_address_init(void); -#endif - -#if !defined(HASHED_PAGE_VIRTUAL) && !defined(WANT_PAGE_VIRTUAL) -#define page_address(page) lowmem_page_address(page) -#define set_page_address(page, address) do { } while(0) -#define page_address_init() do { } while(0) -#endif - -static inline void *folio_address(const struct folio *folio) -{ - return page_address(&folio->page); -} - extern pgoff_t __page_file_index(struct page *page); /* @@ -2237,10 +2187,6 @@ static inline void clear_page_pfmemalloc(struct page *page) */ extern void pagefault_out_of_memory(void); -#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) -#define offset_in_thp(page, p) ((unsigned long)(p) & (thp_size(page) - 1)) -#define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) - /* * Parameter block passed down to zap_pte_range in exceptional cases. */ diff --git a/include/linux/mm/page_address.h b/include/linux/mm/page_address.h new file mode 100644 index 000000000000..e1aaacc5003f --- /dev/null +++ b/include/linux/mm/page_address.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_PAGE_ADDRESS_H +#define _LINUX_MM_PAGE_ADDRESS_H + +#include // for struct page +#include // needed by the page_to_virt() macro on some architectures (e.g. arm64) +#include // for PAGE_MASK, page_to_virt() + +#if defined(CONFIG_FLATMEM) +#include // for memmap (used by __pfn_to_page()) +#elif defined(CONFIG_SPARSEMEM_VMEMMAP) +#include // for vmemmap (used by __pfn_to_page()) +#elif defined(CONFIG_SPARSEMEM) +#include // for page_to_section() (used by __page_to_pfn()) +#endif + +#ifndef page_to_virt +#define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x))) +#endif + +#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) +#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) +#define folio_page_idx(folio, p) (page_to_pfn(p) - folio_pfn(folio)) +#else +#define nth_page(page,n) ((page) + (n)) +#define folio_page_idx(folio, p) ((p) - &(folio)->page) +#endif + +static __always_inline void *lowmem_page_address(const struct page *page) +{ + return page_to_virt(page); +} + +#if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL) +#define HASHED_PAGE_VIRTUAL +#endif + +#if defined(WANT_PAGE_VIRTUAL) +static inline void *page_address(const struct page *page) +{ + return page->virtual; +} +static inline void set_page_address(struct page *page, void *address) +{ + page->virtual = address; +} +#define page_address_init() do { } while(0) +#endif + +#if defined(HASHED_PAGE_VIRTUAL) +void *page_address(const struct page *page); +void set_page_address(struct page *page, void *virtual); +void page_address_init(void); +#endif + +#if !defined(HASHED_PAGE_VIRTUAL) && !defined(WANT_PAGE_VIRTUAL) +#define page_address(page) lowmem_page_address(page) +#define set_page_address(page, address) do { } while(0) +#define page_address_init() do { } while(0) +#endif + +static inline void *folio_address(const struct folio *folio) +{ + return page_address(&folio->page); +} + +#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) +#define offset_in_thp(page, p) ((unsigned long)(p) & (thp_size(page) - 1)) +#define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) + +#endif /* _LINUX_MM_PAGE_ADDRESS_H */ -- 2.39.2