From nobody Wed Dec 24 16:02:37 2025 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (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 EB0F8882E for ; Thu, 25 Jan 2024 03:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706154590; cv=none; b=NWQBi7AyG4li9yqND1q9KFTryclZYpDxswMKbz6gk/LbPr/Wg3HlKxQTlWmqj0BJMB+cORnwf6ODBKT6TtNLeYOJfz7LDiwGud+U5tfjJeIty58mN/znArd5i1kwlyEATNrxWhvVamli71CVjOsqA2CCfMlwL4WHtscL8KhjLF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706154590; c=relaxed/simple; bh=jqlAvAkCgpat+VhHEUnKov5cONdf0wTY+vdjPpgtDi0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q+LeLxb0csl3wDvUZwvtMnDTIpGcpxhZHnsMc9NXMzEah2AgaeA9SMB4B1Rhwye0W+iHOpSMiaHxSiztl9AjuECp9hClbG5qEy5lRUxQJQgjYAbSFNckymOOusMEsd4dXzb3Ec0obAGEUmeDajwtsHzFfmS9iHylMrCsw+Z8Tt0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=p8fd/qFX; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="p8fd/qFX" 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=1706154586; 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: in-reply-to:in-reply-to:references:references; bh=Ts12caryezrugH79moklhax9deIOA6cUraDxKWjHyX4=; b=p8fd/qFXbNb5rBgoPLFoGR6NCbbshJlD0+cYlLoGs8vIHLRmyWEM85qkUf/nFenBz431YK UKhMzanl0wWopcVuoGaImlIUche5F8QlbRuSDEYvXQbSXp2FohGUwTlbgDXqyYHP61M8Sg S72oK8dNwlb+edx/SDwQbO5p9YNepik= From: Yajun Deng To: akpm@linux-foundation.org Cc: Liam.Howlett@Oracle.com, lstoakes@gmail.com, viro@zeniv.linux.org.uk, brauner@kernel.org, vbabka@suse.cz, willy@infradead.org, surenb@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v2 1/2] mm/mmap: pass vma to vma_merge() Date: Thu, 25 Jan 2024 11:49:21 +0800 Message-Id: <20240125034922.1004671-2-yajun.deng@linux.dev> In-Reply-To: <20240125034922.1004671-1-yajun.deng@linux.dev> References: <20240125034922.1004671-1-yajun.deng@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Liam R. Howlett --- mm/mmap.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 49d25172eac8..f19bc53bc08e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -860,13 +860,15 @@ can_vma_merge_after(struct vm_area_struct *vma, unsig= ned 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 =3D src->vm_mm; + struct anon_vma *anon_vma =3D src->anon_vma; + struct file *file =3D src->vm_file; struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; struct vm_area_struct *anon_dup =3D NULL; @@ -2424,9 +2426,8 @@ struct vm_area_struct *vma_modify(struct vma_iterator= *vmi, pgoff_t pgoff =3D vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT); struct vm_area_struct *merged; =20 - merged =3D vma_merge(vmi, vma->vm_mm, prev, start, end, vm_flags, - vma->anon_vma, vma->vm_file, pgoff, policy, - uffd_ctx, anon_name); + merged =3D vma_merge(vmi, prev, vma, start, end, vm_flags, + pgoff, policy, uffd_ctx, anon_name); if (merged) return merged; =20 @@ -2456,9 +2457,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)); } =20 /* @@ -2472,10 +2472,9 @@ struct vm_area_struct *vma_merge_extend(struct vma_i= terator *vmi, pgoff_t pgoff =3D vma->vm_pgoff + vma_pages(vma); =20 /* 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)); } =20 /* --=20 2.25.1 From nobody Wed Dec 24 16:02:37 2025 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (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 54A7610A01 for ; Thu, 25 Jan 2024 03:49:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706154596; cv=none; b=Xj3WV4TvD+aHxHTeNt/uNVPOHJqA2inZf3tE83o8Roa453J3wg9mvPZolMOUqAu726hxWnqAt8o/UYKx8jNObvhCEMP1Nn7HkmnlIAdqBql67kvdmHxuInO+GnxLhQ93HHytPBJDszBfJlngwEj8ccEDIyk1zRHKgFvcAVKrGak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706154596; c=relaxed/simple; bh=73ZPNorBDGeZQoqSY1zb/FAA9ykzNR/xXGUzku/jFWA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WVsXgrETX8NE/qyOEkaZT5V9BMJ3Gxr1/+mGzrvEjrlJW51hx/mmkYr6YMt6yBNWE2hY1hixqJ41malozHzkZQHyYYwD7RuchFvgO403WnTAUpMhiANHGRMkSzE7G/+ppBfLoL1It9mW/2Vafj9yEzYFgBUHrQUV1A91Bak43X4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=TP9P8j4w; arc=none smtp.client-ip=95.215.58.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="TP9P8j4w" 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=1706154593; 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: in-reply-to:in-reply-to:references:references; bh=i6+UflKme2rdjDNdZ2iFhopxIKTWi9f4kjyYutjoOt0=; b=TP9P8j4wYgzgj1xUO6g20xYqDXcVPDuvlJavt38IgPULE49lOg/3PDgmY31WgxvkrWC0OB zPmTNvyIyMZ2SPNVR06ETZJgsvj+dyVvmkfsvGAoKXc+s3tSZ4zq7dnfUVn4gLjT1aG2nI 2vTQC2TNOTx5zN5/dz4JuMv46KNioxI= From: Yajun Deng To: akpm@linux-foundation.org Cc: Liam.Howlett@Oracle.com, lstoakes@gmail.com, viro@zeniv.linux.org.uk, brauner@kernel.org, vbabka@suse.cz, willy@infradead.org, surenb@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v2 2/2] mm/mmap: remove find_vma_intersection() in vma_merge() Date: Thu, 25 Jan 2024 11:49:22 +0800 Message-Id: <20240125034922.1004671-3-yajun.deng@linux.dev> In-Reply-To: <20240125034922.1004671-1-yajun.deng@linux.dev> References: <20240125034922.1004671-1-yajun.deng@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" We need to find the current vma by find_vma_intersection() in vma_merge(). Since the src vma was passed, we can add a check to figure out if the current vma is NULL or the src vma directly. Remove find_vma_intersection() in vma_merge(). And initialize the next to NULL when defining it. Signed-off-by: Yajun Deng Reviewed-by: Liam R. Howlett --- mm/mmap.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index f19bc53bc08e..ea02fdc91aa2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -869,7 +869,7 @@ static struct vm_area_struct struct mm_struct *mm =3D src->vm_mm; struct anon_vma *anon_vma =3D src->anon_vma; struct file *file =3D src->vm_file; - struct vm_area_struct *curr, *next, *res; + struct vm_area_struct *curr =3D src, *next =3D NULL, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; struct vm_area_struct *anon_dup =3D NULL; struct vma_prepare vp; @@ -890,14 +890,18 @@ static struct vm_area_struct if (vm_flags & VM_SPECIAL) return NULL; =20 - /* Does the input range span an existing VMA? (cases 5 - 8) */ - curr =3D find_vma_intersection(mm, prev ? prev->vm_end : 0, end); + /* + * If the current vma and the prev vma are the same vma, it + * means the current vma is NULL. + * Does the input range span an existing VMA? (cases 5 - 8) + */ + if (prev =3D=3D curr || addr !=3D curr->vm_start || end > curr->vm_end) + curr =3D NULL; =20 if (!curr || /* cases 1 - 4 */ end =3D=3D curr->vm_end) /* cases 6 - 8, adjacent VMA */ next =3D vma_lookup(mm, end); - else - next =3D NULL; /* case 5 */ + /* case 5 set to NULL above */ =20 if (prev) { vma_start =3D prev->vm_start; @@ -921,7 +925,6 @@ static struct vm_area_struct =20 /* Verify some invariant that must be enforced by the caller. */ VM_WARN_ON(prev && addr <=3D prev->vm_start); - VM_WARN_ON(curr && (addr !=3D curr->vm_start || end > curr->vm_end)); VM_WARN_ON(addr >=3D end); =20 if (!merge_prev && !merge_next) --=20 2.25.1