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 1A119C4345F for ; Tue, 30 Apr 2024 15:30:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27F566B00A0; Tue, 30 Apr 2024 11:29:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2045C6B00A2; Tue, 30 Apr 2024 11:29:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 055956B00A1; Tue, 30 Apr 2024 11:29:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D1DEE6B009F for ; Tue, 30 Apr 2024 11:29:56 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 93C61A089C for ; Tue, 30 Apr 2024 15:29:56 +0000 (UTC) X-FDA: 82066583592.06.5555BAC Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by imf02.hostedemail.com (Postfix) with ESMTP id AFC1B80006 for ; Tue, 30 Apr 2024 15:29:54 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=DBTzHSZM; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf02.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.49 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=1714490994; 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=IXKxrCtgCvr5klQOAqmpVlw6+TXQtqNqSxD0Fn0GyUc=; b=dVLWRWLh5nQ5Z1rzjwK3f+DLp7frRlpHvWjk19KunuNUzvX98Q8PgHe3Uu3Gm5HG73Uk9F nbyySAR5V7WInF/J+cQOjpKqBelOxxQ0ANLOebPNUJZaEsM3oxiDp/85LS8U6pjH9uH0s2 tazdLzRrvqVF4vgSmfpfdfiK6etQiHY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=ionos.com header.s=google header.b=DBTzHSZM; dmarc=pass (policy=quarantine) header.from=ionos.com; spf=pass (imf02.hostedemail.com: domain of max.kellermann@ionos.com designates 209.85.218.49 as permitted sender) smtp.mailfrom=max.kellermann@ionos.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714490994; a=rsa-sha256; cv=none; b=kULLYxk4tBAXPpNn7tU4t6bo35QtewpzK6Wn5ZwjiOeuHiTVJ/ysWsqWrjxjIlmH8UGRe0 LEe14C9PGflaSUeBIxDh4rgW4vVr/8RoHLM6w71ffL9p6P7eRk5nXWWkk/n5O9G6N8EC7k Qxzj55iJ9Ds0Shtjs8PvNQWtV+8R1/Y= Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a5200afe39eso654691766b.1 for ; Tue, 30 Apr 2024 08:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1714490993; x=1715095793; 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=IXKxrCtgCvr5klQOAqmpVlw6+TXQtqNqSxD0Fn0GyUc=; b=DBTzHSZMfM2aM0RvGzqfDBNBcN+oJgpPK5oqNOrLDQk9ctNfzrO8xA2TaGg5J8uiMM 7asflYs+w1bfDi8YmQ6g2jya/6b2H6dzvkRVq5aaCK6hVUAMFPnBjAgLil25ei2dH9VC FftoYzV9LfTo/cnkWYnV05KgVUhS4SEvjrbr7HZIqwLyf/8Xt//+aIdU5nQfZ0eUGcVD YQ4mxfLh2/ADM41VtvSVoylB5Uqgw+WOafLOD08LTe1u+gTNy051FluDpQWi3AiJJ9Sf cAssZksLuN2mK5WSjhUFnPL0xjPe205BqRskMLwkd1PmCbzCwpJ/zG8yF7uJ3ouVTSAd y8gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714490993; x=1715095793; 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=IXKxrCtgCvr5klQOAqmpVlw6+TXQtqNqSxD0Fn0GyUc=; b=FLC4C3Wi2Ty/b/5tAIMmIXaLgnH8TQZ3B7svbHKGxAXszlBCBgQ8ZnJ99Vh74rcDPQ RtUKWlPULKQapCA7MCxiaDWWcR7oAUc1IZNk7Gbb+OMmysjwl2lesnjuBMMS4Eb3NHhV F41gPYt7affP784ZW2Sbo6my/EmMSmwsb3uCmAj3oAuhS4F6t3bk8nn5ezlfkbwoGUYg Wm1ASq/SynL4no7GJYlP2b3NZTUidpw3mSMowqFyonaqP+Z0Bu/bH2H5k6mdvih56FYV EG0dCZyp+QS2eyLJchDl82khw1bf0yUUa4492kVZZvx9mJXUZjbWdCP/dU7+CJu4PAbF a1/A== X-Forwarded-Encrypted: i=1; AJvYcCUOOsADnosE48ZQmctizyLpCTEDFeCSh3n1FzTgzzuyQq/PDORDMW1V3Aw+hYfKhqQQUiB1oOpNDTnfTkRN82jzj2U= X-Gm-Message-State: AOJu0YwCwdbmaqfKrO7nFbrogoawjW0fAd9Gvkzxgdj6v2Uau4blVpBy 2eZvHrhPeUIeFN3EFdRG/45rYY8IUlHsTSGKChOoIU4+6HT3+D+QXUQliYzN2vY= X-Google-Smtp-Source: AGHT+IF1Kcn+grgqk4BRBsySeGH9c4NPl6D/AQSw5d/hYpB6grkidjHbqos9xjspf6/C70Q2HKf7vQ== X-Received: by 2002:a17:906:40c9:b0:a58:9a74:57fc with SMTP id a9-20020a17090640c900b00a589a7457fcmr56836ejk.15.1714490993267; Tue, 30 Apr 2024 08:29:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 08:29:52 -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 08/15] linux/mm.h: move folio_next() to mm/folio_next.h Date: Tue, 30 Apr 2024 17:29:24 +0200 Message-Id: <20240430152931.1137975-9-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-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AFC1B80006 X-Stat-Signature: kuac54xbty51s1oqrkdtbzreehkbm5bi X-Rspam-User: X-HE-Tag: 1714490994-625681 X-HE-Meta: U2FsdGVkX19n8J6pIQCryl3/QO4rUjgwGV7Yr+0yKxnxgctfOI3QxOmwrCBg+6qmC2A87xhoiPTPCtlku+etV5s/rsAeoKXR8javCrZasmcG+pagbMnw2HQ2YT1WYY9hjYNQzqTbEyR+t1jChO48eVxJJhJMLANp/TUX/7u5R9WoLnwFgrQpv7apmmf6r9eDmaadsy+Er27gUwvJz1uENz6YRV8gfG4Mb34vC2q9eUQLit27c152jAYS0mxuy6ZxkAuWmhd8scLYZZAWnHTotuhcgmw0ZWVxwULyQX9ElkEHaTYfZeC+Ok/LgvKbddArK2w2Jjv1YKc//AALo5kBUISgy5WB/UTuY7cOAOaPagRdbdFKYJSNthuj0LEnj3JtcBYu/PhHEt1zecsbMPfzHBeWQ/8WEkl9KsjnHM4lbjv+eliLD2O6FA1liWRBfxqUDaJd0VzyS6ghZcxtTufcT0/n30r1tkUooWn/dx/zFp0503K/k0q7tVnHZ5QIURrG9PKnzSb6g9+lFXfWUPrXzTw1C08EEVDfOqvmSHf90Es4nXwOhHOqFTQCo7il533DpUdvkMvH+uFqpzl5XvEEh1tIypH44hS+mmzBStpuqmb+tJsLzq4Vkx5JJh9bASt6IYHT+PVoJZ/KvVUnpPWoPdSCLATxK5vCnttk/U7Lifa9VlzXuRg9SvzyP8YhW9cbjk/zXjeC/CWy82cRe0P1IR60Lub3ojyB3yuRQVkaru0ovtn0gZnTer55QT2BGk41HUc3gOhHZgXb+xjqTgnQlXUwTmZAwvvRQXlvOsX7lichThGlSy9gv8JywyxUtpD6LXYejePrCzjkvV0HjxOy7riP1TW6kpKDo1wRz7pg2oLUQjwg9pc2lxPkVh7rOwE9WCZt6aF7XuB4WWONxHDm+mhGMoNQMv3/DUVjrPJj7ix0S61s8w41wKtEwAEOs++lswwAf/TaoiNbl/pSmfK X5p7wvS6 YFRLMKARUIn/w3Q/n8RghGs6nt+WXOkwpzVArMi2GCgwrsUo+OoSu4q0vKgbzN9tt3uisog161kChWJV1KJp4OKQLFavpWNaZTLDHAbvjnumnS2IDO/Dz00evUyhhpn5B7Yko/WVbBKWraSy0YGufAfFvpYee41XhYSNxMc0VKzP+y5PdMd+usxp4ibIeqa4BwQGp2y2kiU1ZULxD5ZJhDN3f5asGBiobZj6XMMzZCMKXNIvlX3Qi650kPA8D1JILA9k0Cq/3/XrNTW/sJUKIx8bqDlyFwaPVZcFqtwfBRujC0FlyNAq/lPA5n1kyLrpKaXkJlj6DSnUauzG4n4Lq/iVA+bFU3GOQEOxOPUowOmpFCaAkEGkDKsvHFrFjGqF0xDsKy8MBai6hOvzYP5xJiFNWpTXKg7qERCnXzEqmux0Gh04TboRz3B68UvEfutwX7dtjN2dmmlqHiub6iWBYT6VYQw== 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. folio_next() is used by linux/bio.h. Moving it to a separate lean header will allow us to avoid the dependency on linux/mm.h. Having a one-function header may seem excessive, but there is hardly another way if we want to distangle linux/mm.h from linux/bio.h. If one day, say, folio_prev() gets added, we can still rename the header to something like folio_iterator.h, but until that happens, this folio_next.h header seems like the best trade-off to reduce dependencies. Signed-off-by: Max Kellermann --- include/linux/mm.h | 20 +------------------- include/linux/mm/folio_next.h | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 include/linux/mm/folio_next.h diff --git a/include/linux/mm.h b/include/linux/mm.h index d5019aed8330..5b3d56454344 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2,6 +2,7 @@ #ifndef _LINUX_MM_H #define _LINUX_MM_H +#include #include #include #include @@ -1924,25 +1925,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone, #define MAX_FOLIO_NR_PAGES MAX_ORDER_NR_PAGES #endif -/** - * folio_next - Move to the next physical folio. - * @folio: The folio we're currently operating on. - * - * If you have physically contiguous memory which may span more than - * one folio (eg a &struct bio_vec), use this function to move from one - * folio to the next. Do not use it if the memory is only virtually - * contiguous as the folios are almost certainly not adjacent to each - * other. This is the folio equivalent to writing ``page++``. - * - * Context: We assume that the folios are refcounted and/or locked at a - * higher level and do not adjust the reference counts. - * Return: The next struct folio. - */ -static inline struct folio *folio_next(struct folio *folio) -{ - return (struct folio *)folio_page(folio, folio_nr_pages(folio)); -} - /** * folio_likely_mapped_shared - Estimate if the folio is mapped into the page * tables of more than one MM diff --git a/include/linux/mm/folio_next.h b/include/linux/mm/folio_next.h new file mode 100644 index 000000000000..7016e303439c --- /dev/null +++ b/include/linux/mm/folio_next.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_FOLIO_NEXT_H +#define _LINUX_MM_FOLIO_NEXT_H + +#include // for folio_nr_pages() +#include // for nth_page(), needed by folio_page() + +/** + * folio_next - Move to the next physical folio. + * @folio: The folio we're currently operating on. + * + * If you have physically contiguous memory which may span more than + * one folio (eg a &struct bio_vec), use this function to move from one + * folio to the next. Do not use it if the memory is only virtually + * contiguous as the folios are almost certainly not adjacent to each + * other. This is the folio equivalent to writing ``page++``. + * + * Context: We assume that the folios are refcounted and/or locked at a + * higher level and do not adjust the reference counts. + * Return: The next struct folio. + */ +static inline struct folio *folio_next(struct folio *folio) +{ + return (struct folio *)folio_page(folio, folio_nr_pages(folio)); +} + +#endif /* _LINUX_MM_FOLIO_NEXT_H */ -- 2.39.2