From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793914441; b=mydavL42KeCEQgjOKoXiCp4B5p0mqyNBzr6b8DXB95iRfWntvkAE6Wx6j7oH6IYPa9bB XG+8zMVn1b6hJxopaJdGCFi6SnnZ0FwSUBgw/aL5DxhpkSlOjmv8AUEAIcTFw9PkMCE/i iugw72jEgdY/nBD8uwecFZCkndBPoKsGMQVr7u2jdzjx08E7shMOI/2uNlTSXAADSRJJi QP0H21+uF+Pjnf638XbhooFZ73Ewc7QUkpmrku+LqXbyNKh+wNk0LTKcA/RUiECR1UtE/ LBYRULW75BzufZLp9z6iuOC6/VDMLOtB5qTkiqWU+XpsIsGKYS9jF8fWJwba5jBEs1g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793914441; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=Q1O6PsPSrFnt9BTLaaISkTdkv8+AsEerts7T47IxUwQ=; b=qaNJhiYsi65aPwhY2l7n4YsK5scsp0wkR4Tc6YazKHuI3OCpm6ovmmkdS2MKxnX2uje6 /KSJ/vUeJUFt2rFxMrQ9q33pC4nKwkGp3EdFcGuKOXwyaRK3Ee0uTCQ8fJJJmKoMAWOal agbW8OEQioqVTFg7eRA/liatbhqhZ1fR+gjfEVSnuUe6gkw/CGpa5zOMy9zlZpNCeoq1q GnDcYfP8CwP1vunCyA75olbSFDItOcpLob0LBwPLNW12SRYGvR72YkpjnwMghw7bxnPYc vs17c2cUcV1Wp/EHOgWBKpfCvt3lyYMS/boHKe0W6dJERw7O8kGUGGn1jJ01IJEo0Wg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=FP6qFnXO; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2327606A338; Thu, 5 Nov 2026 21:34:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=FP6qFnXO Received: by smtp.kernel.org (Postfix) with ESMTPSA id 265CA1F0089F; Thu, 5 Nov 2026 21:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793914440; bh=Q1O6PsPSrFnt9BTLaaISkTdkv8+AsEerts7T47IxUwQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=FP6qFnXOsA4KQpngsPCZd5lXBRNPCMj99mGbaOnvk5VdxhrZD9E2YiEbUspll/M98 k46DOiZz/G4kPuu8uUVt4XNGYcEkntyJBALH3XTT3CahGiUpY2cDDeocvjUuhR/9p0 wJGvlS5BjR/voyFaU125NCiqWpfEoToetp0cUf9HT58FmMhUV9ZuaxarhpeLKXuy9W qlKv7KwkPEzfONlC3AHLNnNMXXon1I/FJSztkelxU5z1gphUucDgmgGsBNnuZsWVqz Ho3I6eXllot+zXbOF7NC4ZDW5Vek8hlvaZQeijm2vj/9vbhhr6pkv8eyISBtYZOGxb 9183O3UZctltw== From: "Lorenzo Stoakes (ARM)" Date: Thu, 05 Nov 2026 21:30:59 +0000 Subject: [PATCH 08/13] mm: convert miscellaneous VMA flag tests to use vma_flags_t X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261105-late-2026-vma-flags-v1-8-0d3cd15ab75f@kernel.org> References: <20261105-late-2026-vma-flags-v1-0-0d3cd15ab75f@kernel.org> In-Reply-To: <20261105-late-2026-vma-flags-v1-0-0d3cd15ab75f@kernel.org> To: Andrew Morton , David Hildenbrand , Jason Gunthorpe , John Hubbard , Peter Xu , "Matthew Wilcox (Oracle)" , Jan Kara , Rik van Riel , "Liam R. Howlett" , Vlastimil Babka , Harry Yoo , Jann Horn , Lance Yang , Zi Yan , Matthew Brost , Joshua Hahn , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Usama Arif , Kiryl Shutsemau , Xu Xin , Chengming Zhou , Madhavan Srinivasan , Nicholas Piggin , Michael Ellerman , "Christophe Leroy (CS GROUP)" , "Ritesh Harjani (IBM)" , Shrikanth Hegde , Pedro Falcato , Kairui Song , Qi Zheng , Shakeel Butt , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Leon Romanovsky , SJ Park , Rakie Kim , David Rientjes , Alexander Viro , Christian Brauner , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Masami Hiramatsu , Oleg Nesterov , John Johansen , Georgia Garcia , Paul Moore , James Morris , "Serge E. Hallyn" , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Fan Wu , Stephen Smalley , =?utf-8?q?Ondrej_Mosn=C3=A1=C4=8Dek?= Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, damon@lists.linux.dev, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, "Lorenzo Stoakes (ARM)" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7804; i=ljs@kernel.org; h=from:subject:message-id; bh=qpbuJVrxyY/7AAHSEFGEKenLjEhgiUuNHBU8QsxXe74=; b=owGbwMvMwCV2fu7ZrsZH9SKMp9WSGLLefF0+1f0Tq5WqHxOL/8ZuOem6JVHm36fmN294GXLt9 Oy1G9aWdJSyMIhxMciKKbI8/yK+P0gkbF7nBX83mDmsTCBDGLg4BWAiM58wMnw+cf5EVN3exN9H REo0wg+meG1S8M+ISRBNuON3NNyf24OR4aTj3j3KcWEz8vZrMrSkLHpV0no97fyM/DRD6bnMDyf HcwMA X-Developer-Key: i=ljs@kernel.org; a=openpgp; fpr=E7F417BF5214569E89D04F46CF9DCD8A81E27F14 Replace use of the legacy vm_flags_t flags with vma_flags_t values in the remaining straightforward VMA flag tests scattered throughout core mm, HMM (and its test module), DAMON and the OOM reaper. No functional change intended. Signed-off-by: Lorenzo Stoakes (ARM) --- include/linux/mm_inline.h | 2 +- lib/test_hmm.c | 4 ++-- mm/damon/vaddr.c | 2 +- mm/hmm.c | 6 +++--- mm/internal.h | 2 +- mm/mempolicy.c | 4 ++-- mm/mmap_lock.c | 4 ++-- mm/msync.c | 4 ++-- mm/oom_kill.c | 4 ++-- mm/pagewalk.c | 2 +- mm/vma.h | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index ab69b9930893..da04d81a819c 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -657,7 +657,7 @@ static inline pte_marker copy_pte_marker( static inline bool vma_has_recency(const struct vm_area_struct *vma) { - if (vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ)) + if (vma_test_any(vma, VMA_SEQ_READ_BIT, VMA_RAND_READ_BIT)) return false; if (vma->vm_file && (vma->vm_file->f_mode & FMODE_NOREUSE)) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index b409c42bfe6f..d7702d99ac9b 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -1248,7 +1248,7 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror, mmap_read_lock(mm); for (addr = start; addr < end; addr = next) { vma = vma_lookup(mm, addr); - if (!vma || !(vma->vm_flags & VM_READ)) { + if (!vma || !vma_test(vma, VMA_READ_BIT)) { ret = -EINVAL; goto out; } @@ -1320,7 +1320,7 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, mmap_read_lock(mm); for (addr = start; addr < end; addr = next) { vma = vma_lookup(mm, addr); - if (!vma || !(vma->vm_flags & VM_READ)) { + if (!vma || !vma_test(vma, VMA_READ_BIT)) { ret = -EINVAL; goto out; } diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index b549496ea8e2..9a43f7428142 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -240,7 +240,7 @@ static void damon_va_walk_page_range(struct mm_struct *mm, unsigned long start, goto lock_mmap; } - if (!(vma->vm_flags & VM_PFNMAP)) { + if (!vma_test(vma, VMA_PFNMAP_BIT)) { ops->walk_lock = PGWALK_VMA_RDLOCK_VERIFY; walk_page_range_vma(vma, start, end, ops, private); } diff --git a/mm/hmm.c b/mm/hmm.c index 2f1e98c6b644..058d0b48399a 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -595,8 +595,8 @@ static int hmm_vma_walk_test(unsigned long start, unsigned long end, struct hmm_range *range = hmm_vma_walk->range; struct vm_area_struct *vma = walk->vma; - if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)) && - vma->vm_flags & VM_READ) + if (!vma_test_any(vma, VMA_IO_BIT, VMA_PFNMAP_BIT) && + vma_test(vma, VMA_READ_BIT)) return 0; /* @@ -659,7 +659,7 @@ static int hmm_do_fault(struct mm_struct *mm, return -EFAULT; if (required_fault & HMM_NEED_WRITE_FAULT) { - if (!(vma->vm_flags & VM_WRITE)) + if (!vma_test(vma, VMA_WRITE_BIT)) return -EPERM; fault_flags |= FAULT_FLAG_WRITE; } diff --git a/mm/internal.h b/mm/internal.h index 8b1263e81054..cbb205f06097 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1249,7 +1249,7 @@ size_t splice_folio_into_pipe(struct pipe_inode_info *pipe, static inline bool vma_is_single_threaded_private(struct vm_area_struct *vma) { - if (vma->vm_flags & VM_SHARED) + if (vma_test(vma, VMA_SHARED_BIT)) return false; return atomic_read(&vma->vm_mm->mm_users) == 1; diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 80c693c6d693..31d42bcad529 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2015,7 +2015,7 @@ SYSCALL_DEFINE5(get_mempolicy, int __user *, policy, bool vma_migratable(struct vm_area_struct *vma) { - if (vma->vm_flags & (VM_IO | VM_PFNMAP)) + if (vma_test_any(vma, VMA_IO_BIT, VMA_PFNMAP_BIT)) return false; /* @@ -2565,7 +2565,7 @@ struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, struct vm_area_struct pgoff_t ilx; struct folio *folio; - if (vma->vm_flags & VM_DROPPABLE) + if (vma_test_single_mask(vma, VMA_DROPPABLE)) gfp |= __GFP_NOWARN; pol = get_vma_policy(vma, addr, order, &ilx); diff --git a/mm/mmap_lock.c b/mm/mmap_lock.c index 834bbf86e004..1b0560a4dfcd 100644 --- a/mm/mmap_lock.c +++ b/mm/mmap_lock.c @@ -636,7 +636,7 @@ struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm, * Well, dang. We might still be successful, but only * if we can extend a vma to do so. */ - if (!vma || !(vma->vm_flags & VM_GROWSDOWN)) { + if (!vma || !vma_test(vma, VMA_GROWSDOWN_BIT)) { mmap_read_unlock(mm); return NULL; } @@ -659,7 +659,7 @@ struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm, goto fail; if (vma->vm_start <= addr) goto success; - if (!(vma->vm_flags & VM_GROWSDOWN)) + if (!vma_test(vma, VMA_GROWSDOWN_BIT)) goto fail; } diff --git a/mm/msync.c b/mm/msync.c index 90b491a27a14..953efa1738c5 100644 --- a/mm/msync.c +++ b/mm/msync.c @@ -81,7 +81,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags) } /* Here vma->vm_start <= start < vma->vm_end. */ if ((flags & MS_INVALIDATE) && - (vma->vm_flags & VM_LOCKED)) { + vma_test(vma, VMA_LOCKED_BIT)) { error = -EBUSY; goto out_unlock; } @@ -90,7 +90,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags) fend = fstart + (min(end, vma->vm_end) - start) - 1; start = vma->vm_end; if ((flags & MS_SYNC) && file && - (vma->vm_flags & VM_SHARED)) { + vma_test(vma, VMA_SHARED_BIT)) { get_file(file); mmap_read_unlock(mm); error = vfs_fsync_range(file, fstart, fend, 1); diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 5d48bd862c27..91b11299cb5d 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -524,7 +524,7 @@ static bool __oom_reap_task_mm(struct mm_struct *mm) * of the address space. */ mas_for_each_rev(&mas, vma, 0) { - if (vma->vm_flags & (VM_HUGETLB|VM_PFNMAP)) + if (vma_test_any(vma, VMA_HUGETLB_BIT, VMA_PFNMAP_BIT)) continue; /* @@ -537,7 +537,7 @@ static bool __oom_reap_task_mm(struct mm_struct *mm) * we do not want to block exit_mmap by keeping mm ref * count elevated without a good reason. */ - if (vma_is_anonymous(vma) || !(vma->vm_flags & VM_SHARED)) { + if (vma_is_anonymous(vma) || !vma_test(vma, VMA_SHARED_BIT)) { if (zap_vma_for_reaping(vma)) ret = false; } diff --git a/mm/pagewalk.c b/mm/pagewalk.c index e6493bbe6919..41e19f544493 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -393,7 +393,7 @@ static int walk_page_test(unsigned long start, unsigned long end, * define their ->pte_hole() callbacks, so let's delegate them to handle * vma(VM_PFNMAP). */ - if (vma->vm_flags & VM_PFNMAP) { + if (vma_test(vma, VMA_PFNMAP_BIT)) { int err = 1; if (ops->pte_hole) err = ops->pte_hole(start, end, -1, walk); diff --git a/mm/vma.h b/mm/vma.h index 3fc3b47a954b..201dbfe3d7f8 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -597,9 +597,9 @@ static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma * private mappings, that's always the case when we have write * permissions as we properly have to handle COW. */ - if (vma->vm_flags & VM_SHARED) + if (vma_test(vma, VMA_SHARED_BIT)) return vma_wants_writenotify(vma, vma->vm_page_prot); - return !!(vma->vm_flags & VM_WRITE); + return vma_test(vma, VMA_WRITE_BIT); } #ifdef CONFIG_MMU -- 2.56.0