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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B00DCC5518F for ; Tue, 4 Aug 2026 10:03:01 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4hDpyC6rm0z308j; Tue, 04 Aug 2026 20:02:59 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1785837779; cv=none; b=TI5AVIQse3lPtL90bI01775ehW3oR5cqQ373lFUv7fj5MVWqJd2lzYHDSa8mzeDdxCUeI0VJUxks4yfENCmnCPybL+KXw6pm92DSvkGuKAKrFB9bQ9bsz1l7i6o2ndBXjTNdvTJsqYTOD2HGoP4pqaZqUmSfEnq4+H9rVdHi0h/YtGaMytPATEbwyWHtBRtTKUZAAV9uAI7Vj4tMh2kLxSmn3wIC5UmmO6XSLxd/iYsjnDAQIj2VFPaF7uL6jsITA2ec3EsQQsuU7MH0nDLP3F2RRHoTZ/4pEW1FOjRuRTlHB+PVtDBVBhPPPz/TgUoP7QEBzYGU6y5+D5LC8/zVWA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1785837779; c=relaxed/relaxed; bh=oAh3PBs47lZUHcwbeGXM5gS5ZzePV60tR0gQfqSs8Ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=HdbrIKPycmfgcOcV98EKDYgpgrQEo3CR3vIAnsTMtfGvxJ8D7NJaHZMcEAEe7eKzwjuJALSzDfI3goF0Stu/O8dkodOYl4hXVtag/p8h+pdyyuKGxBExq8O78Rlz0tvx9Z8FpvDE8sD9Vue48I854oyItFvMvdSUcYGa65Q4sqQBA9PRE00pi4m8nqeSt3W+rFOji1IhrBNKCP3Yq8XkuXepB03SRioz9FwMlVwWtg67EMV/wDNfCFANujK3HXO5HJ85Da4+s8pJZLJmUPpeczmALYlvy+PJbLdvvuw7asP/WGhJ54jS24gA2DlFNXMVeEl+kk8UPiBWWKH4KvVN4w== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=U15z8VN5; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NBeIS5MX; dkim-atps=neutral; spf=pass (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dhowells@redhat.com; receiver=lists.ozlabs.org) smtp.mailfrom=redhat.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=U15z8VN5; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NBeIS5MX; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dhowells@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4hDpyC05Qcz2xpn for ; Tue, 04 Aug 2026 20:02:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785837775; 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=oAh3PBs47lZUHcwbeGXM5gS5ZzePV60tR0gQfqSs8Ac=; b=U15z8VN5r2KRg9e4nHtvQpcPSdHKEfpect9zgTEQ88FOgZktTk9gCKaggIovF5YDsuaTu4 Utxg4QVh8ZGPNz1p5O1HiANonrttsoxsRxhkUGg5eRv/aCq0uLKizaI4F8k3gEZwa0pET+ 4z6vDAt0KAS+NaU+uS/hsdIVhIKcGJA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785837776; 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=oAh3PBs47lZUHcwbeGXM5gS5ZzePV60tR0gQfqSs8Ac=; b=NBeIS5MXK6fjk1mUq2gGuerxeHb3HwPjVct4c3sihm0CeLjIOv1BNLaMnC4lprE/c69ARG QQwQ6Xq+9TtLoLMJ/aNSOeo0YD8/yFyLgpfK13JJJJQpoUVi2sxT1zF2xcHZKTFvCTwXP1 YJkV/E2DkQtN0H7vazLBjrwW/ic3rm0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-194-cUWiaM4DNZaB1m-nN1xIOg-1; Tue, 04 Aug 2026 06:02:51 -0400 X-MC-Unique: cUWiaM4DNZaB1m-nN1xIOg-1 X-Mimecast-MFC-AGG-ID: cUWiaM4DNZaB1m-nN1xIOg_1785837768 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55CA51956088; Tue, 4 Aug 2026 10:02:47 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.32.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 89FB41800480; Tue, 4 Aug 2026 10:02:38 +0000 (UTC) From: David Howells To: Christian Brauner , Matthew Wilcox , Christoph Hellwig Cc: David Howells , Paulo Alcantara , Jens Axboe , Leon Romanovsky , Steve French , ChenXiaoSong , Marc Dionne , Stefan Metzmacher , Eric Van Hensbergen , Dominique Martinet , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v8 01/25] mm: Make readahead store folio count in readahead_control Date: Tue, 4 Aug 2026 11:01:56 +0100 Message-ID: <20260804100224.2748935-2-dhowells@redhat.com> In-Reply-To: <20260804100224.2748935-1-dhowells@redhat.com> References: <20260804100224.2748935-1-dhowells@redhat.com> X-Mailing-List: linux-erofs@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-MFC-PROC-ID: svOmeOM62mJ2i5qgfTVRcrUF2qcIpepybad2m8putco_1785837768 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Make readahead store folio count in readahead_control so that the filesystem can know in advance how many folios it needs to keep track of. This is cleared by read_pages() in case it is called from a loop. The count is accessed by the filesystem with readahead_folio_count(). Signed-off-by: David Howells cc: Paulo Alcantara (Red Hat) cc: Matthew Wilcox cc: netfs@lists.linux.dev cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org --- include/linux/pagemap.h | 10 ++++++++++ mm/readahead.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 2c3718d592d6..e1e51bace388 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1348,6 +1348,7 @@ struct readahead_control { struct file_ra_state *ra; /* private: use the readahead_* accessors instead */ pgoff_t _index; + unsigned int _nr_folios; unsigned int _nr_pages; unsigned int _batch_count; bool dropbehind; @@ -1527,6 +1528,15 @@ static inline size_t readahead_batch_length(const struct readahead_control *rac) return rac->_batch_count * PAGE_SIZE; } +/** + * readahead_folio_count - Get the number of folios in this readahead request. + * @rac: The readahead request. + */ +static inline unsigned int readahead_folio_count(const struct readahead_control *rac) +{ + return rac->_nr_folios; +} + static inline unsigned long dir_pages(const struct inode *inode) { return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >> diff --git a/mm/readahead.c b/mm/readahead.c index 558c92957518..069ded56fd80 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -188,6 +188,7 @@ static void read_pages(struct readahead_control *rac) if (unlikely(rac->_workingset)) psi_memstall_leave(&rac->_pflags); rac->_workingset = false; + rac->_nr_folios = 0; BUG_ON(readahead_count(rac)); } @@ -303,6 +304,7 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, if (i == mark) folio_set_readahead(folio); ractl->_workingset |= folio_test_workingset(folio); + ractl->_nr_folios++; ractl->_nr_pages += min_nrpages; i += min_nrpages; } @@ -473,6 +475,7 @@ static inline int ra_alloc_folio(struct readahead_control *ractl, pgoff_t index, return err; } + ractl->_nr_folios++; ractl->_nr_pages += 1UL << order; ractl->_workingset |= folio_test_workingset(folio); return 0; @@ -822,6 +825,7 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset = true; psi_memstall_enter(&ractl->_pflags); } + ractl->_nr_folios++; ractl->_nr_pages += min_nrpages; ractl->_index = folio->index; } @@ -851,6 +855,7 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset = true; psi_memstall_enter(&ractl->_pflags); } + ractl->_nr_folios++; ractl->_nr_pages += min_nrpages; if (ra) { ra->size += min_nrpages;