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 CA9E9C54E58 for ; Tue, 12 Mar 2024 09:42:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B01D8D002B; Tue, 12 Mar 2024 05:41:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 838B58D000D; Tue, 12 Mar 2024 05:41:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D7AC8D002B; Tue, 12 Mar 2024 05:41:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 54B7C8D000D for ; Tue, 12 Mar 2024 05:41:57 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2874EC125B for ; Tue, 12 Mar 2024 09:41:57 +0000 (UTC) X-FDA: 81887895474.26.F3E476A Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by imf07.hostedemail.com (Postfix) with ESMTP id 67AD640016 for ; Tue, 12 Mar 2024 09:41:55 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="A+Y9T/h/"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf07.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710236515; a=rsa-sha256; cv=none; b=SDRCYxzTqaTdSG3t50xSMRuCX9Dd5AJza2cnsTV3iwZP6mGwEUeTF5uh+1t7OyT0NaqIKS +PZlf9SqdET1ax1XRJjD5HTQUCyBPIVoY4KzzjnzzTAIeNTRnUKczQxBcg/xy6NQ23zNGi pnBipUb1gOq0txOgMe1k2Jb3dknVIvs= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="A+Y9T/h/"; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf07.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.53 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=1710236515; 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=9wE2HsEwQuIKqCaqriShH9hKkj+cYk+gvkRx/+6+3to=; b=MpJjesIgtGfAkG1Uq5LU/zbXREYbmsGkW+dWM7X/Ll2uJ+Ih2GGqi+iA/yCF0bbKEO3und vZNjHwCQJS+EepRLpstiUJZbxp8JqsA7JGthf/xJIGZZhewSoczWPiDUA15SPdgj7E+Q/A rXqwfT01eZp20WyDaOHD4oDN2BkEUoE= Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a461e09ddddso252461266b.2 for ; Tue, 12 Mar 2024 02:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1710236514; x=1710841314; 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=9wE2HsEwQuIKqCaqriShH9hKkj+cYk+gvkRx/+6+3to=; b=A+Y9T/h/Zc2mKjyIuHynuh8VHAIjwUO+tQQmL+aBUXVzjd4ykbOxKp80Rh+GuLJjL5 J3m6/E1XfNPVL2rzqvowIXR/z+EPLE0Zf/E42YAdigRG00FZl2qvXaFUIlZksfE/LiYy uBm6WCzaxTYU1betPjefEwSbZqgBURlzB0cxXXH2ej3gN0TEe5/9sUGk+4MbrXiHp4y0 CWYApNC67Wm+JUOQXSu/gYP7vwjizHTfAnAw1kNIdC/6fkrebBbuRnvfXDmEZlN5pM75 vjBAe8k0ekMIiur87ILm/f/LVkTljtvN8uu5lnX1GP3/DqXedUanP9KTuyV6lPeExvUL 9uXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710236514; x=1710841314; 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=9wE2HsEwQuIKqCaqriShH9hKkj+cYk+gvkRx/+6+3to=; b=B5Hb8gaNdoT1VV92I96mll/EkMjVEIFNBvCIGRl8e8DA8BmZlY/syYHNBfU1xBYlyG wXt4iWHE5FqW1K+OzTwkKl1TqKcWCv6KzmoVseMzHh75wekfWnO+YSPRuONblBo1m0Bv NLlvZO07v7JwGP1e5vzruwLoEdAlJKSvRJls9HCCr0oPl6E37rbaiUqcDWBtB3cvN4HY CTEFrCJhMO3rNWB8/Xah/viNzo/PKLwE43pPl+oSmx0Kd3X7FMv1i4U2cwHMYyET4Lp9 jbzC0abfyi4pahkXFYf503pjlo1cokCCQTmtZtVk3fcHBkznFrNEcYuhz8NFAHEj9qgb fYqA== X-Forwarded-Encrypted: i=1; AJvYcCWVNydsawrNekFtKKEd1dB4KHVcB6/3mPkd0SjAqC/Wjsq83j8bfyiVQuzgD0c4XeZ8GB2yIpTyWpZ758mKHHukVCw= X-Gm-Message-State: AOJu0YwEr7cfghSB/Pbv0/Kx+QpCKnCbsBfBL6kA5Spxp/tygb64+SB7 XcyC2CDeeSZ56gPmIbavmSEdSp2WBaztCMPuKs74TeuW1r2wQtxfaFF1cf+hvCw= X-Google-Smtp-Source: AGHT+IHwESUJTLeXYVU6c5C17eRydF4PJMg9KLfv6dX8WUbheMpCuO1M61+d7bvgT7hUFtR7+f1vtQ== X-Received: by 2002:a17:906:3a9a:b0:a46:2751:1358 with SMTP id y26-20020a1709063a9a00b00a4627511358mr2898595ejd.62.1710236514117; Tue, 12 Mar 2024 02:41:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 02:41:52 -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 05/15] linux/mm.h: move section functions to mm/page_section.h Date: Tue, 12 Mar 2024 10:41:23 +0100 Message-Id: <20240312094133.2084996-6-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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 67AD640016 X-Stat-Signature: ptqh476jc47pkj7mquyp8qkgtgd145zj X-HE-Tag: 1710236515-579650 X-HE-Meta: U2FsdGVkX1+UcMFOH8dUff7/B8BLakhc6nekSGJdUudrL6owAw2k6Y8eaEQ7JyaeSc4OMXNn6N9X3DeHUS7jbvI3kUKo0xRntZchQOphhXTq+I7RoCTt3BLSvn86eKBgPRnRAhPDibsX7ShhGXQrxkO1U60rywZwhQ8w2SHjqPjujc8XHJNjA2GXHpvkZ3Ic3NRkJIU3jZDA2AnNTp9sBcDcWTFMDqOWdsmr3fNYULJ79HGQywo3d8rU61jD3dJ8DthaOJb/UWXp+XB5n5aU1wXAu0drIH+oTmgiB/J6+wvnjBwZtc67k6ECoPkC1xJAVMrJOKt6utED5Jz6UOzn0qjkfhhP88BLBEr1fLl3n9kHc208Ns1KBf52QrWtH/sc8yC8MtXA2gyNCPIgSWKyoV9/8BZohekDy5w0uMbaHtXGdY8p34ooOiUlgJX4Fw0MqamjD+chAlA+h4Y9yevB1hJvjm6EEyes0I047wmOWkWEFGRgfJOCTRjCF8Pf99LCyKNeziUF/4ctyfavkRIw5jkuMS9P+WV6rBQUwOtPyJo4IKQCa06NHtpl2CrHGbTLXKlPaPNnOQS1g12C5dwqaD2QDNK3eMaFwhUWySTNuSugKIwv7FHbuT37Yo9kUbVCxheB6w94/ljW5tmt+qGC4v58e61oOjmLg1Bvqj0j/0CqAZBMUOvKEQaIbYzxQicwgKXObHWLveP8D5fyXjT8DIwBQua6QI/Tv/t2FKq/d4d98aLdqAb3KlbhPbMnqZZPWxZ325J4VsyJReCd97HfBWDaQZxOtLkXbsERleSX9HnsxjWBKxIuydUHjV4wnZs82lHnZ4OTjmylU0gBXDCEglFUh/p6mAtz2MDH7ADe/uYOqzl7paCHPqPYrLO8+523kKzz/hVx4jCCSDcRBeUAdlM4oLUnWekTLxjSi5zWjdUkiZfurpMo9v9D7C71Ikht8A5H3XoQFNDn08Ub+Eu jEcw90l+ DUZ3TVgaHLoTMREaUCmwyZpsNr8irX0TAZXYG8Z+SPaMTN26ve65IIm+YkYVK5/gcAU9LvWOa9EqEbWmE8i/VmP2BZEnGxuo2crcr5iLMvrhJ30YyDbT7fNS+tDlL0hhuXrgYNyz0PGsgBCMxvpeOBtU2AaXo7PQvNlNV 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_to_section() is used by __page_to_pfn() (but asm-generic/memory_model.h does not include linux/mm.h). Thus, in order to be able to use anything that calls page_to_pfn(), linux/mm.h needs to be included. This would prevent us from moving page_address() to a separate header, because it calls lowmem_page_address() which in turn calls page_to_virt() and then page_to_pfn(). To prepare for this move, we move page_to_section() out of linux/mm.h into a separate lean header. Signed-off-by: Max Kellermann --- include/linux/mm.h | 18 +----------------- include/linux/mm/page_section.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 include/linux/mm/page_section.h diff --git a/include/linux/mm.h b/include/linux/mm.h index e140ee45f49c..79c1f924d4b5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3,6 +3,7 @@ #define _LINUX_MM_H #include +#include #include #include #include @@ -1637,10 +1638,6 @@ static inline bool is_nommu_shared_mapping(vm_flags_t flags) } #endif -#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) -#define SECTION_IN_PAGE_FLAGS -#endif - /* * The identification function is mainly used by the buddy allocator for * determining if two pages could be buddies. We are not really identifying @@ -1838,19 +1835,6 @@ static inline pg_data_t *folio_pgdat(const struct folio *folio) return page_pgdat(&folio->page); } -#ifdef SECTION_IN_PAGE_FLAGS -static inline void set_page_section(struct page *page, unsigned long section) -{ - page->flags &= ~(SECTIONS_MASK << SECTIONS_PGSHIFT); - page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT; -} - -static inline unsigned long page_to_section(const struct page *page) -{ - return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK; -} -#endif - /** * folio_pfn - Return the Page Frame Number of a folio. * @folio: The folio. diff --git a/include/linux/mm/page_section.h b/include/linux/mm/page_section.h new file mode 100644 index 000000000000..e4558c2691b8 --- /dev/null +++ b/include/linux/mm/page_section.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_PAGE_SECTION_H +#define _LINUX_MM_PAGE_SECTION_H + +#include // for struct page +#include // for SECTIONS_* + +#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) +#define SECTION_IN_PAGE_FLAGS + +static inline void set_page_section(struct page *page, unsigned long section) +{ + page->flags &= ~(SECTIONS_MASK << SECTIONS_PGSHIFT); + page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT; +} + +static inline unsigned long page_to_section(const struct page *page) +{ + return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK; +} +#endif + +#endif /* _LINUX_MM_PAGE_SECTION_H */ -- 2.39.2