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 63B0AC4345F for ; Tue, 30 Apr 2024 15:30:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EBBA6B009C; Tue, 30 Apr 2024 11:29:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44CC16B009D; 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 29FAC6B009E; Tue, 30 Apr 2024 11:29:55 -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 007AB6B009C for ; Tue, 30 Apr 2024 11:29:54 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AB4A5C0412 for ; Tue, 30 Apr 2024 15:29:54 +0000 (UTC) X-FDA: 82066583508.22.4807333 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by imf01.hostedemail.com (Postfix) with ESMTP id BB6744001D for ; Tue, 30 Apr 2024 15:29:52 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=dMLvFo6Z; spf=pass (imf01.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com; dmarc=pass (policy=quarantine) header.from=ionos.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714490992; 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=lYyjC8Kfa0Af7gs2LI27MUvkVyN60Xn76v1gWBOZ170=; b=L8owxtiRQIAMWMEQJ6Foi58WRO9ndfBHCuLWcoS0xHJmtvsJRoiKtkHKCjefQLU8ElSQ1I sC0uDtlWaSpu/LnzO2SVboU2Ddh+ClNm+WuFCG6sOjIAnLs2sSqr+HmQ9OEr2WCS3TolTs 7qGjKji9/e1UP4agLZH09NRZaxIY8LU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714490992; a=rsa-sha256; cv=none; b=6mqnJl3uxCeieEI8mL41Tj+tNksQXIvhYl5iOYDRO7IoEEDxf4q9f39pQmRib8Entoyq6E c5P+GtHWnwy4DV2T5B+DpHnYXqOBdBoNON2DO4LlaaCI9PwHDYeoZpd22T6qLQIUDf1MDA GcJ/vM0DaRXIBM914j3Neo2Oh21/PFU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=dMLvFo6Z; spf=pass (imf01.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com; dmarc=pass (policy=quarantine) header.from=ionos.com Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-518a56cdbcfso9350915e87.2 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=1714490991; x=1715095791; 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=lYyjC8Kfa0Af7gs2LI27MUvkVyN60Xn76v1gWBOZ170=; b=dMLvFo6ZLf+O2ls5yzY4amlF5SO7B+xgRRBcJJHnEMoBtiKSzABtl6SViPcH0RYjtY /yu6VzXhe2+Yqm41RJ9D9AaCLkpmXpcQ38QCxqGvl9KtP6DxsokwzyJAJyN3zaeeIPct 36b8aeh/e2uiwfBSwWnyll5f/ww0KFmPHy7KjEJzhHNqL7wIu8AVB/bcB7r4YmpRodWk zEJ2Vm4dEzLemT6afjT9A1Fix7qQ63cv9bjCnqX9+/UbBUyUzSYxsN1ESpYmGM8l1hlT dSp3lQ9bYZqj/zxGdmjVWjkzFF/aATQrqldLRptaK71Mns11PoTDj+9IPhUxgRfCvjOW e9hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714490991; x=1715095791; 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=lYyjC8Kfa0Af7gs2LI27MUvkVyN60Xn76v1gWBOZ170=; b=psQy/IgGFJDy9biATqJ8wlVO6UnXxlSDrcnEEy9OHR8Oq5O8Dqvfp0Vj28uAjNY5ex v7ScEzgmUUAncZMpe19oi5iFMiN5BqvshyYPRIkKEFPr2uagas02sl8eUF9VUWbySkmU 57mU/TAgFoc9zo5+zjdotCwVLqLxo3wyHVr/YkhCPfwvTtNep1oRkAeXD7LmAnw2Rfaz tzPWfoTwSbH0Gy7KzYdRIraLx8Ajh8qCLVtGp4+b/YxZIz2YsO671AagHVLPNoSzdYCJ oW2A48ymWbikWwVFiZO42qPw5fGD+mm2aNhOkb3ezah2G8la6Iir1uOb+zH+o2DnxnHw fhag== X-Forwarded-Encrypted: i=1; AJvYcCWLe7Wo2TmUMQEIAG4zyU1xbtKnvkdFYvh1d7oV07H7PQIiuS7hdmsK32ssqjzwrvyBL5LP+Upin/HfSC+D3y/ySRg= X-Gm-Message-State: AOJu0YzUfqExk9O+PRBd8mBUdmDCrv7Nxji5hmNKd+SzQcXfOUEKgET+ XgcYgVL/GpJr0s454ZARVhdZH704j+ILlkTXI8BXKMvMVevDN8NwzHQxGn5UcZE= X-Google-Smtp-Source: AGHT+IEZqckD1nkWxXmgmQ79xLtAR4rFM2Cwj6VP4cUWGFV/ZsSYMaJAIGHngkRwAyWNoCYsL7VrEw== X-Received: by 2002:ac2:4a81:0:b0:51c:3f4c:ef6c with SMTP id l1-20020ac24a81000000b0051c3f4cef6cmr11075201lfp.40.1714490990784; Tue, 30 Apr 2024 08:29:50 -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:50 -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 05/15] linux/mm.h: move section functions to mm/page_section.h Date: Tue, 30 Apr 2024 17:29:21 +0200 Message-Id: <20240430152931.1137975-6-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-Stat-Signature: nji41garb7djisou5ifs3s59yfbcw75y X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: BB6744001D X-HE-Tag: 1714490992-29157 X-HE-Meta: U2FsdGVkX1+L7+AIei0uIFicFBmvUhOGhs2T5g5SGgMN4E6CE8+gB/IXNXkX268Te/Zuk/SGvJXXnuV4z3LgUFw6iP5ZtRgEUyChYHQAEnFEEKt2KlcUysVn5WN18xLUQ7FpXXbcd8xFjsgSvXqeKCs8mI0XPMjGs8beppIbDzOrAhe33pNGudF4+ClURyP5Yw15ducrmbfJjHl7CD++LeWHXXiR45i3JqnZhIOLZ94842ZNnhkcSpf6/TH8euzZYlq4obYcRL4LWE5Mbg59/O1OePas7S53qUq1kc7Ng5mtRJqbywhQO6KHDvzZIYWjpN/v3/q3PxkQK20sNpLTXtZtEZRIX6EISLEkbqGRCFxD0smWV/qAk0htXhkKU3lIkE7U60wwGt9cwstWrsUKZSslLpY4bZQOz7gmVMNpRhMpTynhiemnMDPLgVJYk/VEpXA9rgiMEqEH7rrsDWXWr95ee72+5u0cnh4glSUrNqi69SJBVe8IF2DiPsKFisvuodWcmrZzsfnYA4ZFBYi4bEeJvUpTgy5RM+YwDUp+XJuGdnxuzqdd9e8BvHH3o/GMUq4FB8jLEIuDFAxtHLCVCehrdrMxB1H8XB+auesFe1Mmpe4sslbkLCS9SV/dB9JNpfoZsx4sjcxxgvHLoiEQTRSQw7+YR097BIvHy7cenqqP+cdGPguHkgkAnPD0zsDP7gFp1LqAu2xuxL9KG0RnUPbfXAgwGBJJPy71Hdhyjq0qaIlHy7l1Kze1qqe1vivCGWod4JX2YynSIOI0D1FN8I3/7PtXArUgsP2JtsTFfPBsHmpJp5mFbsZGHA2G2DMtJiQlCu0LlTlYY2BjY3ReowiluP40+sk6dtxODdBqFf0jXwl3k/jL1ygRItdaUQ0yoZ856H/uE7aAKAzPL1+aHvJ4t3na695Btvn0tHkz3jSpc9/M6oDZXCnH+7k2eoXgUrWraTsrKqFu3RgrA2L Fyjg+dn2 1o0hUnSB3NBTAhyFnQbnzMIHXgonzU4l0NymQkhowJ444aR0lAwBUctrhYUJbD998ufHLFWPDRoGHK098b9o4O7Pc+Ero7FHSd2ItEAiBl9E36IqK7SYoqFgsQ1GgwUVksME2FzjivuWb55bWEJ9AV6TlbhjQ+dXgVMvIqM+hfF+BUY9ShVWxUCgTSbqEmlQT/kvNhjQNYoPqG3yiM9g+pqcWJtGyr/E6b5Ww74Hkvc4D3Jorp/MYo280swtnCkZEU6POTdtX8gmLvakKRiwewUsZnYPU+4j3bqrIQYyhcfFTQZVcBdmcfEoC6VsVp7rwxbHWXJLt8WlhyCq1c7kjqJIAVjn3cImXa9jD/VdKtJIwNBTxo5ixTGkxUqMf0l6tys1fN1it8q5MgRyqmPn4HznURyE3KiePeQf8Phpz2C2iETo= 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 4a176690ab95..84013f24a6a7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3,6 +3,7 @@ #define _LINUX_MM_H #include +#include #include #include #include @@ -1639,10 +1640,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 @@ -1840,19 +1837,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