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 E865FC4707B for ; Thu, 11 Jan 2024 02:15:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E62A8D0006; Wed, 10 Jan 2024 21:15:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 796848D0001; Wed, 10 Jan 2024 21:15:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 685A08D0006; Wed, 10 Jan 2024 21:15:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5A58C8D0001 for ; Wed, 10 Jan 2024 21:15:42 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2D4FE1C13C5 for ; Thu, 11 Jan 2024 02:15:42 +0000 (UTC) X-FDA: 81665414124.13.8BB39C7 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by imf12.hostedemail.com (Postfix) with ESMTP id 9E97E40016 for ; Thu, 11 Jan 2024 02:15:40 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=a46xlnMp; spf=pass (imf12.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704939340; 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=o0NgjRU2NV7JHGIppMqbyQQ2ZDc1uYffbVtkLp09wOM=; b=x/jhP1sg6iB1fjtwEKwi7KN8DtJTE5CpHrQgCPU69/CxMFuFtlpVLfk9qt8XRfq+FRMN61 bJITY7eybJKnH612RND0sbV19wk9LsObdLqjLlwCsUgLytN+pocDOQSNupkEB+9QERNF8m 73CK4rF7/5/ZzfSH6CdSIw5HAAHi3pc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704939340; a=rsa-sha256; cv=none; b=0hVyX4L0X654uCOAEeJGPh8eOtDxhosCtaqZg6lP0QHd6fnlzcBxp4Qg3UzXk+3tYhb2hP JWXTKQR9HpXg/T4MsWqfK2+bEgbvtVRO3pv7PoGeUAwVwnDw276+585SkDQerEdkaVSgmG 0EgKTV+ummYiAFO3jYGhpHi/O0gsJwc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=a46xlnMp; spf=pass (imf12.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1704939339; 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=o0NgjRU2NV7JHGIppMqbyQQ2ZDc1uYffbVtkLp09wOM=; b=a46xlnMprMCg8OaJGKL+IpPWkj4c0zSutZ2JLvyGTBnlR0FJekhX1FZmtHMxnd01eYfgr4 Xr3pH+cgzIR422DF5vMG4EZr3DC6jkGwJBD3ZO4E0dR3vTXeYb895kwAPh8U69zp2S+z54 pFwqFTAhAjKCTvYiyKzLQc04FJZh0YA= From: Yajun Deng To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] mm/mmap: introduce vma_range_init() Date: Thu, 11 Jan 2024 10:15:26 +0800 Message-Id: <20240111021526.3461825-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 51ahjebu53mimqzbpdt16uhcr6g15dfe X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 9E97E40016 X-Rspam-User: X-HE-Tag: 1704939340-420215 X-HE-Meta: U2FsdGVkX18DNzrZ6ilg43DUv+EzuSlo5BupeCAmoKcN9gbbAlie1K9pbvKJ43XqbdyXzY8ytop/fTQKlWA+xCbxl1DAc5Db2cBCuhXQDps/7qZ7Q1tqNAFEgyJXW1DoUJHxpOYCaMx3q72Yk6hVn9YCSqsnOv21A20SQeU3X/FRfBDYo4aGe+fn3dlqV8CgTf52v5Is6kXRaH8fNN3pv43ZgUnvnpusrJqCVauA4ycmSksnXy5anWFkTeax8iGyafDIYP80xbOganyWbDB/VDr9r6TurLRSqj7bZej6sFaXLQS3tlBbmDBWJW8iV7uuWVuo+SuY3MtvWQN3KzZ6V2JBQRuqgHPUP6cwpwGSDBDlBZWeXSOToAowz3TgPhF1Ot7Zhi/4wkyswWZ8uZkIg3dKZXIV4js9lTBgxQUIQLTy3VFp8768aPjeFqJ0xmMl5+DcvhmB2rrb/R29VAphm5rP8vUayQaPCUxjTWIDx0GEQ7k0HrhPuPVGvAkKrT4MNXUAHcYbHo06A4SoDajtWkwEcuh0KFb1zUl9AaUq0SmX3uNYFoUsh16Df6DSUpC6o0wkaD7iObuIAnlOIBFQaVqL4gb2QRW8DO7uVwyIi2ufs2McwmlnzkmnS6S2Rm+wbUHqoJIbDHUs1si0EWksErwVwVvAzD0REM24diQNHsDQNACLAGAQ9gLgygdAI+nVeRmT6j4Qu6YqeKxD3m8O+rBqmS0+yedVilzT3FKw/N62LGYTCpO05m2mv+Mskz7gS9fZgyBXqhIxdcgf/dB8+NRINJ+VlEtGfjY2OqCr9aQlQShMEPHdn7s+j4FnKx4N8ntbYhiZbqSe4Isy04yriV4D0yUstg2SvmwELLmkIuPG6EhF2Ja05RyjlMGGdjbY 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: There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma. Signed-off-by: Yajun Deng --- include/linux/mm.h | 9 +++++++++ mm/mmap.c | 29 +++++++---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index f5a97dec5169..abb4534be3cc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma, return (vma && vma->vm_start <= start && end <= vma->vm_end); } +static inline void vma_range_init(struct vm_area_struct *vma, + unsigned long start, unsigned long end, + pgoff_t pgoff) +{ + vma->vm_start = start; + vma->vm_end = end; + vma->vm_pgoff = pgoff; +} + #ifdef CONFIG_MMU pgprot_t vm_get_page_prot(unsigned long vm_flags); void vma_set_page_prot(struct vm_area_struct *vma); diff --git a/mm/mmap.c b/mm/mmap.c index 06f1f3e88598..0d3f4612d001 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, vma_prepare(&vp); vma_adjust_trans_huge(vma, start, end, 0); - vma->vm_start = start; - vma->vm_end = end; - vma->vm_pgoff = pgoff; + vma_range_init(vma, start, end, pgoff); vma_iter_store(vmi, vma); 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); vma_iter_clear(vmi); - vma->vm_start = start; - vma->vm_end = end; - vma->vm_pgoff = pgoff; + vma_range_init(vma, start, end, pgoff); vma_complete(&vp, vmi, vma->vm_mm); return 0; } @@ -1015,10 +1011,7 @@ static struct vm_area_struct vma_prepare(&vp); vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start); - - vma->vm_start = vma_start; - vma->vm_end = vma_end; - vma->vm_pgoff = vma_pgoff; + vma_range_init(vma, vma_start, vma_end, vma_pgoff); if (vma_expanded) vma_iter_store(vmi, vma); @@ -2811,11 +2804,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } vma_iter_config(&vmi, addr, end); - vma->vm_start = addr; - vma->vm_end = end; + vma_range_init(vma, addr, end, pgoff); vm_flags_init(vma, vm_flags); vma->vm_page_prot = vm_get_page_prot(vm_flags); - vma->vm_pgoff = pgoff; if (file) { vma->vm_file = get_file(file); @@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma, goto unacct_fail; vma_set_anonymous(vma); - vma->vm_start = addr; - vma->vm_end = addr + len; - vma->vm_pgoff = addr >> PAGE_SHIFT; + vma_range_init(vma, addr, addr + len, addr >> PAGE_SHIFT); vm_flags_init(vma, flags); vma->vm_page_prot = vm_get_page_prot(flags); vma_start_write(vma); @@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, new_vma = vm_area_dup(vma); if (!new_vma) goto out; - new_vma->vm_start = addr; - new_vma->vm_end = addr + len; - new_vma->vm_pgoff = pgoff; + vma_range_init(new_vma, addr, addr + len, pgoff); if (vma_dup_policy(vma, new_vma)) goto out_free_vma; if (anon_vma_clone(new_vma, vma)) @@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_special_mapping( if (unlikely(vma == NULL)) return ERR_PTR(-ENOMEM); - vma->vm_start = addr; - vma->vm_end = addr + len; - + vma_range_init(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 = vm_get_page_prot(vma->vm_flags); -- 2.25.1