From patchwork Fri Apr 4 21:06:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14038911 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 DAB2DC369A2 for ; Fri, 4 Apr 2025 21:07:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2316B6B008C; Fri, 4 Apr 2025 17:07:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1935B6B0092; Fri, 4 Apr 2025 17:07:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 082296B0093; Fri, 4 Apr 2025 17:07:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DFDAA6B008C for ; Fri, 4 Apr 2025 17:07:08 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4FDAF807D3 for ; Fri, 4 Apr 2025 21:07:10 +0000 (UTC) X-FDA: 83297596620.09.47C50E8 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf05.hostedemail.com (Postfix) with ESMTP id C1FE5100003 for ; Fri, 4 Apr 2025 21:07:08 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HUNgvhyS; spf=pass (imf05.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 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=1743800828; 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=XD5DRAgwl43mO26b80F2cM1Xh7X51SvTXhMhcHPhHfc=; b=FWpbBW+Q+Gzi7dPZQlzDrASYNAdNmq5N0/+ZzzAdtmttZMviU2Q+avTyruqWvNsun9OLwr 3n8DPl5DXodpWLWXHrhO8eI5y2j8Y3lECSEUr61YvegoqitQ0Mix8a+c23+Lfgz3I/9qLJ 89WZAiC+aBNU7OKQSzqPKUR0bjnfT/Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743800828; a=rsa-sha256; cv=none; b=LtGY5Ri+WGRcCBnaS2GgFURDx+XplFIdTzsb0++aW0y4fvHAezSraCwN5kF/mBrIVfRnqb vy7gAukRmL7dQu5BTBI1UsFNAr1gil50t2L5xQwU+KxWC9nXmGAgyjii8RdHudLj71J+ri ETpR7AakIgILAf/2JctTEk/8XEfmPos= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HUNgvhyS; spf=pass (imf05.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id B8F6561139; Fri, 4 Apr 2025 21:07:00 +0000 (UTC) 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> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: C1FE5100003 X-Stat-Signature: eq18zyg48y1knehfz4ortnxgt4w7s387 X-HE-Tag: 1743800828-955012 X-HE-Meta: U2FsdGVkX1/krbl28B/+OT/Bjar3QVjWTe0ScVAe1mDrRrwaWwpSbs43CgaDCzq4tNVO8uYc9/aRox85+I8iS25oV3Oa9DI4wNkmqoPsroLBht7+Xu/WD/81kcxXPvyDrOQ55RgvCVkaV/js0JWoXKBJp7Jlwn0/HdijhStNz2hXDvIGP8jSr1QonzsgB8L+v8uVvgGE1/ExlxLdjUXFBzjgL+i8SVRsqB1vIbZtsS1Ty380P1AI/zNqkpNISHUmyVjfMVZGefOXQh9Y6HdUZ/9YQwe/wMAD5rirBNRwLQUQmT5KDAtZQC5pVGKhOlWy/EweWCuLo/uL7gf045a28hM+wdHe8be4r4SyM9pu4Bleulish5rqV1tSZOhzyp0DaIVa/CVHMfsyLaB5FgfF/s55Lmd+v5lYxLrxH8RVwh4Co+NMFr7L/1VNu1Ze2JmY2BFmp5Up7asLYxECYs8X6Hz7Zkx3hk9u5s1otoFQgMI+g7BbpT0pVQIjueuIk0lwxlM9roYXXdehEFj2in8l32gLF6YW6j/OVhW4U2juRCI8yeJacQSBP5NdB7nPh0e/kaG0QH5weuf+p+deKCO0fJ/A1I1WCIDigfGBVHn3uOhqvQ/k1Oj/3Q3evVGVN6wSxnpO7w8qPRsM9z0tCltRoLDvO6onNpLmowDyVXKXkhsXEOQulw2AKcOd5Le/qryZs32ypDK7VEzOsYjzf2EHFPxgWZNnGTd2t1qcu4grqxs9oMWCaLtpoT6mvIpp4ZMYu0QBH0o8AiKffZ5cBNCb6tEdp50Mft+hLhw5Zmi8WaxXkcKdNpGdPpzKLffIRHsXqSoLG6gizyfpZe/3yWUey3zHcokjQgIj9uxFh4uHe2CN1ElgVVzJTx2iMnFxtoCVUITwQI9LdUEz+SFp6Dw6dBZMc94100KGJvfj3Gam3X46McL2vkShRoPp3pDC/wmKgATcryyx+WBmaMvCs/E SvyMdoFy eJbnnho3rQzEH9s/9VXPIB8sUmMjO4NSBSYFBzfArQbzPR3vP26wysC20nwko2GbOGzy+w22RL8IpK3werK/swjiNuIz6Itxy0q4Ne2XFD+Vm2OplgoefzpltquiGLUCLRPG0hjFVUcFVdStoicEGIHdgb8JB2FzNcT5ebxT6lD1d2nZsKS275KXhPaO7Ugf2XYvjxiQD7r1RfMFLo0YR36yJ0ZdlDPpBkGMF9XJ45gXN1QZ+z2Yl/8dWNVbw/GQMpYQk2+cqC9bqM5ElG2RvXpq5tzDy4Fg0wDC4cJ1bi1bltIw= 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(). 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; }; +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 = behavior->behavior; struct mm_struct *mm = vma->vm_mm; *prev = vma; - if (!madvise_dontneed_free_valid_vma(vma, start, &end, behavior)) + if (!madvise_dontneed_free_valid_vma(vma, start, &end, action)) return -EINVAL; if (start == 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); } - if (behavior == MADV_DONTNEED || behavior == MADV_DONTNEED_LOCKED) + if (action == MADV_DONTNEED || action == MADV_DONTNEED_LOCKED) return madvise_dontneed_single_vma(vma, start, end); - else if (behavior == MADV_FREE) + else if (action == 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_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 */ @@ -1677,8 +1684,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; @@ -1692,7 +1701,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; @@ -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, 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; @@ -1796,6 +1806,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); @@ -1811,7 +1822,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