From nobody Sat Feb 7 18:52:15 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76CBB19995E for ; Fri, 4 Apr 2025 21:07:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743800828; cv=none; b=Fk61k2RDJ7i8F01zQ19rmrqQSApoSsPvUNeBoQ7z2hsYbVK4LCg3DJ08e6qxrCfoMiCHqmRO49anwYHEAVFSi1sywRBbQ3id3Ny0fjPpKCK7w8r5romEeRJS+x+gJykd/cecyf48dPCHRDFIhsayGIkOlISTrCfvcSi88WUNuok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743800828; c=relaxed/simple; bh=CxwThz77NK2ocIQM45XioWZ5doCa2VSf2GhbT9w5GE0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pdJJKe7PORVAS8VAMy572b0U/sEec1LPCTNRav+/kb93Ot9u8DO1TCvBK3JjpAuamX6KCQB16V8fJJPCxYs4GCcqnJ7VvAJZl/eC05cjuiHfzoksQ1gCE+kHtMq+9034qSa7tJ0wl5Qa8CyAMT2bNokfDWCVSo+ClyFkVS6Z+hY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HUNgvhyS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HUNgvhyS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B4BFC4CEDD; Fri, 4 Apr 2025 21:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743800827; bh=CxwThz77NK2ocIQM45XioWZ5doCa2VSf2GhbT9w5GE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUNgvhySHeYKE/pVHAXtqhLJUQbvfW/laXnWakps7gS2JVcoFZwX2YpU7xEIOUgLs qnHQZw+MxH4zoiiMIKJSjJm4+G1PgLa62n1szHW306Eka5L1Lva0xa5tMCJ2hjJTJg +iKJgQ1FaOJjNz8MbaHkcJ65VX6Yx9UtkFLPcaoHzjnOsewVwsdtRNW0orFgQiMmma E+oxc36SF1Z+/bhzGGfeYsoqfWYMBbjJ4Pn3t2d64j/uUTNOE/LVMaFgdpDMpjBpUN RtwE4iFSLMjjRMNcrVeRfEISqjGd1bYLPWultgzuAKddTnwjOvwia2wpgcWZfIzd/s yEfzJSsfQeEXQ== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R.Howlett" , David Hildenbrand , Lorenzo Stoakes , Rik van Riel , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 1/4] mm/madvise: define and use madvise_behavior struct for madvise_do_behavior() Date: Fri, 4 Apr 2025 14:06:57 -0700 Message-Id: <20250404210700.2156-2-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250404210700.2156-1-sj@kernel.org> References: <20250404210700.2156-1-sj@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To implement batched tlb flushes for MADV_DONTNEED[_LOCKED] and MADV_FREE, an mmu_gather object in addition to the behavior integer need to be passed to the internal logics. Using a struct can make it easy without increasing the number of parameters of all code paths towards the internal logic. Define a struct for the purpose and use it on the code path that starts from madvise_do_behavior() and ends on madvise_dontneed_free(). Note that this changes madvise_walk_vmas() visitor type signature, too. Specifically, it changes its 'arg' type from 'unsigned long' to the new struct pointer. Reviewed-by: Lorenzo Stoakes Signed-off-by: SeongJae Park --- mm/madvise.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index b17f684322ad..8bcfdd995d18 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -48,6 +48,11 @@ struct madvise_walk_private { bool pageout; }; =20 +struct madvise_behavior { + int behavior; + struct mmu_gather *tlb; +}; + /* * Any behaviour which results in changes to the vma->vm_flags needs to * take mmap_lock for writing. Others, which simply traverse vmas, need @@ -893,12 +898,13 @@ static bool madvise_dontneed_free_valid_vma(struct vm= _area_struct *vma, static long madvise_dontneed_free(struct vm_area_struct *vma, struct vm_area_struct **prev, unsigned long start, unsigned long end, - int behavior) + struct madvise_behavior *behavior) { + int action =3D behavior->behavior; struct mm_struct *mm =3D vma->vm_mm; =20 *prev =3D vma; - if (!madvise_dontneed_free_valid_vma(vma, start, &end, behavior)) + if (!madvise_dontneed_free_valid_vma(vma, start, &end, action)) return -EINVAL; =20 if (start =3D=3D end) @@ -915,8 +921,7 @@ static long madvise_dontneed_free(struct vm_area_struct= *vma, * Potential end adjustment for hugetlb vma is OK as * the check below keeps end within vma. */ - if (!madvise_dontneed_free_valid_vma(vma, start, &end, - behavior)) + if (!madvise_dontneed_free_valid_vma(vma, start, &end, action)) return -EINVAL; if (end > vma->vm_end) { /* @@ -945,9 +950,9 @@ static long madvise_dontneed_free(struct vm_area_struct= *vma, VM_WARN_ON(start > end); } =20 - if (behavior =3D=3D MADV_DONTNEED || behavior =3D=3D MADV_DONTNEED_LOCKED) + if (action =3D=3D MADV_DONTNEED || action =3D=3D MADV_DONTNEED_LOCKED) return madvise_dontneed_single_vma(vma, start, end); - else if (behavior =3D=3D MADV_FREE) + else if (action =3D=3D MADV_FREE) return madvise_free_single_vma(vma, start, end); else return -EINVAL; @@ -1249,8 +1254,10 @@ static long madvise_guard_remove(struct vm_area_stru= ct *vma, static int madvise_vma_behavior(struct vm_area_struct *vma, struct vm_area_struct **prev, unsigned long start, unsigned long end, - unsigned long behavior) + void *behavior_arg) { + struct madvise_behavior *arg =3D behavior_arg; + int behavior =3D arg->behavior; int error; struct anon_vma_name *anon_name; unsigned long new_flags =3D vma->vm_flags; @@ -1270,7 +1277,7 @@ static int madvise_vma_behavior(struct vm_area_struct= *vma, case MADV_FREE: case MADV_DONTNEED: case MADV_DONTNEED_LOCKED: - return madvise_dontneed_free(vma, prev, start, end, behavior); + return madvise_dontneed_free(vma, prev, start, end, arg); case MADV_NORMAL: new_flags =3D new_flags & ~VM_RAND_READ & ~VM_SEQ_READ; break; @@ -1487,10 +1494,10 @@ static bool process_madvise_remote_valid(int behavi= or) */ static int madvise_walk_vmas(struct mm_struct *mm, unsigned long start, - unsigned long end, unsigned long arg, + unsigned long end, void *arg, int (*visit)(struct vm_area_struct *vma, struct vm_area_struct **prev, unsigned long start, - unsigned long end, unsigned long arg)) + unsigned long end, void *arg)) { struct vm_area_struct *vma; struct vm_area_struct *prev; @@ -1548,7 +1555,7 @@ int madvise_walk_vmas(struct mm_struct *mm, unsigned = long start, static int madvise_vma_anon_name(struct vm_area_struct *vma, struct vm_area_struct **prev, unsigned long start, unsigned long end, - unsigned long anon_name) + void *anon_name) { int error; =20 @@ -1557,7 +1564,7 @@ static int madvise_vma_anon_name(struct vm_area_struc= t *vma, return -EBADF; =20 error =3D madvise_update_vma(vma, prev, start, end, vma->vm_flags, - (struct anon_vma_name *)anon_name); + anon_name); =20 /* * madvise() returns EAGAIN if kernel resources, such as @@ -1589,7 +1596,7 @@ int madvise_set_anon_name(struct mm_struct *mm, unsig= ned long start, if (end =3D=3D start) return 0; =20 - return madvise_walk_vmas(mm, start, end, (unsigned long)anon_name, + return madvise_walk_vmas(mm, start, end, anon_name, madvise_vma_anon_name); } #endif /* CONFIG_ANON_VMA_NAME */ @@ -1677,8 +1684,10 @@ static bool is_madvise_populate(int behavior) } =20 static int madvise_do_behavior(struct mm_struct *mm, - unsigned long start, size_t len_in, int behavior) + unsigned long start, size_t len_in, + struct madvise_behavior *madv_behavior) { + int behavior =3D madv_behavior->behavior; struct blk_plug plug; unsigned long end; int error; @@ -1692,7 +1701,7 @@ static int madvise_do_behavior(struct mm_struct *mm, if (is_madvise_populate(behavior)) error =3D madvise_populate(mm, start, end, behavior); else - error =3D madvise_walk_vmas(mm, start, end, behavior, + error =3D madvise_walk_vmas(mm, start, end, madv_behavior, madvise_vma_behavior); blk_finish_plug(&plug); return error; @@ -1773,13 +1782,14 @@ static int madvise_do_behavior(struct mm_struct *mm, int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, i= nt behavior) { int error; + struct madvise_behavior madv_behavior =3D {.behavior =3D behavior}; =20 if (madvise_should_skip(start, len_in, behavior, &error)) return error; error =3D madvise_lock(mm, behavior); if (error) return error; - error =3D madvise_do_behavior(mm, start, len_in, behavior); + error =3D madvise_do_behavior(mm, start, len_in, &madv_behavior); madvise_unlock(mm, behavior); =20 return error; @@ -1796,6 +1806,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, s= truct iov_iter *iter, { ssize_t ret =3D 0; size_t total_len; + struct madvise_behavior madv_behavior =3D {.behavior =3D behavior}; =20 total_len =3D iov_iter_count(iter); =20 @@ -1811,7 +1822,8 @@ static ssize_t vector_madvise(struct mm_struct *mm, s= truct iov_iter *iter, if (madvise_should_skip(start, len_in, behavior, &error)) ret =3D error; else - ret =3D madvise_do_behavior(mm, start, len_in, behavior); + ret =3D madvise_do_behavior(mm, start, len_in, + &madv_behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat --=20 2.39.5