From patchwork Thu Apr 10 00:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14045657 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 98382C369A6 for ; Thu, 10 Apr 2025 00:00:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8AA106B015B; Wed, 9 Apr 2025 20:00:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 834466B015C; Wed, 9 Apr 2025 20:00:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D5896B015D; Wed, 9 Apr 2025 20:00:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4CCA66B015B for ; Wed, 9 Apr 2025 20:00:46 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 164771CCE3F for ; Thu, 10 Apr 2025 00:00:47 +0000 (UTC) X-FDA: 83316178134.24.FD58325 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf13.hostedemail.com (Postfix) with ESMTP id 7718420011 for ; Thu, 10 Apr 2025 00:00:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=b9oAE4TY; spf=pass (imf13.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=1744243245; 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=poQPQqAzFl41Mz7AHPcU3Sbk4NPcgLoS1V8w1FRCQtk=; b=Hhx2hvBkMNZ672G08btQ0zocHgX7zha5/C6mSjJCln2AaBIjbhcSzoTjDrjSMSRholplpr VqA2DBWpGxIbECsuy/rHBeE66XAZP+3md2PT1T3F4oNy3iE5gQXRy7RPdj8LsZVbIVJp9E DtCCTkIZTopYIFFuhsIUIuTKSce6X4Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744243245; a=rsa-sha256; cv=none; b=Oihn+iVQKjgt0OkJ9l6+FXLFYeNbXVzKPnlgUfr21E1WRJLNEfi4Yx5FGZJK2xAAvzJYCC s2ORxyiSSlxTAQuHu7Rn3tKeqIpJmi7RwXNP7u5H3sxAoSUV65xrWcdf0o33GYi1KsXz0i AD/5xvqguW+TTeFdG+/RIVOGaPZti7I= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=b9oAE4TY; spf=pass (imf13.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 E22D46112C; Thu, 10 Apr 2025 00:00:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42D10C4CEE3; Thu, 10 Apr 2025 00:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744243244; bh=xd4mck/AQ5TPoldc/O3PgGKXoydGwIPm1O/sUKAmeLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b9oAE4TYiYRGl4iNGjv4aMkqQaxVmLxLLE3yT1rh0/X9MYBtai3P6dP8ovYbsONvV IqD+wwLVuqQS8znqCewXXKH1QX2vPh1PW+UxXocMW6E7i6RJ6QVVT68DCkB/haYNQj 4e6B56AbGvGkI8wUxg9aTkC0RzZZuh+hWfJrenp6gZvixz/xdA+hm/vpQJ1iXO95tC XZqQgPb4Hp4beOK9e1xTDr0UM+cPPL+zoG1CEjDWvdYpawa0AC9bnB3GHfGeE4aX6b xGUZqOJmPmbptvnzMqOqiw/igLJR1gCriDFUnSvifui/dOmOLMuC7TKVj9w60/HWZ0 yFMxgiCdFX76w== 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 v3 1/4] mm/madvise: define and use madvise_behavior struct for madvise_do_behavior() Date: Wed, 9 Apr 2025 17:00:19 -0700 Message-Id: <20250410000022.1901-2-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410000022.1901-1-sj@kernel.org> References: <20250410000022.1901-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 7718420011 X-Stat-Signature: 5jtipffp5f8m469y6i1zh8zu6p7tsdt9 X-HE-Tag: 1744243245-23958 X-HE-Meta: U2FsdGVkX1/g3plSfNeg0YNJa732BuBHiwLMarxriggQI6dXbWkuof5cJdVxBK62EXzayXwXtgbt6rJtiF6yl8PJfi7/KpYTZ1Yqoqmn/Snn/D8FTr+o6DZ07kq97okO5sy0GVld9NpDWgaibruTPa09jTuQVgh9Q9oarGIq79rF3y2ImE17e8uPISaLo3tEkRYSPilPHCVjb27198ycgYx0na9ma3bmINk3/mgPQyC1niugH3EnORzQnn1nFsU02lgvH3rIufgNsDbUxNcP4P180RCMtfbRQK8gEGs0sfDXYJ8VXNtQ7i57poEloD/CmxRXq61bEZI+lhDLELv8XRX8wnpX/pCXR2ub9MobDmAhqbW7S9O+QbhIRF0woEUw601gmFI1fhDTuv8w9eVcmvFi+nqool4X4CBh9ApedSKWL0BioH1BqkkZUyDH5N/iiSD7+MBnH7d5hzC3vhyEqC9KXzxcbs4Ukabj4x5ITjUjDYLXlYTybU2YGbFt2ficrBU/lWPkTtwXTwk1gWjgLjTYhAPha5MinfZ1vQ9+u8w1PzSkIP/fxQyK7HUlnqrLIc7AJi9BcamP5wnQ8sySpr4JlTuem+aQfnk5XTgOSnxP8bc3FY5apwfMj4PFm7PvHx0VYlnya0NX8eP4wCSxW/WNnuY0EXs/Tcsofo46bNXIQAtEbYKROUoyMn+4uUAGQ5k5+trHTyg42AvN4tvSRQSTDXPEAZfgpB1ZZCNox4fNlnhnFKnHKJz3cZQlhR22FK+MnhWg2mFmBUCFEt+xhswExUML2LuQ1ToQvD8a2B10RVOWLDOtQosvNehjNzB/wHPFj6sLw5pywDcD7W+eV9nLbpfYq1CGl1DX/NWaAsecZ67gtqRZHywvLyUqjlmhr7Lw64dwIEaoRJwmiITcZPwuCcC8pmsp4r5cXU1ton+2/PyTTwLO1F8W3YecoMHm+wf9XQi7F4572IaFVXA FVksbfMx ezb8DkOoBsoKlgHayfCMxv14F7ryYm9zKXQGdq864d/CWIGyKZpnxL3jd9j27448z3hPQq4kR5VMi8nzdHt+eCnD/ppLVm1aHqvzjxplYWZ1WzwZw5zbgaNhUZKKj+IbkrArZzRS4RiJ7Wje0j7f19GwJonlZUofT3nu6x8RNe/9jaJ8bNV3awnmQz8pLlTtiaPFYs2bwAs54MoP+WhfvpmpWilJcIQ1/vwplln/bum9GiI728egXAqBmkT+Gr9Ruq81QyJ083p8uGtAqkx0AXIljGPnz4JTGFyO8YlDyB8+nxY4= 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 | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index b17f684322ad..26fa868b41af 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,8 +898,9 @@ 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 *madv_behavior) { + int behavior = madv_behavior->behavior; struct mm_struct *mm = vma->vm_mm; *prev = vma; @@ -1249,8 +1255,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 +1278,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 +1495,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 +1556,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 +1565,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 +1597,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 +1685,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 +1702,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 +1783,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 +1807,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 +1823,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