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 7EBF4C4345F for ; Tue, 30 Apr 2024 15:30:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 870B56B00A3; Tue, 30 Apr 2024 11:29:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D2556B00A4; Tue, 30 Apr 2024 11:29:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 649F46B00A5; Tue, 30 Apr 2024 11:29:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 356BA6B00A3 for ; Tue, 30 Apr 2024 11:29:59 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E070A120884 for ; Tue, 30 Apr 2024 15:29:58 +0000 (UTC) X-FDA: 82066583676.24.9F9C716 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by imf16.hostedemail.com (Postfix) with ESMTP id 000D6180006 for ; Tue, 30 Apr 2024 15:29:56 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=M63hZAP2; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf16.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.51 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=1714490997; 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=6oorfyqrd4QwX7XzlPeMB1uMNuRLLm4J9vR9colTNE4=; b=z/pZseiAkKXDPkI3msCxyRKnLPHULyBuxx+e05Mte/ospva6tVn3esTmyDpCfUNsTznTTp H0ZM9xa0tGxsCHDZLk5x/gtMyYHlHtnjPTXjIm3L2NrujOB+4TFkR1AFl28kZa0f4I6plP 3Q6UbCAkby54m+jdxKMtdBrcXOs5Fhc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=M63hZAP2; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf16.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.51 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714490997; a=rsa-sha256; cv=none; b=frlEa4Zp9oJDJS1BU8UnrDqpIe+SnJK5V0C5p8RHaw8EtjEcg+RXfND7wN5JWYIcUS3z7N WjWrAh5lY+MDKSE5Xg39qyqRNEeel3KtJwsHuI3vQcuXkcV3D2Ty8UWcrOlQaZsPRF6JR3 xObg3WUG8yaBqYbL6B2n/2wDnBOAxdk= Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a5557e3ebcaso957606466b.1 for ; Tue, 30 Apr 2024 08:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1714490995; x=1715095795; 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=6oorfyqrd4QwX7XzlPeMB1uMNuRLLm4J9vR9colTNE4=; b=M63hZAP2v/Rw3OsvtJ2rdlhSdVTF9/TtepkecA6e1m48QLJZlQhMTSUkcZGDWquQU1 pBE6GF/svIB6votLH20ONkRhBGnEeiGEOZG0JEZd8ybmHyCldtPr2BXceU0gB+wmEYeN d4XXFdLSSjaLUAIsLcNmpyrffP85r54Uv38ekWGwwLHQBpLkzZvHfWEIycaAsTgQQzzP yoIgROceBVyRKJYCVjSewGXqNPP52D2h9NUJaGjs96uUomG5aQlYUOvR/MTZYWNQYyRV ZKylgtEgxGBlpRdNSi/2pezPXsp+nsEywv1Qbi7+bB4kgjbtjPokRzQc/IDbbu4fSdT3 /IXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714490995; x=1715095795; 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=6oorfyqrd4QwX7XzlPeMB1uMNuRLLm4J9vR9colTNE4=; b=tOM2emQ/MFvXCQ6iuqmxiD2DG55kmYei6rDFyxJEAsOs2yuEfbsmgMMsuUeUyR0WLQ gc/lHwA20cAHmeDfbGcZFtjpq6lSmlKTIOQCHmkXlOgnnEYzapc+h0jQZfOn/uGl7BnZ DGz2U1881V6T8e0XXbBkHxSm7TMn/BuU8iwi9KilTCHqCOzOrSjoYrmFEe7Xp5nrxdBl 14jU1JRT6BmbtvtenVFqpQW6U7z/b6UhsyyWsNmQ92jbACOgxjaGlFia5/S/i08LKqfX RkvBt4ME4Il5XzfA9a0RdzQ6KyUEtj8Pp0yfhUg5MN4UC9Q50AIyQNkusKi2qWEqpH6N J+ew== X-Forwarded-Encrypted: i=1; AJvYcCU3lvHLg5z5JTpYLnkyvk8mPLuwt/XFyE8p7I9YON3C7811XOYuhbUM7YAU85OHdBbECkLKBbDPUM/LZZWGzYFpeSE= X-Gm-Message-State: AOJu0Ywxoqf1L4qsi90F65lfWSCOGM2eMCDacrAPQ2CbNBzWcs1UGviG R/tzfsxZWc5SlKUtxYxKv3VScbdCzcMffa2+52RqxDzoC6Ac66MsMiOS32g6sv0= X-Google-Smtp-Source: AGHT+IEvp5i5JRkITPWTjlJ3U3QwiTNFAq2awThpXND5syZ983MA1H6lBc0Vx2slfoNy4Dv1ockB1w== X-Received: by 2002:a17:906:c791:b0:a58:eac2:a54f with SMTP id cw17-20020a170906c79100b00a58eac2a54fmr99681ejb.18.1714490995492; Tue, 30 Apr 2024 08:29:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 08:29:55 -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 11/15] linux/mm.h: move page_zone_id() and more to mm/folio_zone.h Date: Tue, 30 Apr 2024 17:29:27 +0200 Message-Id: <20240430152931.1137975-12-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-Stat-Signature: tpjbrs99eyob6bpg3pxyg38u3ofegsw7 X-Rspamd-Queue-Id: 000D6180006 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714490996-122694 X-HE-Meta: U2FsdGVkX1+vu0DNU2TqqDRlZ56Q9p3XlW06q7AKwOw/podgS+l8L8Q1nUfIAFHj1CyKHWc1PoqyVAfSkJXOJEob+UaQkvPC2IyUqSBQsq+wm07p4kKu+Lg0Fzl+EBl35+LQTHRIOo4ZMK+544O9h6LSYQEGK1dIUfLwyb9TF/48iVWasVHnbXensVGh4OIzN30h4SU+TucCasfaD+ezVE99pICyuQyg0UMRe9Gj8Sqzpe0iKZS2IC1ya79oeZE7Z9rPse/uAUPehagdbNFlip/r73cse+/1sVPJRhhSsiFPXyEBX8vYUFKxMbiD3n/q6pqJ2BkpsrjQBRSF8FlN5h7gkA61W5Igvv70tH81bF1a+8UhUra2HQmGzz+6zuQ3NGu1XWGFdATqn09B6/upGWdcVSirS0/OD8QH60ev87izXnWWxzfdi7fvepa1NBmIiUgMpGxGHh+8cIwBLnBpyPV2gMibQkTD6N7AKJseki/AKOhxyDofpAc5KogbKFIMEyU80GTgVBTjEXpXFVsfiMl6nBUmcBtLNhr3zgIsD9WCOnbX23pvKzOQFTSy2ykGJZl/q3a4rNXgyALsrVSHYI/GeCIOpGXgoWYBXjpu3GCWVt8rQIAEtR4ZGcHsvLwiMbVuq46ZZIap13+09+zXFbJBqZKlwFKkKfug6FmeZexpcyuMMjTaRj1JMEiDCpBy5qTXVVf9BcCcjnM/jhOKgWNlyhjE6CK6mDgVQezlWknUO9vGUGAZx6b/TLFFKrdaPIgz/ekgyyAsWHLh2DJbMhX/rPjFRT/JV9r42JeqxOhPHoRJbo6cel599Lgo6/JH8dyBgMd+/6gHX8orYPjUfbz120Th7svv9qsZIH7IOh8DZJGkeIf1UFoJosFqHTnoRA1GdtBhNVwOQhfPeVNRUpOBci2RFkVS9G6cXHnLdyI4giWEfreowCPu7vmB80bXvXvdtycs+dJTqF56BLA JDKYAfQt MpaKJYZFWMAX8F81YhjtsFbzr5KCsr4pZ6tYwtGoKRYfWm1ztk4fT8D0jOEfb5tREo17tLGaEw3MU8BjO9nLSgvUffUfpVdwlFiH8Ci7uKyevDgsVmF2eIH7wVmf6goS8YC4GIaBL8RoYYn9mRU+31YhyN2G8a6veoLi5HrkvLDbv9NsyrKgIVfB+DyLdx2Ypy4rL+0+KMOSukPYfE8lNiRyGnnbRM5LsEzv37ddtPHknRVC3MKa2UVj36A6yAtowAYXSIPRS0ioo/wG2Zni7DiqWssiDE6b5KJ4UrGUB4Cf5cvFSBnxG9ikta0FL9hbAglvfnHvg2Zn9kaCy8YnojJ4ThiSUtzd+uQH+OyUSTOdLpv9hkfOtx16hfFYWRbWpudEAnk/CzOWYaKatXhpwL+WLE+EoEKmXL4Sp7POwa/WtPQ4= 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: This is needed to eliminate linux/skbuff.h's dependency on linux/mm.h. Signed-off-by: Max Kellermann --- include/linux/mm.h | 48 +----------------------------- include/linux/mm/folio_zone.h | 56 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 include/linux/mm/folio_zone.h diff --git a/include/linux/mm.h b/include/linux/mm.h index 035e56e203df..7af85220711c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -1377,33 +1378,6 @@ static inline bool is_nommu_shared_mapping(vm_flags_t 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 - * the zone since we could be using the section number id if we do not have - * node id available in page flags. - * We only guarantee that it will return the same value for two combinable - * pages in a zone. - */ -static inline int page_zone_id(struct page *page) -{ - return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; -} - -#ifdef NODE_NOT_IN_PAGE_FLAGS -int page_to_nid(const struct page *page); -#else -static inline int page_to_nid(const struct page *page) -{ - return (PF_POISONED_CHECK(page)->flags >> NODES_PGSHIFT) & NODES_MASK; -} -#endif - -static inline int folio_nid(const struct folio *folio) -{ - return page_to_nid(&folio->page); -} - #ifdef CONFIG_NUMA_BALANCING /* page access time bits needs to hold at least 4 seconds */ #define PAGE_ACCESS_TIME_MIN_BITS 12 @@ -1554,26 +1528,6 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma) } #endif /* CONFIG_NUMA_BALANCING */ -static inline struct zone *page_zone(const struct page *page) -{ - return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)]; -} - -static inline pg_data_t *page_pgdat(const struct page *page) -{ - return NODE_DATA(page_to_nid(page)); -} - -static inline struct zone *folio_zone(const struct folio *folio) -{ - return page_zone(&folio->page); -} - -static inline pg_data_t *folio_pgdat(const struct folio *folio) -{ - return page_pgdat(&folio->page); -} - /** * folio_pfn - Return the Page Frame Number of a folio. * @folio: The folio. diff --git a/include/linux/mm/folio_zone.h b/include/linux/mm/folio_zone.h new file mode 100644 index 000000000000..3f3e4284b911 --- /dev/null +++ b/include/linux/mm/folio_zone.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_FOLIO_ZONE_H +#define _LINUX_MM_FOLIO_ZONE_H + +#include // for struct page, struct folio +#include // for ZONEID_*, NODES_* +#include // for PF_POISONED_CHECK() + +/* + * The identification function is mainly used by the buddy allocator for + * determining if two pages could be buddies. We are not really identifying + * the zone since we could be using the section number id if we do not have + * node id available in page flags. + * We only guarantee that it will return the same value for two combinable + * pages in a zone. + */ +static inline int page_zone_id(struct page *page) +{ + return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; +} + +#ifdef NODE_NOT_IN_PAGE_FLAGS +int page_to_nid(const struct page *page); +#else +static inline int page_to_nid(const struct page *page) +{ + return (PF_POISONED_CHECK(page)->flags >> NODES_PGSHIFT) & NODES_MASK; +} +#endif + +static inline int folio_nid(const struct folio *folio) +{ + return page_to_nid(&folio->page); +} + +static inline struct zone *page_zone(const struct page *page) +{ + return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)]; +} + +static inline pg_data_t *page_pgdat(const struct page *page) +{ + return NODE_DATA(page_to_nid(page)); +} + +static inline struct zone *folio_zone(const struct folio *folio) +{ + return page_zone(&folio->page); +} + +static inline pg_data_t *folio_pgdat(const struct folio *folio) +{ + return page_pgdat(&folio->page); +} + +#endif /* _LINUX_MM_FOLIO_ZONE_H */ -- 2.39.2