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 E01BBC48BF8 for ; Thu, 22 Feb 2024 11:51:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F69B6B0078; Thu, 22 Feb 2024 06:51:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 74CC36B007B; Thu, 22 Feb 2024 06:51:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C6266B007E; Thu, 22 Feb 2024 06:51:09 -0500 (EST) 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 484BA6B0078 for ; Thu, 22 Feb 2024 06:51:09 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 18F0980D93 for ; Thu, 22 Feb 2024 11:51:09 +0000 (UTC) X-FDA: 81819273858.16.5723259 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by imf24.hostedemail.com (Postfix) with ESMTP id 380BE180017 for ; Thu, 22 Feb 2024 11:51:06 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=OQNAvzJ+; spf=pass (imf24.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.54 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=1708602667; 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=bU66tnpYofC3HczPR5LqCx53IAlSBOajb8Iggei03v8=; b=8iYR5s/1wb8KrLvyOuNMMMBA1hOksMs7NvdHKq77k9RzcN2HwR0FbCZxMsO3qkcBYTbqwd JE6YEsxSI4C17foD8cyGdtuE2KabSj1PqQh+zCjldvhnKMwgrIZuMKEnaiz+5giWAZmbS9 j1psghqS3h10qW9PaKsWEZlUveJTdrM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=OQNAvzJ+; spf=pass (imf24.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com; dmarc=pass (policy=quarantine) header.from=ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708602667; a=rsa-sha256; cv=none; b=V4KnlogRZ79qfBkgs9Ab9baUGzc1tStgGTCCd/0tFuWaHvs/S8dBLCfemzPIUTVcVav0e5 6Top3TqEmOb0gWfKDrOanp+C0+qhOMvXGoHPOsmEUVQaT8mN3MIKLGiyzX4IKspviZaTXb yjqb6lCb14+GBgFj90RcxAAP9TbL2n8= Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-33d9c3f36c2so128417f8f.2 for ; Thu, 22 Feb 2024 03:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1708602666; x=1709207466; 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=bU66tnpYofC3HczPR5LqCx53IAlSBOajb8Iggei03v8=; b=OQNAvzJ+qNPZ/Y9I4OgQ2ldj9f5/mvITk5+kkp4xjBVp8cle2wwj2J7SlDuwLAS0v8 5wi2nZitbAzWxjH/Ek1R/olXOskQ+zr4fHQOEyDT0B6ShPWj2Q7hJLqcD7hKFjm8nNHS L0dArEtM8D6jI9ZmKIjFQCj4y5HX+oScnnXThYRgiSYGppRxaBAyTxZGdQ1No15rb9xU WtgchZCYlRhyQO6dnZoW9evY7C01BYNWrkJPQmYHNkyk94WdRJ7O2RW6o1q0CnFg/flk fIE8PPZG3YuPYPIP7QTCqIQDqwVPJcgX7qeX7E70y2pBh1EANKVyBKsZVas1EVOLtwVd SHGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708602666; x=1709207466; 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=bU66tnpYofC3HczPR5LqCx53IAlSBOajb8Iggei03v8=; b=YSKhwGD2+XBUbOlJbzXAmg2iwpxX0mjA5EfcLZtlHbPcLlbfxCK2+bVd+4/dq7AOTT NFfbi3A6RGrZ6Xmi2q+D26i49G3rt/8xz5RxipdViKwkeRKKDMoq4fiZL3dEHTr7DMyk rVvGy4KyBW2zr78/+SyT9axEglCRTzh9HVSvItuKPyIoqEgLCklIg0li02UIQjLIPyzq aiYImnikvoGBc9K/EeYX4B0tgm9Gpi8SDp+BKcaPfXcxHJuTd6qAmm8NHap7hj5Bpmbo MHhIQOFlsrQZgvtNxf1FZrBVmwmpRxGBz4mUbwSpY5+GzbMDqu36qENj9Xlb5vqmQAO7 rIHA== X-Forwarded-Encrypted: i=1; AJvYcCWgqhXPUtvrdCT+o9q48n+AKCA4dW+xfKwQy68HQ/ik8ItXRHJWAZZb5hIlgaDseWWlACA+OgWT2Wqnc2UrXwLTRz4= X-Gm-Message-State: AOJu0YyGJ7TrZUbMJJAJ3l0l6GKf4X0nonPliNEbXPagCqBUWxWDpR5a Ee+Hid95zp0fCb6Pk7k/VYJQ3IJryTXJh+49GAcx4YrxLFnGyqAM5QMo4kNZXoc= X-Google-Smtp-Source: AGHT+IHWgvt0/sZsRq4iRTjhX0psvS+eVhVBMHB4PSfSQw/t1/qrWtQi6HShkpncAQZpTNIObD2jGg== X-Received: by 2002:a05:6000:12c5:b0:33d:40f0:b0de with SMTP id l5-20020a05600012c500b0033d40f0b0demr7809643wrx.6.1708602665810; Thu, 22 Feb 2024 03:51:05 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f010900023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f01:900:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id co18-20020a0560000a1200b0033d4c3b0beesm15044920wrb.19.2024.02.22.03.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 03:51:05 -0800 (PST) From: Max Kellermann To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, Max Kellermann Subject: [PATCH v2 04/14] linux/mm.h: move section functions to mm/page_section.h Date: Thu, 22 Feb 2024 12:50:45 +0100 Message-Id: <20240222115055.1172877-5-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222115055.1172877-1-max.kellermann@ionos.com> References: <20240222115055.1172877-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 380BE180017 X-Rspam-User: X-Stat-Signature: oz7ctmat3zz46uk5qzpjwg1kc8s937dd X-Rspamd-Server: rspam01 X-HE-Tag: 1708602666-770899 X-HE-Meta: U2FsdGVkX18A66fVNoPPAMLciOIXnsuvigcoeVATIV0a301ugYuhpBbsTvCpWNVB63olaMcH0C0hv0nLCd6ouqrZJrTo/vMOBaoqPCMyeSt0XRKFqYOhXdfJREvt5NtDVoCTi9MiSYCdZZQbPyFNLe8j5/D5KUtcoTaXPDTv8Xg3fdkBMnsxBgWuP7WosKsbycpu7M+HISCss0ysoYsUkqpwbE4WDXV51ny9xj3nP0oAWCvJP+N6z16hIqeBdEh1alJB9aFEwwBbwxgZp6UoKfLfycXABgBMGyiQoiKAyn7Ldk1lCku+ImwG/a5wZkyWTLcxbcmvX5f2qJiJFRiY15Yo6yiIQ730mb2utlPzx5zOcZOg7M0RlTzIwhyzNEqZI/f3V4NCL9mWjwPoyyQ824bNJPU8FfE/SCeGrjUL8yxZ02VorAqdH1waWJJ0/3hN+G2NfVekQxojWzhrrXGPMG1yldA6bTgknDv2gQiEabz2KAb+4T0yE1gwk7IjqPniFQhuWKgSacJ2UiF6J0nWlpboHv9hX72p6S48UGGbYPtg7/FmsvFrg2FirmfhcGlpsZFeT8phRru4fNgxT0NlLe2XzTez1Ci3anNSPf8NTsvJs6qtlp+jMl/KD+wpFcKUmrrc7LdvgyNOreqSH9fJGeiIWmUxMtgm1czdOD5F95HUTVtT8zjyzBKMP9BJp5/SMNuCgXLX3GVYdRXcLT5H+u2gL117NHXfdbgS73p5yI8tmOTNjzHH1ZvxwkWjeyO64s1qqX6g6RP+s4PrZRVaar4+yqBptd7rkklTHsgQLQOdEd0AYRz4e15MuU9DNKtmoECQ5x3uOZeDZqCiJ7S4iZ1zXif/w2yCLLNK2My2MJvflqp9VxtAGQF2EbZPCeCJhCZaU1n11JwoWtWkKvPLmR5EHqbd44QqICciKkjgvzxpet40dUEJtqVPuVgM/hgADbz7SNf7Y8/zEj0Zkv5 fIZPRs6s y0tHxoc/TVAUruHtwklrFcecDj2X+xZ/pTDNc/xHwzxm4YqZyt0yAt6dvX7b2uT+whTmQ8A2ZcNTpaAIpjYonCJWqsfX8WBVTbzGLsAb3lmV5394U0bCG22ZWEVJxWnra0RT841UZbJeTmOMkk6WbzQr2RGJkBOoZwcn6Brt/d1TWDc6SVeSB5RiZ7RomObTGjOJwKMlEcNsEcmqcaJq/4tKUuw3ikJftycgfoD2MCFJQxR7GiG9phOM04EaGBDsWEViy/XK7dBK8RPkEYpZzWHPLTBaXq9QkUep9Ub0XrXW0gBkp9ps7e1gb2P/SwtzV4CxKEImdYOtrmoXnJ05/XyMqXKEmDSTNoApC0dfthHZ+BNWoEfcDTzCWB9xEP++E/en19S8Nid/ZdZ5Y6Pi4ml4pDIyclse9lkNZjHixicZ2xxA= 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 c8d909cc1353..7c3d2bd69818 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3,6 +3,7 @@ #define _LINUX_MM_H #include +#include #include #include #include @@ -1627,10 +1628,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 @@ -1830,19 +1827,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