From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68E84393DC5 for ; Thu, 21 Aug 2025 21:07:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755810444; cv=none; b=pbRhgaSrvvwQmPX1M/Apg4bDiEjd5gMgRntDTm467IClj8x2s1GutVy/uQktO9/IjyWRc2a2IxbR61Rs/FWyAJgFOZdFQRD9Vb7hUzNdl/gwhzSN+vIVH6ZY6vieTr54iy6Y1vBT0lS0sER+bQE/lvKclIKqCLqxthiOZ/o9Mww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755810444; c=relaxed/simple; bh=YHqdaFs44MkX9xejnDLPb5jqQiahm5Uq2LcWXm1xRfQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=h9EMjrFtJxiO0De9V3hEbehyBqziWsGW1wJ9eBi/xI1D3/AOYF4HxbqymOR7+6NiA8P1iKQMpo5h/IcwwaPmfZ4mzrqGUUso7Hg4k+EJ9nQkXXTizJrY+ZKBPMJkZVMVb7qOCorrXrv96+SCo33BohOS7kJQH/Wjs8LvovVXqW0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=I5XHebeL; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I5XHebeL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755810441; 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:autocrypt:autocrypt; bh=Cp1mFCWwcTWQzzsUUmh88+YFkDBcq7Y5lQlba0VlHo0=; b=I5XHebeL4HMY1kEyBzzWGBx4qzWJa+Tpw2AMkpnML9hOkntDkEfAyqsBEScbmqaSIwpcSN 9OG4FNqKoj7EYuC0+EgDPdZtVuWmhcIsm8n+PpfSiOYuMFOF0H8da8jJP4r23LDEDib1KJ jylFJBj+LDqx3rF9Yeas90w7J20w6kY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-x1xcgIZHP72UNfFyml8zvw-1; Thu, 21 Aug 2025 17:00:42 -0400 X-MC-Unique: x1xcgIZHP72UNfFyml8zvw-1 X-Mimecast-MFC-AGG-ID: x1xcgIZHP72UNfFyml8zvw_1755810041 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3b9dc5c2ba0so686701f8f.1 for ; Thu, 21 Aug 2025 14:00:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755810041; x=1756414841; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Cp1mFCWwcTWQzzsUUmh88+YFkDBcq7Y5lQlba0VlHo0=; b=o4+4hrMlgM4LwY4ptlE5yvbmWPMp19P8GTrWLFXIU3/kxFB7EVhjLKY+lo2dW4NPXb cSb6CG2Kflg4bsJIQzzq+UodmTTKG/lNwbyfilVbO+vVuNB6/7Agg8jMRuDe3vWBO8pa ftJqoaycXbj3Y2tLrCkUK0ScrKjcn2uWjfXvpcXCOm0QubcKzY3anWNn7AYHbIee10Qt ztnzv2kgWi5WaPlhUkX8JoGxV9q3bweNAa2mriAcRXQ8hIBd3JRWujr8bYBK8Wby3j/Y dRV1lQDIAoWv72TFtt9cRgNYCPw0IFLmLgjOg8Lapgz8Oh6ywgBCtPIy8MdK5UMCFN4T T0EA== X-Forwarded-Encrypted: i=1; AJvYcCWD88d6o7YC3AyFfuh7/No7EJMQBi2fl+WPl2EvfopJg3yeyunQ35LK9UBtoWsKzLPPlTs=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh68gRGK8P9PgxsD8y8Lk/0YkfEh8xCb4n4jBBnC/RefjuEol+ MCKgDBRxwYonfq+lsBKUKwXeQnhPR+zMAd7pvvQhIxlHq9nlNx7hIAxGmRH8hUOkYbtPEm0dfVv 4QE/HfQMGcbjZ6ajarAQL4u/cR9+9iWDeFT6x/hVWaIxocWjx1dA7DA== X-Gm-Gg: ASbGnctUcoCUuHqWhV1jwdi+7Ux3M69GzR+OdkjljE9dzK8m39DSnCRHBQVveVXh6Vt bVuLKt7c3fsJOMTh/tEW47mlKEjJK5EvUgOEU+CF8vvSbzXaKs8bN3WubwDkkoqxU/dD6H8Noz6 RjhCowOvCqpMmivu3Bm29Np55G9bdePpRG40tu9knA1cDNc1uJ9oMVQ0H1GpVLGwVtyUQnWBom0 Y5DYYtn6czhSLEyb2iwrYBxQPzQRrWVr+A/ign5tZpCLVmahdmRsCfSrR10RUAFMZH4SeVbbhM+ HA3vsZNm4hRY1k0vJoATUlHO3sOkd4gE7YCFT978CMYvSSzeW27lxAwoGu89coF3yNhnETlzO7w lpf2nIO5KVicOXAK2L2kgr5LS8Q+1cdmynHKxdEI/T/KRgtPVNEva8lhOlpBDdQ== X-Received: by 2002:a05:6000:200d:b0:3a5:2465:c0c8 with SMTP id ffacd0b85a97d-3c5daa27e6amr265220f8f.7.1755810041320; Thu, 21 Aug 2025 14:00:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7vpqV63aDfbj4LuprqMLqq42InG6u1nR+Dt/+ZPeyx1uRJcEanVY8H02OCG3yOg5OQPh6rw== X-Received: by 2002:a05:6000:200d:b0:3a5:2465:c0c8 with SMTP id ffacd0b85a97d-3c5daa27e6amr265173f8f.7.1755810040805; Thu, 21 Aug 2025 14:00:40 -0700 (PDT) Received: from ?IPV6:2003:d8:2f26:ba00:803:6ec5:9918:6fd? (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c4ccbf04fasm3476159f8f.7.2025.08.21.14.00.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 14:00:40 -0700 (PDT) Message-ID: <23c6e511-19b2-4662-acfc-18692c899a6c@redhat.com> Date: Thu, 21 Aug 2025 23:00:37 +0200 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC 13/35] mm: simplify folio_page() and folio_page_idx() To: Zi Yan Cc: linux-kernel@vger.kernel.org, Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org References: <20250821200701.1329277-1-david@redhat.com> <20250821200701.1329277-14-david@redhat.com> From: David Hildenbrand Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= xsFNBFXLn5EBEAC+zYvAFJxCBY9Tr1xZgcESmxVNI/0ffzE/ZQOiHJl6mGkmA1R7/uUpiCjJ dBrn+lhhOYjjNefFQou6478faXE6o2AhmebqT4KiQoUQFV4R7y1KMEKoSyy8hQaK1umALTdL QZLQMzNE74ap+GDK0wnacPQFpcG1AE9RMq3aeErY5tujekBS32jfC/7AnH7I0v1v1TbbK3Gp XNeiN4QroO+5qaSr0ID2sz5jtBLRb15RMre27E1ImpaIv2Jw8NJgW0k/D1RyKCwaTsgRdwuK Kx/Y91XuSBdz0uOyU/S8kM1+ag0wvsGlpBVxRR/xw/E8M7TEwuCZQArqqTCmkG6HGcXFT0V9 PXFNNgV5jXMQRwU0O/ztJIQqsE5LsUomE//bLwzj9IVsaQpKDqW6TAPjcdBDPLHvriq7kGjt WhVhdl0qEYB8lkBEU7V2Yb+SYhmhpDrti9Fq1EsmhiHSkxJcGREoMK/63r9WLZYI3+4W2rAc UucZa4OT27U5ZISjNg3Ev0rxU5UH2/pT4wJCfxwocmqaRr6UYmrtZmND89X0KigoFD/XSeVv jwBRNjPAubK9/k5NoRrYqztM9W6sJqrH8+UWZ1Idd/DdmogJh0gNC0+N42Za9yBRURfIdKSb B3JfpUqcWwE7vUaYrHG1nw54pLUoPG6sAA7Mehl3nd4pZUALHwARAQABzSREYXZpZCBIaWxk ZW5icmFuZCA8ZGF2aWRAcmVkaGF0LmNvbT7CwZoEEwEIAEQCGwMCF4ACGQEFCwkIBwICIgIG FQoJCAsCBBYCAwECHgcWIQQb2cqtc1xMOkYN/MpN3hD3AP+DWgUCaJzangUJJlgIpAAKCRBN 3hD3AP+DWhAxD/9wcL0A+2rtaAmutaKTfxhTP0b4AAp1r/eLxjrbfbCCmh4pqzBhmSX/4z11 opn2KqcOsueRF1t2ENLOWzQu3Roiny2HOU7DajqB4dm1BVMaXQya5ae2ghzlJN9SIoopTWlR 0Af3hPj5E2PYvQhlcqeoehKlBo9rROJv/rjmr2x0yOM8qeTroH/ZzNlCtJ56AsE6Tvl+r7cW 3x7/Jq5WvWeudKrhFh7/yQ7eRvHCjd9bBrZTlgAfiHmX9AnCCPRPpNGNedV9Yty2Jnxhfmbv Pw37LA/jef8zlCDyUh2KCU1xVEOWqg15o1RtTyGV1nXV2O/mfuQJud5vIgzBvHhypc3p6VZJ lEf8YmT+Ol5P7SfCs5/uGdWUYQEMqOlg6w9R4Pe8d+mk8KGvfE9/zTwGg0nRgKqlQXrWRERv cuEwQbridlPAoQHrFWtwpgYMXx2TaZ3sihcIPo9uU5eBs0rf4mOERY75SK+Ekayv2ucTfjxr Kf014py2aoRJHuvy85ee/zIyLmve5hngZTTe3Wg3TInT9UTFzTPhItam6dZ1xqdTGHZYGU0O otRHcwLGt470grdiob6PfVTXoHlBvkWRadMhSuG4RORCDpq89vu5QralFNIf3EysNohoFy2A LYg2/D53xbU/aa4DDzBb5b1Rkg/udO1gZocVQWrDh6I2K3+cCs7BTQRVy5+RARAA59fefSDR 9nMGCb9LbMX+TFAoIQo/wgP5XPyzLYakO+94GrgfZjfhdaxPXMsl2+o8jhp/hlIzG56taNdt VZtPp3ih1AgbR8rHgXw1xwOpuAd5lE1qNd54ndHuADO9a9A0vPimIes78Hi1/yy+ZEEvRkHk /kDa6F3AtTc1m4rbbOk2fiKzzsE9YXweFjQvl9p+AMw6qd/iC4lUk9g0+FQXNdRs+o4o6Qvy iOQJfGQ4UcBuOy1IrkJrd8qq5jet1fcM2j4QvsW8CLDWZS1L7kZ5gT5EycMKxUWb8LuRjxzZ 3QY1aQH2kkzn6acigU3HLtgFyV1gBNV44ehjgvJpRY2cC8VhanTx0dZ9mj1YKIky5N+C0f21 zvntBqcxV0+3p8MrxRRcgEtDZNav+xAoT3G0W4SahAaUTWXpsZoOecwtxi74CyneQNPTDjNg azHmvpdBVEfj7k3p4dmJp5i0U66Onmf6mMFpArvBRSMOKU9DlAzMi4IvhiNWjKVaIE2Se9BY FdKVAJaZq85P2y20ZBd08ILnKcj7XKZkLU5FkoA0udEBvQ0f9QLNyyy3DZMCQWcwRuj1m73D sq8DEFBdZ5eEkj1dCyx+t/ga6x2rHyc8Sl86oK1tvAkwBNsfKou3v+jP/l14a7DGBvrmlYjO 59o3t6inu6H7pt7OL6u6BQj7DoMAEQEAAcLBfAQYAQgAJgIbDBYhBBvZyq1zXEw6Rg38yk3e EPcA/4NaBQJonNqrBQkmWAihAAoJEE3eEPcA/4NaKtMQALAJ8PzprBEXbXcEXwDKQu+P/vts IfUb1UNMfMV76BicGa5NCZnJNQASDP/+bFg6O3gx5NbhHHPeaWz/VxlOmYHokHodOvtL0WCC 8A5PEP8tOk6029Z+J+xUcMrJClNVFpzVvOpb1lCbhjwAV465Hy+NUSbbUiRxdzNQtLtgZzOV Zw7jxUCs4UUZLQTCuBpFgb15bBxYZ/BL9MbzxPxvfUQIPbnzQMcqtpUs21CMK2PdfCh5c4gS sDci6D5/ZIBw94UQWmGpM/O1ilGXde2ZzzGYl64glmccD8e87OnEgKnH3FbnJnT4iJchtSvx yJNi1+t0+qDti4m88+/9IuPqCKb6Stl+s2dnLtJNrjXBGJtsQG/sRpqsJz5x1/2nPJSRMsx9 5YfqbdrJSOFXDzZ8/r82HgQEtUvlSXNaXCa95ez0UkOG7+bDm2b3s0XahBQeLVCH0mw3RAQg r7xDAYKIrAwfHHmMTnBQDPJwVqxJjVNr7yBic4yfzVWGCGNE4DnOW0vcIeoyhy9vnIa3w1uZ 3iyY2Nsd7JxfKu1PRhCGwXzRw5TlfEsoRI7V9A8isUCoqE2Dzh3FvYHVeX4Us+bRL/oqareJ CIFqgYMyvHj7Q06kTKmauOe4Nf0l0qEkIuIzfoLJ3qr5UyXc2hLtWyT9Ir+lYlX9efqh7mOY qIws/H2t In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 21.08.25 22:55, Zi Yan wrote: > On 21 Aug 2025, at 16:06, David Hildenbrand wrote: > >> Now that a single folio/compound page can no longer span memory sections >> in problematic kernel configurations, we can stop using nth_page(). >> >> While at it, turn both macros into static inline functions and add >> kernel doc for folio_page_idx(). >> >> Signed-off-by: David Hildenbrand >> --- >> include/linux/mm.h | 16 ++++++++++++++-- >> include/linux/page-flags.h | 5 ++++- >> 2 files changed, 18 insertions(+), 3 deletions(-) >> >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index 48a985e17ef4e..ef360b72cb05c 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -210,10 +210,8 @@ extern unsigned long sysctl_admin_reserve_kbytes; >> >> #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) >> #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) >> -#define folio_page_idx(folio, p) (page_to_pfn(p) - folio_pfn(folio)) >> #else >> #define nth_page(page,n) ((page) + (n)) >> -#define folio_page_idx(folio, p) ((p) - &(folio)->page) >> #endif >> >> /* to align the pointer to the (next) page boundary */ >> @@ -225,6 +223,20 @@ extern unsigned long sysctl_admin_reserve_kbytes; >> /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ >> #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) >> >> +/** >> + * folio_page_idx - Return the number of a page in a folio. >> + * @folio: The folio. >> + * @page: The folio page. >> + * >> + * This function expects that the page is actually part of the folio. >> + * The returned number is relative to the start of the folio. >> + */ >> +static inline unsigned long folio_page_idx(const struct folio *folio, >> + const struct page *page) >> +{ >> + return page - &folio->page; >> +} >> + >> static inline struct folio *lru_to_folio(struct list_head *head) >> { >> return list_entry((head)->prev, struct folio, lru); >> diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h >> index d53a86e68c89b..080ad10c0defc 100644 >> --- a/include/linux/page-flags.h >> +++ b/include/linux/page-flags.h >> @@ -316,7 +316,10 @@ static __always_inline unsigned long _compound_head(const struct page *page) >> * check that the page number lies within @folio; the caller is presumed >> * to have a reference to the page. >> */ >> -#define folio_page(folio, n) nth_page(&(folio)->page, n) >> +static inline struct page *folio_page(struct folio *folio, unsigned long nr) >> +{ >> + return &folio->page + nr; >> +} > > Maybe s/nr/n/ or s/nr/nth/, since it returns the nth page within a folio. Yeah, it's even called "n" in the kernel docs ... > > Since you have added kernel doc for folio_page_idx(), it does not hurt > to have something similar for folio_page(). :) ... which we already have! (see above the macro) :) Thanks! -- Cheers David / dhildenb