From patchwork Mon Feb 24 16:55:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13988495 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 6DF13C021A4 for ; Mon, 24 Feb 2025 16:56:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9177C6B0088; Mon, 24 Feb 2025 11:56:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C4F06B0089; Mon, 24 Feb 2025 11:56:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65380280001; Mon, 24 Feb 2025 11:56:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4614C6B0088 for ; Mon, 24 Feb 2025 11:56:17 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E60CCA3CE6 for ; Mon, 24 Feb 2025 16:56:16 +0000 (UTC) X-FDA: 83155441152.02.E098CF9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 6D206140008 for ; Mon, 24 Feb 2025 16:56:14 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QaB8nhGw; spf=pass (imf26.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740416174; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uW/SnbGZfnRd/ZrL3KWYJ9GZqWtDH7XgQk5JORWTALU=; b=qBpxeMKVYjr/bQ8BtQeeXpISkzR+c0y1pL28dQqsd57UmTKU2SFYJTbjAoqloEX0+19sgs a5+jAj44xeeked/KvJ55nLuRb9Nqd+CIf/AKBmRWjwKThziJMaeJnURfLZ+91d/4faLsRI zNA1dnOQtTpguM2zKdsG7FLtV6DKnZ0= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QaB8nhGw; spf=pass (imf26.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740416174; a=rsa-sha256; cv=none; b=5ggatU+ZLTj+E6kmlcQg+i1eGoo75ClS1XG+kPhXET69cHjGKzioXJt5bMCT46k52Qt9oJ ozAAM+bRm1A+uoJLlLmSZDnC1Daq2rppXplS1WmNONIVS1HbjYqxW9rVgsaNalkQYzhPd0 XppKlC+cYUdxV+wKM9dv2x7PA/z+OUc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uW/SnbGZfnRd/ZrL3KWYJ9GZqWtDH7XgQk5JORWTALU=; b=QaB8nhGwzCv91IpV1xDNyyMsDfFYhJE67m//m0sIICe0gyjv3U4o9XJtK8rayIL8Coxjmi /+B/pJMEjHL14I6JaI1HhJ/Xe0kQLHd7NtXPYPl9pkXX/oMwq7ajziW9S9Fsj/uHzGIc0j We4w6GSQPpaiWa+f6VZtx501BbKr/Zk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-RaO7pPhSM9KhxYXAfaNMRA-1; Mon, 24 Feb 2025 11:56:11 -0500 X-MC-Unique: RaO7pPhSM9KhxYXAfaNMRA-1 X-Mimecast-MFC-AGG-ID: RaO7pPhSM9KhxYXAfaNMRA_1740416170 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43947979ce8so19945465e9.0 for ; Mon, 24 Feb 2025 08:56:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416170; x=1741020970; 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=uW/SnbGZfnRd/ZrL3KWYJ9GZqWtDH7XgQk5JORWTALU=; b=k8Tnl8ykYMGF5UAzDcX4E5m0Zdka8Ola7wn5fx4r+6MDNFmdGj/ADBjOaHX57eNDzq aRHU80tjQ5g6OwBecgMVoEkvOlo/FPP23AWKxw4mypUWMcxHBan9k6b00QZawYocXO62 /0HTwR6LdKdonBHIuvri5Fa4yHRUX/0KVul82yOleKG2OO+RTuQ7HE03gDHb+d9VjQqI Q/cnoany3NWxXSrZvzKDziubPBsfbAeEU/u+HTMycZTtl0f9a+hrDU/CpUlOCDILcC/O EFo6VphNWJx9R4CchvCehZz73egZGxbRi6+GcJvfFu9bYsbziLO32Ape+kP3FsR4OmkN aeQA== X-Forwarded-Encrypted: i=1; AJvYcCUtVMNIS5E20KrgUoJlL5XvDfC2KEK6kUrdL/xdUdy1/VSbK4q21Py1js6UqhVxHiNz09dilgK6aw==@kvack.org X-Gm-Message-State: AOJu0YxgqTDKNwKD8Y38IO3EnGGonBJf2GETDV3IJ/13za5Qrdiax671 IDVwEqbApZagcvzzhiRgPEHzV4KIXUdp4Q2nd1y/0GDp3Vg+k0T2bBnvF88g2C8jz7sG/p5917G 5/pGz1PzeHL06DKB6Jo8Urpxq4vo0Twz5CjAJ/QnX1k7tsrdn X-Gm-Gg: ASbGnct2zo3YsmUJVA2f+2FQ76TNnvmd1gobprZ/3xpKNY7BkIzby7fEb8rARNnhX1B iDakxh1d5FdspKS0PaHMMK1xmWBUhj8xkRWAI1zMJ65trKPbFz5q1/W6GRBoalh51yI/B5wce1Z a9YK7Wa+5HH7u4rE3rdIFDNL4eefvKA1hthWli5NrDd/zFIWihzEpBQr0NP8I//DvN6CiThyr3J 17BLjgwJaN9mx1wZy7yXB5lKynDg+khlZVdzAHAETWHco5PjWZL0wmIbfVdQhKUw3dLc8k3P4rC AgODPqU6EASwhmLxpmIEiCg0PbAIUMLaqK8ICgWfBQ== X-Received: by 2002:a05:600c:34c2:b0:439:9828:c447 with SMTP id 5b1f17b1804b1-439aecf1426mr121409385e9.17.1740416169806; Mon, 24 Feb 2025 08:56:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMOxvVak9cDaBV2o8+q98fYh3JQOIg7zVYXNoNjPQAK1ZeuqEa4rOOZBLfaDjBIQaJ00l68A== X-Received: by 2002:a05:600c:34c2:b0:439:9828:c447 with SMTP id 5b1f17b1804b1-439aecf1426mr121408975e9.17.1740416169419; Mon, 24 Feb 2025 08:56:09 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-439b02f3eaesm111237045e9.24.2025.02.24.08.56.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:08 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , "Kirill A. Shutemov" Subject: [PATCH v2 02/20] mm: factor out large folio handling from folio_nr_pages() into folio_large_nr_pages() Date: Mon, 24 Feb 2025 17:55:44 +0100 Message-ID: <20250224165603.1434404-3-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: i4_e4gEhOEnfI9WxjGqrB5EwoIFLOi8-YeO13i0p-O4_1740416170 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6D206140008 X-Stat-Signature: 3sgxxyuyn188sktcyyx8yjh617ze19ey X-HE-Tag: 1740416174-31242 X-HE-Meta: U2FsdGVkX1+vPmir3/8tmnUtsiuT3KiQHTUJVnhvkvQOoCZTGgUsyEwQsoBipbp564t1Fqzev7VQNNuDqQ5e9BY+0k/GdP/V8JKVztP4yV952kEzF6gWr+iQ42tfhkxJ5buTRQVB2akZhfYWTJjq4n5JJmK3ZLd9URv/5QIlX1i36xl4WlqcGtUS0YEZB6xY83fHCSRev4Vz0qZiUbCbH3Nf/QYWCfYASjZZc+HiMGnrRppKOmBNaae16CKMd3o/d+CIBxG3LNLfKxzy7EbZmjLUR5oPf3fAR7mjmt/PIaQV8/UsnJDnN9rLItaAjqUyJ/59uaAvPJH2kAxJifHs9qitZHmMtzoB8vYRNqOeDw+Zc/ygpGOP1febc0OQbpOAZTqIbnQmdXcumjPJQpP3I2axPppuKW6LyjRrJaU9nOpcNGJx6j8k9xuIsQ4bdedSRByMafrxAtOt1EZZ0aiZSdVup4wQ90K4tvffqmkNOMHpPle7g3mlbHFuDAiaqCBZOAL9gn8sBAHf+atwl2NNAPBu247LO1/Q7lZU2YvFuJAFrF1Rxyb0AcccLOVHa9fM9ip+rb1v2lleUBsIv5jsMDujtHHddc7XXn3hWqAGLeDN064bQbOOfbz3qLI0gOxj/9YfeyAWM5g2PfsfUiGpu7Q7hgcKFcym/KlCaiyD69ONEi2sIMmrY6Ik/tD/qj3Z0RoczWtLljjZj+yEOqxQhi0hDm4zTvylAyzIuk+WeDzr2z26BhG8E3I6yQf3967sc7G2QtKdJo9vgGWKFV3nimMuNuFDKmajTrMnROWEMnHn8TzPUsKxnghn3vhOr5AmW4XXuSCi6Le0LblTKTEgOuVjCmac0Z5/miBq8rjB9F0hGoylfHP7AzDUMm/W4f5NjDGHNlApNJ0bJiSj16KWtacfzYzwmJhm98rgxmDwSq+OjOGPNdsyrNUyNkj2FtS2A7La1GHgZMPgrG5JJTE uFQagtqz 58lkXkV6zqdg2C56O3H6I88y2Ym/EUKyrmY0JZCbseXvoL6TBxo/wAwp7EeHVfGo1KeOJe5QhDis7B23MNjjrgAxUjqRi3RaEaiBDBBw8iJE5r2l4px1AibPp9skACq3r+FPQHQSY7QjuqMxs5EQwJHchnf4OqdqO88SqF8Nu9s34kZJPGZ9T4zEXlzVWA3wnK8T28Z1JdfZI9LJTs/wn4VwMzWk/F66c/PAG+zbq/+fQ3V2e9htzKIazNtHRWeVcAZLoZ2YsaQKSqHjJDxP59xp9/kYnRGNlo9aOjPMXTvn/H5Y5Zng7TZaL9KC+w8GFnoTZ01KCoUyTik34z72HoEI4FOpRgdN9N4ZFohJYvFW4/yMKFFLR7z1XEsbY2KeHWgxI7kjVt59N/Znrsx35XK0N9O6iedxfCX3OC3bw1z7e5ReAG6HoJjZEOS9TgJl/WzE5MBclJuiktGd/EueWjLhk3v5tyrio8OHuDnhpI9CMllehoCtdmekUVuNKftrSWltBn/48Ukzx1QVMkbRoy+Z5UUEkozDjQB3m3s0+rL/qWafPP63a+ZYP20WSxeg3njcz 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: Let's factor it out into a simple helper function. This helper will also come in handy when working with code where we know that our folio is large. While at it, let's consistently return a "long" value from all these similar functions. Note that we cannot use "unsigned int" (even though _folio_nr_pages is of that type), because it would break some callers that do stuff like "-folio_nr_pages()". Both "int" or "unsigned long" would work as well. Maybe in the future we'll have the nr_pages readily available for all large folios, maybe even for small folios, or maybe for none. Reviewed-by: Kirill A. Shutemov Signed-off-by: David Hildenbrand --- include/linux/mm.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d00214e22a174..7c5a8fd29cfcd 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1199,6 +1199,18 @@ static inline unsigned int folio_large_order(const struct folio *folio) return folio->_flags_1 & 0xff; } +#ifdef CONFIG_64BIT +static inline long folio_large_nr_pages(const struct folio *folio) +{ + return folio->_folio_nr_pages; +} +#else +static inline long folio_large_nr_pages(const struct folio *folio) +{ + return 1L << folio_large_order(folio); +} +#endif + /* * compound_order() can be called without holding a reference, which means * that niceties like page_folio() don't work. These callers should be @@ -2141,11 +2153,7 @@ static inline long folio_nr_pages(const struct folio *folio) { if (!folio_test_large(folio)) return 1; -#ifdef CONFIG_64BIT - return folio->_folio_nr_pages; -#else - return 1L << folio_large_order(folio); -#endif + return folio_large_nr_pages(folio); } /* Only hugetlbfs can allocate folios larger than MAX_ORDER */ @@ -2160,24 +2168,20 @@ static inline long folio_nr_pages(const struct folio *folio) * page. compound_nr() can be called on a tail page, and is defined to * return 1 in that case. */ -static inline unsigned long compound_nr(struct page *page) +static inline long compound_nr(struct page *page) { struct folio *folio = (struct folio *)page; if (!test_bit(PG_head, &folio->flags)) return 1; -#ifdef CONFIG_64BIT - return folio->_folio_nr_pages; -#else - return 1L << folio_large_order(folio); -#endif + return folio_large_nr_pages(folio); } /** * thp_nr_pages - The number of regular pages in this huge page. * @page: The head page of a huge page. */ -static inline int thp_nr_pages(struct page *page) +static inline long thp_nr_pages(struct page *page) { return folio_nr_pages((struct folio *)page); }