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 33835C4345F for ; Tue, 30 Apr 2024 15:30:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB1906B009D; Tue, 30 Apr 2024 11:29:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E114A6B009E; Tue, 30 Apr 2024 11:29:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C15226B009F; Tue, 30 Apr 2024 11:29:55 -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 9C4F06B009D for ; Tue, 30 Apr 2024 11:29:55 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4BD65A1559 for ; Tue, 30 Apr 2024 15:29:55 +0000 (UTC) X-FDA: 82066583550.03.9E4BF84 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by imf03.hostedemail.com (Postfix) with ESMTP id 5C6D520029 for ; Tue, 30 Apr 2024 15:29:53 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=fl8oU24w; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf03.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.174 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=1714490993; 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=clS/QN9E/f3CIYj6dWbs31v4GElV2ZW9RMM74gwG6WM=; b=GWu2Fww7w0gkTEdFnpXcLZcgUYYeYsUvv1vK9hugnVmg6W3qnj1EaKqR/N6GqgWyt/zDIE ZJ8VJxm3QsQdVrHbmT/SarX0p46Y4REbS2hTFa+FVlQ+K8NaXJRQ3+DGJ8EAcoA3NrNtmE ru2nPdNGCjBlt/vSARKuZQNZ1L0ucbA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=fl8oU24w; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf03.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.174 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714490993; a=rsa-sha256; cv=none; b=SR+5+qcZN5OiXNb71Pyl5jrYp2yuA0DVjAzohpZAAMcQMcMQNnNwEhf3Br0g1O12ul1Lgp m9oPTc64qOXgDVF4BsoDUyw8PFhoR62Xj71ESv4CH93xZ6xouBAJUoYlWBYf67n4PR0ROP cAJgybSdHQTnJ5K9/Myegm5b4gvcMYg= Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2def8e58471so92595291fa.0 for ; Tue, 30 Apr 2024 08:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1714490992; x=1715095792; 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=clS/QN9E/f3CIYj6dWbs31v4GElV2ZW9RMM74gwG6WM=; b=fl8oU24w3l6xkePEkbYPiiJ4631ViQW21Guqj4aCfMkPXgOnAKs4Y2wedY5hdJZ8Ru uer0nQZfKaIucrfuMX0zqhdmlKP7Jydxi9vx8aXN191vSiK7zxLD0XG0Kt0jExdYwDml 8CJt302G619jq77tEo8Mlg4MkRXJf5Iere3coStFW5PfFNd9hc1OUiobVw5wD+TArmNy uu2kqCMl3tShYEjOCjSu/yMwpHiSbmd94qyiiVNdGcSQ5ExW3NjoMUfKPfn340Yv0CaA hhDbIZhISbPFsS6yu/yCe9gPivTTrDoYPprbp1NRs4NgDy+Md9j1+wUyRxzt8vapLBB1 Plew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714490992; x=1715095792; 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=clS/QN9E/f3CIYj6dWbs31v4GElV2ZW9RMM74gwG6WM=; b=KnNaVjhpveoWi6Ii0ZKvqqz1WMiRCxUECZei32IX2a+MKwDSsbk38qpJ5kyr45gQUf XMEy2GAoKHrdWV/fSiydguajL8mbLZf1fdw4T0kGzAYCItEW8A14MyYd4OEqV+oIKmTO UgYUAkNG4TtB/R5GCUS1cRnDZplo/gDl+7bL8RUy0fEAX0fq42FxmSlv3c4aCXWvFxJf SE3LAUoD2AihitN5yr6YuLi0gb7R6+NZ+xgy7KAieeq+/oDkr9A51050xlSeRagp4dQ6 8pIUdUb31Ey7W6wNdqblBAfEM4YYlL2I6hs/dxpINyYhOzOLm2mqkIN0wx+qoVhYOdNL s1lg== X-Forwarded-Encrypted: i=1; AJvYcCUioz/zPOArLY0npajV6OAZx/kK4vx51Jgt6jyP/V8uCou+7GhwHJgyZDvg6qZHVQxIjl6g+yJ6jfg4iVPhI7AtpSw= X-Gm-Message-State: AOJu0Yw1Zy110toYCgDkezxGogCR1j6L2DnfeYQXaLmx1w9VRLuU/Rfc iyL9hm1lThlGFkooesK4kWLBL+/b645jcAScDtbHrUzFzjwyKKwde3B+binnDgWCEms2/920I9Z H X-Google-Smtp-Source: AGHT+IGfQ5JNalek9HZZ3ibOKrJ4dtXixxHgZ4g+rJgs4EkRdUsgSMPxDzg87sbWnCFbN8mWikNP9g== X-Received: by 2002:a2e:9c06:0:b0:2df:c395:4482 with SMTP id s6-20020a2e9c06000000b002dfc3954482mr34300lji.32.1714490991730; Tue, 30 Apr 2024 08:29:51 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f06e100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f06:e100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id a10-20020a1709066d4a00b00a52567ca1b6sm15278137ejt.94.2024.04.30.08.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 08:29:51 -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, david@redhat.com.au, Max Kellermann Subject: [PATCH v5 06/15] linux/mm.h: move page_address() and others to mm/page_address.h Date: Tue, 30 Apr 2024 17:29:22 +0200 Message-Id: <20240430152931.1137975-7-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240430152931.1137975-1-max.kellermann@ionos.com> References: <20240430152931.1137975-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5C6D520029 X-Stat-Signature: sjtcpwxwkqzy3k8sm6aqgghjk76cz9mr X-HE-Tag: 1714490993-553421 X-HE-Meta: U2FsdGVkX1/kCi+UaxvwvZNGoMD+YAZZLTUmLM9cv8+zcl8RD1qpn1ai9gUQlLZbI1CQ9znpHJTu8U148n1RIR20M2WYd9e5Inx7DdkRdfZNWN4Gg+j7zxAzKlbYbID7BtuZRgXG4cU/tlzHv6lSbUDRv6aakCBUexEgtfBRiuyeL6BhS9/Y/jesQGTP353oDrwI8g/fqgWt43qZ3zkIxp85ngRRCha3f78t1k/53fexCm4c3/Awg6tPWahn4GfrU+n+zCnNkGsBrLuvqP/by071rKkMa+iGeAYlTYIe2ntwl+ZdwRyPaekAnnfjXhVuo11Jsj9WhKrX+a2Q7RKb3oQ6YWCt58AB/hDdS071NN48Qo7ognW8kvmVSorWD1bNXZJcb+JBNwM9GZTWk0lrvDb09z7eKIlljoIlucrNvzQ0URT+lQ7Bp2ttTfcoENB2u3WVMZGHWcsUIZgG+jMpYeu/NCj6ACIeYPz7zsQphSmO3ZYOW9/Zkvw3qCR6LohwvzGjyEn2Gchf1SitSBT6bMtqvFuV2L+yz4dlXDcJC0ZXmeeoSQSzJuX4VtqGIPM2WaW41GcHV1oH6tk8rBC5hDmoSYqRVxHdS9+Af6cuS9KxVgA5jup2OVl9nOuN+w0RJt7HaNX9zUomoghsi8KkXbqCFiHtvDYt6+gF1QQmVlTfVdMsNemF94Ahmjozl8XuAiiLw4khtRbs3ryiw5eyHJ2fuL6p6owjbDg5vaYdqDyEHNFW9c35pUgPDA8oEmhhzUoYKG3c1yKA/9niypvseahG7wz1EXU/VfMqFbgOalxa4+7Mq9RGMM5VaAORpp756IXPN0SaO0gi40U7xj61cY4MZggBjrrQ9Vr79lzscRjBJrUkTdIlEN46wFUPGCylpUskBsq+p54xJ4ZfP1MpA8PFf8TumQAPM4A7ssibFqpHUssbR8FMuBiatk2AuR2qgYMrt5Xfo7ivGvey3rH qNBt7NPo H+ibWEOtWPsGxl/x5r3rpUkFDBbVUXoi8Wk8vssUc7t9Q0rwbn6tVUHM+/FnIPEMpUjIJBHDoTaTKTnYn986OVhBrzPOV7y2C7CBlo5tBnQP4MIEEXiWvt6SuKxodYPP2F3N0i4GpLFzy8MLOFXlbI4X1Zb9HlaMEgFwJpeiYL3yDDKDXWkGA0ugDPknpoeESpXjE/VPCQi4gWdN5WwXU5OgGoMFV4hShy8LEinfucNlyCv0Y9H77bhnog7SKnDmqdW7In27ZhsA6J68FkwPvdDa5dxwJawywcQlsbeuQ/nJ/hUJd9bHUjGsjx13TexOMmq+lUJd2IEUeCr2A6ThUVAMLLw5rX0P/v2XhuhfVOxh1ZPh2YQGDEskDjumuhopMa0N083Qrie7mswMFpmE4Bc5OrXwW70j4N3GYMZCl5WjbxmI= 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 84013f24a6a7..0dea734194aa 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 @@ -105,10 +105,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 @@ -212,14 +208,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) @@ -2182,44 +2170,6 @@ static inline int arch_make_folio_accessible(struct folio *folio) */ #include -#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 - -static __always_inline void *lowmem_page_address(const struct page *page) -{ - return page_to_virt(page); -} - -#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); /* @@ -2282,10 +2232,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..630fc4e2be95 --- /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 + +#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 + +static __always_inline void *lowmem_page_address(const struct page *page) +{ + return page_to_virt(page); +} + +#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