Received-SPF: pass (google.com: domain of linux-kernel+bounces-39540-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 25 Jan 2024 21:25:01 -0500
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To: Yajun Deng <yajun.deng@linux.dev>
Cc: akpm@linux-foundation.org, 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
Subject: Re: [PATCH v2 1/2] mm/mmap: pass vma to vma_merge()
Message-ID: <20240126022501.juc5d7xpotjyying@revolver>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
	Yajun Deng <yajun.deng@linux.dev>, akpm@linux-foundation.org,
	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
References: <20240125034922.1004671-1-yajun.deng@linux.dev>
 <20240125034922.1004671-2-yajun.deng@linux.dev>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240125034922.1004671-2-yajun.deng@linux.dev>
User-Agent: NeoMutt/20220429
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?owy1pMs53Ia2uwS6obrkegI4oX2oIXMJ9ZyvOkeK4UFMnSWn3AJP7wWYpeDi?=
 =?us-ascii?Q?P4NIqrtRJp7lOxJX+DIVOG+1fY6BCfLhIR895ViYJ4e4fmhYQUan9PGnzOM3?=
 =?us-ascii?Q?fOfp9K8IY4a0rmRvyg3K70GinPTKOrmi616bK569A7mRnkG8a2VX54kd2Hw/?=
 =?us-ascii?Q?T5XPfsqVgiY8r8WYRoI9PvlEn+sUUlTnMxTNcN5PtQCGDRIV3wBi6vkqRLks?=
 =?us-ascii?Q?d5jTXtG9zYReCbKlxIygKpBTCvQvO0R7ujJbckdeDpEQpQrF720Nzp81jF+u?=
 =?us-ascii?Q?aAZXm5ePCr/t2abkkdtdG9D10WvaYIzYHkZi+JIfbjGVFaaQNAGQsj+lb72Z?=
 =?us-ascii?Q?Otwm0oiYTNAVFsPcu6Utf9I33WR4LBOJ3szsUIXaeChKxwrqPospp19kpvXw?=
 =?us-ascii?Q?7bwX5mrmRTimBA3y5OdsQ1cbqfqohnH9MG/OCYm0jjVU6zIsDR0c9oTXaZ7T?=
 =?us-ascii?Q?PMVYHJpPzB9/MD4EQbYMHBLELD73fVqMSx6Jny4us9grpq9SF8ahsyaeiu37?=
 =?us-ascii?Q?tHVZ1ZHJO0ivA/6oKXW+plYFqM22NIrtPUDy6gmgQHP/Mk6W1aGZCmeNup6v?=
 =?us-ascii?Q?/4d3Ue/gkwSnzcEINNk5ExR4S56emg3ZlSzMG2VTD8EpxH2SpxW6B1KkTwNv?=
 =?us-ascii?Q?VcLtXs9keasdlsUo7JYWQ9vKD5P0XE+bQM87+WbKHuhYDiS4DUvAuQKVQrHj?=
 =?us-ascii?Q?/2Krkay0hwhsMSIyNS0GyY/bFEDul2JWZJpjgFZD/Hok5UTQnDTPa8sBQNNG?=
 =?us-ascii?Q?dZv0QfkhI9ariKag2u+HiMUPyz33KuTi74U05SqdnfvD7qmLwE1Stmnj7f10?=
 =?us-ascii?Q?E6ceGuuKheNDPQFS4S46unwt42VjLzTVTR869Z0WY/N0zfGrddR8Xv18XvT+?=
 =?us-ascii?Q?pdCoGXxSXpx/xu3nFnW3+kArUPMlGAGHsvL55w9C5/WCkPcYABxjO9/m/Mmi?=
 =?us-ascii?Q?N1I0qrtaLfTUNJhMGW+iGDhBAZVirqPjqbuJDpdaZBYjyoV49JIzcM1T1MoI?=
 =?us-ascii?Q?uZoXLM+f56isyA2s9bdmp8TU01mrom+cnU0udanPueT082HAn8mTi9OdChML?=
 =?us-ascii?Q?IP2eKaiqYVBxl0E40TmCqZSYpD+A6+xG2M5onHmG/VHSMmHZO9MyfHIeCIIn?=
 =?us-ascii?Q?+MUS/LfiDY0DnYAlQsljz6W8p7mbHLuHq3wJygzwqyyY8dPjYVedqxiJ4Zrg?=
 =?us-ascii?Q?n5EVQw39WpUa9OgTPXAszClTyqlXH5PyFAxIZqKOE6BNAEUIYgDB6XfR8Dos?=
 =?us-ascii?Q?41YB/83NmphI9q2VI64b6wtYJANq2W/xQqYKKYSIZeutc3u4iceWE/06iecV?=
 =?us-ascii?Q?1IuhaseI4mfbpfNDANVPUtEPGJyYvOcRpW3cFdLp3U+5Ri9cmLidgTMVQi25?=
 =?us-ascii?Q?bJNL/hFaHNQ56a3SQSICIfUEaX98qsmN24Yt/0JKm6x98kx7HoDB/tZr4zl6?=
 =?us-ascii?Q?EAeJERJMQmlFTdZHrnXZ8yNTnOu/cDD7QhwACj3QCuP7QC6Gzn3l3H32Ls8v?=
 =?us-ascii?Q?UF2KCFaGsL3NoGdCEZ0A6pHZ/35k+udKVvyHUUfle0JGFwZt/RYUdvWBTcFU?=
 =?us-ascii?Q?H9oeTb/oNgTd/9FAsyQmM0wllI3o6ur5zxGp8TN3?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	WQ072EObyXsDbFrzbWEI6R3Q/M4WvDEnMOi/V9gGoqUhWytAmoJqiDudICWCKUbhZnChjjfeT/twX6wVgKPqh/p61GYQeko+vvmA9Zw2o1FxIzA8/Sqed6YalWdtBuzdyIDYKzFP805+0gn83dB8GIDrZrDYG8G9H1Y6/TDsB5VzDCDp3jOX9Ng2mxafsyC/LcfTUXlh9L1uN5cKVI3qJ9EZm1ZEm92pZTgvyYCYNoWMFACFCcWQ2c9ZAgPFaypfRMQlVheEK/FbdtVqECTybnxcJYBBnZYDzhpun4wP+2Xmi6/ITCO8iK+i1AJgyv67I9zjRnZg8DoeS9E+8HX+zkIcSI8ltFSFm0D/wGHwsfe47WxVf51NTTTY/ISdq31upOQtER8ucZoHlJRQnT3cd3EpYdq1mZunEHrrDPK+4l5fCjumG2g1Cxt6BL7KCnBjMN+oWS/2M+0/2bqwqJTAi68mHfmfUgHfUmo2SEjckQgBIcyNhVJJ5rXOO68bJL6iwVPQGSgl821WS3bZpz2/cvMYGDjNw/4yPGsKuTkAPo4cRR7qxOeGhaIe4hPO9tyjK1wc9xBG0Ictz/7SbvIW7wO9SrtXj3c0R4iqwsn6MMo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4367df7f-428e-4375-9d51-08dc1e1600f5
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 02:25:03.5492
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VCoOCN6DpW2z2xtUiVzo7WKd2HFZqU2y7AAxeyulzzDad+l/P0imYmMf426zWJCDZom5OosogmG5tX7yJvLbLQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7666
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0
 mlxlogscore=999 mlxscore=0 phishscore=0 adultscore=0 spamscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2401260016
X-Proofpoint-ORIG-GUID: pxaFboipmb8VLRR_pfmrdRHOvlvpkD1A
X-Proofpoint-GUID: pxaFboipmb8VLRR_pfmrdRHOvlvpkD1A

* Yajun Deng <yajun.deng@linux.dev> [240124 22:49]:
> 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 <yajun.deng@linux.dev>

Thanks for splitting these up.

Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>

> ---
>  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, 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;
> @@ -2424,9 +2426,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;
>  
> @@ -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));
>  }
>  
>  /*
> @@ -2472,10 +2472,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
>