From patchwork Mon Mar 10 17:23:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14010445 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 C4D4EC282DE for ; Mon, 10 Mar 2025 17:23:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23FA2280025; Mon, 10 Mar 2025 13:23:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C51228000B; Mon, 10 Mar 2025 13:23:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03EDE280025; Mon, 10 Mar 2025 13:23:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D5FE628000B for ; Mon, 10 Mar 2025 13:23:31 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 682D8B8EAF for ; Mon, 10 Mar 2025 17:23:32 +0000 (UTC) X-FDA: 83206313064.25.AB729DD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id B5B25140014 for ; Mon, 10 Mar 2025 17:23:30 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hQaulE8A; spf=pass (imf26.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741627410; 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:dkim-signature; bh=3SF2PSh+LV92puKFbfvOVdj8msgpYK7b4AvM1fkKrao=; b=zbeHx1WxBReMA3TdaNesW+R1GKbQUdDKvnfVME8A7T2UC45rgpfxsHhxfCXBlJ9uyv0Ock wfm0VjMSo9FgTkbYOto/alJNdKUWw6xE7vKNAmGJse5qFvI74077u7eITH2/AC6Xle8nGP 2p+uttgZENg96ubKs0M6nm4ZXi5R7mg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hQaulE8A; spf=pass (imf26.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741627410; a=rsa-sha256; cv=none; b=nohMF7O+u6WrD8hXHrljmPXAs8K06e5HpOF5Au8vJt6X2bfpSjeK2oszYUowRqeTgb2r1W KU+QkH4QrS6dYaBqvxKhu9zTFOuRsQDhcalzEirbp5nDThNN1mRyoDR6VcmO+/2zgLoZWC 1+Mj7Fy/UYR77W20N10D/oHHMxARPrY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0D7215C55B2; Mon, 10 Mar 2025 17:21:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77A85C4CEF7; Mon, 10 Mar 2025 17:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741627409; bh=4dhdwBK3uXi/DICcheMKZstN40gWxuAC0U5kXen1d3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQaulE8A/QMb9rjKSApl6fMLGmwITsJNjmDE/wylUwceFMbDOjyBzaCG+ymEcYxtB yac+cSxxdxCG0sffnMnnapqPgVDofYfA7hCavPyXj62MObV73yNUVRcBVPpbbJ+pXp Ao1+ptYPErt93XP/gPcnFn4ayqyp1rMQRPBxYKY2tUtmV9FZGignk+VK9guNz7H9B2 Db0uGgEW7OgM/N+Dwnj8hWTSmB634uk7VEeM0J0r06rbD/IUwDR8mmoXV/y82Sgtj+ lO1ipuZJ8GoK4eZQJxxAMeDsw78WXXsY330Uy2c35Zl4OjMo9XCFhWMFlEFss4ZzH7 QeXzSHEmPnwyg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 5/9] mm/madvise: define and use madvise_behavior struct for madvise_do_behavior() Date: Mon, 10 Mar 2025 10:23:14 -0700 Message-Id: <20250310172318.653630-6-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310172318.653630-1-sj@kernel.org> References: <20250310172318.653630-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B5B25140014 X-Stat-Signature: rk95616m1ckgxqxp5kcukddybme9rb5r X-Rspam-User: X-HE-Tag: 1741627410-847725 X-HE-Meta: U2FsdGVkX1/6KLJ8Zc+yWNa+t99isQV4zVgb0DFuszlWSY7JhaieEM3AEzZ/b5GXdq3oF4+U+PdMZlLAsGV4iydE2Bbd9TM866SKuCpGNR2M1VIFOiKSaBKBQqhbLZTmAwXqkkpI++1uP+JGMkWugXQnqf2aHCf0ITs62EFtp3caM40NGIfJEOSAd3+f8P5SBIuZIrGCxnjiK/NEsKk1rzGPS3NLqELHJBOhP8TlfitXPp9dT/Grzj8c7rhXPkheSB/aIeiZYMbI+WIafIe8FV3mVYe5Gc+XVNJ4BhXr+drrhY932SrS4qStr+5qLyrSCkKXvzalyOsBW5Aj+yWiwJZdoglrZIxBGp6C7PzzMc8UnaDzfr/cSSdLfTIS/pnbybsz1mHmTCKKvlX+5diV406HraT5B/EILedHHcGKqkjeM54iwQfJymxglwLeZC7PoP2ybAXSFy7lKkqkly1/E6SNeWAfzjZSUjaCN800YzW9e4DLUv8sndZ3PbKPSoPe0IdxSrWDss9b47Rigoc0akKPtGiC/cXq/f8NGxMRdai9bhH4/5/HxO/+EY50EdcdtBdqwVusNnDE6Evi8QJ0gNv19BR9ET2hxqaOsvX3gqCrgjcYELAXczhg+oU5tfEq3H1b0O3EqfyLkcvKwWsEcNL6N9gKuf9y/GeCbT25c8ODerKxrzikYCY9uza5VW7MEv8tWAn/1966KGWdDU6tl7IpBZF63btL+vA47mSSdjNaymhoPdwnn9E5uFjxAYmAzSiJxSEg1GVUbQh3cM+tfw4incE3ds00GrbiJ5YP5mZ2yiknkPlL/hH4s8Q2lLQFUZzy+4/P7v+qB5OP7ag+n1Jc+3i/2wDYG15gpvmOWTyEvSlQJ+9AtcZ8hEfj1l7MUTehkkp0XvwfsfdzxSPYkDVIIhMczHVP3NcTG6x7PbSjYQn0hoG/Fw9+bK0j+vQIcLPe4VoQVn+V1UDRabk nH/ZIuPq 2cssOWann7N6sC/W0IQvWdmHzkh/4KF6ZOIgUWW/9YTuezMOJZVjVxjVNIYJxX6c7/+8k0LDYtYLeNUimyrWFL6k/NShhfWdQbAF9oCTXnPdpDcFwE6qa2oU85B4zL0UOhDQj9+vgUKceGaJbvBpoSIp1rpGQR88FAWpqyKbC8Z1KeyfxgD6G5bhfUtmZUtb09gzSvv0lzmZXBLo3B8qTpq3kovWL3yp2+vTuf9Uletff4QcS6iXRNf4Cez5xGhoHtxTnUvGdH1n0PRSSupzRHQM3UQ== 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: 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(). Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes --- mm/madvise.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 469c25690a0e..ba2a78795207 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -890,11 +890,16 @@ static bool madvise_dontneed_free_valid_vma(struct vm_area_struct *vma, return true; } +struct madvise_behavior { + int behavior; +}; + 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 *madv_behavior) { + int behavior = madv_behavior->behavior; struct mm_struct *mm = vma->vm_mm; *prev = vma; @@ -1249,8 +1254,10 @@ static long madvise_guard_remove(struct vm_area_struct *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 = behavior_arg; + int behavior = arg->behavior; int error; struct anon_vma_name *anon_name; unsigned long new_flags = 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 = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ; break; @@ -1487,10 +1494,10 @@ static bool process_madvise_remote_valid(int behavior) */ 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; @@ -1557,7 +1564,7 @@ static int madvise_vma_anon_name(struct vm_area_struct *vma, return -EBADF; error = madvise_update_vma(vma, prev, start, end, vma->vm_flags, - (struct anon_vma_name *)anon_name); + anon_name); /* * madvise() returns EAGAIN if kernel resources, such as @@ -1589,7 +1596,7 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, if (end == start) return 0; - 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 */ @@ -1673,8 +1680,10 @@ static bool is_madvise_populate(int behavior) } 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 = madv_behavior->behavior; struct blk_plug plug; unsigned long end; int error; @@ -1688,7 +1697,7 @@ static int madvise_do_behavior(struct mm_struct *mm, if (is_madvise_populate(behavior)) error = madvise_populate(mm, start, end, behavior); else - error = madvise_walk_vmas(mm, start, end, behavior, + error = madvise_walk_vmas(mm, start, end, madv_behavior, madvise_vma_behavior); blk_finish_plug(&plug); return error; @@ -1769,13 +1778,14 @@ static int madvise_do_behavior(struct mm_struct *mm, int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int behavior) { int error; + struct madvise_behavior madv_behavior = {.behavior = behavior}; if (madvise_should_skip(start, len_in, behavior, &error)) return error; error = madvise_lock(mm, behavior); if (error) return error; - error = madvise_do_behavior(mm, start, len_in, behavior); + error = madvise_do_behavior(mm, start, len_in, &madv_behavior); madvise_unlock(mm, behavior); return error; @@ -1792,6 +1802,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, { ssize_t ret = 0; size_t total_len; + struct madvise_behavior madv_behavior = {.behavior = behavior}; total_len = iov_iter_count(iter); @@ -1807,7 +1818,8 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, if (madvise_should_skip(start, len_in, behavior, &error)) ret = error; else - ret = madvise_do_behavior(mm, start, len_in, behavior); + ret = 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