Received-SPF: pass (google.com: domain of linux-kernel+bounces-39541-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Thu, 25 Jan 2024 21:28:51 -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 2/2] mm/mmap: remove find_vma_intersection() in
 vma_merge()
Message-ID: <20240126022851.bovcqfbp23jkq2zj@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-3-yajun.deng@linux.dev>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240125034922.1004671-3-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?1au2d7kdP+z5PeGWd2vWJufDkArJuVvE+GKRWowadVY6VGHQyxu0+xGQHyoZ?=
 =?us-ascii?Q?GEJtdq1LBypHulIt/fK5NmFGLhGgQAu+vOaj1yt6dJnB127wSj6FrXjHUER8?=
 =?us-ascii?Q?ZRRpIxPT4vHZxWq9YePQP/0dnah8pOupn1PgaiFdbYXEuy1p/ob5iqxXHKyn?=
 =?us-ascii?Q?1gLuM91XYOQ7nAjZveScTMn/cxzNp/WjkAAxQRkuRtsQYa0zXIybREg3zw8t?=
 =?us-ascii?Q?ZEkS2Kv268c3BCimMAlBymdemmjPh6v13wkGkL2D90zorHdQifBVqCLRIDhJ?=
 =?us-ascii?Q?sXF3VTtfx/+1T/Q0ujaIioTpeLXBlhfH8O+FBZAOpnh2shPfuFlb9CasuESg?=
 =?us-ascii?Q?2rVSJTqQnN00MdF3/QrkyFjXjaK/VfV7HXZMQxWOX2RBnJ/lFqEcdTVJdpq1?=
 =?us-ascii?Q?gAMG6+555vnS/rI9oYN2rGaTi4AVWeUERfiW7ct1F5wQnFU1xi7w5LkgcxI0?=
 =?us-ascii?Q?e8UGfS1ea4bAnzw+21dO5H3Kob34gQM6M/4LuX+d+jPnHFV2fd64qhhORg5K?=
 =?us-ascii?Q?TK7g2/LZ2PVKbQZ6PCyW28kKvNc0tHysJ0MxuVpkc8AggaHhvIi2AFGOp5mS?=
 =?us-ascii?Q?yjgwoVij8xVkB3qNPu+s2hDDAacjHyVsxwUqA1fhkUeeIPLPYCIVf9oFAz2m?=
 =?us-ascii?Q?pwWMhau7aa+LCqj+7ue1eCOFcRYmWqY45pSnZNAOMvXGY4QUmugBv6Nxr2MW?=
 =?us-ascii?Q?JfecXzN8Mpcq/XzKtffLDmnQ+AlAhopTtr7jBJcLDD3/QtZnlv/Krq0JXN/4?=
 =?us-ascii?Q?uliM020iVT2uoXhACFnc4qH1TpUQ4m3G1E7a2RMiCwz+98xl03qGN4YV07ij?=
 =?us-ascii?Q?Uiwe+pT5seFQsMNJlUw8Qa63ytl8u2tObsrw+3dh87BFArPHNJpb63nNbINI?=
 =?us-ascii?Q?QjGcOkDC3yUM8GTUghTUUIoBAWVKUE6s1A2UdxjPYjJ5jkU8GvxUMrn0ABJS?=
 =?us-ascii?Q?v4jw0zcE8e+C/YvQ0TXH7wFUn175xeHGDe9H8icFZGKw9pcUOfBqxHG8RFm3?=
 =?us-ascii?Q?td3wpI9v6DvmrsFvn+11IqkjQjIp6kFoAm7T8XpHrMxj8kIH1gv7Wj2zHcXX?=
 =?us-ascii?Q?k5R9yzYpiWTNwaEMuKedLh62ixUCeeTuxvQPrvjKhHN5wtj6eebILP1az+gr?=
 =?us-ascii?Q?vacT1LGplUYYtUYkvi8W3a2Ayeqka4CF3+aRhi6wqBgUbgRykFa96xbWEyOo?=
 =?us-ascii?Q?Zd90dVEwUY9WOofIpUywknwV24cR85Vprx0VV94U9MXfsNmA35jWO63ZUoMy?=
 =?us-ascii?Q?2yj3W/HmfYM3ANyr3rpKlBdRv3Tsf8BvKZ+/TeOMhcLJTXKWi3GPyjN0yIiJ?=
 =?us-ascii?Q?cAzHQ8LDN+4zz6BSo0sA2mH3OvQrtgkH/CP0WYaBS9bPTgkbRWutaK2YXuj5?=
 =?us-ascii?Q?WhDnhEeIjRjTiTsjleNuT5DlH4h8VSxG3XGbku1gwFnIUocVowYXSDajVOKH?=
 =?us-ascii?Q?4lGNX0zJjjSn+fA1il3xqn7jNStRIP2COPUYZfFfcHd8W6SL4mm/oR8X+KDK?=
 =?us-ascii?Q?q1YgKKXi5wkVsAkLB8oZRloAExCECAtQpsmVjO/lhQzwFNq61EVs/MYM40qc?=
 =?us-ascii?Q?G4XPZwwVytnHlJbazm2V5oneoy/IwDiBQ93s/o8q?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	NzPqIPHIgucYCvNP7hU4L2BplxMmbr+nJfegHEjPLypDogVYpCvqjwPbE7wp1alb7LgG3cPaJyyL29BLqXji2+nRT/Fuee7VLNamtCjjVsomaljgVe+VeVnoDpxf8U0qD2cokCKYTJf4rb1SaJVsgLF8rVnF4zneAx0H1cB3LZXl5oji+RxAfBwphB6yz46NsbuhXgPW/ri1clm2PQ50kSyBFW4Jj3VIegG7QjlYIEE+x9UviTH9MWuFp4IufVfBez/BAlrIcmoWMtI460UiAagtsI3GPOz9JPr2SZ/y0/jGRw3DFMilwjC5Tb4QMSdRkwSjWQtWYl3QOkCGWayawf81ewYUVPIaypDIRcw7uPZ2x+RJdNTWr9jmHrqhcgTvgvLaDmk20eoo1i3fppoAA8IbU/GrNtsEmKvrEdMfr6bQwS3bOvC5sWDZmrGNZSrRmtl7IkbmC7AAXkTuPoH0TyFc/zVnLt5upMKIST3AWxdaJlKoKBSWLnPxX9ZHAnwAUL/IdNUSHKZPrHKUiCTaMo16QBXRdgl+p7ApWUru0BxHRqn0SVvQPPBRZIs7SU25dtnL8nNR+p5HwjErmQGa8agOuDeoj0f97rdJfnC0AgE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2139d29f-09b9-4ef6-fefe-08dc1e168a02
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:28:53.4416
 (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: 3PJ6lNkr7eittBkRUnuY9SYxHieVv1SlYtTI4uGl2VkKwYdWjzrvGCUVc0R46cDulMsdVCCUifYodVwTV+eZdA==
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 suspectscore=0 mlxlogscore=999
 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 phishscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2401260017
X-Proofpoint-GUID: -IajgTxUzyHAxI6FNRd95loKvtUYLmIU
X-Proofpoint-ORIG-GUID: -IajgTxUzyHAxI6FNRd95loKvtUYLmIU

* Yajun Deng <yajun.deng@linux.dev> [240124 22:50]:
> We need to find the current vma by find_vma_intersection() in
> vma_merge(). Since the src vma was passed, we can add a check to figure
> out if the current vma is NULL or the src vma directly.
> 
> Remove find_vma_intersection() in vma_merge(). And initialize the next to
> NULL when defining it.
> 
> Signed-off-by: Yajun Deng <yajun.deng@linux.dev>

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

> ---
>  mm/mmap.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/mmap.c b/mm/mmap.c
> index f19bc53bc08e..ea02fdc91aa2 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -869,7 +869,7 @@ static struct vm_area_struct
>  	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 *curr = src, *next = NULL, *res;
>  	struct vm_area_struct *vma, *adjust, *remove, *remove2;
>  	struct vm_area_struct *anon_dup = NULL;
>  	struct vma_prepare vp;
> @@ -890,14 +890,18 @@ static struct vm_area_struct
>  	if (vm_flags & VM_SPECIAL)
>  		return NULL;
>  
> -	/* Does the input range span an existing VMA? (cases 5 - 8) */
> -	curr = find_vma_intersection(mm, prev ? prev->vm_end : 0, end);
> +	/*
> +	 * If the current vma and the prev vma are the same vma, it
> +	 * means the current vma is NULL.
> +	 * Does the input range span an existing VMA? (cases 5 - 8)
> +	 */
> +	if (prev == curr || addr != curr->vm_start || end > curr->vm_end)
> +		curr = NULL;
>  
>  	if (!curr ||			/* cases 1 - 4 */
>  	    end == curr->vm_end)	/* cases 6 - 8, adjacent VMA */
>  		next = vma_lookup(mm, end);
> -	else
> -		next = NULL;		/* case 5 */
> +					/* case 5 set to NULL above */
>  
>  	if (prev) {
>  		vma_start = prev->vm_start;
> @@ -921,7 +925,6 @@ static struct vm_area_struct
>  
>  	/* Verify some invariant that must be enforced by the caller. */
>  	VM_WARN_ON(prev && addr <= prev->vm_start);
> -	VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end));
>  	VM_WARN_ON(addr >= end);
>  
>  	if (!merge_prev && !merge_next)
> -- 
> 2.25.1
>