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 C9A9CC54798 for ; Tue, 5 Mar 2024 09:00:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7686C6B009D; Tue, 5 Mar 2024 03:59:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F45E6B009E; Tue, 5 Mar 2024 03:59:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59F276B009F; Tue, 5 Mar 2024 03:59:49 -0500 (EST) 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 3CF396B009C for ; Tue, 5 Mar 2024 03:59:49 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 05B2812044F for ; Tue, 5 Mar 2024 08:59:48 +0000 (UTC) X-FDA: 81862387698.18.440C1AF Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by imf11.hostedemail.com (Postfix) with ESMTP id 020564000A for ; Tue, 5 Mar 2024 08:59:46 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=aJoNoaIm; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf11.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.167.54 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=1709629187; 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=vWkBM5tIy5PhqkgdzEH2kjchZlZ2M02DQLlgzFaKC2fNcftHOAzQsx0qGH3qcSEhM5TOH/ ozk1r2AqrnAyG1VrbGK6vqvzcOsZUDQGtInwbwbo8NNGJyskAxHK9Oqzq0zAsQj6apxh1h /uPhhSx9EycQk6vBFzxti6VwJkM2dLo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=aJoNoaIm; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf11.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.167.54 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709629187; a=rsa-sha256; cv=none; b=DiYLs26C0wa/vMdIwNLarLxpR+V46uJEY7NDtwORDg/bpodbo3KPvmXEHMp2T2pB277NeA JqoSxcqLjBE/wa0kZxUCvjUCI5gw0klHUNfvfbcb2XQbPl18rqh79theYK3fMbjWxQtgXf TAoqkirwI24IRrR1mpxD4B5xp/9tjfU= Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-513382f40e9so3712237e87.2 for ; Tue, 05 Mar 2024 00:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1709629185; x=1710233985; 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=aJoNoaImTX6N7QFaORKHDI7EBO3GrVc8g325lHeAz2Tadc49U1bS/wdCUdGuAJH6EI nieDYFw8LB/1nrnIOQdHVciK1Yn1XeJJilZsWu5HAKmWdIoa/m6rdBAhyNq7OhZrBMUs wp+riTrRhKDsB41gbaLob+npwVlyRZD2Wducv7KDHJclGXucTFNDkK7NSrXZD6LsvdyP nuj0UKlOEkouR4rv1DiHVYSAY1521cRF+f0sg2UhzuX/fq2YqDZLdN6ga92o5du/IeSp Jw1Q8W6zNK2PGZxacxxMLla69WbRM5+TkbZu31ukfu25N5u4Qoh6K+HMSeJ8RubVf17+ IteA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709629185; x=1710233985; 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=ZevW7T/DDEePFrUBKXs+cSA9uvPKUeRWIjJlVz0BMVAqlSQ9hW6kzhbYzVxLLl93Y8 MygXGVH6ch/exENNPURoVPudT9HakP4KQ2FTDpinL69GVp4NnyD/xNvWICq2AW5PPGeJ rYsWFsPN1KtUdDD9r+0p3Lqkj2ZDTEVSBhz0S4iYI/StWrH/IFINQLq3n1oQ850sfXpp MS/7VbXQ2/C0uqAH3kNjTtK/KaGM99VXes6NKlNqa9cJ16wFyCaK6tUJOC7hACdZeOuu iX5wlPQiDS5AFGKPwAEibSRdNZAIxtHnnvTb5PHaMGVTPnGTBOHd1mCOuyoOnoD9y++E QAow== X-Forwarded-Encrypted: i=1; AJvYcCUfLuNhhf5h3dn+zWhAWalXxg/NOa1xlynhyZwele1eAmUA2u5JfWBP0Xy5naYQO9UbxSqZ8rTH1Qral0yULk57Mrc= X-Gm-Message-State: AOJu0YzUuuxCtj+rE+OE7geMo1n8hfHnFKVmAjeUPvFSXQlQLIrNHJmG fIzNueMyoXOpby4+UCuIm7Ze6S7JOd4265jzvoELl07+P/yXoz+8RuPcV76G8KM= X-Google-Smtp-Source: AGHT+IEOCYDpUQLk3buGpFhw7wVnYWZuernsI+pAHl/63TvTJG0550L21BMcbBfy9DsuHHJx6gg/Gw== X-Received: by 2002:ac2:5a48:0:b0:513:575f:cee0 with SMTP id r8-20020ac25a48000000b00513575fcee0mr318604lfn.16.1709629185320; Tue, 05 Mar 2024 00:59:45 -0800 (PST) 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 gs4-20020a170906f18400b00a449d12cdc5sm4453005ejb.119.2024.03.05.00.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 00:59:45 -0800 (PST) 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 v3 10/14] linux/mm.h: move page_zone_id() and more to mm/folio_zone.h Date: Tue, 5 Mar 2024 09:59:15 +0100 Message-Id: <20240305085919.1601395-11-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240305085919.1601395-1-max.kellermann@ionos.com> References: <20240305085919.1601395-1-max.kellermann@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: gxube31z47t3ha35wjwcocy8o647o6ff X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 020564000A X-HE-Tag: 1709629186-737632 X-HE-Meta: U2FsdGVkX19FZkJKM4fiM1kojyDZSlaejIox/9iEAbZxF2QNX0D0pEREeKFsNBSwV7/btrZ7Wu4rZsD1OpjBsumr6XRHh2CDzVoaS5Z1fK6i34Bsv9To2O3LqDHiSxtkoEdyhZgfAjEVGSQuMlHDwK+AEihB19EHVaVY/eM+33j5lb/GvIq+S35YWMlhEW+mw8OOzivMgswuC8sUSbYfHY8Dz9bAK16xLpc7Ya3Ex2qyAnqVmc/neyqyRBhqarK7n2bbxt7kJ2lgU/ioJ3Azsb+ayPrMs2fOksEfTfMAaNwqjYljIZsbR7GwvE/JQHsLqEaK7HZ/kXmB4yEdf7gK/DBkf7Ru7rsUeVIpRaCa9xsn2N+1MJjmmuMBx4vKDA0JiL4YGZWWPTos0Pkn09dT+GH91WZY+IUpmecLMyNlhuvw3GALA3CjoX9xRgU3qTHSQlx2BD3tBAQNKAFwPK1iMAXb9uQa6LulFuWZk4aUAJ9roKBtAWgstyAi7IN9ez80++/YWnDskgL+gTGHifjlBFmK/bKsSRH8qEfID8bA9diwYCW7EOcv/m22H7W9Our3ASv5goUEvjP+i9RK72xyh2FR6dRZb12wAlpL5o8F7Y/hPTY0CYWruWSvfBUGLM5WpWtrMpx6jJqeJX5zEiLBCBSxLuaQcO6jA3ly1Bsiy+Y/Dz/MuBH0JR4J5GvxWHgVUCv/OYxLBfaJQY3CIywO+29qpm4abZnO+EAIwNkAJhofzLo0UBZKWaX6AU1nOIbD2145U2sZJ43+TQr1VtvX9U+Jus95t9fi6RP0taKZog3ixnWZp2zx5qjVU0NOm7C976bwT/FTQFhlMXaSE0Au6TYHr5XAVBUkXqQE+gSoNzyRoIjTelzIykptNY+kSmme9Suh01kz2fZwhFdpiBxc/E7AWPwM0U4Pid8LbsFJAXA5Tx6+oTh0y52RMRWk+Jful9uJYre77D4T+OuFte8 +aEodvzj VYSYhWpMh4qToNW7gmevN7g1Lx6X6yzEPG6yLpy9ce+tKLkOp8zQuU+mVIvAIm0WfvyaTuGtHGQGBAuXg79jLjL8w1YzMAQiqRhtCLpUg1kkMF5e0kzLL9l7398uXY1NbxYo38FjTYanhGysS75/QAg/gv8e7ECWxpbptXi2yr0tJWE4lyKOx4isP9gtsSWl895EoSq69RlcwtxZ1OAFwEWzZFaR+bQAK/8rjfsTifPg8eX+k7dEgBhuy7Nq2Uq4aqE1dC7pOa6UQ5IY5WKO+I0EnH/62VRHlZ0twliXJEWX9mOxzLeEKoJBnehmVq80R2JPguAp4ywdbOsk4M0+pYZ4GiKwKJKlRqulAdkg4mjVhB4pC9z+BUj6QXRg84wEGFhaI7iMFUqHVdHXGxOgxC0RSo0XCZH1J2Q4/+0B2+0mLWF4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000024, 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 */ -- 2.39.2