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 ECD50C5DF94 for ; Mon, 24 Aug 2026 14:42:48 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4hTDCq0xWSz2y8f; Tue, 25 Aug 2026 00:42:47 +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=1787582567; cv=none; b=YBjTOG2h9BoW1ovzmska6wyUah8NFKXI9aidNfRVp4UxsN/fWZDWSFMST2nbHtQOi+CkVbAxkszPjw/DAQdAPAexRi2npdmQBztyE78w5eQqceiUIEjKZAvmpvqtmjpc9PH+IJqn7bHquMmOWR63XJbdwBP1OEgUnmNcZbmrWt7RyqiNv1t6iQFr+LTY8S0Aj0Q0fF8mYN9OBt8GyfwiaqpAqCMgW8LjYk2jYpN33MKORKxKLGdQb5vM1VLlq0tMQKGldhymmFU3gjaxx+Ps+ZMpm9gapNeMH/wiagTXlk1cXdZdW9LFTifnjDd7f5znZU534GNptKLro/m/TSmFWg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1787582567; c=relaxed/relaxed; bh=oAh3PBs47lZUHcwbeGXM5gS5ZzePV60tR0gQfqSs8Ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=AwFh+8z8ZXf8Dr7Ola0fHKCCXrwH3lyHgrHoj254PNkT/KMwbg1lX3lvY2DaAaUjXZkHfF2mpzqO3Y1aYLU4LprLCAEYbG4ZVQbiP0lEW7s+qiMh/oHePREfhFmcOpO5n1fyknFMNjwQdp/nT/qNtEvWLmFPPwwBvYq0zVantoVl0ZgPHd2+X5QwUWWqk1FswbHIQK3LMNX/rPmnl2PlInTNVYoJalD32jRjZKUU07KwSvRqHvy7ru6z997TM1sZcOpF92YKmbO08FGnW5H4IV9OfKuB+QHCO6GNz4G9+bsIMVqEY01/QFI8zoXsaUSGrcJnp0pHPm0K1I2Cb1DppQ== 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=JpBDVl+P; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MsnttJos; 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=JpBDVl+P; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MsnttJos; 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 4hTDCp08H2z2xmh for ; Tue, 25 Aug 2026 00:42:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787582562; 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=JpBDVl+PYx66HmoLYaBuA0XhopaxuHRrTrPOT2xUdBSsc4v/JVd7olG4QX1Bpo0L9iHYaB K8fKzSdox5sZmlACuHRoBZaQvXdCnm+CUWdmJzSdfdXX9i9+1ysXmqcEac8V/ovgqXxxsq wC5ff99A5fyWgmiClfekspnkTJmVdPI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787582563; 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=MsnttJosLwdaXVCkO2FtJxEg/8OpArLDgvYAqBP6LWDbje8fChu1VjGhy1P29mUlj9Rcz+ GQ0jN+3lc8ned3lAzAR4oiX0YrVdfe5KjO1lXy/GP8M1Nt3w3J0vyVeRm1qlzsGarUIRiq vlJjh9YyPwRJjey30SULPYbLiI/VDow= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-fezJf3dqOA29Pdmv6Zl6fA-1; Mon, 24 Aug 2026 10:42:40 -0400 X-MC-Unique: fezJf3dqOA29Pdmv6Zl6fA-1 X-Mimecast-MFC-AGG-ID: fezJf3dqOA29Pdmv6Zl6fA_1787582557 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A7F818601C5; Mon, 24 Aug 2026 14:42:37 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.15]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BCA1D1800767; Mon, 24 Aug 2026 14:42:29 +0000 (UTC) From: David Howells To: Paulo Alcantara Cc: David Howells , Christian Brauner , Matthew Wilcox , Christoph Hellwig , Jens Axboe , Leon Romanovsky , Namjae Jeon , 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 v10 06/35] mm: Make readahead store folio count in readahead_control Date: Mon, 24 Aug 2026 15:40:59 +0100 Message-ID: <20260824144130.759997-7-dhowells@redhat.com> In-Reply-To: <20260824144130.759997-1-dhowells@redhat.com> References: <20260824144130.759997-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.111 X-Mimecast-MFC-PROC-ID: KDRMO7bA7Yn6DWSogVLX_s9cTOCjT7pjQf_q9B7vB_w_1787582557 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;