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 4B1ECC83F07 for ; Mon, 7 Jul 2025 09:08:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC77E8D0003; Mon, 7 Jul 2025 05:08:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B787F8D0002; Mon, 7 Jul 2025 05:08:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8E3F8D0003; Mon, 7 Jul 2025 05:08:16 -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 974648D0002 for ; Mon, 7 Jul 2025 05:08:16 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 21C07B9A5D for ; Mon, 7 Jul 2025 09:08:16 +0000 (UTC) X-FDA: 83636892192.05.233216B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf25.hostedemail.com (Postfix) with ESMTP id D4902A000E for ; Mon, 7 Jul 2025 09:08:12 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751879294; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eAEGoipk9tpRzs1Qk9DAfk1iEfMfekPRJBXgG5gqKAs=; b=Qn2qcX562guOn2IDbwpX+UHby1+Yks7PBKsGZ56xMRF6rydu9iQVoA4GL47LlWlIsvrLzp cm6WfOps+hG0P1fBuvIMrogM9Ox0am9CgXbXgr55uowcAx9QedDF1IP4R9koueCquXuKnr 9HensfnT5PfbLq2D47PJkTCqoYjI9QU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751879294; a=rsa-sha256; cv=none; b=de4NHw4fih8GlJd7V9dqmCZukTRfLr1jEgyc4TBcOpcW5bPruGce61KDZB67vo8xRxNVyt NkKCfH0C+fGUVboNZdnOUw74nkS3Yx2ARKMVQFGEYNwffQJK+MmWObDDUcIKn0YkFSeK1e zYMbOvRBrDSB/3qnOrCfqaFDI8tyXSw= 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 7A02D168F; Mon, 7 Jul 2025 02:07:59 -0700 (PDT) Received: from [10.57.82.4] (unknown [10.57.82.4]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3312F3F694; Mon, 7 Jul 2025 02:08:11 -0700 (PDT) Message-ID: <0e0f674b-3b7e-494f-ae7a-fc9dbb98dad4@arm.com> Date: Mon, 7 Jul 2025 10:08:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [akpm-mm:mm-unstable 77/240] mm/filemap.c:3283:37-43: WARNING: Consider using vma_pages helper on vma (fwd) Content-Language: en-GB To: Julia Lawall Cc: Andrew Morton , Linux Memory Management List , Jan Kara , oe-kbuild-all@lists.linux.dev References: From: Ryan Roberts In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: myme9cypjy7fk9g987qyt3awt6pgcw86 X-Rspamd-Queue-Id: D4902A000E X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751879292-552217 X-HE-Meta: U2FsdGVkX19IHQ5Qj/wxG2gZ/N2slQh8v+p06nawrTks2MsXSm12krp8jAt6pAznpNk+C+1TBsdTrJo/5n6RVgjnPt6lfjy8jxR1baI/7ceCg24Ayd4R/9RhctDKLDi1fA6zo+omPzP8a4sPYR8g4RSje95RCMUwUkx1HIWIhHwp/sRwEAKysfeqycIsRBpDM88WiFbmHxKDIBdf8VLlp5ytlxycQYWbFVgAprGIbMtgk/+o4yb8ND2oulYOMia6hPxTmmELD//Lx/HdndXVTvj31VkgR82habN+1JGMD14Qd/l8FbNxwd8iUA6qqg3HGN48ZrdeW92lshOUM4aXcjbbdsWDajAgTkT23fy5vC67u4TaAJzY2SY72cxldhkNfQ015H/FqxP+KlKW+nhOS/Z1LtD6AVuErbqI9n2grgXJW/EFDLPzC5N2PGchJQdVQsC03NSDSKicxI7QrxZx4nKW+huOcKp90sooYyfmzlbSwtwbTvsaOV9WHmgzSEduFfArjjg5xV2G9I/GTbSbJnrY3GqA5smztRHTia6zVF7IJt+nSDFaI7xo4dO4duGqsuVvGOxInwpX4dqmlCFxCvdDGNvX8Dv+ejqr1JtkdQma9QJYY4EY0l2N3IkXbrq6H7TXy/eo6S2vu7k3315T5pjJKut2M3fylfeHx0eLxWOBnc9p5KPqDHFIaG9Os2DbrldURAxZR7hqtSGg149mw+F2qfj0Yq7QP/TKLlbqjqnfVS9jSom/DSLKOncDdfmVO44o6dFeYxdb4rRR0fop7pGNppUSerN+2QpTWzGUr5868P8E1G+fNWRJoXDFPblySuH5kAWMK2SlCwQgL0zIurqWx7lMa0bYEKioiBAjDF2Ei5+4lYo7QfywL/lOu3Cr4X0kwSdSjiR2f7F0ES0m4vrAKGz/gr0cKJLTzIBCattkpNJ/ywnUce0lCUPO1jUC6hopt8N0KFpMd11WAal Tg1T8a4W +d+nNTHywRtXbL28+myAlSR1w4z7NswhA2EahbVAiTyLFUIvxOW/pWlSR+1AuuuDzNaPXIjDC/Db5lydnvUIOKWAtSrjV1b2kGG6A4kfAq+9VxAYh8rWVS4ncspfjPxQe7FQNDjmFeNtvcIs4Ng8nF5zlgdwp+OoHoMH8A/INYT97o/3YFYdcSn3D75xXqhVBRvL5LWu+Wwf7rj1OqjSGck00mUopP4YUZkUsVc8M4NtmL9Yxh6Kd8sdv6I5MrnRo/5+6pAHLN5O7w8AE3yHUKgyw/x7OJxWykSGOKcdIoEdSa4Cg7n9f+AinWBSoK3nHnrD9As/a5YBQls2OjLLt+xUI/gFftAZL1Wn9jEz+Sfq6ns87+SRHP3vXp4bJu8+zmk8qdQFHlS8p4x15y/IcLKB9HGbtfZ1/6DZWX2yyYtdAOg78v4QV4g/aZgM4c3RWUl4nvCvNnmMqtsuTTU3MWSZFbqbgPlZENvJT7ejsa+fiZICNi18IRJNXgBu79A21emdN 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: Thanks for the report. Andrew, would you mind squashing in the below? On 07/07/2025 09:19, Julia Lawall wrote: > > > ---------- Forwarded message ---------- > Date: Mon, 7 Jul 2025 14:53:04 +0800 > From: kernel test robot > To: oe-kbuild@lists.linux.dev > Cc: lkp@intel.com, Julia Lawall > Subject: [akpm-mm:mm-unstable 77/240] mm/filemap.c:3283:37-43: WARNING: Consider > using vma_pages helper on vma > > BCC: lkp@intel.com > CC: oe-kbuild-all@lists.linux.dev > TO: Ryan Roberts > CC: Andrew Morton > CC: Linux Memory Management List > CC: Jan Kara > > tree: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable > head: 5aa46327724d1abe18a36e9dec4f26dba8989710 > commit: b58187b2ba0af49c48448c3fe1b400cf8fa14232 [77/240] mm/filemap: allow arch to request folio size for exec memory > :::::: branch date: 33 hours ago > :::::: commit date: 33 hours ago > config: i386-randconfig-052-20250707 (https://download.01.org/0day-ci/archive/20250707/202507071459.lLPSj5Bd-lkp@intel.com/config) > compiler: gcc-12 (Debian 12.2.0-14+deb12u1) 12.2.0 > > If you fix the issue in a separate patch/commit (i.e. not just a new version of > the same patch/commit), kindly add following tags > | Reported-by: kernel test robot > | Reported-by: Julia Lawall > | Closes: https://lore.kernel.org/r/202507071459.lLPSj5Bd-lkp@intel.com/ > > cocci warnings: (new ones prefixed by >>) >>> mm/filemap.c:3283:37-43: WARNING: Consider using vma_pages helper on vma > > vim +3283 mm/filemap.c > > 4687fdbb805a92 Matthew Wilcox (Oracle 2021-07-24 3240) > b58187b2ba0af4 Ryan Roberts 2025-06-09 3241 /* > b58187b2ba0af4 Ryan Roberts 2025-06-09 3242 * If we don't want any read-ahead, don't bother. VM_EXEC case below is > b58187b2ba0af4 Ryan Roberts 2025-06-09 3243 * already intended for random access. > b58187b2ba0af4 Ryan Roberts 2025-06-09 3244 */ > b58187b2ba0af4 Ryan Roberts 2025-06-09 3245 if ((vm_flags & (VM_RAND_READ | VM_EXEC)) == VM_RAND_READ) > 6b4c9f4469819a Josef Bacik 2019-03-13 3246 return fpin; > 275b12bf5486f6 Wu Fengguang 2011-05-24 3247 if (!ra->ra_pages) > 6b4c9f4469819a Josef Bacik 2019-03-13 3248 return fpin; > ef00e08e26dd5d Linus Torvalds 2009-06-16 3249 > dcfa24ba68991a Matthew Wilcox (Oracle 2022-05-25 3250) if (vm_flags & VM_SEQ_READ) { > 6b4c9f4469819a Josef Bacik 2019-03-13 3251 fpin = maybe_unlock_mmap_for_io(vmf, fpin); > fcd9ae4f7f3b5f Matthew Wilcox (Oracle 2021-04-07 3252) page_cache_sync_ra(&ractl, ra->ra_pages); > 6b4c9f4469819a Josef Bacik 2019-03-13 3253 return fpin; > ef00e08e26dd5d Linus Torvalds 2009-06-16 3254 } > ef00e08e26dd5d Linus Torvalds 2009-06-16 3255 > 207d04baa3591a Andi Kleen 2011-05-24 3256 /* Avoid banging the cache line if not needed */ > e630bfac79456d Kirill A. Shutemov 2020-08-14 3257 mmap_miss = READ_ONCE(ra->mmap_miss); > e630bfac79456d Kirill A. Shutemov 2020-08-14 3258 if (mmap_miss < MMAP_LOTSAMISS * 10) > e630bfac79456d Kirill A. Shutemov 2020-08-14 3259 WRITE_ONCE(ra->mmap_miss, ++mmap_miss); > ef00e08e26dd5d Linus Torvalds 2009-06-16 3260 > ef00e08e26dd5d Linus Torvalds 2009-06-16 3261 /* > ef00e08e26dd5d Linus Torvalds 2009-06-16 3262 * Do we miss much more than hit in this file? If so, > ef00e08e26dd5d Linus Torvalds 2009-06-16 3263 * stop bothering with read-ahead. It will only hurt. > ef00e08e26dd5d Linus Torvalds 2009-06-16 3264 */ > e630bfac79456d Kirill A. Shutemov 2020-08-14 3265 if (mmap_miss > MMAP_LOTSAMISS) > 6b4c9f4469819a Josef Bacik 2019-03-13 3266 return fpin; > ef00e08e26dd5d Linus Torvalds 2009-06-16 3267 > b58187b2ba0af4 Ryan Roberts 2025-06-09 3268 fpin = maybe_unlock_mmap_for_io(vmf, fpin); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3269 if (vm_flags & VM_EXEC) { > b58187b2ba0af4 Ryan Roberts 2025-06-09 3270 /* > b58187b2ba0af4 Ryan Roberts 2025-06-09 3271 * Allow arch to request a preferred minimum folio order for > b58187b2ba0af4 Ryan Roberts 2025-06-09 3272 * executable memory. This can often be beneficial to > b58187b2ba0af4 Ryan Roberts 2025-06-09 3273 * performance if (e.g.) arm64 can contpte-map the folio. > b58187b2ba0af4 Ryan Roberts 2025-06-09 3274 * Executable memory rarely benefits from readahead, due to its > b58187b2ba0af4 Ryan Roberts 2025-06-09 3275 * random access nature, so set async_size to 0. > b58187b2ba0af4 Ryan Roberts 2025-06-09 3276 * > b58187b2ba0af4 Ryan Roberts 2025-06-09 3277 * Limit to the boundaries of the VMA to avoid reading in any > b58187b2ba0af4 Ryan Roberts 2025-06-09 3278 * pad that might exist between sections, which would be a waste > b58187b2ba0af4 Ryan Roberts 2025-06-09 3279 * of memory. > b58187b2ba0af4 Ryan Roberts 2025-06-09 3280 */ > b58187b2ba0af4 Ryan Roberts 2025-06-09 3281 struct vm_area_struct *vma = vmf->vma; > b58187b2ba0af4 Ryan Roberts 2025-06-09 3282 unsigned long start = vma->vm_pgoff; > b58187b2ba0af4 Ryan Roberts 2025-06-09 @3283 unsigned long end = start + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT); Please squash the following into Commit 9fc12248e06c ("mm/filemap: allow arch to request folio size for exec memory") (that's the SHA it has in today's mm- unstable), to use the vma_pages() helper instead of open-coding: ---8<--- diff --git a/mm/filemap.c b/mm/filemap.c index 957189a12968..0d0369fb5fa1 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3279,7 +3279,7 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf) */ struct vm_area_struct *vma = vmf->vma; unsigned long start = vma->vm_pgoff; - unsigned long end = start + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT); + unsigned long end = start + vma_pages(vma); unsigned long ra_end; ra->order = exec_folio_order(); ---8<--- Thanks, Ryan > b58187b2ba0af4 Ryan Roberts 2025-06-09 3284 unsigned long ra_end; > b58187b2ba0af4 Ryan Roberts 2025-06-09 3285 > b58187b2ba0af4 Ryan Roberts 2025-06-09 3286 ra->order = exec_folio_order(); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3287 ra->start = round_down(vmf->pgoff, 1UL << ra->order); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3288 ra->start = max(ra->start, start); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3289 ra_end = round_up(ra->start + ra->ra_pages, 1UL << ra->order); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3290 ra_end = min(ra_end, end); > b58187b2ba0af4 Ryan Roberts 2025-06-09 3291 ra->size = ra_end - ra->start; > b58187b2ba0af4 Ryan Roberts 2025-06-09 3292 ra->async_size = 0; > b58187b2ba0af4 Ryan Roberts 2025-06-09 3293 } else { > d30a11004e3411 Wu Fengguang 2009-06-16 3294 /* > d30a11004e3411 Wu Fengguang 2009-06-16 3295 * mmap read-around > d30a11004e3411 Wu Fengguang 2009-06-16 3296 */ > db660d462525c4 David Howells 2020-10-15 3297 ra->start = max_t(long, 0, vmf->pgoff - ra->ra_pages / 2); > 600e19afc5f8a6 Roman Gushchin 2015-11-05 3298 ra->size = ra->ra_pages; > 600e19afc5f8a6 Roman Gushchin 2015-11-05 3299 ra->async_size = ra->ra_pages / 4; > 28b31a2b2dbfc0 Ryan Roberts 2025-06-09 3300 ra->order = 0; > b58187b2ba0af4 Ryan Roberts 2025-06-09 3301 } > db660d462525c4 David Howells 2020-10-15 3302 ractl._index = ra->start; > 28b31a2b2dbfc0 Ryan Roberts 2025-06-09 3303 page_cache_ra_order(&ractl, ra); > 6b4c9f4469819a Josef Bacik 2019-03-13 3304 return fpin; > ef00e08e26dd5d Linus Torvalds 2009-06-16 3305 } > ef00e08e26dd5d Linus Torvalds 2009-06-16 3306 >