From patchwork Thu May 18 14:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13246937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1241CC7EE2A for ; Thu, 18 May 2023 14:56:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8684290000D; Thu, 18 May 2023 10:56:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81A4A900003; Thu, 18 May 2023 10:56:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6446B90000D; Thu, 18 May 2023 10:56:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 57754900003 for ; Thu, 18 May 2023 10:56:20 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9FF1F1C7577 for ; Thu, 18 May 2023 14:56:19 +0000 (UTC) X-FDA: 80803676478.26.4F32D37 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf21.hostedemail.com (Postfix) with ESMTP id 1C05B1C0012 for ; Thu, 18 May 2023 14:56:15 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-03-30 header.b="qgMZr/RX"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=WseFp9PB; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf21.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684421776; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qP9dd19Zy82dZAbmnDhZ0v5iuqHTboMRfJ22/dlTxVI=; b=T7b1k+MPFQ5J4yUnmm9YYrdB2C+PKPTuX/KLnmOOYfS3VG6AexQxnTZ3rDZ4oasYnTCslI WptUCyqdZBHazWAL5/2nvQJt+Yi1l4LNXWlKjjOQ9BA6tFSgWJcUZoxyTd01K1XtOOH/Ro QWfgYbw5wyYoHuGPciaQtJEKqLRcCPY= ARC-Authentication-Results: i=2; imf21.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-03-30 header.b="qgMZr/RX"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=WseFp9PB; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf21.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1684421776; a=rsa-sha256; cv=pass; b=Oivu2xMmIVmXkdK7gbXOiZBkGdpZF2+tN8fGf1xOQ1t+TROkcE25D1kQ7yYPet932cMX30 evb5aqBsy7eU7tOPiOv8ulnvajz3CyIAJIyu+xoLwud/14F3CmiiApWH7SeRH2htY60nKR xoBK7cblqtZPE4xrLOY05yOd7n0UPIQ= Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IrdL028532; Thu, 18 May 2023 14:56:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=qP9dd19Zy82dZAbmnDhZ0v5iuqHTboMRfJ22/dlTxVI=; b=qgMZr/RXok3QHpyEKEoCL9oWQu/WE4lc/0BJv8A0PkzpEHhuZd9FfBtAfR8XIIXmVufA 9oEspFjlkvzSrLmzfrUoNFoIRzeR/+gfbPZOMO3mwBpiaDIzbXGigSYxL12b5L6pMZQa at53Ey61zXX/nb+BoxWmTRcTbuayUhzZrqTJXHxiFTxH0JcNDsT4FaE2B8EBx0MUwGY0 QhNP5H6iMjKCj3ik+mhMuGZIWVHJQCGRA9SDy5eRTJ/GRcZZDUnu4a2dAUSZ3rHOx73p Lr1+tlup6ERbkaRBXusrYPyvJmLGt0haopIjHqwE3ACsBwvnw+mHaaVMgvSJ/rsv/fgG 8g== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj1fc8f90-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:14 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE8Kdh033921; Thu, 18 May 2023 14:56:13 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c820-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1HbdzodyUEmDt8qgExqAgR17vmORMZ712RSA9f69mlk8TpLcRurHms/AkOZpx1JZu8MeNdZ5nNXbZK+l2Iby4hwC6g+msdyoVEhsiaM/+M9uGTvD0l+eYJixtLIOVrkPjeGtqNXlD4xINT6L4SF1fx2nn/gvIrZ8Jvp/qhGJ3IPRryUwHCrbEJYdnrw+J2ZPPdjz6M9MwV0rG/egj3HlAVcHExrwU5M0LjSW2BLBOEvB9ZTFahkSC+FGHNjNbNJOY+GZv/vnkrl5dkjHUtJ3V04MBSKHcF/MUxv3DvmbIgfxr48aq9R4zEB7mSjen4ecjgAeRDW7BKDx2eDgOUFBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=qP9dd19Zy82dZAbmnDhZ0v5iuqHTboMRfJ22/dlTxVI=; b=mQdMPqwGhp7fhO7NCEyllGguMJXCePtPqQhOgoRTy1DZ81qI8DzzWCbhXG4W7ucKTAPPsUAj8KBtpqCtlVFKTQlp3OMHlFHIaNbgzfUY/uMpV/d5g6uuj89+1nfA9Tgj7JA13mxS4N/ehJLTnRC16eJOYouX/5lDZ+EJQKjGdviK6HsorRn9NfGhVUnPQzF4OoeqZ1qBmOMJLrACrwgznaxA8AE8FA5wWXkZjvQplFhtbzmnLeBY/V6XrLOlzVMcqJuSdrITGRyqgUJh32Ib899qeC/goyKwlRrd/+iDfnVKUUrBzhz/adiEJ/bzCwMVmbl4kxT6X/fYvLdMbD7LRw== 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=qP9dd19Zy82dZAbmnDhZ0v5iuqHTboMRfJ22/dlTxVI=; b=WseFp9PBoz8E3udTMsIr/wxjkacvCo+xLobM/Yp5QcD2VhqCR5PhlPb96cTLc3ga2BvuYv2x5D3oQxi/AOukyhWBfjaSJQJDV8e/ij2+EfRmsQwQlGHeQntZFNjhmb6HFQuBLEqAeJu5hXL98sAfa6Vl5l9/6Rt1ZOO6QcdHLl8= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM6PR10MB4347.namprd10.prod.outlook.com (2603:10b6:5:211::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.19; Thu, 18 May 2023 14:56:10 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::998f:d221:5fb6:c67d]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::998f:d221:5fb6:c67d%7]) with mapi id 15.20.6411.017; Thu, 18 May 2023 14:56:10 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v4 09/35] maple_tree: Convert debug code to use MT_WARN_ON() and MAS_WARN_ON() Date: Thu, 18 May 2023 10:55:18 -0400 Message-Id: <20230518145544.1722059-10-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com> References: <20230518145544.1722059-1-Liam.Howlett@oracle.com> X-ClientProxiedBy: YT4PR01CA0339.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::22) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM6PR10MB4347:EE_ X-MS-Office365-Filtering-Correlation-Id: ae7dc1bd-f484-480a-1998-08db57b0048a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M3JL1brhEGCGnEjf/xBg/Qesm3oG3tQD07Nl/CY4LcrePXQ8Z2XbQuwOkxBjvXxxhBtxj4yNUbdDpuQ1oWhUIMW3MDuB2mJqArIS+O9pQGUMzxN2y4Nk5rmeUWgIvClduWGkfSE3cQ1hqEI2VncX+KEhJ3qaqAKGbcOa/bcPCAufykN2tG8mrmJPt6r1wiwRIjjR5hdpyIqMiQg+bDDihcceLPskJaaJJS43KEJY2LP0dnH9iZU3vr6KM9oxHRwT5Yh0bNrXV6SHa+HSUTMKKeR7QTzA80cLHd77FTh3xIFV+Fd2A2uFAco2k5rJzf4c8cdbLdHV5rKbC9Xl3yWmWY0U1dNeyf8ZGZbyxFc8NPYgKYkTPrVr+BhcsQEBvQtSdttuFXsDI3wpB9wAj7L7+Zgaksuk09mquwQyOgPSTvwFtcZtKU1IRx691rbz17vUrjm+ctUiAVwk5/+zhcnjl8d/3eRWItrPZQD/gxDubU9PXmWP7hHwWlS41Sktpa1kXGSbzwJe2u+z+lhDoECZyFoJmSASpOogB9WDIiygww1t3erfxZLq+bfHIu3cEi+/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(366004)(136003)(346002)(396003)(451199021)(86362001)(2616005)(4326008)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EW8ci2CTAWH6+Mb2mhENOzU+LYwG8KJMK0yo/8dJJpao6Re3G9YK7uKwo3wqX52uKdGJ32d6pBiuUnyyOGqPpDc8SlxXHyRWg2s0NPdM0UTTi4vofClWXOsFXe2GoF76ahOGEJm3Wqi2ao2Jeaht9MCIkjo246TCdm94gTawGe/fhwrb9jPnJMhm2xfmk4rUCJtsIDD85LvjRBBNVg9RqPV2FMxRm7JE4HQdqxsMKXt504Ppps4tqI6UaAu4DT4JjGrETTxCSQnNSQDPLjq6mJkqPBqvRyFEKI3eig9f9RjIy0oDNVQdaIVI1RHH+5V7SX7GnEH3SPFUE5x8bzALEGZRfLmGd9BPJKe4rOLQfESTTNTr0avG1EJN/s+rwXlS/C7DpYqQR/ng4Nfo62avfHGUsGjjulLp7ut7+B0tzRzobiSGktOB8gFbYnzzl18/XOnKje093ooqI+sogy9YAJ5QsgtJXmvmrwvHsN8AfncPKeOuED7LqVYtGVhss7rrGA3Oi1YAVF5y9rVDq4M680vVfVGiS9W39Eez6g8XrabHFki09ywzJrUemm1Qi8wJ9XvfYKdU27gOLsSzPhqvoKtDenPutEVHsKfWA2+rxBvw2jkfxIHZxETFdc8yWHQbkYJrAST30+ske9qWVyzdD0+dTWqmABkuMvqPKNtw81bxDOJ+vozoFN/l8bZ2xvpoBRkqFYXtzB8V8dMBFySkCqrcsZdDcJ0YP0TK5f95v8S5L49jAHXRaKjmUYy33BAW/oo48kJCu0jrSIUCFBapnI6V0UxArFC07EMca7i4Exy+0hqagfK+LelFPeTh/blwvRdeFURnT3w+iYzb4+y0GZpThyWnRWoTXnnfq/pzMN0EvbHN2nKhJtICVxBwFLONgeGd2CaB7PWgYWrY+xD7iRUyvmmbBk8qEoHAN4NCv+qhBH44tkplR6jJX5mfcDkeHJneG5nIY1FjMZcWEOEvOrbO/UfEmjVdbefO6jcuc9VwBFir5ypXAGlxpcl5TdwQfnk8WururwJPiF5thBPWI/s18HK/plGjfJRUIpOwTg4Nuj9fr5Eg6VmyKM05THxrUniKTJdCYG+yG5yHUezmq/Np3SbLl27r0y+7uuvJ2q7EJ4kUP4ufVLcl7ijzRofSivmINMSLWiTtL/paQ2cpfgO0y5ImyZnMQ132lMcKQRgVDUYi8/gmDGO0G+fMlVzI3B5F/8dGtkmMT9KdCyKg7iNcDtfAuha4CT42/61a1f5YeDNVjDQmNHNoI1CoWE4DVWAlWGpz0+uvyEjtpKrGgkO/OKLOcfnX9S5wX5bVSQ31c/zPvN+fMljgqguVRS9gWshUBmoqrG/mVHwtIxmCTz+n7ZBHrH5/QhCF685pT4grd88igmNdIWnY7liAPDVGdeuezlPrKuc165urH53qorAy4jPR2S9o7p0DrUKmgM9ltpOfssxd4w9wIPTaOrn9NYCjNkp9Cr0rETis+a/UF7VO3FqyeBpmuSS/yf4txpp1s0SFvsF3IWAgceVTVpsTLFtgxhyWYiOqClggPNej+XX7P311VQiPo/LAXVBYO4hq/fLBDhrn8rf1cWMSrxlmuAQMOvbCflzZyFKDGtjffQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: pIUr0crr65TNOutO+R0F20AFejSzK7Qekf0kCGpOSjE5JB60lGtLgu1RBBDTLyFv7M7WTqzu6hEH3hBkY5RgbKVkdjITNcSz72VIIDSL/z/Eu0VYFtYfN5WxCFcCVtyL69hkvYAMgTfMV2CRx++X6EfCYvGfbrmY/5mY8BIZqgJMFeGaC+fNHCQ8O/2MW/irbVBy+4obBKcmN49KgF9vFOVW/0B1b7o4O+GhdjeIm9dGPwQkoCmmnoSdVaU7XZ/78o1h4quH5UvPnImpqoG1930QLxKbSNMHL3XM4/zQ+AAVMXS4LCuBEonyHJyV2bR1z8Cmfv+XFflXqkXHYs5pQ4xgSxEXfasKeyqFGWGdaK/2V0OsDL91RgYwqjnfWhGqZnO4TSGOVGS6V7VW/uRJpbFlozuHTISSPaUoExJI9B+uhnLuGHHq2hIXBNllaspS5fUicaE1Y98KmF7qn/Q5x4+sToHs1P2eC6OzGiJmNfDxcfGRBaYzXI49o94CEzARLaEaZRbPbmEsHO/Rvjh+WYioBK4IxSzdIc1ygXb15e155C+QCuE2NzsdyN0GfQAXEmviLqKU5jgCyJgnGoSpPZGkRY5NO7sME7NX+HIKOYnZXILk0c6/ODLbXR18DQCP5g3MBzftTrrTgh6fqr78tyTRjtePDKMnQgLbk63bj6BqDugFZLptC/P7v95rT0ry+Myjn/asEwh0rpsuoYvUVYk4YsDFJxSz74kiBwJ61TVPKVsxYVGHn9XdFuUhTVdhFZd09yeqSz8m23pHGKCBPe7uPkPTOEfCx7p0z3o73lwiKAR66fKsVUh5Ezjs4hPTYJWuG6gYQOfgNPnkYlyz2M0Fh6KUvQnxyRJdJfua+kAucwBBzUL2j/38Rlu4vlguOo4aeN205h7p5Ll9V+6SRg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae7dc1bd-f484-480a-1998-08db57b0048a X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:56:10.6571 (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: +yoTv4b2lpjrbLpQ68hea+H/xuH9F3sPoKYGbdBiMJDgP+/iDvfhrUIKzeJocAxvBBjItZr5X3Gp7l3x0e+jzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4347 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 spamscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: Hp7Z5ks0L0a7gtK-oW2ABlSPG1UfeVJL X-Proofpoint-GUID: Hp7Z5ks0L0a7gtK-oW2ABlSPG1UfeVJL X-Stat-Signature: yttdyfe886wh7qi69r1cq9j5cu46nnn7 X-Rspam-User: X-Rspamd-Queue-Id: 1C05B1C0012 X-Rspamd-Server: rspam07 X-HE-Tag: 1684421775-261371 X-HE-Meta: U2FsdGVkX1/x9KelnWEPYng6JneU/0kg5tq9JaWqx/pT1g0cGJ28EE9SXwjZ1l/N+xNLF/e2UrKvlQDjR0XI309COcAsMpwqAekxncWk5HZMWNeUWeju3Vd5ryq7sWjXlc5e+i5MAPDVhNwQu2KFqL3goTqoQFxq+/zUQDj0W8034pyiGcqOfK8/HDn2w99aOCwinuR3Vd/rP8h/BXcdVauWFtuq7Zi9c/E+2GvhELRBlLmGNz64aYH3D3cgr0AE1WJ/JRbdCUKH58aWYBAZqhkT5TnuuBJIAM9POYBoZr6hTklnUzkspjIxQ9PkBpIAIa/jlvmiTtes19WRm0wVKzl8NCXfkntW4H5PIJXZUhAeyJWrr4yXmDQbmDj3Oi9cSOb7OgD3LawUUR+0bm2zzSPaYVOm5vpMOgcSELlTWPvvjUXLcB7tEEBfvzgVFNWdLhtU6eC2ogl6aoP+xPP7+nsj95YwgSrAhZQBD6EBxfDS57MkuHuwA979z/oUi089WkjF3+9JGB115EZsHIr9S0WDLBZuRjm13kOduxA4oF52Fi4z/0H+c+3rRVe/cMRFLTkzH3SJt7hNkXG2th/kbz2qpLj7SdsMifwJvjjRjS7h+3R1OySXJtsIJWN/vDmhonSuKjWF9aE47uc46ZsxM4m+gNKtU8A+bKxe6W5t50s+jWGARo7g4enhX2D6Rh4zgovbkuRPEppqEL3nrwbT7dBssj3PLL0d9+r1kmAZlvk8o6I1cyesSoHoiOvOXLuV19d+cCbCa6foyGPih77j7wfYgXvryHj106BS+xumv1S7sowcXPh9b17+cUqAqDDn76TFqjVdXRklJoWlZNJkjPL9QSCpicCcnqfy7kDX8bMJaGhYqTwk/shahKY2pgWnCp5QJ8MeJr1SU/+nBqqV5BMteTlkllnbB1QMtEYZDjBoRmDcfoENVe+SYh0r0J8xm7KW2ZirvEovGINJj5L uK2zeetk fC+Xiw+fOit7jwh1Q1rHv7zuUh7W/vqWBF+T4TO628+VSFVjKqueRKfYitqeYGb9cp/Q0aNY3z2vYVqAa/cFm1Zj8Kc1DMvL3Ql7mnpeOq89QdyfJ0sTdE5VqkdWLboP2dScX8KcsdRPsXHHyni+uwCNmkBo9RIdbwLzd8XWjG/f+AwZvrUwDnY2uQE9hZFrT7dJ2WzFHP12rf/y0C/OHlWV8S8TM96tmYsnVhaKxo7Axd50/k4kvDDKmrJh0H+grESAcP9rmHGJDjOJ7VPY39OLl8VYKrATcZ7yYK2I5elItlTxauekLKO71cNeEnfQWUz0PnwKvmQ7vlzfGuJ4hsE1k4m/GnYflZS3grTVJFAyUA08crjBNEbzSveXxaADuyd6zL8q0lR1RKlVVNGf+tVmFrxGNoK7O+L9XotFZAWsMVTo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Liam R. Howlett" Using MT_WARN_ON() allows for the removal of if statements before logging. Using MAS_WARN_ON() will provide more information when issues are encountered. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index c3ce2bc59412..8fd83f21caf0 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5698,9 +5698,9 @@ void *mas_store(struct ma_state *mas, void *entry) trace_ma_write(__func__, mas, 0, entry); #ifdef CONFIG_DEBUG_MAPLE_TREE - if (mas->index > mas->last) + if (MAS_WARN_ON(mas, mas->index > mas->last)) pr_err("Error %lX > %lX %p\n", mas->index, mas->last, entry); - MT_BUG_ON(mas->tree, mas->index > mas->last); + if (mas->index > mas->last) { mas_set_err(mas, -EINVAL); return NULL; @@ -6529,10 +6529,9 @@ void *mt_find(struct maple_tree *mt, unsigned long *index, unsigned long max) if (likely(entry)) { *index = mas.last + 1; #ifdef CONFIG_DEBUG_MAPLE_TREE - if ((*index) && (*index) <= copy) + if (MT_WARN_ON(mt, (*index) && ((*index) <= copy))) pr_err("index not increased! %lx <= %lx\n", *index, copy); - MT_BUG_ON(mt, (*index) && ((*index) <= copy)); #endif } @@ -6678,7 +6677,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn, max = mas->max; mas->offset = 0; while (likely(!ma_is_leaf(mt))) { - MT_BUG_ON(mas->tree, mte_dead_node(mas->node)); + MAS_WARN_ON(mas, mte_dead_node(mas->node)); slots = ma_slots(mn, mt); entry = mas_slot(mas, slots, 0); pivots = ma_pivots(mn, mt); @@ -6689,7 +6688,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn, mn = mas_mn(mas); mt = mte_node_type(mas->node); } - MT_BUG_ON(mas->tree, mte_dead_node(mas->node)); + MAS_WARN_ON(mas, mte_dead_node(mas->node)); mas->max = max; slots = ma_slots(mn, mt); @@ -7133,18 +7132,18 @@ static void mas_validate_limits(struct ma_state *mas) if (prev_piv > piv) { pr_err("%p[%u] piv %lu < prev_piv %lu\n", mas_mn(mas), i, piv, prev_piv); - MT_BUG_ON(mas->tree, piv < prev_piv); + MAS_WARN_ON(mas, piv < prev_piv); } if (piv < mas->min) { pr_err("%p[%u] %lu < %lu\n", mas_mn(mas), i, piv, mas->min); - MT_BUG_ON(mas->tree, piv < mas->min); + MAS_WARN_ON(mas, piv < mas->min); } if (piv > mas->max) { pr_err("%p[%u] %lu > %lu\n", mas_mn(mas), i, piv, mas->max); - MT_BUG_ON(mas->tree, piv > mas->max); + MAS_WARN_ON(mas, piv > mas->max); } prev_piv = piv; if (piv == mas->max) @@ -7167,7 +7166,7 @@ static void mas_validate_limits(struct ma_state *mas) pr_err("%p[%u] should not have piv %lu\n", mas_mn(mas), i, piv); - MT_BUG_ON(mas->tree, i < mt_pivots[type] - 1); + MAS_WARN_ON(mas, i < mt_pivots[type] - 1); } } } @@ -7226,16 +7225,15 @@ void mt_validate(struct maple_tree *mt) mas_first_entry(&mas, mas_mn(&mas), ULONG_MAX, mte_node_type(mas.node)); while (!mas_is_none(&mas)) { - MT_BUG_ON(mas.tree, mte_dead_node(mas.node)); + MAS_WARN_ON(&mas, mte_dead_node(mas.node)); if (!mte_is_root(mas.node)) { end = mas_data_end(&mas); - if ((end < mt_min_slot_count(mas.node)) && - (mas.max != ULONG_MAX)) { + if (MAS_WARN_ON(&mas, + (end < mt_min_slot_count(mas.node)) && + (mas.max != ULONG_MAX))) { pr_err("Invalid size %u of %p\n", end, - mas_mn(&mas)); - MT_BUG_ON(mas.tree, 1); + mas_mn(&mas)); } - } mas_validate_parent_slot(&mas); mas_validate_child_slot(&mas);