From mboxrd@z Thu Jan 1 00:00:00 1970 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 3B228C4828F for ; Sat, 3 Feb 2024 01:46:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8B096B0078; Fri, 2 Feb 2024 20:46:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A3B126B007B; Fri, 2 Feb 2024 20:46:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DAB16B007D; Fri, 2 Feb 2024 20:46:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7A6246B0078 for ; Fri, 2 Feb 2024 20:46:58 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 428AEA21D2 for ; Sat, 3 Feb 2024 01:46:58 +0000 (UTC) X-FDA: 81748804116.18.B8D18C9 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) by imf26.hostedemail.com (Postfix) with ESMTP id 6D85C14000C for ; Sat, 3 Feb 2024 01:46:56 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=p6EkLQZK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706924816; 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:references:dkim-signature; bh=uQvZQX7CRf4lYHiNuYQqSkwD20GYoPXfurrH/TrfrDM=; b=1l0xMW6f+tBrudbDIAk0PZZ3Hva+ta3Dj1QjCbQic3ClDbBB7YnPCk1iHW0IQ5ycyBsLd7 OEKq6vrWauY3rt1kXCSLhYRVU5fIwQMWuQCRRxLHOAViMLdGj/MtvfZXE2fnxnNLxPRrzf JMcA8H6E3ynHNAY5OOWQnP3PTEuL15Q= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=p6EkLQZK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706924816; a=rsa-sha256; cv=none; b=aCXjk7NMvjWp0jMgNGcdj+4oDZonIVj7p5erlKHVBPqENxh+ReNgJvVAH4R71IHI2OyyO6 Gq++YV8FUYbX6SqWUKiT0o8c2aDZ8PYmd9T7fU8tR+G7utBsJaux4o55uEHfKQD3JYnC2k ww0AAQKq1zhIDTdforIF4P+xD7M+CMk= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706924814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=uQvZQX7CRf4lYHiNuYQqSkwD20GYoPXfurrH/TrfrDM=; b=p6EkLQZKrQJEwcsgDXE/fTmFVdRqB943qHykZbOyVKNKxwNukE2NC5ycHNeoh+pKu5DciD jCL1nM06SY/U4834ld1B8GqctQdCtx6eSxdVEpXPblqihAZISAe4MJdu4D7JWBjxfCn4aG zjyQ0wQ5bXKBGbnovzi/9l2nur7cCh4= From: Yajun Deng To: akpm@linux-foundation.org Cc: Liam.Howlett@Oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3] mm/mmap: pass vma to vma_merge() Date: Sat, 3 Feb 2024 09:46:32 +0800 Message-Id: <20240203014632.2726545-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6D85C14000C X-Stat-Signature: 5tbs83mki3zi75i5d4fiuhmoknhbtffx X-Rspam-User: X-HE-Tag: 1706924816-547076 X-HE-Meta: U2FsdGVkX19d80RvdPHzUuXvQ6xG7iHc5qRxL1LWATo2TUObQdtM7wa34wRdg2wmwbKN8lMGaaTSJyHq39baRa71shKv+rASJGgoVv/8wCN3qRfEAOVqmT5+wxaiTphsywZLpmVAS06O2NjBcUdTkLAfYz/D8FSSUrUoVhLxvxzIKe0RsqXKKpnwCdFJTezcZJioprPqfp4GAk+uZcZ+CcxyKO1omStTifbwLsQCxKL0eF1dAA/qyEtwjHj0dpsQxfeE01CApsw4PMTax4uVsKRsGZ9Kmdb0UMHk5PUrrz856qgwNMeQvNm/LrfZd+ZoBLAy7rGwIdAUwZLYFn+kTULYBQPUg7ZohS3UBpZz0LCrcDOYhK1TbNtCzMmPVyo8Qrtd6NcqE3j1G4OJKb2SEAtBcwccw9sk79IbV9rrdC6MttjcEjDEfE6urDkuz3mmt/oWQIePgzO9QGLqNYYtFtnAZ+7Yft9eZusX9EYpqbsRnGWYY05XyySw1PkwQMtFQcwLcYjhqKfTABySwu32BtQBt8wHpOjAqOjkR31XGO317tcdH81g7ItE3ahgW6mETqfUBWwzzyx0Fl2vgg6ZW5QPizVsGPIuUeXmjMDnLjBvh7s46ZnHWUpmkbYAj7WAS1m7sdHsVTVjILVwmFRcHRBbVB82AYDZf/O6kR0rc5GMy74UyxZGFd8OjzZa2HMLKIZNmehCTHOYC3bYw+jgsOHuYR9gKv6mzgiLyxUg6fZBpq+T2hjJFsPlbBbUE8pv69Gtz1dNeJqpfdaSyOu+TEFTgLaja2xxqYR8SnWTHVxrktJkuc21uihLQOZAySsbB8KpYaadqR8Pmaf+nW7xQEFEIjaKs85KqfA1uS/UFkTfLILNB5Nmhal9GCz+kSyc16HE/XQg8cVhLVSmGtwkwqU/TcpZrY7sUqfbX4EGfbw9OGPuQMJ0R/TNMHsU0mprf8drbz+AqmvfMMrqWxb g8TDhwcu KOggTwmqJMuDvdblO9g4qCB9bCZabMLimbvybPUQXsDU4imJO3Z/kBp60rS+amnbkBPg9bsNoTuxUDllsj0kxg6gwVZUDw/V6EMyC+rd/5eBqTme9nSA4J6BKNxfPyZVN4B2rpUhvnckJJGGhcYMf/Zhpc5dFSDJ9TspkBe4MVAcPHls= 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: These vma_merge() callers will pass mm, anon_vma and file, they all from the same vma. There is no need to pass three parameters at the same time. Pass vma instead of mm, anon_vma and file to vma_merge(), so that it can save two parameters. Signed-off-by: Yajun Deng --- v3: resend the first patch again alone. v2: split it into two patches. v1: https://lore.kernel.org/all/20240118082312.2801992-1-yajun.deng@linux.dev/ --- mm/mmap.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 485a6e1e4226..8f176027583c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -860,13 +860,15 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, * area is returned, or the function will return NULL */ static struct vm_area_struct -*vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, - struct vm_area_struct *prev, unsigned long addr, unsigned long end, - unsigned long vm_flags, struct anon_vma *anon_vma, struct file *file, - pgoff_t pgoff, struct mempolicy *policy, +*vma_merge(struct vma_iterator *vmi, struct vm_area_struct *prev, + struct vm_area_struct *src, unsigned long addr, unsigned long end, + unsigned long vm_flags, pgoff_t pgoff, struct mempolicy *policy, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, struct anon_vma_name *anon_name) { + struct mm_struct *mm = src->vm_mm; + struct anon_vma *anon_vma = src->anon_vma; + struct file *file = src->vm_file; struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; struct vm_area_struct *anon_dup = NULL; @@ -2426,9 +2428,8 @@ struct vm_area_struct *vma_modify(struct vma_iterator *vmi, pgoff_t pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT); struct vm_area_struct *merged; - merged = vma_merge(vmi, vma->vm_mm, prev, start, end, vm_flags, - vma->anon_vma, vma->vm_file, pgoff, policy, - uffd_ctx, anon_name); + merged = vma_merge(vmi, prev, vma, start, end, vm_flags, + pgoff, policy, uffd_ctx, anon_name); if (merged) return merged; @@ -2458,9 +2459,8 @@ static struct vm_area_struct struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff) { - return vma_merge(vmi, vma->vm_mm, prev, start, end, vma->vm_flags, - vma->anon_vma, vma->vm_file, pgoff, vma_policy(vma), - vma->vm_userfaultfd_ctx, anon_vma_name(vma)); + return vma_merge(vmi, prev, vma, start, end, vma->vm_flags, pgoff, + vma_policy(vma), vma->vm_userfaultfd_ctx, anon_vma_name(vma)); } /* @@ -2474,10 +2474,9 @@ struct vm_area_struct *vma_merge_extend(struct vma_iterator *vmi, pgoff_t pgoff = vma->vm_pgoff + vma_pages(vma); /* vma is specified as prev, so case 1 or 2 will apply. */ - return vma_merge(vmi, vma->vm_mm, vma, vma->vm_end, vma->vm_end + delta, - vma->vm_flags, vma->anon_vma, vma->vm_file, pgoff, - vma_policy(vma), vma->vm_userfaultfd_ctx, - anon_vma_name(vma)); + return vma_merge(vmi, vma, vma, vma->vm_end, vma->vm_end + delta, + vma->vm_flags, pgoff, vma_policy(vma), + vma->vm_userfaultfd_ctx, anon_vma_name(vma)); } /* -- 2.25.1