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 53DA5C46CD2 for ; Wed, 24 Jan 2024 03:57:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4F446B0074; Tue, 23 Jan 2024 22:57:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AFFF56B0075; Tue, 23 Jan 2024 22:57:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EF246B007B; Tue, 23 Jan 2024 22:57:55 -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 9119A6B0074 for ; Tue, 23 Jan 2024 22:57:55 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 631A11C0B03 for ; Wed, 24 Jan 2024 03:57:55 +0000 (UTC) X-FDA: 81712846110.12.C4A3C20 Received: from out-175.mta1.migadu.com (out-175.mta1.migadu.com [95.215.58.175]) by imf16.hostedemail.com (Postfix) with ESMTP id 87E7A18000B for ; Wed, 24 Jan 2024 03:57:52 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rs501SWW; spf=pass (imf16.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.175 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=1706068672; 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=pc/i1VbKtSEso2IXmI9KYzDVtKwwDVTOJQT3Za9yKGw=; b=b3OAyUoOr9D9UYoHfc9H8NpwLGA9QSsB9j1RQOzSdDFgHwJUZUP5nceUDukPpmMsb3tP84 1jim+e2FCk7ak7YOyj3SGaTtE/YtGy8TjZ4bCJbCO5AbZVWHr0eI8oAGXvEGr8+iSh4qhd SMCJQGm4QBjazeo+Q58qd2VjYVMtKnc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706068672; a=rsa-sha256; cv=none; b=LlAZdsKA9RN0c4cJOa9UY2IP90SnnKbL+eiV+KZ+hLXt2+DesDTJ3snCc3pTwMz0b3MDEB z5PlufLVj/I7czkfxlIoXyrjUOWokFXaoCaE8xZtDkpiXkK5XezCPoAeFNyyQPNShiGTPG J4eghMom7I0TEm/P2CML3gIo3ZuAnNw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rs501SWW; spf=pass (imf16.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.175 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=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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 87E7A18000B X-Rspam-User: X-Stat-Signature: rffgrsr7qqaywsmpxwnsz76bjd7iqjes X-Rspamd-Server: rspam03 X-HE-Tag: 1706068672-596992 X-HE-Meta: U2FsdGVkX1/lVD+SAlEYmcuxUEZXG4Kntcv6S/cJXqqDMoBsFABtPi/koJKHAOYXysIalfinGE8hRXIP8LjcL0DG4C3YsInJGwfArs+Hb29ESoTlRNc4I83qMELvSPtyjPKnJkzgsS0G5uigbWnjLQNRNJ0CA9hoPCicg41P583qpuPcf/HYPFejQBtvQvRPOPKB7BDYqoM89lX8KCMJoKMa+vQ/I3MUfKi1kzPig8YfX/P5vAGoOtILJgMJdWELQIyzbHByq77ZnYKCe5Ut1PUVLYt9Hwa7JaG59HNJ/WzNSID/19rc3QYCsKxdw1/DObwe/NmBxDHVAku0Yrzgd89xLTAPNzlcv3QfuKGhcqZLZYXXHVBrVRuYNYpV6ojCZzpspe/Ua5H79nXg7qc7WVhqxufc3HdyQWCACIHuvqandTQmc0KqmzxyOhhwwtIVr9qbUK+0TIuujayzuwu3OI8nSUJBGbbEG9uGgoidN53RkoGf57pUujrV/Dr0GNKmU2wP9fLkAZW6i7wh2l3GYhAX+OSWuAqVojfvCo3irOLCMGtjvgoqZLyahf7aMhX7RIPXiGlV7K/fRVNgpbBIMQV7CsvxxWbGRSFJGajL1sp8uGbETxM7qOUUygpXmi8ESPle7xFOpAuQun6s+SeRjiRMYSFT67e0hJbW1PrpMKR61pfLqTzkxi8DIrzXvPRCoO+EuTD2iBCnN/bPoso8N7ChDoDziwzfuh6+wKcCRt9fUf+EvCJeaE2BpRJ0ee5Y717FwESUdMhuyrSXdJr2nkSxKfmHML1oDDYZosfWhnXgEVEkHsEzv5a6AUUOkhfcO3Au3TBzVIQ13On2RP74JtUZzfSGqTjewAo2vjqPQwOjEH8Pt5kiTNYZwNStQHpjU89NmRpJaIWleNhZbctIXQFTeUiUJYbiM7OKyHYe6sj3yaCq2W8fZZc2U8xn+NzprDsHNm5lU2hFlIONiz1 6X5sy89w RDq1jyq0Rqu+IsYHpAyVrIYsYXJ16kQ1SrZUHjhChtQUGpmBxJ7rTbuW9eFzmxa42P0a9VJYPD+DiJ4oqca7nLv/iILDQEJJG5aD3U1ckPMpt91cEtTm9BUQdD26LAZu5p0eQBkoVeJJMoM5n1m0j6yG5iuKrH2mt4WKOjiTYLcVPgvAARH6YFqx/wQ== 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 in mmap.c, introduce vma_set_range() to simplify the code. Signed-off-by: Yajun Deng --- v2: use vma_set_range and put it to mm/internal.h. v1: https://lore.kernel.org/all/20240111021526.3461825-1-yajun.deng@linux.dev/ --- 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_struct *vma, extern bool mirrored_kernelcore; extern bool memblock_has_mirror(void); +static __always_inline void vma_set_range(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; +} + 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, vma_prepare(&vp); vma_adjust_trans_huge(vma, start, end, 0); - vma->vm_start = start; - vma->vm_end = end; - vma->vm_pgoff = pgoff; + vma_set_range(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_set_range(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_set_range(vma, vma_start, vma_end, vma_pgoff); if (vma_expanded) vma_iter_store(vmi, vma); @@ -2809,11 +2802,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_set_range(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); @@ -3163,9 +3154,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_set_range(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); @@ -3402,9 +3391,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_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_mapping( if (unlikely(vma == NULL)) return ERR_PTR(-ENOMEM); - vma->vm_start = addr; - vma->vm_end = 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 = vm_get_page_prot(vma->vm_flags); -- 2.25.1