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 AFA98C369D9 for ; Wed, 30 Apr 2025 14:59:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C733A6B00C3; Wed, 30 Apr 2025 10:59:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5EDF6B00C4; Wed, 30 Apr 2025 10:59:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89FC16B00C5; Wed, 30 Apr 2025 10:59:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5F0806B00C3 for ; Wed, 30 Apr 2025 10:59:40 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A900C140122 for ; Wed, 30 Apr 2025 14:59:40 +0000 (UTC) X-FDA: 83391019320.13.5A5F531 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 01B07180004 for ; Wed, 30 Apr 2025 14:59:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.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=1746025179; a=rsa-sha256; cv=none; b=F0ToLtTSsvZwF3P++m5KbqmByQeiqyPuDVMV1+wjOOKKkDTYqQAk05HH7kOHwokZLzA3Lh BBqT+xfe105a2pha4vb2ZUTi3C3w73RWLG1rMPG0Ne3Lm51Rl7N5SFtmDd1akOnhNwlQwY dyIFWqJCvTgR9KGu8p7KdcJpFw4CKIE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.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=1746025179; 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=EN7ZPHvGiSzGYm48voOJstuP8lj63a9IPxLXN6o2vns=; b=gNoWmMvq376S+0OuqVxkbWqdCg+YBhuedopOwMJvnGjG+sJE+UPN4FaNf1FhI8k0xRbUZo TFgrgy8cMoDEZzJnuhIjXUGXqufHR4xMVrTDJNsrlv8y/lwlv8YAh+ZoLHwJbbkinl6mrG vtiF+RPU19K8qjWLj/Th+o1sSJQCB5I= 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 F1430168F; Wed, 30 Apr 2025 07:59:30 -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 4BD443F5A1; Wed, 30 Apr 2025 07:59:36 -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: [RFC PATCH v4 3/5] mm/readahead: Make space in struct file_ra_state Date: Wed, 30 Apr 2025 15:59:16 +0100 Message-ID: <20250430145920.3748738-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430145920.3748738-1-ryan.roberts@arm.com> References: <20250430145920.3748738-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 01B07180004 X-Stat-Signature: unb39wb6bd1hy9nqaygn59zokmhbfm6y X-Rspam-User: X-HE-Tag: 1746025178-858028 X-HE-Meta: U2FsdGVkX1+BUK5UMyJLliQJA0lxRdyLx+CUTIwc1uUsUsAJho94MEkQ3wE1XaIMm0gfamnf+sMK//FAqcygD3Tjmlhcs+2Fei2/ucvIONo14dLh7K144ndRZ7gV+Qa/pXgNSSF5IChHjUnWUJxTcLoWAEJ4S4BcR20UYcd+uBDewFEZ0190L+Gws/oPwMz2xcuIBIkSMjNFFd+qtcS4XaAlVDbM4g+bpOLpGkeD+ta9DdTMT4QFl9BnAWdqcp1d1w0jeIqgBTPW/h5jlVU16y+nCx5EmDDun/9EieFUFTAkxS037GL7cRk3SY0tF02EyDidWk1YQNO7aTy0egwnjSF4BjmkK7DI1y2yz6FP/9G1zUmwcOIkAmDgiIt4NUkj8n3zDELLCnn+WyVKMBB5r/n+eBW0R+WklK3GPB9xCmsmM2XQlnnKzV0EzrAJSPoyscnzNA4LTkH8xhWVvn4HRyg20xbRVYpM05vsA8rxRtZdDkXR9XWcB4p52RAejqN1ag4A5QcFhPdcTChdShrxZo+r2h3VMwYqpr9qjrIHFrKr6Mq3Rkc8HIBWbH9q8C0Q3/CvuIa1idgUPhpd7SSOJS/CBNQu+GkBeAwdMJ/C8VojpsBUyRdzSdFYE1DYDkpzOgevQf8SK+kFv3mlOXS7zfMKvY/WLnu12M7Gw9nFDshO2zShX5XPDuaqwa7jAuc+3uGlOvk5kcBNs9253qzrks8ICMY+D0go5QNHtqRKDJMeqfKZXcncE69Oimmd8kvhRlKfDJUnDB4Z+NJfTRVnFhRMWw6JPFJZlXmSppky33sVPpJcCCBYyHyksWAxdFqM6KoSafFJrb2JKnxcYcvstcVfvFQg1VYEO3GDXE3Wek3xyAUyRoIXdLWIzZArl3YhR/qeRlOA/BfZQ2gR+PkrOe3fRgwUVCraIkY80mMFySTaN41EVvVI0bn2rUmEFW/Veds/Fpka585kz/xbz3z 9c02iAgq KEj70U5BPki0LjTQJrTlal/VgWW/bmWRC20OTkyt9siJGGoXxLPOKb4ZQlZzCDoZEmbUH7T2/0h33DpP/L7+9RrIzoR8SOSxzCnYH3kv9+45qcFfuGexnGFVL/5FtCleVmEOiWQNw4GTNLNOhZyXMDg8nngMzEdBPGVgbCtB8jAL6fLlFi8cpelwMx5IwvVMsBeFEGxyjvDsXHW8= 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. 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 016b0fe1536e..44362bef0010 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1042,7 +1042,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 7b90cbeb4a1a..fa129ecfd80f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3207,7 +3207,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 */ @@ -3275,7 +3275,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) @@ -3595,7 +3595,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); @@ -3657,7 +3657,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; @@ -3699,7 +3699,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