From nobody Wed Dec 24 20:08:25 2025 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) (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 50D128F72 for ; Wed, 24 Jan 2024 03:57:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706068674; cv=none; b=CqWaFNcA+5WgYd7fyLT9bB2MxsVZRYsTmyXqmRH81Aq4pErNmCshcE7b6ioQOIpyWgK3PMz8mRKtzebyXvxEjEIoEAItc6f2KBjrbvoTB24kawgj+aPj8YPrUB9WLrzUtEaf7fiTuQ6LeoZEikA8JJCzPRtTQVm1S1OS5dX+G38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706068674; c=relaxed/simple; bh=lYhs7+P2QVAmsCMG3P7ZWdn74Zqa7PqQiiZy1MmiysM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=iF7FSqEvHqCRdjDI5d5NEgMEUawlNBmb0cEdpLkpC66p+YTU7570ZuMmIahkBkoKZKVHpS+M5JsRdOdY//UTUPVEMjQd8+5jazRArqcbO6y3CdcvU6B9V0breBZIPAd1aJ0PmNOSRen0ka830gK0wYJZ0qDPcWPt2YoK+wEknLg= 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=rs501SWW; arc=none smtp.client-ip=95.215.58.189 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="rs501SWW" 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=1706068670; 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=pc/i1VbKtSEso2IXmI9KYzDVtKwwDVTOJQT3Za9yKGw=; b=rs501SWWvHSqUn4l2tYKu2axRaydOkEfeidfRdsBh4PsSCB/4WXkcMdxeCkhkrN8AEfRyr o7OeGK4Qb2v5wTaPX/82JaXWhXrB0t26jvsNfJyca+MUE0k0r6xJ5z9HIna0Ok+PizijC9 qusxYYVBIGJXweAxwlhbCiaPhRe9bf0= 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 v2] mm/mmap: introduce vma_set_range() Date: Wed, 24 Jan 2024 11:57:19 +0800 Message-Id: <20240124035719.3685193-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" There is a lot of code needs to set the range of vma in mmap.c, introduce vma_set_range() to simplify the code. Signed-off-by: Yajun Deng Reviewed-by: Liam R. Howlett --- v2: use vma_set_range and put it to mm/internal.h. v1: https://lore.kernel.org/all/20240111021526.3461825-1-yajun.deng@linux.d= ev/ --- mm/internal.h | 9 +++++++++ mm/mmap.c | 29 +++++++---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index f309a010d50f..1e29c5821a1d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1114,6 +1114,15 @@ static inline bool gup_must_unshare(struct vm_area_s= truct *vma, extern bool mirrored_kernelcore; extern bool memblock_has_mirror(void); =20 +static __always_inline void vma_set_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end, + pgoff_t pgoff) +{ + vma->vm_start =3D start; + vma->vm_end =3D end; + vma->vm_pgoff =3D pgoff; +} + static inline bool vma_soft_dirty_enabled(struct vm_area_struct *vma) { /* diff --git a/mm/mmap.c b/mm/mmap.c index cf2f058bb3ae..7a9d2895a1bd 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area= _struct *vma, =20 vma_prepare(&vp); vma_adjust_trans_huge(vma, start, end, 0); - vma->vm_start =3D start; - vma->vm_end =3D end; - vma->vm_pgoff =3D pgoff; + vma_set_range(vma, start, end, pgoff); vma_iter_store(vmi, vma); =20 vma_complete(&vp, vmi, vma->vm_mm); @@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area= _struct *vma, vma_adjust_trans_huge(vma, start, end, 0); =20 vma_iter_clear(vmi); - vma->vm_start =3D start; - vma->vm_end =3D end; - vma->vm_pgoff =3D pgoff; + vma_set_range(vma, start, end, pgoff); vma_complete(&vp, vmi, vma->vm_mm); return 0; } @@ -1015,10 +1011,7 @@ static struct vm_area_struct =20 vma_prepare(&vp); vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start); - - vma->vm_start =3D vma_start; - vma->vm_end =3D vma_end; - vma->vm_pgoff =3D vma_pgoff; + vma_set_range(vma, vma_start, vma_end, vma_pgoff); =20 if (vma_expanded) vma_iter_store(vmi, vma); @@ -2809,11 +2802,9 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, } =20 vma_iter_config(&vmi, addr, end); - vma->vm_start =3D addr; - vma->vm_end =3D end; + vma_set_range(vma, addr, end, pgoff); vm_flags_init(vma, vm_flags); vma->vm_page_prot =3D vm_get_page_prot(vm_flags); - vma->vm_pgoff =3D pgoff; =20 if (file) { vma->vm_file =3D get_file(file); @@ -3163,9 +3154,7 @@ static int do_brk_flags(struct vma_iterator *vmi, str= uct vm_area_struct *vma, goto unacct_fail; =20 vma_set_anonymous(vma); - vma->vm_start =3D addr; - vma->vm_end =3D addr + len; - vma->vm_pgoff =3D addr >> PAGE_SHIFT; + vma_set_range(vma, addr, addr + len, addr >> PAGE_SHIFT); vm_flags_init(vma, flags); vma->vm_page_prot =3D vm_get_page_prot(flags); vma_start_write(vma); @@ -3402,9 +3391,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct= **vmap, new_vma =3D vm_area_dup(vma); if (!new_vma) goto out; - new_vma->vm_start =3D addr; - new_vma->vm_end =3D addr + len; - new_vma->vm_pgoff =3D pgoff; + vma_set_range(new_vma, addr, addr + len, pgoff); if (vma_dup_policy(vma, new_vma)) goto out_free_vma; if (anon_vma_clone(new_vma, vma)) @@ -3572,9 +3559,7 @@ static struct vm_area_struct *__install_special_mappi= ng( if (unlikely(vma =3D=3D NULL)) return ERR_PTR(-ENOMEM); =20 - vma->vm_start =3D addr; - vma->vm_end =3D addr + len; - + vma_set_range(vma, addr, addr + len, 0); vm_flags_init(vma, (vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK); vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); --=20 2.25.1