Received-SPF: pass (google.com: domain of linux-kernel+bounces-50925-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Fri, 2 Feb 2024 23:56:50 -0500
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To: Yajun Deng <yajun.deng@linux.dev>
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] mm/mmap: pass vma to vma_merge()
Message-ID: <20240203045650.lyavwh7lbaa2z2ur@revolver>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
	Yajun Deng <yajun.deng@linux.dev>, akpm@linux-foundation.org,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org
References: <20240203014632.2726545-1-yajun.deng@linux.dev>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240203014632.2726545-1-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?uf5X9kT6aG24WBKQREeok/ahskvjvB7JUJ1JrGMEEjPuCT0orXIQjfNF0t36?=
 =?us-ascii?Q?v3w8RLlbMjiLIzzKyL+FWuWSTE/QZ2ujad5DEsGKME77+LCwDwomNWgU6Cuv?=
 =?us-ascii?Q?gZK6y+UBVuAuYA8z3M1iI704PFqYdMXmAWzDqXv9sq/0m23JucjCIYw9n2nm?=
 =?us-ascii?Q?OKQl8UzbTCRbkUMfirBvrM32Meb3hOCe/DSIdyvPtejaZ455M0m7jTU1Q5xn?=
 =?us-ascii?Q?2auQU6rU1Pn9ZVfmXBmqizRZfO14pHSyTm1k+aM7TkgaMPQHfe3v9kZnJqsV?=
 =?us-ascii?Q?/i+ZFOEXswA2OlW+3iJab6ctpcNQm7TjGZRRCaCjjOhT4exaXnnyysHJumit?=
 =?us-ascii?Q?dSikvXTd9+Tu60EGFH7CI6j6E/virhUlAw5qC+HplcA0yLlxlrok8RbxzVZW?=
 =?us-ascii?Q?8v0Qf7fOcdBPVHRtrkGwusvzUydLeQUY7m3kribpXPTSCTxATnftHTO79s3h?=
 =?us-ascii?Q?FwdGHZ89MwpGmEY53hneuT83jO3GOn06a2gDqOR2N5neLnu1cxUxMopiNVbY?=
 =?us-ascii?Q?AIvGosw0WiGX0puq9ZKbw9XUD5hP2iYKhqvbRLCiJ/oMq6e2H667sTzfv9im?=
 =?us-ascii?Q?b4PH9WNYmRlxWh3GIt+TDZnk97+mVWxG/7EQV9yOuIo0MXLHZEajL2twTxau?=
 =?us-ascii?Q?lUUvHMrmtzOMeXf+iMZc85rr9vT3tnuY+7XOFNP6OhsbiNDs5IiJ1OapfV8a?=
 =?us-ascii?Q?OZJlKF59WoHDfOD0dcwU2whaqU3DRhxH+D8RHo3C/VpzBn5rV+0bRSxb9TmO?=
 =?us-ascii?Q?/77DqAZoGQ9qOjF2QZzyGZZi/A+HkQaJrO2mxPQFrPdOJa6oRoV1yl4IE4o7?=
 =?us-ascii?Q?RwgNYHQgUUdjWIvv08ArXt5/8M1mmgkzTvMfr+Dl2aYbNAPgh1Ox1nqqMe3O?=
 =?us-ascii?Q?dGSbKq71d6jH0Y8BIeYFzkvnq/y+dCly3ZhVNHBXi9+jTC5lqxkvZVrL+Xzl?=
 =?us-ascii?Q?olN5vp9j+DaGJh63EkpQcW+XHW1F9gaaUbqw/MHjJDRACIj71T+CKc40PD9v?=
 =?us-ascii?Q?NhNFobbahaIel1RZ1eV7DhjlO0+MZ2aMOh1Sa9Zz6zOhIpri8zqPf42TC5AR?=
 =?us-ascii?Q?uEltoNlWImAeAgZUL62Q7hUzAMctZBhmY38ML8HLcelYxfEIw5UOZtaGDfJh?=
 =?us-ascii?Q?9eaad+ctKjCKU3SokA+ZiJ1I9zqLIeDU1llRL5rRYWusLAa94mXKKS+iwer8?=
 =?us-ascii?Q?ZAdV94ru4IjUMM4fG1rJu7XdytOICEzilTX9xr4HJcQNPQF9i/5VnyEuoOii?=
 =?us-ascii?Q?REzNeG9F7090FxLCB8wFyGeIJfLrx3pGqpvuYQesyGDMA3IVGulmOZ0pnN8/?=
 =?us-ascii?Q?pEBqBRKWMUdNGkbOmi4awVv1Xla5uc3BHC3sshC9vqD6pMVyLoZ+WV8ZPhy8?=
 =?us-ascii?Q?DT+LqFoH0PgGUUTHkJFuywiJEaeZd+hR3EYZn88tYFmLVayQepXivePB3Bsy?=
 =?us-ascii?Q?ZVfuEtLBHQbGBBpV+y7ou4NOU+svdxghYJ8zlbBdaRXs5bWOB5bHk4K6NOYJ?=
 =?us-ascii?Q?EC6Utjpa0HSaKfbUf94A8sQD4yeFfU84PcY2iS0z0s91Su0DTUwC8nOIuXdH?=
 =?us-ascii?Q?JRv+2WCSTEmpNxkRGT3W83iQwtsmOa0ytxWvaoOEJApkZpgwufCoKasmjbSk?=
 =?us-ascii?Q?HQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	yqV975Twq9IfvHRVGHQSdeuGNnCwE5cjbWsc6olIo5ypkVR+uGDdLp9p4ilesoSWBmcVj8fDHAXP7XUy0W2bN633wwXl9qcF9T2PmAbLNMVGQwXsotSrKP4l+e/xBcfumUepw0gO+OhWrG6ymz7YZOsN2vjKGeTPdiiKTA0P+x7rWtgWGDDXqrF6QOubJmdoYzkPL251kkWsW+dDHhgKP4U8GxwBOafknY8hYDMhk7TmMOiP7lE2Prgfjxm9bYhrKeJQUIIo9JBApijPNQBriqcLWdZAcrdg5Cqeyup/kJO+tCYpBOxoPyqJIuMAnH1sPDQs/1ud1qHvHiYzW54hJSuxVhXvnyJvy052A1ozafkPJ/sYiUvVW4xQAZ4CYKpmrh1TXsRnQ7VbhL1CbVVRt5VAJhb3DZpGMtRX9+ZwfFPKqG8wsqNfsi/HMAYrLYc0qej3VXfzVERICQ/E0kYSt6dJ//kWQv6s7UMLzZqKjVHjVPvJNd+VlQMJKqCUiWDIxJY/P7+8bOZgSasNmJG4c/JikUfFqPQFXElHKZvZ7i1y4KYzt297/KjPxDWeMUrxH2Jk1OBz4B8Sms0oL3m4yuT94oft0DR/zxrA7buFQUo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 381f3637-48f1-4148-98b6-08dc2474894f
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 04:56:51.9130
 (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: ZMbHUy6aMrZrTkEPgvN3Fx4tMl18eFikPljxfTlExQOySq9utc6RzXnJg4fC5ZFEtpJayvq/Pwjf3ezLCEBcKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5308
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-02-02_16,2024-01-31_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0
 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402030030
X-Proofpoint-GUID: TwXWzgyj7FA3uvcTlHGWldtdoN3n8b4S
X-Proofpoint-ORIG-GUID: TwXWzgyj7FA3uvcTlHGWldtdoN3n8b4S

Thanks Yajun,

You missed the URL for v2, so I've added it here for completeness.

This is the same patch as I reviewed in v2 so my R-B still stands.

* Yajun Deng <yajun.deng@linux.dev> [240202 20:47]:
> 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>

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

> ---
> v3: resend the first patch again alone.
> v2: split it into two patches.

url for v2: https://lore.kernel.org/lkml/20240125034922.1004671-2-yajun.deng@linux.dev/

> v1: https://lore.kernel.org/all/20240118082312.2801992-1-yajun.deng@linux.dev/
> ---
>  mm/mmap.c | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 485a6e1e4226..8f176027583c 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;
> @@ -2426,9 +2428,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;
>  
> @@ -2458,9 +2459,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));
>  }
>  
>  /*
> @@ -2474,10 +2474,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
>