From nobody Thu Feb 12 23:08:45 2026 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 B89CB192D6A for ; Fri, 3 Jan 2025 19:36:07 +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=1735932969; cv=fail; b=FcV68OVq1t3N3/P6Pu66p+vb04UEdkVKbC+ZefzS7sz7bMUK6IikTato0NapdKIOBrW/N+grsdOwqYK1EvtCOYyOiZ2s9+lt74a4Kl6YWL3whMb4wVEcx8pKkhcPJIVu8APpeUFwr68b/+ePnJSZ9fOmiV6I8+YbqwSrfdMuSL8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735932969; c=relaxed/simple; bh=zV4TL3uezHXlpD+8nCbu8FNN9EFZwblXo26jsFk7zTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ELzdXs+q5zX2pUu0eQ3hFC9ezQ37zhoSxMomaiar2XkquMWv/O/XpXFX5fuAEpSSEMxlIfBG7bujwpLyADXW4pezYyFcUfrSKeqUvpvZMMVswqShz/1ENEJlXt+5JtGv2TQ6k80LHM8LRKFN7a84QJO7Nqvt/3grEvstY04ZZoI= 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=mgHOEZc6; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=wJBLkkTV; 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="mgHOEZc6"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="wJBLkkTV" 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 503Id2Xe010155; Fri, 3 Jan 2025 19:35:57 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=3jaS/xLrAjAhPiHbJzeTkokGziOM4zC2CzniFbbXxRM=; b= mgHOEZc6EfbWY4DhaodlEkQRvuD156xVx6WPiafR6pC5sBlgYjbtTQEPeKlXOPk/ N2zw7d7V4Fe83WsIn3kULB5cKAnviHB/tAtwBJLTQX/qBF78zd7QxPigB9im9fXT Z5mM18XEkz21akNOgc0304cSZnatBD6cpoN3firh/XqlMoPtXEZx2yqF9CvSHFbf QykSIn9m06DiRSrY3ckt6U0uhS6MulegfiwZ6YNVilHfs7Ok6v7GYPpgNDHeR3iP cvQDJWtiNRf92l4TXO0uJtGnBy3JccjzAkfLAbsqONORVBjnTTUtEWOKlKWR1G0N Ws5ngB3yGS1N/bi2DOb9pg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 43t8xs8jd5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 03 Jan 2025 19:35:57 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 503HZI0g027650; Fri, 3 Jan 2025 19:35:56 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2174.outbound.protection.outlook.com [104.47.57.174]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 43vry32nwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 03 Jan 2025 19:35:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h2lLZnb8aRBCA1wg5/VbiweB9qew3eFTWRS9gcC5XSo8zF98s7ez4gD5wD5dEyLBCE1nI78sVayvN16AUrK3V8aC12Hj9mURK6DfEcmSB8h2mYSHQ5sHSfsssHRx2Gh4FCHkBJCLc0fHi0xUITd5eWkdrUVvm3SDzso/z0Ouwy0fQSgt6L0FLJrx+/GB/WbaHP7jRBhWqZJx870zkFpx5bz2v8ok+ZyaQ2hQR2mAVLbrcPOLtHkQRzvYo9YTwXmVmD/zIsVEKKh3Ppflo14nNd9CPhgQYlmk7ZrBjAonteL6r3/mXxAH/UVkqHvU59VYVFg/hRc4HtyEAVB3g/Op8A== 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=3jaS/xLrAjAhPiHbJzeTkokGziOM4zC2CzniFbbXxRM=; b=x54rHeHQ6A8RveeQNUQQO/b3Pa4AhiSEd7pa/dkXmvVF/K1laErYqtJc/L0p9A3DUNqiphPMFotOcuW08V2Vps3chBMmeJvrvtpsfBZiErXSXagKHHWk8cVJnW/+BjW2MlyLBGNPr7xmDcDF6poujRPTisuO3j5DtLlUlB7RxN0Sfp2cs/2gJ7jtfEOmw8clqw6lPihqHfYU3iZqmDy8SKmp4wFaCESCfNojxGQ7a2Ka7r30vprhYC0oG+UtTAE7PMXW9q3i8/2//o4w+bp9MjB6N8+McIXrdxMB/e71eIbOHHsiLEJroi6B5RwCA+Qh60VI7OJBEQ6wjrOF+qie6A== 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=3jaS/xLrAjAhPiHbJzeTkokGziOM4zC2CzniFbbXxRM=; b=wJBLkkTVsAlNLUa8DNSpqTJwmvxEbl9gdObtjsAlqT2Bnk/s8wBbUI5X6PIaE5dZV0ReodmZqmpywE3ASI8JhyjYJEez/CxY5zMdC9cc3BXbHm+N183YClwJZ1LLebzQBO8Vz4fwqa7AYMPgar675YZj/hV0bZm7S9jyRzcLjRo= Received: from BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) by CH0PR10MB5163.namprd10.prod.outlook.com (2603:10b6:610:dd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.14; Fri, 3 Jan 2025 19:35:50 +0000 Received: from BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9]) by BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9%4]) with mapi id 15.20.8314.012; Fri, 3 Jan 2025 19:35:50 +0000 From: Lorenzo Stoakes To: Andrew Morton , "Liam R . Howlett" Cc: Vlastimil Babka , Jann Horn , David Hildenbrand , Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/2] mm/debug: prefer VM_WARN_ON_VMG() to report VMG debug warnings Date: Fri, 3 Jan 2025 19:35:36 +0000 Message-ID: <986e45e9549e71284ac7a7fa878688568a94d58b.1735932169.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P123CA0071.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::35) To BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) 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: BYAPR10MB3366:EE_|CH0PR10MB5163:EE_ X-MS-Office365-Filtering-Correlation-Id: f2be6784-5b29-4249-f483-08dd2c2dd3f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qcdUZSyp1RwTpAc9Q67JeZOwAm6vRXSUcYBJy4/UZbvYwpXa0RcSGiSX8liY?= =?us-ascii?Q?FX54+hwJu4VzOuvZP1vFr4RmRNPNhOwzyM5DCrHSDFYga5v8MypdSEmTwsmJ?= =?us-ascii?Q?lbiQhCJ14U5ndt7Vtb9E0vp/lJFdajXYxZ2RSqM10nV4Kp2zbK2kX7wHOUfH?= =?us-ascii?Q?NKtSheYeYKvMFls0QFxtn4IMV7VSwiuWKCjGVA+66xpwgodXdalW0qWd/UfB?= =?us-ascii?Q?PVvSu3KLc/V0WCW53Z0HFMP2Q+Kb1OKybs+jvmDTe44dkENFb3xaNdJXlydW?= =?us-ascii?Q?klCKhnsPM9hMhb09L6tLfMf6umU3Y8xjIyIyqAq3KEglcY3boU2c/nHIVGA8?= =?us-ascii?Q?V5ZQlhiYxGe5G6PY+CRpons2O0ram4xurAGj4pghQOztNdwrXLTNdkWcHviB?= =?us-ascii?Q?CHRipfUoUnojH/DYtNPL4lvapXThjkELnaU+SOoUfBcFrkKfHHLNgFBmQs+z?= =?us-ascii?Q?KObIwFFQq9mFsa/4Gez4ML2KTyB2CblPXtJtcmP4jMfGkW/mIH4K4wpggz5q?= =?us-ascii?Q?B7tGQY8oNj120rTaOjL52q2kThOy+T7+ENN/5uPesVv+YNwxlJozkVnmeMgw?= =?us-ascii?Q?/QiFw07JhgI07nu354EVPdpgv4l5Z5w/JT3as55D7IBc+hU+j/OK/cq9WjvQ?= =?us-ascii?Q?/u1aBBX1COPbvXE6PaNB0soCzR9Yu6CHdNYy8gZLJkSYJEkuxmDqpKA3TQj2?= =?us-ascii?Q?kHimp+WkoEf6mRW/y3x7+M412qa/WjyRQtjy/4XI2lNeYR0hM74J38MLC2+y?= =?us-ascii?Q?ra3EOsbgpjJP5VZ90fN7jgQ2pTGpYauq2E4KbzFWu9VDV7AhOugvgxCzW5rl?= =?us-ascii?Q?9i057F2ENsZVLWH7ApFt9mAbswILMzmK819w8T/3PBrfdhuw0uY3cDH9X1wj?= =?us-ascii?Q?hztW33nIk5Lvwwo0SFfNzo69dapNvjSOk3mxXOZnYJLeT7wiRI5yImRishgX?= =?us-ascii?Q?LQogNLjSnNtV5TM9ehp6SqucXIC7mYGwfVuK6bf5Vri+ZQZchz0N0BhKvK5t?= =?us-ascii?Q?m+1a+2jHcpTYnW7xUzG5g70NCJEtXJwyRz4XOxQGfB9OVnq6P+TVegpeoHcG?= =?us-ascii?Q?zNZXt2P0edPcVlm0V/afgb4zscUu0Fjl7b32mAywHvT9PO3QIvoqkNcsLo0D?= =?us-ascii?Q?G4Oz6UnYKhKJgU1O6cf5QH9QFLtcJzKTi4CTpc0aVfymMic3QOHXPnKH9Upp?= =?us-ascii?Q?K+MvRLY05tk8Uw+QR1+rQd3sDxJ6X5s90GHuxYbcDGs596XzNgxgPWQ6cWQk?= =?us-ascii?Q?2NCLWFSCodnHLHa+LnI7bFIcm+Oeo9iaUgmn52VV9Fy/pLyPX3+822utd6bR?= =?us-ascii?Q?qU4Jgkjpf58Cc8fDZgFe7/6a43LRlp/VhlnT0QdpctHz8nDeupDhuS/oeEvE?= =?us-ascii?Q?GaQMoeNmi2FtqFTtVRY4HijBNlWR?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3366.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Dxj7NmKmCx3kqec4Py7xVtwYCK6i6X+hza8m4cXm/Ekd/fN+mRRsELsMnZkQ?= =?us-ascii?Q?lQGq12Vs0K8L59NcxxQy5+fQ91YZoT1A5JnyxtCg6C798rQFQX4Ljol+38wP?= =?us-ascii?Q?4yvqwregVjKf0AFfnllY0MoT1lsqFIVoZ6gD1NDcSsMeIoz+3bIxA/pgRsc0?= =?us-ascii?Q?mwHsm6Ot2y5TJvFeARzNURopFn38LykoN3JPwROfeW2VezF6qxXqpITh69Z7?= =?us-ascii?Q?4HcA2+qNn48ePhV0BVbyz+XxQ2VNPoImH07fLo/slYsH3HDofhvN45QhNJ9I?= =?us-ascii?Q?BW+U6nccP+rrUpMYFIyikdUSRrdYcHf9m06GglL0uv0mnUbvNPw9tJsMcePx?= =?us-ascii?Q?98EFFCXB0afkKcMDJbZrC9WjEtDJQfpZWVU8f1XloyecD9LVmLzNdkKz2iJo?= =?us-ascii?Q?dpOp0v2R1jyYExQV3qkyi3DgKVG8JC0u4vsTkUwcpQl88RWhkF5IKdZlkr6g?= =?us-ascii?Q?NSayOnhur/Q8ERmZQz8S4fxY+g2CI1Pib30qmJCxHRLbBR5pNZEklbCV5oI6?= =?us-ascii?Q?xZKjPie6aN5gySHUoW8SQGQlsLftT+YWTOSnAqbbX+tqOeUQssn7RJISrzhe?= =?us-ascii?Q?38Ph3gvBvSI51fRDnJqjIzNAX3QYMm6ixhrAEpkv4EvEgOXkNP9vOWHSznAb?= =?us-ascii?Q?0Hes3CSy6whG+6n1d2CQVw+H6tklXhHziMT7C7/qMba9n1imH8/fOJbSMPiO?= =?us-ascii?Q?f2GKi4+61XmxPBEP6zFgsWpSC+q90gmCz2O86KKfqQcgMGf2ZPXe/uP8JeGe?= =?us-ascii?Q?8IsLsMwN/2Q4BVQYGy0pqNRlAs3l9evdmfQ3QlLeaxByBSGEFYwMdOzOk1vd?= =?us-ascii?Q?iPtSmhMi2nfkPw3MuiZHtgXS0xikWrG/1u/7MWF2cU4a3LaBGTPKrU1gXbzE?= =?us-ascii?Q?lqpKWX82WfJMLnAEuiFZbjd1MVr+UufEQ81QSp+XkQSPZKNF/8lW/yURHJvM?= =?us-ascii?Q?N88VFE5oITjAFm6kcoSF4R3wFwqcJySeKJMPpxNIro5I15N+dNELZtnNwXjz?= =?us-ascii?Q?NVh7ycFZA9hwdAfMnT29xczXXLjdgH9yKpKWDslIf3ICaa0pseIfzFhFyNnA?= =?us-ascii?Q?3Om3YaA3zAOCuERdss+iHVivibbi43zcnWrWMvOvDjan6sMBCT1ifT5eMx/y?= =?us-ascii?Q?4zCX+j+7jmKkWbtea5c4poqlyIv4tLHlMM/LpAE6ia4mP6oGnm/Xn3GZV+3I?= =?us-ascii?Q?nQQ7DZILIGkmWc6ENuxwSP2FyRFX4xSSgJR3iaomOZ/l+F8ZtRWMVduo1OCy?= =?us-ascii?Q?bnCI17LwE2twTV5K4IzWES5+vKzU0RIWxjYGasgoPYN/vxs3Qz8KcVAmaWUQ?= =?us-ascii?Q?LCHHlmmeUuSmW0ybpU0aulS20j58NARvX+iu9ITCsE+9jZUmLmWEmYu5/vda?= =?us-ascii?Q?CbaPmuxGQIlc/gzyMCXyvDsRQSsoiw9hmrETntkg7rLqjSjL/Ddm23kOrd+V?= =?us-ascii?Q?e1iwo8r0FgvIbwOS/jxA/JbZ6Iw219wUSPsM6q3bqx8Y570WYzaIqVYD/BFm?= =?us-ascii?Q?6Y8BiZU+bteGwuHj90lfmOuxQlGIKsydOREQxv0JfEYThB1pdEasjOgprtFQ?= =?us-ascii?Q?M2IvMIvcHf4xV2wh3HNbt9TxT3rbAWa3x6wSKRcUolbrGoPRdICe0yjY+GXz?= =?us-ascii?Q?TQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BxcQM7NBaH9gNZEPnRx1Ncf0g0didbxvQXnrd1hdIJdyf6aX/OHmRk5XccUL2AmMoSYNJdc6xBzWxFrAfs4p8skDblp+zZKgCyB76Ly4210Bf5uflvuHhcngxJK0k3COOEEGoRgkgutkhVRCUlf4zP/X1AWvn1NeFhqEqd37lkQCzEKMwgT1tr/cP8N1cplhupEy8re95LColW4PiLkYL5Lz1o4rZsrM998OCy/JlwboW2c1Yun7jr/s5Vd52ncxnaBupv9AG9f2rve6oos8O9rT2PClYuMWojz3HzpRIk4Q1DsskVa5xABCkezkwrSylS+y6oe1sJosHGpzpN8QNLqLMS/eaVo1epWdjmyFlqAv6Uutjdh1RfknaF9DROUva5cdCHYkeaIPt29d4Ck6+Jv5ENMI2uYtVeXYyzomqM0dqoglYldX4prYkP9ui77XZhxwHDJFlii7ZO+DFUjy8tUjWLCqUuvumSMXGUobRxxtrC1hU3sfJleBGpJnizBZXgNzgcy2hdlb/sZcCyy7fWfDDjQsVyQPC6Mw/jULqmhAZZj88YwzpM8cnGBaV0wBYiMppmxonL18faNBgT6pOfu1sMcn7LvJC58nZDePIKI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2be6784-5b29-4249-f483-08dd2c2dd3f4 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3366.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2025 19:35:50.1808 (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: CTyK5d0fSg/voI1FoxDb4vJ9+WYKpojBDm7r/ovUJEZfwWfIgDopFYLePiJhv9l0JLDhwEHEzmG3hZT4QUOa71Cjbyq0w/3rKdayHpYAmj0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5163 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-02_03,2025-01-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501030173 X-Proofpoint-GUID: OvFA7MaSUiREwZTnZ5xurnaRqmNao6p3 X-Proofpoint-ORIG-GUID: OvFA7MaSUiREwZTnZ5xurnaRqmNao6p3 Content-Type: text/plain; charset="utf-8" Now we have VM_WARN_ON_VMG() to provide us with considerably more debug output when a debug assert fails, utilise it everywhere we can. This allows us to have considerably more information to go on when things go wrong, especially when a non-repro issue occurs as reported by syzkaller or the like. Signed-off-by: Lorenzo Stoakes --- mm/vma.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 4cf2acc378ba..dc843e32b3b7 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -726,19 +726,20 @@ static __must_check struct vm_area_struct *vma_merge_= existing_range( bool expanded; =20 mmap_assert_write_locked(vmg->mm); - VM_WARN_ON(!vma); /* We are modifying a VMA, so caller must specify. */ - VM_WARN_ON(vmg->next); /* We set this. */ - VM_WARN_ON(prev && start <=3D prev->vm_start); - VM_WARN_ON(start >=3D end); + VM_WARN_ON_VMG(!vma, vmg); /* We are modifying a VMA, so caller must spec= ify. */ + VM_WARN_ON_VMG(vmg->next, vmg); /* We set this. */ + VM_WARN_ON_VMG(prev && start <=3D prev->vm_start, vmg); + VM_WARN_ON_VMG(start >=3D end, vmg); + /* * If vma =3D=3D prev, then we are offset into a VMA. Otherwise, if we are * not, we must span a portion of the VMA. */ - VM_WARN_ON(vma && ((vma !=3D prev && vmg->start !=3D vma->vm_start) || - vmg->end > vma->vm_end)); + VM_WARN_ON_VMG(vma && ((vma !=3D prev && vmg->start !=3D vma->vm_start) || + vmg->end > vma->vm_end), vmg); /* The vmi must be positioned within vmg->vma. */ - VM_WARN_ON(vma && !(vma_iter_addr(vmg->vmi) >=3D vma->vm_start && - vma_iter_addr(vmg->vmi) < vma->vm_end)); + VM_WARN_ON_VMG(vma && !(vma_iter_addr(vmg->vmi) >=3D vma->vm_start && + vma_iter_addr(vmg->vmi) < vma->vm_end), vmg); =20 vmg->state =3D VMA_MERGE_NOMERGE; =20 @@ -855,9 +856,9 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( =20 pgoff_t pglen =3D PHYS_PFN(vmg->end - vmg->start); =20 - VM_WARN_ON(!merge_right); + VM_WARN_ON_VMG(!merge_right, vmg); /* If we are offset into a VMA, then prev must be vma. */ - VM_WARN_ON(vmg->start > vma->vm_start && prev && vma !=3D prev); + VM_WARN_ON_VMG(vmg->start > vma->vm_start && prev && vma !=3D prev, vmg); =20 if (merge_will_delete_vma) { vmg->vma =3D next; @@ -969,9 +970,9 @@ struct vm_area_struct *vma_merge_new_range(struct vma_m= erge_struct *vmg) bool just_expand =3D vmg->merge_flags & VMG_FLAG_JUST_EXPAND; =20 mmap_assert_write_locked(vmg->mm); - VM_WARN_ON(vmg->vma); + VM_WARN_ON_VMG(vmg->vma, vmg); /* vmi must point at or before the gap. */ - VM_WARN_ON(vma_iter_addr(vmg->vmi) > end); + VM_WARN_ON_VMG(vma_iter_addr(vmg->vmi) > end, vmg); =20 vmg->state =3D VMA_MERGE_NOMERGE; =20 @@ -1053,7 +1054,7 @@ int vma_expand(struct vma_merge_struct *vmg) =20 remove_next =3D true; /* This should already have been checked by this point. */ - VM_WARN_ON(!can_merge_remove_vma(next)); + VM_WARN_ON_VMG(!can_merge_remove_vma(next), vmg); vma_start_write(next); ret =3D dup_anon_vma(vma, next, &anon_dup); if (ret) @@ -1061,10 +1062,10 @@ int vma_expand(struct vma_merge_struct *vmg) } =20 /* Not merging but overwriting any part of next is not handled. */ - VM_WARN_ON(next && !remove_next && - next !=3D vma && vmg->end > next->vm_start); + VM_WARN_ON_VMG(next && !remove_next && + next !=3D vma && vmg->end > next->vm_start, vmg); /* Only handles expanding */ - VM_WARN_ON(vma->vm_start < vmg->start || vma->vm_end > vmg->end); + VM_WARN_ON_VMG(vma->vm_start < vmg->start || vma->vm_end > vmg->end, vmg); =20 if (commit_merge(vmg, NULL, remove_next ? next : NULL, NULL, 0, true)) goto nomem; --=20 2.47.1