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 BC275C677C4 for ; Mon, 9 Jun 2025 09:27:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 543F46B00AD; Mon, 9 Jun 2025 05:27:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47ECA6B00AE; Mon, 9 Jun 2025 05:27:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 395636B00AF; Mon, 9 Jun 2025 05:27:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 138466B00AD for ; Mon, 9 Jun 2025 05:27:50 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C9C14C12B9 for ; Mon, 9 Jun 2025 09:27:49 +0000 (UTC) X-FDA: 83535335058.03.FC696E8 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 28F9C80008 for ; Mon, 9 Jun 2025 09:27:47 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749461268; 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; bh=qoMlKqQLvIGnOQH07Hg5S191oF2ViC3DzIUmAtNtoR8=; b=6ROvCNL72hyKIE5UNxoQXieimBdmvcC5W+pCC+dNYVLHTiOtMnCr9MtR+IqGiIjPelVQbF EWN+sZBkw9ye5GjmIGv6OMWYT+OJwZ4dSEjJQrGscgZpMk0SASQ3jTohdWnYu3SYz3/weE 5Y5L/C8/6TF4bFWQ3zG1lQ+V23qdpyQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749461268; a=rsa-sha256; cv=none; b=iA07lVgToPiRbhBDYYg5tnR9g1wPb6oSqYTwZMXVEuQII1XK0KF6vcHNL7GUWP2a1E0JlI x+uX101Xc3mAv4peL+uJNpp8/0qz97JXZjxTPOErDwPL0iUTlbdCMnb0NsvqQNqTiRcGnE cle6R1MS2IlkNlujfjRDe1ouZySbk/Y= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 993D1150C; Mon, 9 Jun 2025 02:27:28 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 399273F59E; Mon, 9 Jun 2025 02:27:45 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , "Matthew Wilcox (Oracle)" , Alexander Viro , Christian Brauner , Jan Kara , David Hildenbrand , Dave Chinner , Catalin Marinas , Will Deacon , Kalesh Singh , Zi Yan Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v5 3/5] mm/readahead: Make space in struct file_ra_state Date: Mon, 9 Jun 2025 10:27:25 +0100 Message-ID: <20250609092729.274960-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250609092729.274960-1-ryan.roberts@arm.com> References: <20250609092729.274960-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 9jiok5z1akokxtaqpdg1obpekba5ste9 X-Rspamd-Queue-Id: 28F9C80008 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1749461267-63180 X-HE-Meta: U2FsdGVkX18wAFofJIC9NZPI3xn82QYCm87KbOOgVtTDMEot8ZWHElY0BlHTyorWqQAdW6Fl7fCfR8SsH4qEBz3XF6fqdXL7+uFOFR2SQeJoGAEEpTW8hhHJleapqPcxvDUl2Yl6T9Jp5R8mvYHmNeppdjW7k7AuWh4wdhEQdDweAArMqZ87m+GZiGZpf3GTna810LvBOnGfQ7rN5OYRV1BAmqvD9iBtnfP2XHIsvywZVDNM5cuMTHythIkM4TbWdLMqJriTMb8GqbawRrw2Twl3D/pMmQCZOxJSFitD/mJMq9xrWlkuXxe+WEkFCjr5owcB8M9EZKI1MXFepyljJNDpSCk/6ZLRW/crsky9k41EsLUSwwpM2jCX3esTPtN4UgLl3bx2Qpb56TvBJB6qJs7qg3FhKcOf2n1ULT4KdvHK+v/CXolz/95VHrSq+tSGNtvEEVbbWlFv4fxZbSR/4qOdDXdol+mLSTLqG0b15UqZ2Zxs1jL3YQA6io5R9j4bsPzFo9XJaqoFMw0PWY3K0TryROl/y9jNSLAnEykUC4cqfc/poX8GNf1UDNAkovxeDpP+p0Kh+D6BwMswAyjrUBe+cMQSodGnwqo6UAwgUdL6wNJzZT051t0hy8PI2Rk1p2epw7R2eT4jmCupb8KAp2RlkbuFaMoh8ChuhIZR7Kua9vA+owdPT9UqWXWwzTpOi/rp0nKPQ17PQJy71jHribdEQZAA3RQRgmTJUhBDm/uKo/dB0sqM++0gnyXR5RVIl9kcNusYqglM1qzXWzw3cSUAHsJy/CrdOeYBl0p1S7fQBPcJDgQ2dLvxrk5QKUnXwQQXHaEbIahkiT1A2QqpAUWiwmL9MC0H1rIXf8yCi2EwTFGMzlHnKeiDg7VdE0cDja5S/H2L3yQJQxerE3/ZEthoYuwQcY6H46Q8qFvlm70TDEjWA3r4ebtUQG5uEa1hkjUffMN6V0is/osONT7 SYBM6Ap7 Q8dqAL48juOdQCBMzqTZ8bvN5MueHx125Ji7CZ526+qjrk4j9WBqhC1wa8JWxRzJh/UUyVZK8K+4rax2Z7ihdNCLe1QtmXaQOwMvaFx88ZVrCO882/aja9B+JC9kReR39uhsaUj65cHIFQedEiz5EdMMbD3ne8hM3qWUJ71Z9tP/J9w8kjv6QYZ/FDMmJb6iqJLg0sKXf/V2o5Q8Rxde28lV7Ixo0GVyMG9u2 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: We need to be able to store the preferred folio order associated with a readahead request in the struct file_ra_state so that we can more accurately increase the order across subsequent readahead requests. But struct file_ra_state is per-struct file, so we don't really want to increase it's size. mmap_miss is currently 32 bits but it is only counted up to 10 * MMAP_LOTSAMISS, which is currently defined as 1000. So 16 bits should be plenty. Redefine it to unsigned short, making room for order as unsigned short in follow up commit. Acked-by: David Hildenbrand Reviewed-by: Jan Kara Signed-off-by: Ryan Roberts --- include/linux/fs.h | 2 +- mm/filemap.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 05abdabe9db7..87e7d5790e43 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1052,7 +1052,7 @@ struct file_ra_state { unsigned int size; unsigned int async_size; unsigned int ra_pages; - unsigned int mmap_miss; + unsigned short mmap_miss; loff_t prev_pos; }; diff --git a/mm/filemap.c b/mm/filemap.c index a6459874bb2a..7bb4ffca8487 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3217,7 +3217,7 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf) DEFINE_READAHEAD(ractl, file, ra, mapping, vmf->pgoff); struct file *fpin = NULL; unsigned long vm_flags = vmf->vma->vm_flags; - unsigned int mmap_miss; + unsigned short mmap_miss; #ifdef CONFIG_TRANSPARENT_HUGEPAGE /* Use the readahead code, even if readahead is disabled */ @@ -3285,7 +3285,7 @@ static struct file *do_async_mmap_readahead(struct vm_fault *vmf, struct file_ra_state *ra = &file->f_ra; DEFINE_READAHEAD(ractl, file, ra, file->f_mapping, vmf->pgoff); struct file *fpin = NULL; - unsigned int mmap_miss; + unsigned short mmap_miss; /* If we don't want any read-ahead, don't bother */ if (vmf->vma->vm_flags & VM_RAND_READ || !ra->ra_pages) @@ -3605,7 +3605,7 @@ static struct folio *next_uptodate_folio(struct xa_state *xas, static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, struct folio *folio, unsigned long start, unsigned long addr, unsigned int nr_pages, - unsigned long *rss, unsigned int *mmap_miss) + unsigned long *rss, unsigned short *mmap_miss) { vm_fault_t ret = 0; struct page *page = folio_page(folio, start); @@ -3667,7 +3667,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf, struct folio *folio, unsigned long addr, - unsigned long *rss, unsigned int *mmap_miss) + unsigned long *rss, unsigned short *mmap_miss) { vm_fault_t ret = 0; struct page *page = &folio->page; @@ -3709,7 +3709,8 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, struct folio *folio; vm_fault_t ret = 0; unsigned long rss = 0; - unsigned int nr_pages = 0, mmap_miss = 0, mmap_miss_saved, folio_type; + unsigned int nr_pages = 0, folio_type; + unsigned short mmap_miss = 0, mmap_miss_saved; rcu_read_lock(); folio = next_uptodate_folio(&xas, mapping, end_pgoff); -- 2.43.0