From patchwork Tue Mar 12 09:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 13589723 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 3DA99C54E66 for ; Tue, 12 Mar 2024 09:42:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 099528D0031; Tue, 12 Mar 2024 05:42:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 049768D000D; Tue, 12 Mar 2024 05:42:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBC808D0031; Tue, 12 Mar 2024 05:42:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C18F78D0030 for ; Tue, 12 Mar 2024 05:42:03 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9B6C0160F68 for ; Tue, 12 Mar 2024 09:42:03 +0000 (UTC) X-FDA: 81887895726.02.EEBFA04 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by imf12.hostedemail.com (Postfix) with ESMTP id DF4F540019 for ; Tue, 12 Mar 2024 09:42:01 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="DqQUIV/R"; spf=pass (imf12.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.45 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=1710236522; 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=KC2kNgBeF7Vel8Ro1rxtb7kBWctFnYPn6ChmmeyuWYw=; b=RjTwjuqthEq1IX2Vs5WfDmUDL2AT1U8vZ0mW0wKoDAfLALE0nVlne3ZXzAsEZ9tKoMYMEB aQht0RBK/wpJ3X8spqXowSIpF27g82/mf5GS1ViJB7Wy7coxTyvnsQrYop//9aX+wOW706 te5MkhD831AaI+o1JIIVnLuiv8uHg9c= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b="DqQUIV/R"; spf=pass (imf12.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.208.45 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=1710236522; a=rsa-sha256; cv=none; b=kYSbEd1hU19vqGMdPmkLbDLB1PhaLbafDtpk6XR6AKFi+gz0zDqtP5kKnot6MMJ54qH+Qq R+oRHSBv64uAXtyoFZmf9oaUeNYD3GYOXr5AKoVNEU4i+N890XPo+P6l9ISBiEDoR6ZmPC Fr2LdJ49RA1jGbaSZ9mv5HmSG6OE/zo= Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-563cb3ba9daso6184914a12.3 for ; Tue, 12 Mar 2024 02:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1710236520; x=1710841320; 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=KC2kNgBeF7Vel8Ro1rxtb7kBWctFnYPn6ChmmeyuWYw=; b=DqQUIV/RYmSLTomBvE+yynCaQQOBfI/+qvpNBO3jpdJAxbcgn9lBfhGL/VfRiZe0Dh 4xJdtVaaVjuTMBlw86FSvzNFP6Qum5CKk7MFW8k9IMHPQ4zG+hDHuFOcYXSLDnPhEnjz aOghy67ElfgcB3SshPYd2WejFNHLQNeF6Bm4RVFnaSbEyBt+FYBOUV69NXN3btgol++l XkBI1kke/mGWwkPt9obqRK3cqGOKexyN01JFqPzk2fklNGnIH5w5Gcxjng8gwEGSzm4V rp/8+LoMgOO1z7KmZNa4dUgfL94ljkUuXTR9wnlEobN1sRBp6fg7yA29PAMCWdqesEeg 7VnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710236520; x=1710841320; 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=KC2kNgBeF7Vel8Ro1rxtb7kBWctFnYPn6ChmmeyuWYw=; b=LwCF0LKMQCBX9UQnk+N9IWw77/kN6jJi4PMNl5U/qpsWNrDkK07yc74Vby/KH9zAi9 JqoJs6OL/hBTACgXo+q7GYiCE/fY+v1Szufa34ZJmQWoEutpfWmgBDbtd8JDG4Iwv1ww MPN58BpAjpnyBdgm+c49GwzVaAUH06RVR4WJvs9CSmLIyYuHmeI+maLicXLKCu5moFbh oKseEZE1lVDpp9nu8Us3e6jASMqkhHwVDRZGXE972gGR86XUvk+UJg4cHTa7+ftsWLbt GrzFtqn8zoePOq9HdevbGIR1ocRbvV/0IDtEuSVobDMt9AGH77MixOAT8i5pLI9QGYpd LI6g== X-Forwarded-Encrypted: i=1; AJvYcCXzktz+T4Jd9N7AfXrbQc0VkwXeWcakyvaD+sBQKcrVWdWtzOiowYKhPhspxLMOeoxRVNKLc8Xh5MLyzdWDUrUVrvg= X-Gm-Message-State: AOJu0YwAdTfW2sRvldwCwAeWVslqsELDJk0GXr02U3DDzxYOHY54jTh8 mW7RmWSYVoetuL15L332hKrTHK6YLg03N8KXRmOzCZn1vzoQA6vIdjdBM/M9vZs= X-Google-Smtp-Source: AGHT+IE7UDJ1nLsSaEjUG1+PH6IJCzOExfGwyVhrMeJ4rHCcxaB2l8oErbSbMLUVuRymbgh224TGQw== X-Received: by 2002:a17:907:3594:b0:a43:f182:66c4 with SMTP id ao20-20020a170907359400b00a43f18266c4mr5390555ejc.17.1710236520620; Tue, 12 Mar 2024 02:42:00 -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.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 02:42:00 -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 11/15] linux/mm.h: move page_zone_id() and more to mm/folio_zone.h Date: Tue, 12 Mar 2024 10:41:29 +0100 Message-Id: <20240312094133.2084996-12-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 X-Rspamd-Queue-Id: DF4F540019 X-Rspam-User: X-Stat-Signature: 95fu6you3sbw56oacsxkcmkr3t1cztad X-Rspamd-Server: rspam01 X-HE-Tag: 1710236521-380798 X-HE-Meta: U2FsdGVkX1+CrLmQIiiFJ9odK3S5l75XZzx9GeniSvD9/Wp56u+2iS4XE/vIca+Y+H9tp1hOEasJCw8097J+0Ka8sJQoVoruOeHVXcmh5z7qjk/BQfgoP2jKAgKC3yYWeUriUcEQRxmgtTk/j772r2iXXedMIMzO6af0/LyIZ97Ue7buIgOuP2pak1yeUsTqcJ2ddhSZtoAfUrd0Zo3SXhadjCJDats1sq9tvq3ATHeW1Dn+brV+exyvpVifUf90N6uk4bv9GnkXmEDQuoO/MsJI6OZyOu9YzdqNT+GWBjsvEJaKK1+tt98lLH3//mKTiZyPTUc0Hscp8yFDrHcYwKi4/m7xzeLsPDdMA5SWSUd5SrLuNWO8wZCEz6HqpZQkqNU4kD8CG7j33JNXLMV5yGPXPIReOAdcUfgVtKe9UY4vc0BtEYj8EmUaQrN7uukV6k+YlTZQr0oHvkj+QrNZcGtMuWXyBhWo3ThyULsPCm/iH4QVBTqenkhLXuIHwESFqr4K5AXZjwDWgwV63an/lkGgEzT1aYipFuMwIF/zJA0oUe3/jND3/G3J5f26aLEFWEwEgsQ5QKwjjoYkE4FV3CXxW8qDuJSdrxw3S80qnmcS4M0NnVAnUUi/z3z3HSkV+Q+E8qo8GmfNIZGkXLngBZUF9qXDXZ4G8wq8ZcxGm+0/c1Tl/vPT0XxV1+/aFMmcOxxTV/6g8ARCOlFkQwxqMWYcdqlSikHElhX+D/3OFMM2kmjG1sVzjC/Rdn6PDr0t70qR4V50CSb79D5btwkIxDs4kKjA7Ru939ABmczFGpSQTsesP2ZLWsr21pIBnTP4bZpyPc7G2GmNOoB74c2gzr4j/ELXYOeFEFGkVHNG5iu5E7T3CsnW4V+q0zMhMsPJlXASbVlaRO5aIgOesgOsM/xEH7XzSCxrzGmVc05N3DIu4jzhhHLXlOmHDTkR1ND4V4OS8Pp3xL4iKfCCUfv uoBTQnML DbyvczUbjtX/68O5yh+bDS2MWc6NJyo2Vm79/vJbGLa+so4XMGCgGqe/WgtQjYacUi8wyejcrnmIcJjMOkX7QGZyPtFLqdQZmlx0j0yLS7toFJ8aZbNFh6CWfa1mdKa8HWlCcM/jWlYls6ydcK57jWGLWjhEmyVWPibRe X-Bogosity: Ham, tests=bogofilter, spamicity=0.000008, 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 | 28 +-------------------------- include/linux/mm/folio_zone.h | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 include/linux/mm/folio_zone.h diff --git a/include/linux/mm.h b/include/linux/mm.h index e8a914e7bebd..b3f83fb26aca 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -1370,33 +1371,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 diff --git a/include/linux/mm/folio_zone.h b/include/linux/mm/folio_zone.h new file mode 100644 index 000000000000..572fe37068f1 --- /dev/null +++ b/include/linux/mm/folio_zone.h @@ -0,0 +1,36 @@ +/* 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); +} + +#endif /* _LINUX_MM_FOLIO_ZONE_H */