From nobody Tue Nov 26 17:45:11 2024 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE3B91C07C7 for ; Wed, 16 Oct 2024 20:18:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729109887; cv=fail; b=Z0RAjyUwPELo3Hg13XvsBQ23bLN3cKwgKALvGqhVqTrK2YynOHbNX2a6xXMDxUVRCX36MjmvX3GcjY/bF6uyRP6QpJWUVWsO5ZmqjZGVsqT0GY3p9pwYqQ1wG8BWADkt9kF73HeqsLh9jCJ8kr0NUenEym0GBjwpfoBSQNh8RXY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729109887; c=relaxed/simple; bh=vs6KPKSbk89nYmyCr17K33YMzOwu8q5kCx+CUzqMgRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=o/SXE5wS94Hhf+LtJIRugFcOOGXOHckcYigYwuniYsXNuXGHaTrRFtimlczGA17gIm+1ph7VscPLsuqBQ7OT9SMHBHk0Qew0gl6TEi4XG+rWnJY9fr783dxjxnmUDug6yuyn9jACndHWi1xPGZqmVeY+Oc4WwFlipP5n4NFG6ko= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=SkfIZHGh; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=fSPNfTLw; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="SkfIZHGh"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="fSPNfTLw" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49GHthie009856; Wed, 16 Oct 2024 20:17:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=PuPaBazg2N1hxGMrBWUR5Bk0SIqeJho3EXvfR58ZJtw=; b= SkfIZHGh0FvYqbDNN9m6G06GLM6Z4b0YOKVGmY+faw0jdXgMJouml3obyaipbqJC jjtpZ87SvpWSDx1XzbaBPFbyYaqGRJKdensu3sXyMHjVmACKeFf2FROzmWHfr5wj gcpoWcWdGLEvzHIh1eIDQCrOg7j/gsXqjd43wEj7y/gTC9FUlwWnEr3fSsD2wPrB xmEAatGiKIAZuUqpI6Q12MuijlgmFqorXnI4nx3jF9Cxw4o2NGJXZSJgIujHgNQ6 rc7EEsz+/m2Xr+nPhT4DJInGcej3ApWX2574SGRJVsmEXUM6KcQmhuqoAXgaY/ED 9bgGCzoPIsVXwRweFoP8Ew== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 427h5cn4h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Oct 2024 20:17:43 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 49GIgMdY026420; Wed, 16 Oct 2024 20:17:42 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 427fj9b8eg-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Oct 2024 20:17:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U8VMyEuc9rSs82JPmDTepyQcaJVX5Xi6l7VfcMAznDpI1gWRDxNM5MlVVlJD9qxXclNwvifzprNncccpESVZJawZeawCORiGu68Zl4Q0Er9RDw6yVH/FCrhFOEhlt932RR4A1picKIFKT97ncYt6trb8WXZlNqrvQUPlaR//yv4Rlt/MaAUzakYkVTpcOvDnNXsSogA0sdiuVBkkfYGmuIRX6M5r4nzkfQRVuu7VKndEKPpdtxuTJJbNN0Y74r3iqMSQqUzxNAPUSTHG4P/ao1ovMlgsXrt56rPhMxwwbCWDqiv5uveIYcsUzKo0mGpnYlixE1Hjv87fJ41qeBuYug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PuPaBazg2N1hxGMrBWUR5Bk0SIqeJho3EXvfR58ZJtw=; b=TWuIPiXfc6JsiGrWhIhCDEOmjYduvLFvOnMBD/E2pVRgAe2ysZ1/Yz+bsmuOvhxVQ1z05HZfPsegwzSGiMgT9IO8GbZsRXPkYHd2q+7EjYbKTIlaOKi6188TuwENiL2djtwlOWzHw+U0/c31M53/ygBnJZZnzd6l9vrWZJPlann1ctG/a2fzKMRgKd4ryLXsM2lEkgyxTABrBYvTgoS5YNaanVNewlfFGOFJH8koPzAiz4K9r9MTkFPQ9y9A5JHYa7UqwFpUCWfDraOT8TYagUUopOC9xnTnbYRmt4QW5K6dN6evdpuUA2/BOd0SnjCqeV/L7Z4CyHxImbPoJvaxZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PuPaBazg2N1hxGMrBWUR5Bk0SIqeJho3EXvfR58ZJtw=; b=fSPNfTLwBgQ6gG26v8rhfSusoRfTm49FOpH4ao75/2BlqYcCv1tD0fP9/5FqmFuvNbJfltb0VCpefGAIbqHK8ou6PfyxP1Oj7hfaNu9G+dDTxXebHuNhhfZteMOKUW0LI6eINNMn5BXSUwsswHny0gfRvSNkNJElrY6gvMHGpsE= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7579.namprd10.prod.outlook.com (2603:10b6:208:493::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Wed, 16 Oct 2024 20:17:39 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%7]) with mapi id 15.20.8069.016; Wed, 16 Oct 2024 20:17:39 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes , Jann Horn , David Hildenbrand , Qi Zheng , Kefeng Wang , Jeff Xu , Pedro Falcato , "Liam R. Howlett" Subject: [PATCH 1/2] mm/mremap: Clean up vma_to_resize() Date: Wed, 16 Oct 2024 16:17:17 -0400 Message-ID: <20241016201719.2449143-2-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016201719.2449143-1-Liam.Howlett@oracle.com> References: <20241016201719.2449143-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0113.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::16) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7579:EE_ X-MS-Office365-Filtering-Correlation-Id: e94b05e5-2f94-4296-53b5-08dcee1f9542 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4CHPm5HspxjH6LKHxxFqtAYZUd4T8hqN/t/QthchO3qoeWcm0cY8jmQdrpxk?= =?us-ascii?Q?2yS5BbceYogusCgHXkWijFAaKGLGvdgESJsD8I5HAanLsnjpfqT+gjDP8eKt?= =?us-ascii?Q?CN7tCR1AKQzvSX7NBRcuWWQAUC7F7Tb7h77tgLBREGW0T6Qn43rIybv7znbN?= =?us-ascii?Q?gqEqumLvHlF+wKpYUY9fW43Cs80ERMV/uRoFn7gNQ/tBqEndBoGHsxCYMdZf?= =?us-ascii?Q?ODfAtbKeGDcOchcJCb092Letydjet7GIZlfQBSrnusrLAkQ6aTISKzvT7EMy?= =?us-ascii?Q?XsfVjltz+zDhpelgbRnwSoNUIYyzD8Vw52NfobUFXN9Oo7w1coS2OOWtlKd8?= =?us-ascii?Q?a78CJWBP+COmxCj52VM2AlQtCeujYJY8RZEkt1N5pHhvVpwR80+xS5WL9RLU?= =?us-ascii?Q?y9hyyfzq3Fbb+e6oNw62aOW4Q6eaLehMiFRlU7pvdrTukQ7hdEfI3ZcTqMw4?= =?us-ascii?Q?KlklftoNYkTcbIOTx0MdenXizGQBez1VSBzkhVq8MVKP6vhb2bb2WMy3CDNg?= =?us-ascii?Q?TIJyUl5m/1NDwb/R2PHTFqWnkyvxvj0LfR7M5SAzW3ASq6qCgZ8EWNAlCFqL?= =?us-ascii?Q?OHDGgua4ABPAVomOd9l7h9qrNijNRWElfvlbBUosbKqiIMj/tIH6jaDwJtKq?= =?us-ascii?Q?ucgDGUtJM18/k/qd0f7lt8+K9MHuzQxxW5jIkc8jv/0wlg2euUg4McSGCgbt?= =?us-ascii?Q?ExbSDreyPy2QF66ROVJL7utZbmSdTSPq2aOyFKIitL3kUYIv6EQ2/yC/9uaY?= =?us-ascii?Q?gB8GPdm2EvxxpSCb+Cz3O0IJYh5nTgjyjvKNyltyr2YFTYbjlIc9wzHiazz9?= =?us-ascii?Q?kXZTsssQ7soKfeYq2dYJo9zFh8WIZwWNHjNQCbnkRAjoj+3to/uwih51QHWj?= =?us-ascii?Q?hz1yLEduWqd5ouYMaYawFFXAHuPfce5ISKKY7pIUp7lwexnsmvEP96A4zBM2?= =?us-ascii?Q?piiD2RLPT0SalLaDi7GtkM2V9HmO6bjbO67hz4RePhk7uFWnuHdcSjnSaFxG?= =?us-ascii?Q?GAGSnEXRyIi+Q8XWjl+0Ue1ClgNKJsmIeCY/6i0w1MYqtqAir5aFqaXABRJK?= =?us-ascii?Q?vjCDIpM8SoQUr2Iop4SpHdn3Z4hvLoWASzI/ZBiD7LX80HhTGk1nqeSRklCE?= =?us-ascii?Q?VmWjYFbLuLTqiO4KUQBRZDAKBkaJeCU29aDuRoza80HM0cDLk4495ijVe+5A?= =?us-ascii?Q?7mcjqbQ7DvuCbvFGe55Slqoos4eutfAzql1IvpotztIMkiGTnm//THvNS0T4?= =?us-ascii?Q?rgyoZ5mex2CuM4gvVB195HLPp1FxORuFSclWTSfJHHlL1BVyNlRnP5UwglOy?= =?us-ascii?Q?4QUWvIDjlDec/1cHm8v4gNpM?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D5PJMXtBWu1X7HB8hsOlJmHv/KLYElcntLJRc2xtO3I8u1WkaqsoHTuVSk02?= =?us-ascii?Q?QgKeU08ZX38PbeoHwZ9tIdM3HG2V4zhG/QlGhnfu+WUBkDMARpusIhixeXcQ?= =?us-ascii?Q?0o3S/BmeEK+LiB/7u5sa9eKYWGjJSZTkJOMtt7X/aXePqcfeL8uY2y4T8bBD?= =?us-ascii?Q?LD6BkGcLWREvOlo+X7LaBGDqqJcVKv9kkMZERi5kLmmhlTe1dlIK9mQiiFPU?= =?us-ascii?Q?ViDwgkOA9zvcvcXET4o4vmTWxEsOj313eOcz6ASM+FN6gN+o7w2ubcFgZn8q?= =?us-ascii?Q?IDbcvJ6H82nTNyRgatZZcWDZ7WcCCvnyf5qCHFl+nnBxTsLBzH6ERdy0SDlA?= =?us-ascii?Q?vUSyifXGzsNejHH4CIul65SrWSDwJp46gqbWX6AxF7pAphpuQARIVtUGTg+6?= =?us-ascii?Q?GtuAB2yBA4qYWP4byFdRaJnQHmunJZNYb/2f+Nw9MNhbsZAm0yJ6Rbh/e9v2?= =?us-ascii?Q?VMRh4uYZLE1Mb/V8+na18RzFTYn0nsf4235w25PrmVbhVrvgwZmEMoVe8wTu?= =?us-ascii?Q?0kbUZWOGi5KZb2km1bC6/pVGDRPZsXL7z3w1dWn13QC0Gk2AbBn0klttZbhL?= =?us-ascii?Q?e/xH+qHfFrKqrMh5/UrDBVYNaJHophwqwI3nuUfppKAmxHFD1xAi4p6A1QC5?= =?us-ascii?Q?atv2Q3g7N0tPRfMfChyV2ZvZOu7hAMGfeWiLv7OkkyaiwYkM8svdU5MLC0Bg?= =?us-ascii?Q?XnWYZJOK/CVc/lnrLpOy6WnNvJczJKQxmw7SdWf7zW0xwyU32aorUYmNqhU0?= =?us-ascii?Q?K4ByUCiatmw4GGT9zCyF5zmZCpTa5rKUlYJOSp2PcyCMVRw4tpWy54GxR0jL?= =?us-ascii?Q?D8jKyvBSUnGUlxax+0hCoqzn/+AgvuZIovVAB5zh6ae5MLpKdyh8cZeMnAnK?= =?us-ascii?Q?46fpDNuns+FrngJAUEQK2mZL5lSQTeHkXUpsS9BZd76tNVFYy/l1JmgEhyY7?= =?us-ascii?Q?tF9oLio4lKj8G3tEgNptqNVyqZ4Z2LzVyhXkaqPJD9ZDf+90uljSJ0y3YEqi?= =?us-ascii?Q?4ot7/MPeEhaxLkvu2LE9Mv+Jblq5NxZRKEBKk3kaEIutVWvMZXp1mE0Skg42?= =?us-ascii?Q?2Wxyk3K4otXQMPlHiWX3Wkt4ZphSgnMQ/hQVpPNc1t8zkAfeWqhaL0N6oAWC?= =?us-ascii?Q?b3s99QFWElOh6CiwIoMYMlF/iTcVEltoEy04gf+O21H94Q4UqK1BbT3c05wc?= =?us-ascii?Q?HSMPrm82wDZzcMMeWcOZMI+rJ3QUBjhaZ76IqiKa0kGZ7Nz4pn7H2lExkpd2?= =?us-ascii?Q?3X832xx8vNxMP4NR5Tgdjat58a/32q7GyMegA9NYGlb3HeWfcoz1zsC+BRXg?= =?us-ascii?Q?3/axzIqG2BTunZ/oZSHS7uvysPr/lwcIerBCcmyarjtQBBOZCuvCL5Xzd+ur?= =?us-ascii?Q?EXbi2TLhYfreelDs3sHt7/SH1kGiz58FZBVLhyzHSA1RpGWG3Aaw11g6Nf0b?= =?us-ascii?Q?z6LhuALIJ3EF73qdJxQoYv7A+Kj6q7rOTm+VeR/M/QAUmGP9m6IkzfmLWFfi?= =?us-ascii?Q?6cZVp6aICGlK+RbtPdrsne5EDkzKudqQKRdJfeWB14xN/eLQGlAgDGRx7s9L?= =?us-ascii?Q?0lnP3pQeRBOzDMXlF1qw1HnoJ6vMm/EjqMrSBrmKPurOnBLOEipLeBNGaBU7?= =?us-ascii?Q?ew=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YJW63G3iOmmM8QeUxg9+B4iKj/1CJJp33btOyrrhLBdkN8acoI8S2dKHBhVWmWy/If/1qWhnd+dLPwKqUsJTB/dMuZWrUCihWREUyaispgsfeBonRmk5jzIyJ+5lOdgujmwJbP8JiE6Ubu4/NC9Bs2Grl/g4ql7h637YnCLvpqkU1v4ZqthfGlqj9zUfllSGGAf2zV7p+1o1GPUVR/XPzJHiDkiUuTlWJ0gmA6aKdBzD7TApJa8iUfthsrUaafm9zSolFfZqkEfpOThnVtXEKINDwcf9oDxe53ged5IMOYLLBRGCEM7lyBzd24nzdh74eQStx86pkxws45m9ZvrYW/Ub6/RXjILieIBb6T03+0gfR/xGnbyXzV2yhpopOrmXsRnbNCH4Hc3OvGyX20AxeENjD7UadDcPIbyzKCCF1vf7B/Yd4aXYkGjtRK4d7mmnZTHd6WaRGK+/YGSpBlQMb/uUix6FZ0tWw/1ye343ZH3+aB4dMGIzFLEBfTS83nanzXEWjTnnveWXU5/H+Or+vr0oFlmbVDh7lqG36IMLEJGljjowkswaQ1nRcqT/DqXuivSCOt3jtynzFZUQCPJnjuEWzfcF3NPjNOdDCXVnlpo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e94b05e5-2f94-4296-53b5-08dcee1f9542 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2024 20:17:39.6300 (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: yOz7DkEoHi7LBnxfu4T8e+Vqglrx1HyoWVEILtp2SteENFfgweUANKH85OVfcW7NaRaXEyAJQyxCqctMyss4+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7579 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-16_16,2024-10-16_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410160128 X-Proofpoint-ORIG-GUID: sCl0bjDB6H6qpZOU78KTiYjeOtPelN3o X-Proofpoint-GUID: sCl0bjDB6H6qpZOU78KTiYjeOtPelN3o Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" vma_to_resize() is used in two locations to find and validate the vma for the mremap location. One of the two locations already has the vma, which is then re-found to validate the same vma. This code can be simplified by moving the vma_lookup() from vma_to_resize() to mremap_to() and changing the return type to an int error. Since the function now just validates the vma, the function is renamed to mremap_vma_check() to better reflect what it is doing. Signed-off-by: Liam R. Howlett --- mm/mremap.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 5917feafe8cc..648c29f568af 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -826,17 +826,12 @@ static unsigned long move_vma(struct vm_area_struct *= vma, return new_addr; } =20 -static struct vm_area_struct *vma_to_resize(unsigned long addr, +static int mremap_vma_check(struct vm_area_struct *vma, unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags) { struct mm_struct *mm =3D current->mm; - struct vm_area_struct *vma; unsigned long pgoff; =20 - vma =3D vma_lookup(mm, addr); - if (!vma) - return ERR_PTR(-EFAULT); - /* * !old_len is a special case where an attempt is made to 'duplicate' * a mapping. This makes no sense for private mappings as it will @@ -847,37 +842,37 @@ static struct vm_area_struct *vma_to_resize(unsigned = long addr, */ if (!old_len && !(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) { pr_warn_once("%s (%d): attempted to duplicate a private mapping with mre= map. This is not supported.\n", current->comm, current->pid); - return ERR_PTR(-EINVAL); + return -EINVAL; } =20 if ((flags & MREMAP_DONTUNMAP) && (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))) - return ERR_PTR(-EINVAL); + return -EINVAL; =20 /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) - return ERR_PTR(-EFAULT); + return -EFAULT; =20 if (new_len =3D=3D old_len) - return vma; + return 0; =20 /* Need to be careful about a growing mapping */ pgoff =3D (addr - vma->vm_start) >> PAGE_SHIFT; pgoff +=3D vma->vm_pgoff; if (pgoff + (new_len >> PAGE_SHIFT) < pgoff) - return ERR_PTR(-EINVAL); + return -EINVAL; =20 if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) - return ERR_PTR(-EFAULT); + return -EFAULT; =20 if (!mlock_future_ok(mm, vma->vm_flags, new_len - old_len)) - return ERR_PTR(-EAGAIN); + return -EAGAIN; =20 if (!may_expand_vm(mm, vma->vm_flags, (new_len - old_len) >> PAGE_SHIFT)) - return ERR_PTR(-ENOMEM); + return -ENOMEM; =20 - return vma; + return 0; } =20 static unsigned long mremap_to(unsigned long addr, unsigned long old_len, @@ -936,7 +931,13 @@ static unsigned long mremap_to(unsigned long addr, uns= igned long old_len, old_len =3D new_len; } =20 - vma =3D vma_to_resize(addr, old_len, new_len, flags); + vma =3D vma_lookup(mm, addr); + if (!vma) { + ret =3D -EFAULT; + goto out; + } + + mremap_vma_check(vma, addr, old_len, new_len, flags); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); goto out; @@ -1114,11 +1115,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigne= d long, old_len, /* * Ok, we need to grow.. */ - vma =3D vma_to_resize(addr, old_len, new_len, flags); - if (IS_ERR(vma)) { - ret =3D PTR_ERR(vma); + ret =3D mremap_vma_check(vma, addr, old_len, new_len, flags); + if (ret) goto out; - } =20 /* old_len exactly to the end of the area.. */ --=20 2.43.0 From nobody Tue Nov 26 17:45:11 2024 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A6FF18BC33 for ; Wed, 16 Oct 2024 20:18:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729109887; cv=fail; b=qV4Pueyt8x6vB6IASuNUPYUXVpU3GtkJ/SWuxuW6laqHi1j5rTHoy+HbcYPBnPGpcGXc1d6YI8S1gAGZdshIS9PcvIiOAy8Qrq8yyJvXBE+egm8tlyXCDF3Xw1TOMbVXhQV2SHUHCZhMF3G0sfAlyoh91D2+YaRDrsvJ2ySo/eg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729109887; c=relaxed/simple; bh=OvXEBcy/b3GPKLiqHpgGHA2d7xthMcaKeANfiU65Szs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=eGXmbrg7sOiYFAWw7T6/l4cO75nFyhMhUtUkPahvxrSDlleECAB7ZA7uJ4DAxUvY7rJgXG6CjOFWkIl1f7qUotvlbUqjYLx1m1zqPdRPZYVKpKd+mw8gUtxF9hCt8nhYBJuaf+21gQYaqwaHto3Bji1E5NrXqJ+gnvcy+gnt6iQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YGvzQ+Qj; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Boo0BOIU; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YGvzQ+Qj"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Boo0BOIU" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49GHtfTB027341; Wed, 16 Oct 2024 20:17:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=l3FXzpj5Oxzaq/uDBOwGSH/4JCCCag4pwr8pw0P2YRg=; b= YGvzQ+QjaYhVP6gOYCI4hjPpylG93N2bIT0KaNNxr3/P8wohZzroNAFTwxSHW4mY 1ce+SR2ZioIER7vV7AVd4qccrGXC6/7469dOe213bEv0jZAsCi1mNNC/VITNjwJl MqvRGSaOXLtZ6KVvsH9OQwHYgI71VUc85m0xg3HhT+CaVX/pxoKUEpSWNh6oRke6 +SmAklVXexJppAR6P2iopqKKF4K+PLwBPh+WgG1coMa53CL/foxYMn6YWF+uq5x4 /SvMxU5c2OgskRrk37NyyBvauC5AfdhmfZ0kHlDOjyJcET7/A7zmhd8n14Cjnkwo WHGH1hPx0Td7lSKkTnXR0A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 427gqt4snw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Oct 2024 20:17:44 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 49GJQOOv027123; Wed, 16 Oct 2024 20:17:43 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 427fjfwk05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Oct 2024 20:17:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ePcuh1GPiDAXISjLGRWYrD8B6UVMGoRYwBUt8cL0zCcGMbdphib11J6bVdZOGFU5aomrR3HOq4grLXAbvaQ85/I9U+9ELhd/QKVKaF+xEtGuuHyXwF28FkTx2th+OgOB/GWjLFTYgWf8ojvzNYi0HUm7eLIJwdgpCNxKRY187+pw+nVtrVaSsdNd007RL7pRjkQDMW9WtseV+9zdnseHzipFdaXLrXq71KmOdVWHRwMIEgL/ZbrTqL55zETUaY12Brc7blGOqbfzC5ck8Zeaj9WCvSkJ3QEcXbvABLHxZDgSyPva1FwD0t89lB5c84QTNrhtbEocGQVY2X7uVSyyLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l3FXzpj5Oxzaq/uDBOwGSH/4JCCCag4pwr8pw0P2YRg=; b=zVZUvjqOnfic66nHNeIpnFk3grjVay3OTlDvvNxQGKGvBqRQD89IttVDGOBVFpy2BQLzFSwf+KXbH24CcagJM8L/1eR5SPbCe7BgciYOCCwBfbe0/sKdXPFsjdioLTSS8ZCU4qdmLqEWya0Z92k+mkRNMeFLdZwyjcRytIB4qjPlTOG1K5EbRnalCI5D1nAJ1/vyHKYGCHDWXqbGLz8em0az1Ev4bSD4/iwgp5W/X4MJIOnEFg8d3D3RKTUI9VLeRN9VFJd4Zfiu37HgswHPELd+jWoMVboKuCrL16qIp5Yn7Jba9NfAs/OcoSsARTg44KMfGAWsoJYMJPUoJNV65A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l3FXzpj5Oxzaq/uDBOwGSH/4JCCCag4pwr8pw0P2YRg=; b=Boo0BOIUEP5edjKt/OydlNtMvYckk/ro6868BsDwcj7YUfBPIoZCOu7AJ574utZ1hthbeR5rNJ7H3XYat4Y8WxOR8NfnxsomkDVpV2TGcmzo3izz4cvD4H4Djn84en0Vhpn/D7GoQd9u7yBXphFFCWVMdjHuE7oNyOqf8xsEd4k= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7579.namprd10.prod.outlook.com (2603:10b6:208:493::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Wed, 16 Oct 2024 20:17:41 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%7]) with mapi id 15.20.8069.016; Wed, 16 Oct 2024 20:17:41 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes , Jann Horn , David Hildenbrand , Qi Zheng , Kefeng Wang , Jeff Xu , Pedro Falcato , "Liam R. Howlett" Subject: [PATCH 2/2] mm/mremap: Remove goto from mremap_to() Date: Wed, 16 Oct 2024 16:17:18 -0400 Message-ID: <20241016201719.2449143-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016201719.2449143-1-Liam.Howlett@oracle.com> References: <20241016201719.2449143-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YTBP288CA0006.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:14::19) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7579:EE_ X-MS-Office365-Filtering-Correlation-Id: b0b512ee-24ed-4995-e0f1-08dcee1f9652 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?H/5ooc7ENFAPaGsVkUHYMhkXRAe3zuW6H/76Le9wwPcWBcZA0eGup7uTjpp+?= =?us-ascii?Q?tVWTpHWrOvsq3YSVhOKW5o6gssjQs9wE3Fx3wp2MHUjawBl1YGUwZcE4D+cs?= =?us-ascii?Q?Unmj5+PXM0CE6iLal1FyuxGxzIoO49BIbfebQ3grE3EaQ5/JmtxUme+noFFD?= =?us-ascii?Q?h8MrbQPUSe/8vGB7XNF3BbV/u9C8PnDvNYMPPzN6Hl2hZbMWpn1ooW68TVdX?= =?us-ascii?Q?rg7khjzasGMXc7vnU601Ups+5i6/9ieRgzvvpXs9xdZy3GpbwjCs95hv1Jeq?= =?us-ascii?Q?Z9xmXtA1fxNXhNyirh1Cxe0vzpGAPF1Qk4PIk+25pgq7T61tksmhIxyNwWak?= =?us-ascii?Q?vNvyuhL1leF8sowOLl1TAcncwxqYxVCb8a5lx9zq0qacHnPp0uKcFU+EgtBP?= =?us-ascii?Q?hixfhjQTuKAhiB/vwwKK/0MIVODkruIEVkbFwIs4ry/hvKLHplU1gr8TtVcS?= =?us-ascii?Q?emd7a0o+9fdxBKdXxNNJvCrfzOFATPcu7VhfugVHrF7lwPOVMcbxLL1K4oQM?= =?us-ascii?Q?8lF4nKNh0P1n0R8uPSDGroq+fR5HSsCsNRZPoG7SFUw37p0pcfV7eaNEuTWZ?= =?us-ascii?Q?SdgGgRbRuHMn2lH5y0eGwsEirby9Hy2lEPF0aJNvpjDk7KJ3W29CGEW5c9zb?= =?us-ascii?Q?w73lCruFGieyNY+xrLixqFLUim7CM7ctGQoXvQ9MDpek/fYIY550Zx53/6Z+?= =?us-ascii?Q?zpADhg/n3FH3VP7umXT0/AHYFY4UdM8AEQYWvt1VyHs4iXnqlXnZ3Hc99o5N?= =?us-ascii?Q?IiCShSYwMeX9RV0f5syq6qC1Pcy1v8CZhdlD1Yg9VPsrtT0tfGcYDLi+tOWU?= =?us-ascii?Q?UrIPW/CFZQGihKs2f09GobcBTpUmCjJz9JUp0JbthVbiodefTE3l/xGCufQA?= =?us-ascii?Q?tip/EYPa+0+c07BX6LcZEiYyNgpPfdjSScNsMVeO7DmEGRsg3BzghwYTkqcv?= =?us-ascii?Q?I/jUfKwQ0MP8h19hZUHKza4UG/BHX3gXQbt8C92bZKWK4HUYS7rfCQDrfF4Q?= =?us-ascii?Q?uA9HetVwjmRwoPziHO2FwId/gVql5qDEfQ3ouFJaOwRzE+KirtNdZzD1Smwu?= =?us-ascii?Q?1IrogspAyVERcw9JyE9DqU0TzUTnEzg2AL1v4IpuaxdT3A8kObIe0UDyCYoi?= =?us-ascii?Q?nkOYhJ4BkmwvbfxG2cdgaXKGZnfC04uF25wHxEAyJY4om1GezRLmskEVi1nH?= =?us-ascii?Q?qMEVws4ooVP8I9O1O+m7EIEWbr/1v3oRDmN3V2jcpNf2IaS6yHVhG/pVp+Rb?= =?us-ascii?Q?yf0ix+fNY5kgl/jRB5TG7ABfX1fJiOcDDXaToUQh/WKhm9yi/ZKR+5SOePyD?= =?us-ascii?Q?OuWbyAtAGZPGJFXLm64OdOR2?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oCq2DE7sdj+r6KqJ3Xzj3nrSe7e/8DeK0eWXSXT9K/m49pKP8WuVuYpmAaI0?= =?us-ascii?Q?nBLxvCI+Ys2hK103GrQsqoi/4WpkLnfyitUxm7Ph+j0d5tNmtZTAP/wOOlow?= =?us-ascii?Q?ImLVF6/bSCEDi+sfzqpJbgE2J29lTF5WEtPp2evp3bBunCrp9QtIl6ilhRcG?= =?us-ascii?Q?+TiXdbavmzaOAPiIeKU4uSu6HE6O6rfQlL2O2QXdY3HwZI1rDRIepplBjcV8?= =?us-ascii?Q?Qm/FwiIBMA/IYcBPeD/0W6IIr7rqvX7t52SlES5vXIh1a/QwArMXFHFvEW6q?= =?us-ascii?Q?jSonvZl65NXuzL55GN5E9v3uePazJ/RHF3vxulHkkrZhxsf3aF9h9ZNAxUMm?= =?us-ascii?Q?5DphnZLODrc1XOLpaw3CpCUs8usKaOz2VxkCRXW7b4faRVsYN9WfCMLVJ1ze?= =?us-ascii?Q?ij8wK3tKHGT7zZvx+G1KcTvIKMCKrgkvE7WdRC8J34sSoaoavP02VGOu0+F5?= =?us-ascii?Q?081X2+t1D7tW/Ds2sFYIZb/rkHV0NSe10gvi+Cm52lqPsykyMzDgtMMn+HZ5?= =?us-ascii?Q?Lf1bRAPzVnc2hDon/ySwDrSQurm0PYYuj5D4bU1+s3VOfIo9w9fJPvbn/s4z?= =?us-ascii?Q?QipSSImyEeIDY/iOG/xu/BCQTKFF8ji2nRvNrpzUCqNVCmlkm8bSvh6fUa3M?= =?us-ascii?Q?puh+8I28rg2r7dJZG/5qv5zwAkhiQhVJZPcrebYNwhvObndQH4xsxLu2VWBu?= =?us-ascii?Q?NCrQD5kU4emPl8ZSCbYjONImvHSS1akBceqIh30HjPi6TTU2huw4Qd/ir+0S?= =?us-ascii?Q?8sRNR0ek9tjWpyOkYxMPEKNDGpCY0UkPk4/KIBDdJmo4wk+fHTCMiXwDRf/C?= =?us-ascii?Q?Tti0M7UKvLTi8d+n28vBWt5PHwTg7W0ov8L+MogPofwfi1yn3m4aggbSbove?= =?us-ascii?Q?iW5jt2njhRnqOZBWIWv9YMzT7YWEzMJFTLoo13Qg0zpbweiFnfrlg3LNetYQ?= =?us-ascii?Q?FqlKwJA2rozQ96aGzUNwGfRfn/cXJi28wE9MsvKVnkgd7ABNKAuy3DVbtwDf?= =?us-ascii?Q?rJRBw6Z2WfGyFE/glzy1LGhVSdXeteKmtFj4mkCA0fCVo+ye2r7tUx4qcZAS?= =?us-ascii?Q?33SoHZMPMcS4EwfcYncTLLNfkBc2+UQNQbpfoCPZzEeohMjYebD9J7ndws5N?= =?us-ascii?Q?dUtMTnE4I4vYJu2LqNU9GSCL/MlgYNa1Mz8YtBPbESkLWj3LoXiJUL679rBk?= =?us-ascii?Q?gkEwkL9JbkLsSBxLQIIWRGUnrU6VhwIh58R7KIHg9HeNYpRA2rDH88tdXIPL?= =?us-ascii?Q?KHznwrXf/6RX24fBgm7xFDC40Iqd7ymYds5Hvg/UF+v/esK1oSE2p49LSZuy?= =?us-ascii?Q?Ex1/OCSlpwN2zmzUS038Y264byn8GgFV8j4g38MAsiJVNB3NQlWlyIqnrK5p?= =?us-ascii?Q?S4ejH1ZcvHJuJK1RdRcj1yixHMWo4yltx+YExO8j2wv3kZtrDhPUpkA07jKM?= =?us-ascii?Q?EDal67CrTBB2jB+Pf4KcVQwRecfYk9trXVW8ysuA7eM5B9WpbJBVGXGH62mO?= =?us-ascii?Q?wLnztpZk0vwErUYO7M0wxHhCfN/7S8WfyyLsNYLQBOosdWN+1XJFpGgM7K4n?= =?us-ascii?Q?zrS2rlW1S4xmQQcDpPrMFDWQioRiGhTob7n2ocv2yHM8n5vFGD7dltUyCz6s?= =?us-ascii?Q?zQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: e4vjIhshNh/Co8yQir3VEnhqoPFFvxx/GQj9chvJza/OOC7+sSgym4iO1YVNCIxgq/RaVtw6UyDC60jbBD6a1Z31h7jjEqno0ZboH13rLl5s6ouFMtyPQnwHHvcBQsliswq3k9TJNQUg9+syYrc9MRTJ/+nuytDHrz+UFhbTVNaSGd0eAaQ4378YVzfL2KsNMFAVjUtpjtZh6oeQ7pUW82yQpZi8lMGuPZj6S6XzloNc6V0+PvvteSBCAfB7zYH0AXm6NhlfZnEhunygMqcP9NPoCjwlERsUIxATo1Hlb2n3WQF5z+bHg45PIjGlesVxn8GdHY4zHL7lFfAvrMilKCjXzdfgrcuwSkOI5jayWlERtodBPF6HavblwiOiKOZAkqboMOMVp/TC/fUaexvkyls4iQBdwf+l9zA+H8ZdIPdgXPqQyK3QoQrE28lE4b7xH9ra2rE38UNQ5TK32qpvGNiRnd60nqWgxsMugQHhaJxDNOiTHH3nNyRLNQDpWqyktIEgFzJkpfIMjXdNtM8dwRgAtaTTn7KfgrCaa5IB3MFifS9HwiTS8+TSvk4OLfm7k0iW3fo7VQxyA+nERtKYQlp3gdNN+GjBG9LVKgemWWg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0b512ee-24ed-4995-e0f1-08dcee1f9652 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2024 20:17:41.4040 (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: A/rTvBxze49jguMUuZ9AWCP87yAQMKh+hKnvBrfOxPN9bQCiSgzDxeiW05rwFyZP8LmsTEN5QzQPiLCzyprmsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7579 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-16_16,2024-10-16_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410160128 X-Proofpoint-GUID: WEE5SXNHBXo73NwsSxnWiw2GK66SggP- X-Proofpoint-ORIG-GUID: WEE5SXNHBXo73NwsSxnWiw2GK66SggP- Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" mremap_to() has a goto label at the end that doesn't unwind anything. Removing the label makes the code cleaner. Signed-off-by: Liam R. Howlett --- mm/mremap.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 648c29f568af..5a1eb3da730d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -883,18 +883,18 @@ static unsigned long mremap_to(unsigned long addr, un= signed long old_len, { struct mm_struct *mm =3D current->mm; struct vm_area_struct *vma; - unsigned long ret =3D -EINVAL; + unsigned long ret; unsigned long map_flags =3D 0; =20 if (offset_in_page(new_addr)) - goto out; + return -EINVAL; =20 if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len) - goto out; + return -EINVAL; =20 /* Ensure the old/new locations do not overlap */ if (addr + old_len > new_addr && new_addr + new_len > addr) - goto out; + return -EINVAL; =20 /* * move_vma() need us to stay 4 maps below the threshold, otherwise @@ -921,33 +921,28 @@ static unsigned long mremap_to(unsigned long addr, un= signed long old_len, */ ret =3D do_munmap(mm, new_addr, new_len, uf_unmap_early); if (ret) - goto out; + return ret; } =20 if (old_len > new_len) { ret =3D do_munmap(mm, addr+new_len, old_len - new_len, uf_unmap); if (ret) - goto out; + return ret; old_len =3D new_len; } =20 vma =3D vma_lookup(mm, addr); - if (!vma) { - ret =3D -EFAULT; - goto out; - } + if (!vma) + return -EFAULT; =20 - mremap_vma_check(vma, addr, old_len, new_len, flags); - if (IS_ERR(vma)) { - ret =3D PTR_ERR(vma); - goto out; - } + ret =3D mremap_vma_check(vma, addr, old_len, new_len, flags); + if (ret) + return ret; =20 /* MREMAP_DONTUNMAP expands by old_len since old_len =3D=3D new_len */ if (flags & MREMAP_DONTUNMAP && !may_expand_vm(mm, vma->vm_flags, old_len >> PAGE_SHIFT)) { - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } =20 if (flags & MREMAP_FIXED) @@ -960,17 +955,14 @@ static unsigned long mremap_to(unsigned long addr, un= signed long old_len, ((addr - vma->vm_start) >> PAGE_SHIFT), map_flags); if (IS_ERR_VALUE(ret)) - goto out; + return ret; =20 /* We got a new mapping */ if (!(flags & MREMAP_FIXED)) new_addr =3D ret; =20 - ret =3D move_vma(vma, addr, old_len, new_len, new_addr, locked, flags, uf, - uf_unmap); - -out: - return ret; + return move_vma(vma, addr, old_len, new_len, new_addr, locked, flags, + uf, uf_unmap); } =20 static int vma_expandable(struct vm_area_struct *vma, unsigned long delta) --=20 2.43.0