From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F05C8C77B7A for ; Thu, 18 May 2023 15:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbjERPjQ (ORCPT ); Thu, 18 May 2023 11:39:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbjERPjB (ORCPT ); Thu, 18 May 2023 11:39:01 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9F8D2 for ; Thu, 18 May 2023 08:38:58 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6Ir7f012413; Thu, 18 May 2023 14:55:55 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=FZc89H8cc3jCASthTOjGzkEfMxavJWu8DLVc2e6ZxQ0=; b=tUSgWHxp5dOcpVKMLY+NBufRXIHQulwLgrXU5O9hIUIJSDUIOakObWh5+NoQNYyupPml 8cUtspTFSMTulBIjk6jFoMXL1MSLUat6r/8EFqpmOlOQUHsPF24gngKlL8Z46HPDKfRf eKONDH2RFKx5oNQRUrEwW1v3S2dHRXqlBmc7FJ0Ozh1Ko1NRAd3e//rL5Rrk5f/7WkH8 4wQpgC1S8QGiOeJLuUufBrNkrRjfzTIArN3VmktGK2t1O0Wtoz09V97bAOccKGuc3zqd 0NMpkZJZO7Dbe06NYXw/ja6ehQ1uEFVOziUWJLK/7TNuhYd0mKeQDdUoHSJLf48114Tj Xw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjr85-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:53 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE8DIw004253; Thu, 18 May 2023 14:55:53 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2105.outbound.protection.outlook.com [104.47.70.105]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d66jp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L26YVZQfOFQcycfoS1mdW5ipR7KMXwFssJKTxaa8DmDwuK/MRVmsd4i7GR/yfWjx/+VkSxGu4WGrNbxBYlnGSDu7OTyXxbzDlWNxHRGPgeTWFZr/whQrPATuKHj0+Fe2fWVA45ZLFO46dY83UOhYYftpLETjByVF9Zhzo/W5PA7X+yh+i3Qu6wP0TaWYTUDbUpKAmZhqIRdI36Qw43DO/c3zlGQXtAVJWyElhysXFTL7PFquVOTJEPwppbGNP2XDrgcfAUNb590bVSXsRlqVSAopKJKXsJIMveyA0tLVkmXceVdZhihHGBeKXnlaDWAgYf6fx9UEpykNhoeS3GX+7A== 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=FZc89H8cc3jCASthTOjGzkEfMxavJWu8DLVc2e6ZxQ0=; b=S/MSgTUHt/GaLWNhGeNxPEQFGZXuX6aE337L36wsqAh4jXbQcs22kaPTsM2RWmr4NtQlDXRxHzYoZVG6lafdnML2zX38cT59K1t9kAIpsXC5YTxg8/XUfW8HS+h0I1VHl+/bWELKSGhvvrYYuhSSBrxuKNDhOHhoYKo1l7m5c41QgPLXYh2OlITWMzW+f3AJGaL9BgLXmOtrnLPFrZ5DNxucNhIfio12AOcU5J9Jq1qAjbfE9bCyrHx+UJElpXLq/2ateyFjMWka3yvdZmcG+UiHT0p30tZVs1bH64sbj6BGcHqwY9Oarbcqtu/D+8BPohLVSJKxFp9UQoKiZpW72g== 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=FZc89H8cc3jCASthTOjGzkEfMxavJWu8DLVc2e6ZxQ0=; b=K1BWzRg7EiO1+SY+Iiba4AoIDvqn2XjLz/BLklGmmL6yt3psOdGuTcN5jBtyuaJPsXlHnwYtyYZ0irSCsIoOYYcg3r3hy1OYwE5WwRG7Yy2efNdlT8BfurFK54h+O+rEJtV6K5hoigsYfFGMCOXdvNC5xbRnJFklIweOV9zewG4= 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:55:51 +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:55:51 +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" , David Binderman , Peng Zhang Subject: [PATCH v4 01/35] maple_tree: Fix static analyser cppcheck issue Date: Thu, 18 May 2023 10:55:10 -0400 Message-Id: <20230518145544.1722059-2-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0141.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::12) 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: 44f98ea4-4e4c-4aab-84c8-08db57aff91a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LbT0IxPcBLkgNgRxryjbeGWpH3mqD31jIswB9OR0u2fPOXRSobFYl/yOlKm4DD7pquc4MXQsomyfgJqEDSnX6+TM/F5S6BdN2RLBjoao2YT1gf9VteAjuD8iKMxHNCNvjAwGSIP27bqREIYYuUt6B4KaKHH65ROc3IOhdXFhznuiKUaxe3amcS3L5ZlAJAYX1/992OvY83qY5CXc55zwbYCmqBz9QfcNFxHKtr9+s0kyfmExsR4huaVFXKGZ8hD3HvjO8HjGV25slhhjwoKevDpexOKz82QmNB7iyeMaSZAuZStOp2mvo0Pi4+Z6aheIzFSr1oAI1wIIfXZY/xa+NPvHbS50NZ55ch8iBpd9V2itZkrni8RkkO7kgBl68U8SQK4VO2utWpird52sSd7Yno64CTCutibbikeJqzb2bSlND3R9fDNlszC0Kh4rDyEt6AXBFDg0d6I7NKLXXq5EP99poHMxME4wjwZEKfJcxkJl2zB7LHiRIAK7/oFkwRRqEIVLMuEoIw685HpdmWT/IqVfc/4l/1NcDqYDpkLJIwGhBwJ6QlFS2lr5f+cgvLHH 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(41300700001)(45080400002)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hhuvzDaaEs3k87y9ZPdJH2veIHXWfdyUDsYUWIuldnwu0jN1DsXyX/EgKr09?= =?us-ascii?Q?6qnIZ/6YjlM0UGpqCxH8tK5TpsQFPb/ZCrOt9zKXWz9MeR9Ym9qZ0kFmhEKC?= =?us-ascii?Q?tvcr+R2dV69ZuD17JxUULbaeDItrFVj+vTaVUHZ8Cg6OBUKy9mJtIvOg2APT?= =?us-ascii?Q?MU0aqpC2cdbPgK5TYFgjMDyWaxJVa0Qq6en4sylXqQWCt/NTZscOaw5/Gm/m?= =?us-ascii?Q?K9RRtlm9xUxLE2Mf1/jaP+PKiHRlJvmMUmjXIXZlohOScF3dinJHJZjME2y6?= =?us-ascii?Q?vCMJOxhgcVzA+HLNv3yjyx4MmHUdgSbI96kVIbt/jJtfDIIv9irLJdS7upM/?= =?us-ascii?Q?vz9bNtSD36qAkKud4MweJx/4n/1TvAA3bLjGiedWGcImPjICCvWEqzcQwigS?= =?us-ascii?Q?QkeqUCkrrBonL325bRdrUEJhjNry92BXQLPubh7gFQlbE79eOTzo3LNvqj1n?= =?us-ascii?Q?XF7wSLinZOAqlYQxOk/QLo39GPjsY4XN5fL/FwvhQQb4F+w1dGcsRYNkAsK5?= =?us-ascii?Q?e4ScS3I6S0EML4PVJro0YQO60E3Ce7Jihg7sH0XeEpB/XYsZZGML9OvFVVC6?= =?us-ascii?Q?C/s2Q9HazatZWrr8iQKrSSODF33G6NCjwgAXwE0VGZdWCNb0Gf1dn0a7tgLy?= =?us-ascii?Q?NZr9KXVrh4NWJxA5hxck3GhKWvjIQmteie2xrSVXzb/w/6xYMIG5cUenmzu+?= =?us-ascii?Q?LrtNhX/cu0dBwuFuxpjgXyHkp6QsibX7uBc2GoSEQPTDFUwGjgkyFPrSrHct?= =?us-ascii?Q?wxZYZ2TTVb3gvV240JwRLHt5vac7mr4FKIBpHiJAMsV48SSi3uplTHESqNgF?= =?us-ascii?Q?maEyBchrUOA6TcX9wrEHP/gTxgdBBLzEyjE5JBIUFILLWut0AW8t+dey1J0P?= =?us-ascii?Q?0v3RiLyKHrUtMJlmL17B+RLRw30c6CsqROP0tu5ZqXS2LgKYCGPtLY1xb2J0?= =?us-ascii?Q?lsW2hUR/eqhrNdDIfzNdvhoOTnwlQjOW6XFwX2ZwcK4vRcl1hxEDsNLocxNE?= =?us-ascii?Q?W+EBKVnxwSFvRszbuwhjd7ksIwlwsu3ADV3bur9KMcvkkoQ8e+ZDVN7Wjutt?= =?us-ascii?Q?DzOJik4VKCyuGiHYAlOod15OILyQtgkLsd43XKj67x/J2enQ0cW/GpjDm9Vc?= =?us-ascii?Q?VACJWDonCS6X/McELo0o1sNtGHbeLwwTnYThJJeFeJzo82iHffvSYXOrRCHS?= =?us-ascii?Q?IjEj99F4rs7uN5I5CffLShtQEiZtsuq2zncV+LBWGHows0p6Oqp+oGDnpkjg?= =?us-ascii?Q?9pqYWoOpGdYM4FIeX4whL8zsnMND0nd7RZJJz60wEw7qVuXbb/+QAQpyKGH7?= =?us-ascii?Q?5/YDSWBK8ernlqNiVUL9r4h3LUr0BgLBodFUGmShjEaHRJOOZXRi5um5buog?= =?us-ascii?Q?biBMSygR2yPUVUQR4qwPWzi7iEkbTMtavemHxnUf34Bj6jC121iKcb8RkMUZ?= =?us-ascii?Q?/ELma/S1T67PcBnLCEA1cuj1VevQ7lwTLoZ3TKsXX4/1i8UciIc7aLDhljjn?= =?us-ascii?Q?qIyGmy4ouVxyK4sV58ASkvdYkJYj3YNq5pwcWn3OCYvo7xHLo1kUrWpWYnbG?= =?us-ascii?Q?IKiWEgdmQN6cJKsZjoocMbSWuBWsfHJUwrSIedKKi+Uz0hzwt+yuZe8csl/i?= =?us-ascii?Q?HA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?Nmr/qphyWK/o8lLzB44F/ookJYYjDkQtxM0EQtsf9KzHsd1YQucKNTlVDByo?= =?us-ascii?Q?l2JgGNsNR0NRo9hL37XeBbWLS/EIpGDIisrYkK4v8i5hMc9Lzh4z6nf8TuaX?= =?us-ascii?Q?2/+0j9ghxS0e2utoDdSAEqKz1gwOuLzVZQToA+JHUFopXUPlMSV72Mw9J5Iu?= =?us-ascii?Q?y/npuameCS3Xoj/KMKxDX6SkyTAwVfraNE02EoYkBysdFOUDyRnRSeBd5Eun?= =?us-ascii?Q?f+fmZWb403Ak+ZImGpxaar416yjM1Z89F1Tm38PbkGIuNJ3I//7SzW2cWkTv?= =?us-ascii?Q?Qqkl6xuSbqH3z/LfZdIWaUn45ilAFnHNmWUnpzvaVQZFxB+2yzsUMuY6T83i?= =?us-ascii?Q?VaUDubvhvTQ8bsLAhiSGqa+uRr7cGWzzym4CPtihXpIfrJdlEYpxP9i4SHk9?= =?us-ascii?Q?M6pR6RPo4LvH17wJlRB5e8Fmaf5bQfUnhIWha0TJee66JRjHgSSB2vMYDms1?= =?us-ascii?Q?WOoo1bY45I4Lk5EbXGoUUKr7lkZfIUmoaB1Ri2kD0KWw1XtQMKykRe5y9EXy?= =?us-ascii?Q?DA5GKfNF+qR5UojcrQ56g6zPzaYfUuFa6nxqRdU53W6gb8b6E3/pOSSHBdFN?= =?us-ascii?Q?q27pNLDuMwZBldBu2QZEhM0bYgda4q+c/MQMAeq1wAXOb24Z/0byNxMSTrye?= =?us-ascii?Q?Mc3JMmW6gVHMyHqfbwf8bP5UZLZ+phbJm2Vx/eYNs+gWxgoHYLFlc9bnJG0I?= =?us-ascii?Q?akdLjelKuSIajp67d7yDs2tpZb3Xp33/nad09TytRmmeqeHOFuCBCcmBvBcY?= =?us-ascii?Q?cZC8ibyKMA2hi59EfPJLYyh4ETZVilayYh2EGrUjDDHnR7hOUIVExzZXJjjw?= =?us-ascii?Q?cA6uWct8tpUrVl7C1YriKJyUTlPZvl9lBzfESnkXnZB3D0AJSi2fhzrcpLov?= =?us-ascii?Q?SOdoYx1R1uPeRcPczWvxuyURvN8CmNALu0mdIjlQ0FOmZFLxh8l/mPa9Oj0q?= =?us-ascii?Q?lYPx//+gA4Hf7WAhpsy46A=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44f98ea4-4e4c-4aab-84c8-08db57aff91a 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:55:51.4470 (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: RgCKL9i+gPwGIPHirTd5MqkvPVXSwAwpanWI+eOjKOuPREdgLE3NUEto88EnnrP7H340BDv5/6TJ2AuDl3ebnQ== 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: NMKOVRtQiQ2mXTf_azDIsyeWanyjEtnL X-Proofpoint-ORIG-GUID: NMKOVRtQiQ2mXTf_azDIsyeWanyjEtnL Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Static analyser of the maple tree code noticed that the split variable is being used to dereference into an array prior to checking the variable itself. Fix this issue by changing the order of the statement to check the variable first. Reported-by: David Binderman Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang --- lib/maple_tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 110a36479dce..9cf4fca42310 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1943,8 +1943,9 @@ static inline int mab_calc_split(struct ma_state *mas, * causes one node to be deficient. * NOTE: mt_min_slots is 1 based, b_end and split are zero. */ - while (((bn->pivot[split] - min) < slot_count - 1) && - (split < slot_count - 1) && (b_end - split > slot_min)) + while ((split < slot_count - 1) && + ((bn->pivot[split] - min) < slot_count - 1) && + (b_end - split > slot_min)) split++; } =20 --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 731A6C7EE23 for ; Thu, 18 May 2023 15:23:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231702AbjERPX3 (ORCPT ); Thu, 18 May 2023 11:23:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbjERPX1 (ORCPT ); Thu, 18 May 2023 11:23:27 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47B37101 for ; Thu, 18 May 2023 08:23:26 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JJtw026285; Thu, 18 May 2023 14:55:57 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=LZ+Rvf0vfOSu8urkYzsX96V8zbxpG3dCO4wDwbgmX84=; b=MpYzH4MAXaiZWbvjAYTQaDB9Ej0RHTlp+Ib2swHE/Sl+3V3ykxpUZqif9cvxyg2cUMVA bjmUQTmTZAOjDa+NpX+h6kSbRYChdCGlFxGuBOl37+fYSHxBan5t5wBqgD/N67lVVqYa ECO18ZNGBZU0Q9HiZDE8I4Z9WHIL/0yfZ+qoUPxZF/X1BNVHfS5ku8DwTwY+vQrDm1KU uYeU5zZx/aIkhA6FAg6W28S1vG3+lkfps4avTLbWqXJV+3JVaHpQmhTzAC/iHIxAgf1V 1g/1iGxalfpx9iUi3DxSIOmFVw0eDdvQ/rUyDjIhJX1qU9qQn7VCYW4eTflSiiXIArul RQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxfc2ucr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:57 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDrvv0004227; Thu, 18 May 2023 14:55:56 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d66ng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTp1S8Yoj0OHgT+XUBondm4jVWgHJc4Q9PmIbA2nOserY3y7YBE2+5Hyqwos/YRFsmuU7fv+665yxfON8HduP6tny8O9ui3T/beyPIiFCcQ5I7mPt8v5IrAyEHIxjLKM3+D0GB0wVBWWnVp1nMcBFiPOENDIkORY5VqlOM1TgaNLtIQOmovCoL0HDLiGLrrA857Swq2zLVwUbdgOHe+ZFx09KKhXwRF8AUKb7AYkI4zzUnWzDvmtvwbhBf37d/urjLBCiQs0OWlCOF2eRnyugREDXEovYX3s78K5tr+VinpvVflBB7bE+tW1g23MojDg9WUyvcIOtbtRwKrXZvhK9Q== 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=LZ+Rvf0vfOSu8urkYzsX96V8zbxpG3dCO4wDwbgmX84=; b=CViZc+m1PE3bAP3bEuKKbdmdrBSqOm0jJ8G8y91ypRRH9041tZAQOV0n3sdU6FDoMo4OXjespqmaxL6zqI6eMmD1mLh91tNTpl6CcwnmO/4MEZAXtXTpWHDXfjLmDbQUBs9SUkwsAKcyjJ4TbCkvC25DfKxzZQZclJpJFRHCZPW6BmUEpXwSWDcVKRXlPp72UmjwTACGHgELgez7zH/DH0rs0B8PgIGvH2von40T9ByBa5f6OoEEPoirLBVrnIVYm5YR8fpnxK9pNA1D5lqZkDnSo+eXYWJHNEDYDqb/RnM8/+It+aWWx/g7VSolrrpWqA8NU65Z2OAW2L6r7PyGOQ== 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=LZ+Rvf0vfOSu8urkYzsX96V8zbxpG3dCO4wDwbgmX84=; b=nM+F3RTRqlVQFIFTHvv/7wtHJf1UrWFP1ZqiJ88qa7bNyO7lmnnqSNVKvp6P8uyUCkT8RSqOylmlPH5OnAlMU+NbgP7jpP3f9wnV1G3BvTzKlIqmoIXU7lWllnAiWvwwwlrMpG+VvF7XTYCZeXIv1e5ltAdfNXiHwTNfHOKG3kc= 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:55:53 +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:55:53 +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" , Wei Yang , "Liam R . Howlett" Subject: [PATCH v4 02/35] maple_tree: Clean up mas_parent_enum() and rename to mas_parent_type() Date: Thu, 18 May 2023 10:55:11 -0400 Message-Id: <20230518145544.1722059-3-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0264.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::25) 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: aa70db6d-2356-4a60-a885-08db57affa89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b3sTEtXCdo2+6jk9rK03VO7xdSwMkf1Bb1+yYiSfVQ4pTrdmm+BvXti4Nwb0fVJhnWw2/blWM8RiT7aKr2muuHx06NMxlEJXyf0QKdh89OG5TuwsUN8sNEtN927VrxtoVSLrMqadf35yI+AFRC2w6TVJUxrIm0LK0SwpN+23c+awcdnkDoYNwd+e0Fy4hZ4PLq3EZQcWRAoJu3vpR2q1AdxjfHi/mkh0u+3e60RRpAAMImBILwlFh1qPEn9D0//HzhF7dx8J40LKYLJIk2PYw3Dod+0RHf8cN6x+8Dcx02+4GLqzxomOO1LKskYFzcqt5FIx+uhPo2LdlX+pG8c9KJOxnTnJibLubPSPSZfgPOzafIzQkjla6++HQfoh9CxLnIY18zeUqPj89w/1sYTBCfG2/Bqwj2mwIWE26P/Lvuv/SM3nbhWAKSqASVzCjWiiYedN6cjkQaf4PXHCiyy/O9r/heMWmuZlvbKr7MMhG2vkIf+exxlSI0L+/HLNuzJufCpR75Wd9B5wwbePjLYv782pvOjNLLn/td9AY2u8l/doQSIWwdEf0VIEJIA2xb+e 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)(6666004)(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: =?us-ascii?Q?b6pu5IW9bZpnnn/+MB3vZgzesGibpLA4Ln4OixEk+twHknTZGk+Fc09Sgong?= =?us-ascii?Q?On4UywvOR5THSt31fURz6ckmH4QG9Tyw9FX+8EdHyla4Qs62QPHB81X5HPBB?= =?us-ascii?Q?HXng7MDZLBUd+ioNrXaZLtU1j6TKsAgNqt2V3I7qbCjOwtwQu9Mul9MU0Rbj?= =?us-ascii?Q?yVKpaN4dHsxd9aOSYnkkqA/qBVjKCE4+LA1slmnL6wlDo9UJi779MENanZdO?= =?us-ascii?Q?EGBtOJKxnfpXi86Pbf8na7wJTpjAmY472bUbVKj9rMZksa6gVJ0aABXTNojq?= =?us-ascii?Q?GmEqf9z20MKsVer5+2Tg9njvqTQ1mVt1OJ/Jwseg/HQ016/R1VgRR4oZlug8?= =?us-ascii?Q?PZ4aw+GVeQ9madYcS/YiyVfc5VscrXzWe87SrkfkgKm+nsK5Xzo9ubf80bBk?= =?us-ascii?Q?ZamNZvWUic6biyOL5/lCf73i6tNgUUJxK6eZA3U+NbWDxJkNoRfhcIz8RKok?= =?us-ascii?Q?GNpuVgi7r8kmn4hRH6FEbO9jiHKrV2TLQvcoNd5q19UE9VZU1a376tkeRnVX?= =?us-ascii?Q?SxoaQaLZszDeREe0O/Wxe7kgBORn/G1p3Yka4e2ssEa9xpfXLch9t0RddyUS?= =?us-ascii?Q?XOHhfTAoc+3YSy1SuRiOQOD3lkoeKg4954g1mkgAokf3pGbx+DXXbCwB/8JF?= =?us-ascii?Q?YGVMpKGcMg1kKTknmJQDmg5a/HmdGODUTf8i/WyjKKXIDwea0IY+rrXXCWZo?= =?us-ascii?Q?c/NQYa8MEA5QadHkOBeYZJVckMWRrMTcwthxT9vCocmhOiCnBbgE0GaCKluz?= =?us-ascii?Q?95qf5vnhWJu/9FYZhLg8OULDJIWP8MNdynLCtd1rUNYjSR4vT6C+LMG+IGSp?= =?us-ascii?Q?J6swKLAN6cVNxfiBsCKJ6Q3CXa/zFapTdHeee/N9ZGA+4ZuscCIv+N/zFsvB?= =?us-ascii?Q?4AEMZ9vdYGZTnmbkdbn53s0ED/Jf9kbGTPbfrgiI9sB149NxyOuoCEu+VLMX?= =?us-ascii?Q?stuBJzl67Rm+8Kxhm32cRqpRlj1iDZk+BdeBj+pNAFbCwiZFBp9GqQMhbnfI?= =?us-ascii?Q?+Uzu56NWQgXKyQ25tKzoFM1Z5B6JVCBfISVsrT1jtlUe33F2yPu7JVBHVssD?= =?us-ascii?Q?aDxtj6Nm8eLVEgSd637PK1olEVldmRqqygOy0LgA0ydPVgUsRDA6kq4ypwQm?= =?us-ascii?Q?J0Rnpm5+LigkBQIuCOXPgoShgO5RVaxm3553T0pb7Pqo3lnlnA70Lr7vffFr?= =?us-ascii?Q?H4xZnl4eR9JgScDQomT+XQFxNb0o3lxuvMA9dKZmizuTJurvEpD+HwAReMiK?= =?us-ascii?Q?LFhVOfZF4E1sxGeOe6xnkx+qCS33nbtKzcOcLUMO2Chlc5as9fPOh0QRd5Ik?= =?us-ascii?Q?VSqR0LJMQBsot76i9xwxJ4oCwm0bqg/lEsa7KiKBc//cNM/TmxT5rn0pStDe?= =?us-ascii?Q?7R16pRyv8lSyjttbZ4VBQ+3MEXZ2Qzh6xYNeDvUQxEmqXmuMnfruTgqSP6UR?= =?us-ascii?Q?viAMOV1mb8LgvYybIo17R3y4IHbW7FYI5JGb57EYgZ+VVocxyskiWC1keAr4?= =?us-ascii?Q?SaAy3ToOu8X8BlxIo2B8rUEMJEGYgYNiNsu05KcHlobhHm4JgxXNMX87d6Hc?= =?us-ascii?Q?sETgWdT23yYOKRunAwof6Psm7dSiRpmbpHTPP9xxZAzNdFbNWlMEo1jJs97w?= =?us-ascii?Q?PA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1fQYSlU6drH1SVzKi4KpbIcftVnjCY7FNUyZpwt3ZYXRUbPzYw39sm1a3QGs0IH+VZh8aibpkYTOIOyv8F74zj6hWaGgQeO4Hind5f5OKgifaPTN7u6QLRYSGEBN3YcslI+qFU9edImJg317bxEj5san2eGUeYvSMWhm9TF7qGzYmtzebQ7OcyxJ92hpksXBMC3qPFHnzIFQF/+ydP4GwkBgJXo6VRJfUlvU8PCOcxJhe6uPE4ha9feX+6dvlWrhJhSmxy6CU9rC+oGoZOalQUu6F6O4XBhYcw6vqy/rmEDDRJX2qI9cpyN20C44QUWrJFdV/VWzRP3Oalz00KyuypSMTQOKqjzXREWdpU4ZK4UUFF7XoM1oYLjV8pHHTML6JyJt0RGoPz49YWOvO+Nmc09G0gQyqqh4IxOO4JG6LxwgOe+EJt9TcTWQAJ7hwQMP2xoossc23QEPLDevutR3ZjUUSiOuV2Ibxa/fzZp/XbagbG+PelKq82SYUEE2wB2EvczH299UAUUZ5YN+Llu/M4xgRO1yBQgAY43aWHKFVsO/fmA48GBJKpP08fX6ObUp+cALBCWYaf2WreFqV08NQiYnIZtzKpXYrAem2313tDXzV0M2PRadLGKE/Fket3+VPY6oSIkC1C/p7QmhskMtRrFQAYa/GHoSTfTa/KS5ZdqgC+Ld2jp3mksHRuMdSOB/wQ9W/c89QvzYTmhls7nPqPFLijQdq2Zu72bLYhMuoPHuAuesXaFT4WbvM+DRnwZwUmkJhbYa16k8bsD5dCGId68xi7AUcP+u3u1kyDWM+/l7vwiN0PbBkRGtF5HdJVNZhrG4mMina/7Ra1yKodh5jMrjHe095Yg0LpRgquv1N8xT3qBNhy7wUK0Ysges6kzvM3IdbQxaPiGJbIaFZqVCXxJBgPe4Ln3oBFEWH+wtPb4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa70db6d-2356-4a60-a885-08db57affa89 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:55:53.8253 (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: j4ytq9wxpB+MLhhBlNYMq/zz5aZ3dCyPKWfrYMZMW/pvt7RmzzSns1TR5oaKxPJMpTNBuVkSkT/DC7L6/4rdqA== 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 2-EBsmM22HTK43Mc7VoOyHEq5PY1Ov6m X-Proofpoint-ORIG-GUID: 2-EBsmM22HTK43Mc7VoOyHEq5PY1Ov6m Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" mas_parent_enum() is a simple wrapper for mte_parent_enum() which is only called from that wrapper. Remove the wrapper and inline mte_parent_enum() into mas_parent_enum(). At the same time, clean up the bit masking of the root pointer since it cannot be set by the time the bit masking occurs. Change the check on the root bit to a WARN_ON(), and fix the verification code to not trigger the WARN_ON() before checking if the node is root. Align the name to mas_parent_type() since mas_node_type() exists already. Reported-by: Wei Yang Signed-off-by: Liam R. Howlett Reviewed-by: Wei Yang --- lib/maple_tree.c | 50 +++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 9cf4fca42310..555de3a8343e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -425,28 +425,26 @@ static inline unsigned long mte_parent_slot_mask(unsi= gned long parent) } =20 /* - * mas_parent_enum() - Return the maple_type of the parent from the stored + * mas_parent_type() - Return the maple_type of the parent from the stored * parent type. * @mas: The maple state - * @node: The maple_enode to extract the parent's enum + * @enode: The maple_enode to extract the parent's enum * Return: The node->parent maple_type */ static inline -enum maple_type mte_parent_enum(struct maple_enode *p_enode, - struct maple_tree *mt) +enum maple_type mas_parent_type(struct ma_state *mas, struct maple_enode *= enode) { unsigned long p_type; =20 - p_type =3D (unsigned long)p_enode; - if (p_type & MAPLE_PARENT_ROOT) - return 0; /* Validated in the caller. */ + p_type =3D (unsigned long)mte_to_node(enode)->parent; + if (WARN_ON(p_type & MAPLE_PARENT_ROOT)) + return 0; =20 p_type &=3D MAPLE_NODE_MASK; - p_type =3D p_type & ~(MAPLE_PARENT_ROOT | mte_parent_slot_mask(p_type)); - + p_type &=3D ~mte_parent_slot_mask(p_type); switch (p_type) { case MAPLE_PARENT_RANGE64: /* or MAPLE_PARENT_ARANGE64 */ - if (mt_is_alloc(mt)) + if (mt_is_alloc(mas->tree)) return maple_arange_64; return maple_range_64; } @@ -454,12 +452,6 @@ enum maple_type mte_parent_enum(struct maple_enode *p_= enode, return 0; } =20 -static inline -enum maple_type mas_parent_enum(struct ma_state *mas, struct maple_enode *= enode) -{ - return mte_parent_enum(ma_enode_ptr(mte_to_node(enode)->parent), mas->tre= e); -} - /* * mte_set_parent() - Set the parent node and encode the slot * @enode: The encoded maple node. @@ -1123,7 +1115,7 @@ static int mas_ascend(struct ma_state *mas) p_node =3D mte_parent(mas->node); if (unlikely(a_node =3D=3D p_node)) return 1; - a_type =3D mas_parent_enum(mas, mas->node); + a_type =3D mas_parent_type(mas, mas->node); offset =3D mte_parent_slot(mas->node); a_enode =3D mt_mk_node(p_node, a_type); =20 @@ -1144,7 +1136,7 @@ static int mas_ascend(struct ma_state *mas) max =3D ULONG_MAX; do { p_enode =3D a_enode; - a_type =3D mas_parent_enum(mas, p_enode); + a_type =3D mas_parent_type(mas, p_enode); a_node =3D mte_parent(p_enode); a_slot =3D mte_parent_slot(p_enode); a_enode =3D mt_mk_node(a_node, a_type); @@ -1659,7 +1651,7 @@ static inline void mas_parent_gap(struct ma_state *ma= s, unsigned char offset, enum maple_type pmt; =20 pnode =3D mte_parent(mas->node); - pmt =3D mas_parent_enum(mas, mas->node); + pmt =3D mas_parent_type(mas, mas->node); penode =3D mt_mk_node(pnode, pmt); pgaps =3D ma_gaps(pnode, pmt); =20 @@ -1691,7 +1683,7 @@ static inline void mas_parent_gap(struct ma_state *ma= s, unsigned char offset, =20 /* Go to the parent node. */ pnode =3D mte_parent(penode); - pmt =3D mas_parent_enum(mas, penode); + pmt =3D mas_parent_type(mas, penode); pgaps =3D ma_gaps(pnode, pmt); offset =3D mte_parent_slot(penode); penode =3D mt_mk_node(pnode, pmt); @@ -1718,7 +1710,7 @@ static inline void mas_update_gap(struct ma_state *ma= s) =20 pslot =3D mte_parent_slot(mas->node); p_gap =3D ma_gaps(mte_parent(mas->node), - mas_parent_enum(mas, mas->node))[pslot]; + mas_parent_type(mas, mas->node))[pslot]; =20 if (p_gap !=3D max_gap) mas_parent_gap(mas, pslot, max_gap); @@ -1767,7 +1759,7 @@ static inline void mas_replace(struct ma_state *mas, = bool advanced) } else { offset =3D mte_parent_slot(mas->node); slots =3D ma_slots(mte_parent(mas->node), - mas_parent_enum(mas, mas->node)); + mas_parent_type(mas, mas->node)); old_enode =3D mas_slot_locked(mas, slots, offset); } =20 @@ -3251,7 +3243,7 @@ static inline void mas_destroy_rebalance(struct ma_st= ate *mas, unsigned char end l_mas.max =3D l_pivs[split]; mas->min =3D l_mas.max + 1; eparent =3D mt_mk_node(mte_parent(l_mas.node), - mas_parent_enum(&l_mas, l_mas.node)); + mas_parent_type(&l_mas, l_mas.node)); tmp +=3D end; if (!in_rcu) { unsigned char max_p =3D mt_pivots[mt]; @@ -3294,7 +3286,7 @@ static inline void mas_destroy_rebalance(struct ma_st= ate *mas, unsigned char end =20 /* replace parent. */ offset =3D mte_parent_slot(mas->node); - mt =3D mas_parent_enum(&l_mas, l_mas.node); + mt =3D mas_parent_type(&l_mas, l_mas.node); parent =3D mas_pop_node(mas); slots =3D ma_slots(parent, mt); pivs =3D ma_pivots(parent, mt); @@ -6995,27 +6987,29 @@ static void mas_validate_gaps(struct ma_state *mas) p_slot =3D mte_parent_slot(mas->node); p_mn =3D mte_parent(mte); MT_BUG_ON(mas->tree, max_gap > mas->max); - if (ma_gaps(p_mn, mas_parent_enum(mas, mte))[p_slot] !=3D max_gap) { + if (ma_gaps(p_mn, mas_parent_type(mas, mte))[p_slot] !=3D max_gap) { pr_err("gap %p[%u] !=3D %lu\n", p_mn, p_slot, max_gap); mt_dump(mas->tree); } =20 MT_BUG_ON(mas->tree, - ma_gaps(p_mn, mas_parent_enum(mas, mte))[p_slot] !=3D max_gap); + ma_gaps(p_mn, mas_parent_type(mas, mte))[p_slot] !=3D max_gap); } =20 static void mas_validate_parent_slot(struct ma_state *mas) { struct maple_node *parent; struct maple_enode *node; - enum maple_type p_type =3D mas_parent_enum(mas, mas->node); - unsigned char p_slot =3D mte_parent_slot(mas->node); + enum maple_type p_type; + unsigned char p_slot; void __rcu **slots; int i; =20 if (mte_is_root(mas->node)) return; =20 + p_slot =3D mte_parent_slot(mas->node); + p_type =3D mas_parent_type(mas, mas->node); parent =3D mte_parent(mas->node); slots =3D ma_slots(parent, p_type); MT_BUG_ON(mas->tree, mas_mn(mas) =3D=3D parent); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0370CC7EE23 for ; Thu, 18 May 2023 14:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231527AbjERO66 (ORCPT ); Thu, 18 May 2023 10:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231805AbjERO61 (ORCPT ); Thu, 18 May 2023 10:58:27 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1558F12C for ; Thu, 18 May 2023 07:58:00 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IsjB012432; Thu, 18 May 2023 14:55:59 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=vTkLRZV9sD6K+270TKH+xpnYAi6cmrgED7lowvnLyAM=; b=3D75iLbXEDC/I0T8BgBeiRFUEYBTHsLrp01OP6deVbuiy0Rb3zYZXue9adak29Hgzorx IadYAK8AweILb37UENG7mTS39aMJA5Hv5TzmIOmI9TISzoewh8kGsL1fzW21JRizKrIN h6DUiQwPC3H8JSpyEDVKu3MzVDg7BH2KK2gbD9UkY+6fZIWb4z482w22O9TR+Gd1pjvS CaZqSA7dIO7pN9Mf6HbpkpLpzruLt75iU0YTXfXcCouwgbgv6zC10gzXYKhbL76KtxyY /iG+lhgg+ceQtKv7Z9Jyp/Q8m990OJNeAly2TzoAdWKEb55AAN5RI5UgJlvfPV3lDXUq HA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjr8d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:58 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IENu90036166; Thu, 18 May 2023 14:55:58 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2108.outbound.protection.outlook.com [104.47.70.108]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w2e1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:55:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BdcJDpHhuZPEw1yn87Q8chI1iDR4FUUiF2UJs9KDUhWGSz3GTBAYXvQf/WI0LUthc/7qt8H6rWp37r5LQf4fKRag5+EXuR47iLabcCmLwidup6H+0k2FHGc+a4AQUlxiH/UfKF9bm4mzQ/4J3cjAbkXeFFQ/RB+FQIgjUXoPLdge1hyomhp88ciBPK+Im3dnw/vba3EgRa6pHaLbos9Euqz1urJImYx4zbw+9QrNc8sGBgCWkE4DTCDeBUeixL795epY/+So2ZwNfBjfXOF0hIIIP00fzgs3oM96/9hjPK3wHMoaJI4/Z7ep+xdV0Yc1zh97Zp/qc50/u+kfceCvqg== 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=vTkLRZV9sD6K+270TKH+xpnYAi6cmrgED7lowvnLyAM=; b=i9G1tk4adNVYdT0TK0cutnfFMh9r1tVPBVoQlgTa7iz6Rh4fibmpsU+MT6BieGtdndyX8uawJzMDE4tK+YccSqkjZ9WTrwPtg4bv/M9g9+MEtPk9XwtBNB1lXyM9AGxh118CGSUj0UKKKvWLgPk1HZgsM1zeJyGPiP1Q0w13opu/KHujUn8vZ3GkBZsfa2Af1G3V4kg0cClp/LBmHkBvsqYbIyGq+jHwmMzqo2U97mA2LWOA5tWBq5iRgCk3JCeyIwuds3PkJ/qdLZA2xZNj6DIYSWTwSc+PSguEpAiAXnHpKNPO5mdgYmsHCbOxwtRDA5aEKHC/0Lmiwb4uqlnfhg== 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=vTkLRZV9sD6K+270TKH+xpnYAi6cmrgED7lowvnLyAM=; b=Ez0keSAUyscVRbvqa40Djl/rjlRnpLEMDnAESDb6IgwrJG36NK+3EsuXgBNOghUlwPPdVo9Vtlys26z5q5wU/GWJBoFOkJajij8pMJ3oDjVuE+V1kFkiUSLBbKfrwNTvznJk/6aor56svqHvKdoFf+K7Cc/z/1UDYF4Bo5dllHY= 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:55:56 +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:55:56 +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" , Peng Zhang Subject: [PATCH v4 03/35] maple_tree: Avoid unnecessary ascending Date: Thu, 18 May 2023 10:55:12 -0400 Message-Id: <20230518145544.1722059-4-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0251.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::19) 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: 1d85856c-561c-4165-7c6c-08db57affc09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t3oPviggk0gJFgeNfgurLBDmqk0p89jWTxc2ITUD3B07ftD4ZgeQaMUZEtpEa/A9wYEJmDjP2jjJAlk0s8c4HdU0d4hJ+Ne9auDgOmXt04Hitn+SuVDCc4g+j/IM5kIJFANrb3R14nJpn1qIn2J++x30/hb6FXfTrtd+25d+glnfFPbCed3v/d8Pz0YpvJB3HNmX301Q4STXLQqgkT34o/ihIWaoJ9MnpyU5JTpM2kCvf653dhYBpJywTd1IT3OQu6aHKngsa0lYXIColWEknaelXic47ghWrjKr1AxpEn3pdjaCrNe8VTGrk/8l24mziHF+2BI5qzj3p/p5prBLTP56PI0Eu6bTOSd7yQ/WH1hvZEay87TKg6Otc1KJ16QkQgTpKIlxJX/pHVOohv2N8IjyWCFkRno7ftrBniLSyzbeywVQo+G41lCKzQaA5JbVG/UG9GJM990vlBNmYmVs3A6bWxG7JtwOb9oqMzoT6RiHrSdib5cNxgqQ6RlxSH1K7zYZd31AlKr9UkaBlwCuFH24CKQHLIqM5D45TDV4QUZwkvooPJXOuJscdahAAecN 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(41300700001)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/xsxNDx21mQChfAh0TwzV004f+Vwom76rf5ImhFg3YGRn88kpPDTlwRm/KEa?= =?us-ascii?Q?aKGjptTx5UoIJIFgx+Uc2erxPqOH2RrUENKoGakQL+2z6O37TG1o5Wu/PO4b?= =?us-ascii?Q?YBVSI7qPrlzB7SHzf90dxikfSKTrHPkXH3Oxb+7565hJqya29YoJYJUAmcDd?= =?us-ascii?Q?lqbFHI3x2grY3fIfdMs970PlP2KHMy3z2dneqH2Fnu9Llk01rIQLAA+SnIwa?= =?us-ascii?Q?eFcroMXsWN466xckahW0W7DO7prPR7rsfwkH0w37wlc+RbpVZybSwye5b52o?= =?us-ascii?Q?/0/faDyzjKjLMeESS4HbCUhZLzhNhzjsDV2QfxYvkqZNcaPfSDQz0AbsP+UY?= =?us-ascii?Q?lKpUJcQvxC/GWpDlz7Vdmn6uomGanqUNn/VTF99/sqnT9q6y1pY5CRBR65Gn?= =?us-ascii?Q?kGW6h0zbe42ljWHNnVIxFSz52mEp8Scgr7Bgw4b7CbFSEJtCJWFLv22EjpC4?= =?us-ascii?Q?LsZEJF0U54qC3PRrz5ccASgzuFvVNEd/uQNzuFCw7/2Oog2j67cU7qK9rewm?= =?us-ascii?Q?pxFyZMqOTgcS68XVd868HEfuU7cp3dejwFppL3JFHx1xp9trwp4rVym/Y6jJ?= =?us-ascii?Q?b6TYJyk55cwQTiQGvlSgA2D/F56G0B+UClcar1fzZP4TuEnsQUJMhB3KIJVo?= =?us-ascii?Q?XM1IMgf7RyfCDGWJr//93BdzZ9v38YZYvlTE14WqNLE/ZYIbiljhkZmbpVJz?= =?us-ascii?Q?fd3+3UO3OVPkX2fxQwlzACYm+xnDhbHF9++N131aHKGYEh6OGRurhkBwL28g?= =?us-ascii?Q?FNTCZvDSENSujKq6SoMDBZTtZYQ8ttHLFxv2mkJ5gqKvJyayHD9vxJ1CNDgJ?= =?us-ascii?Q?tlOdpWkxrtfyTfA9gu6XlHSVBNXwrGBmwAGHEIzgrcO8Niv0mhclYATBt7Mp?= =?us-ascii?Q?G5Odm7F5OvFGWf2+7rFAQ+iKIhRpJBSCzNdAeEMAao45697QglPT/btdQKqC?= =?us-ascii?Q?7O/uzahR7ZDv4svID1pvzI9I5UIpLfoaBm/iFJrSJSUx80D3b6mcmTm/ytoz?= =?us-ascii?Q?WO3NpdtAcmIy/UMGpge9cKZScYMjrRyAidYru3aAYav0HGzpllKAOdzyPxlT?= =?us-ascii?Q?/t/RjvgllfnLDN/1UQlg1LszNPeaAeeBUsUDW2hXfl8Ax+w/QMRGc5HJZH/e?= =?us-ascii?Q?dpZc5E6NyjWnWtRON2rwNfwybSoN7yFjtBOpaU2xWJAmpszCMsPlcziR7nDc?= =?us-ascii?Q?GD1pDVZ2BNw5MYSexEBAaLIOMHWFkjCXul0JJcMGPc910yTx3wjgaZB2K3/e?= =?us-ascii?Q?8Z+uU7DMJk831tMZpda2M+LsClTyx0UMye/4R0Dd6BAwk4/dxVAu8Il9y8PQ?= =?us-ascii?Q?5YoJBvd+UdK82zROwDpzi/IZD/rRxfXZGXvCpa4a2/DP0q7ccI6l0OF4Rvg4?= =?us-ascii?Q?ZZDj32c9WMlOe9NMg1TrTo4lHPeqT125AIG/kBTElPFlxD0B0/44AQJnUjEV?= =?us-ascii?Q?jXueHk8ify5BZiWXGp0isjtvZjiv3RxRTQawvFJdpfer0FZLl2PwtYcFOT4o?= =?us-ascii?Q?OsxYmXhGstOiVCJUmVMzSGx6Bn3jCDYPAC4IR9WzH5yJhDWoa+waj0XfPw6X?= =?us-ascii?Q?mCea2ZyyPP2kmueOFZLbk4Wfux2ulkr3orB6t5n/Q7wmwlI4/ZJYaJUZCN2T?= =?us-ascii?Q?6A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?xxJwQYJGZBpIhm7PTUDXVFmF2EY4beea1zuykTTjR8EbnprvUjepjCqWUm4W?= =?us-ascii?Q?1j2RgIFBkiQV4e4LdHnV/HoJ4xoE2aPcBCSFMpGSpQUrS3DgOQsitpWZRryr?= =?us-ascii?Q?8M402vSHBxgCbGeazY71fV9QvYPHQL+aMW2ok8O+D6CRU3jE2tma3FzWMKl7?= =?us-ascii?Q?AA88ANO3qHRVEGaF2FqCim/CDVbZFzUsSQ6rBamlonc9lUsUZ3TlzH90WgMY?= =?us-ascii?Q?wDke4YJX0BS+pEpNTL+orfmQrahOLCI3onyvXZ6UnifFePxdRLc+FgPFMd3c?= =?us-ascii?Q?sdMDKNuxG2sASfrpj1rh5m8C5I6wYNjvI4GCzis85mB0/tdFVGDtZdwUvoe1?= =?us-ascii?Q?LfFE1V1GrcJ3nXBl3Q+81Um3PGBH+NTite9SYW/jSTj7DEUg4lFB7LFGD1zU?= =?us-ascii?Q?MOZAKZ3R8R9eluQ03Kj2dobwp/RiVC2j/z2pkOkDUlfUqUfkjyPXblrZzi7C?= =?us-ascii?Q?6yCckgJ0UHFAFEiC5Wl0URM+TzHg28fLCijlmic+JuX5cR4xMvVcKp430Z1+?= =?us-ascii?Q?eeM4QMzYa+2N5QqHQnMBjapivJG/9m6zXaLZPlOQC7W92vmQCv/zAbLkTSJV?= =?us-ascii?Q?uopVGAu+h1Ml24EPeVjETD19EXjOLOET6xR9bCfWFGAb3P6yoQSDUAiZNmVf?= =?us-ascii?Q?49Ic0wtsK732sj0Caf8wPF+u/J8aWT1CZxnujWuVQkaDfg98E3cqZfhAM5BK?= =?us-ascii?Q?NxQ3BTYM1IH2Pr8l1F7Riln6tFf9VbtKEnPtcF9y1rafTNsrfHNP6St3GQbJ?= =?us-ascii?Q?0WDiYmdy1fWntbN0j/amg9dwY4stWLS8BOgBVmm5hIbuxa4nVDH964qfHhvq?= =?us-ascii?Q?E+Eysw4ZGQLgccPRPxtjQoUsKEnPJg6AfPXeMy6nfCIYQrjpOy933B4xmk5r?= =?us-ascii?Q?YMfm+2+kzQyGCOfQrqs+zQIKzkk9EfLb8DV2J3CKmtEeHB4roHxxQwRVNeie?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d85856c-561c-4165-7c6c-08db57affc09 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:55:56.4004 (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: tsE602Tujvc6t/7rMxx0e+yKe8m8P0D3ys/uwcWnvxoQhQ91xLgQeN+CNnukBDBBEtEZOHLlvxRfoV7kYDV5iQ== 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 6tVROkeCYLwVLJeX6Y0Nc5EfrzMLcO_E X-Proofpoint-ORIG-GUID: 6tVROkeCYLwVLJeX6Y0Nc5EfrzMLcO_E Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The maple tree node limits are implied by the parent. When walking up the tree, the limit may not be known until a slot that does not have implied limits are encountered. However, if the node is the left-most or right-most node, the walking up to find that limit can be skipped. This commit also fixes the debug/testing code that was not setting the limit on walking down the tree as that optimization is not compatible with this change. Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang --- lib/maple_tree.c | 11 ++++++++--- tools/testing/radix-tree/maple.c | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 555de3a8343e..5b29d5a916f2 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1103,7 +1103,6 @@ static int mas_ascend(struct ma_state *mas) enum maple_type a_type; unsigned long min, max; unsigned long *pivots; - unsigned char offset; bool set_max =3D false, set_min =3D false; =20 a_node =3D mas_mn(mas); @@ -1115,8 +1114,9 @@ static int mas_ascend(struct ma_state *mas) p_node =3D mte_parent(mas->node); if (unlikely(a_node =3D=3D p_node)) return 1; + a_type =3D mas_parent_type(mas, mas->node); - offset =3D mte_parent_slot(mas->node); + mas->offset =3D mte_parent_slot(mas->node); a_enode =3D mt_mk_node(p_node, a_type); =20 /* Check to make sure all parent information is still accurate */ @@ -1124,7 +1124,6 @@ static int mas_ascend(struct ma_state *mas) return 1; =20 mas->node =3D a_enode; - mas->offset =3D offset; =20 if (mte_is_root(a_enode)) { mas->max =3D ULONG_MAX; @@ -1132,6 +1131,12 @@ static int mas_ascend(struct ma_state *mas) return 0; } =20 + if (!mas->min) + set_min =3D true; + + if (mas->max =3D=3D ULONG_MAX) + set_max =3D true; + min =3D 0; max =3D ULONG_MAX; do { diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index 9286d3baa12d..75df543e019c 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -35259,6 +35259,7 @@ static void mas_dfs_preorder(struct ma_state *mas) =20 struct maple_enode *prev; unsigned char end, slot =3D 0; + unsigned long *pivots; =20 if (mas->node =3D=3D MAS_START) { mas_start(mas); @@ -35291,6 +35292,9 @@ static void mas_dfs_preorder(struct ma_state *mas) mas_ascend(mas); goto walk_up; } + pivots =3D ma_pivots(mte_to_node(prev), mte_node_type(prev)); + mas->max =3D mas_safe_pivot(mas, pivots, slot, mte_node_type(prev)); + mas->min =3D mas_safe_min(mas, pivots, slot); =20 return; done: --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB451C77B7D for ; Thu, 18 May 2023 15:39:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231812AbjERPjb (ORCPT ); Thu, 18 May 2023 11:39:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbjERPj1 (ORCPT ); Thu, 18 May 2023 11:39:27 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF80D192 for ; Thu, 18 May 2023 08:39:25 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JDRa018326; Thu, 18 May 2023 14:56:02 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=D8uB8KFOovk6IU0Nv+WqVCZaBG68SuibvA7m5a5k7xs=; b=HkR0/2957VGlci50qaSVyHn+h+eQ1rdxvh7aAvEmJ72jN+PvU2bGrE0NQL48wD+DZdt8 SEjdyX7mT6HAce5FkW0tQUhoEB3C9OzPrC88bZKkZplKAb1UDBMdJDG74luSFYXyM3Ev CxKQ2H3X9XXfjV1Mt6QjcxPU45jjhWDdw3JzCmvp6ATlJcZvQpdDL0/xre/Ffpq6AiYF F21UsZ+JSV5OT9yQnC2fd+LTSrKuPsKR4dhBqJKlH4aH1CUWQhXGcopzY57hJA3h81tC +XWMCAIUqD1YfzCqJ38tEwV/3IMXtqXspin3/LIbsWtOpUfcBgfYSF1PwQXh5lHPKyar Ug== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vn6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:01 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDjxeX032141; Thu, 18 May 2023 14:56:00 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10cwr04-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LzhdmZJ3LAc9RQYBSxi1SfVPEpJ7jGb+AIaeBC1QLbgE7FYMgq4PPFcgiGRkoZqVw5XlAwbAhjZvI4lue4DHaw9oB+5f2ZvVbeYB49/4cB09JzdPJznrBAlTIfw7vQh7ewd2RJie5+XsrbldqdXUsWd/uwXC6mYPa9w1I/rutPFAiCyAGQKJkShvSNRLiPbSQluew5jR6NdfuKhJAjeRz73NNM8ZejDqQFDyufiBxubWUrgpRVs0X33jOp1EAz+57dxr7Hx14JVUaF9cdo7+9ABOzwBQaLb45jAyX3hK+d252JlQFXgeNL0RYaBdpNqUdI2aD19Upcbu2hZ9z0uXyA== 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=D8uB8KFOovk6IU0Nv+WqVCZaBG68SuibvA7m5a5k7xs=; b=YaEl8Ca4Kf11o1pmj47ylnHPL4hQB8I+i+N8OvrOd7ky9MeWi+mLxnKf1d3qlu0XT/8WaInED8dNL3A8Y1CPyaUr1x/BbPqRCAzJAYH/oykIqLqOcft4/QRoXlr5AzIOt9xFD1Y7TILiu9VGxjtgEzrGuWWf4CjRaH/9wR+SlYd7GJqFIlD0GPJmZrBmyfgHrDuU/Pdmykl0BxxvH9BLpe/1nw5XwlZ8IVotGuCx29zvNjVnNbK2zUeP1FeliAEy73vas+ao+rELFQeBsvLgMYCQz9I3h96wCmC3EK9RCbApE5bL0oqi0U5JGDDnQr5czeotgFxwrQali0Dxn2GiHg== 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=D8uB8KFOovk6IU0Nv+WqVCZaBG68SuibvA7m5a5k7xs=; b=hd+SNp2TgHsjArBrs6dkY/89yYYzO8FSf1W8s/VjTD7lF1iObqzcVVwVGclCQwg6PYEaUAQZHCmJK6VKDCn1NRv2VaSOw6NU3gD2Y+dDaHVsHZmZrk+AACONmsWvZ38ZXFtoYClxMJm/MC4oYcJDnSor1QMJanSomJXthZbhwjM= 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:55:58 +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:55:58 +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" Subject: [PATCH v4 04/35] maple_tree: Clean up mas_dfs_postorder() Date: Thu, 18 May 2023 10:55:13 -0400 Message-Id: <20230518145544.1722059-5-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0232.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:eb::7) 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: 1184db34-e5e6-4bd5-db9d-08db57affd73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FvteokC2pLglrru80UJ+KbMAcj7Z0p3STLAaIQ+Mw5xWimA81uHcdPZ8zqzaJ/DktMINJafJb/GBk4EH7+o0bmI2uglfq8JO5umHUPZhyB5m/+fqqXIjQQDGxfNRq44IVCvaDFlYGMcFQry9V8221RNPJ+gBydJsLO2U15VP/q36rpxfSwp0fVUKNOKEgs2wDXRKNaCblKRG17xabW6u8D8qTZKU8lzmj6/aSNDhLVE/bp8euVbwQrLPB4JaA8xZjK298923fe8RqufO2TKXPMQGDwLQ25IITvIYpNZRscp/ty81ab+6X8MNNn0wa060MyMnfdn2i5FQfnTlcut5RhjexJiUie7meeoksvF6vUHGwRySh5FFfY51AypMUPWXa46hsOWF4L7TvDjnH09Dtmk59/kTtHCylyAM5SsCXFGXztMc2gwnghbkOJ0dht8YPoCQefCobNJxGsGlENXFmx7sf9H09sHZ4InxEC5zWpKjClEU9jIZWetygZhTN/S/gmiSYBmcS8uJGFDg2hNKvUQJVu4fK3V52LGwUG8YJ6omk9ls+6G+R0CT0HCP7wN/ 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?e1weNKLKgppj7lJsrn7QK0hq13L+8ZRy8VgCwhyS5duG/B5I7eiTRy+exgb0?= =?us-ascii?Q?JVoVK6dL2qbBiDiC2kum+aqwRJHaS5o6QLvpaWuhbdEhh3sANNYGsv3Tl+rH?= =?us-ascii?Q?NfaY3MZjksDBbw+uGAde+dBwx0wObi94P+eM1Yw1juc9yIM4zyFsVCTIbLeN?= =?us-ascii?Q?xC/yT7WV4woqQV9YC3iK4Yq/GDhpKBkoVp5ogWdc6PMEWVOGy4r+OKi1dOAP?= =?us-ascii?Q?gKiDnnKr83NQ6p1waznAGgEFnWe3d7+iT/ETRCGqUEPcqhiaJjHqgW7A2f0u?= =?us-ascii?Q?z/8u1xiQDIyOIIZrB9CI+6+XuvHZgQ5kJLapKA4qSsTcoEZzzmZozeR+uhqc?= =?us-ascii?Q?7dzYwmfoD1Pli5bqaUhrP4GENWx/MEkcOgpm1lUHnsw0Uc938mhXtrek3jLF?= =?us-ascii?Q?mnIYbJDyNxHyXqbW0RCROxfSfYY+9+CNqecy+r8+b3In0sz+ziPT24sg5xK1?= =?us-ascii?Q?ysv1r6bNh6eGi5WCDbcQ9UW3YxSsVXY0Ahok/vqTMDHw3rfLOaNqvGtvQLnn?= =?us-ascii?Q?PxEmM9vCBR0UW4lVqgd6zz9srjI8NFxAWNDUUNuVtteTTYCIEtq5+Mol1rvL?= =?us-ascii?Q?rGNiQx1STMGmOggxvuI205Qgl7kshLkLNZ3eQrzY9aj7lNogxJ7x9qTbupkU?= =?us-ascii?Q?Pa5gr8DSH569dtma2fPBzUn4euceFkW0sF3WWBI0dY4cu1G+2NKMP/VtyukN?= =?us-ascii?Q?cok8SyFIrVMo2jui6YsjEbaWDKoa8BeIEgNCs5xlddk4Fq4ESt1H4lFsKrH5?= =?us-ascii?Q?ONmNg9APgoetF8YzQ0ovu4Hq6/gp2F+eKtDCQ/c10MlYYhTHEM8NSJM/iqsr?= =?us-ascii?Q?NOHU+5K0d9+kld16FuWAzw8123xrXu+aX+dgxX1l8UjyjRT5WtFz3mkF/ozP?= =?us-ascii?Q?TwxT0WalUpvEQJlCvXxhb4psBZ4uAskkuRF4/guVJ889LHNyF3Hvshv/iqzQ?= =?us-ascii?Q?iqf8S9RRYA2DMh4bmpsLOIRGWJu751qDCYIXqBtSU6lT3R3V93nR5NKR8IBm?= =?us-ascii?Q?MK08m2i2CWVtovDCaxcrI7iHpq5jRXYRCyZuGUpxUV4Jh5dkGrMWAdJUXvZb?= =?us-ascii?Q?Fqxknd/001Fe5l6kv7GioDSep4L99Ro1ppcPqMyTsZVuypHpG2xTBzKKcf7j?= =?us-ascii?Q?EGxP4pl70bKYpkyC0X88/yWCCz8mg6TPJMoFuV+7fOumbtKvv9dKFPYqCHT0?= =?us-ascii?Q?9a9J9XeYAZgeUqiJgivuAcC1JIx1uT2Gqt9ThNWC3+2cf+p2NzeNL3HYDrY9?= =?us-ascii?Q?lm0Xqo3lLzX8WM3eqZQQufMNQzF3SP3MSqPW7IBen/E3bft1bxFUJiDWlBdh?= =?us-ascii?Q?N5ZdwXoEdOvmSPDQbfBWvMhs8dZfVC6M2LGPXUkUtnlIgG0/jRVwzTzD2TWe?= =?us-ascii?Q?4nxDL05tu11U8LQnxsXxHPTatVbPAmXPOULmnKhhyLH9XH3aFFh3fKIlJ4CT?= =?us-ascii?Q?8hK3l07IkAYzndKadyTizHdw/J18mdTN3qSzWZGJunK74jmbNt3CUFJtXnv0?= =?us-ascii?Q?3v4ImysTxJHlwKuVknN/zhhmAEw0BF2X5Qf0P4C4aiGCX+SlasOs9rK9xD9p?= =?us-ascii?Q?yTPAHSAhlmKihmYgGhRy5pvHJdBuxibq1daaD348SbYEWLdy8bdt6Peg84/D?= =?us-ascii?Q?gw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JGC5dcW9CzcHNXIgSx1/setwd7iHYuSr9Jny1rZh2UkEXLLnHV2okAGLrC8mOeRPS1tmt8b1es/A/u7m72j3WG4TcLdHtBpOBC6IZsQvJ6nldG2Hk4zmEh0PrBYD1mqetb/ZpM/VQMrdnJM5q0OVSdaRSqUIOs7lfi4tK2YuoNghhGQPC6Hz4mrdHfYPUWBRMSN1Df9tbmNHUwfhxc29SPb4l81uBSIt8wI9C+wdSVkCM5IglCcPv5ybX0VTo58FmpoONgPWQFZUdCBsBX6656aAS5iyj9xVueyXCIPfS++/T3ADvhJ2u1mGIureX2KaQUggsWBbJMa8MbGQay656EKxkneZ94Ajh9PhFH56PQYSE3pqh4I9GBVsJAqdgqy+9x07ueOxCUKI5C4XkTGwUKCp+XC8ZDZFifnn0vQmNGJa29W135chbH0GNUcIDAF+vPj7p9n7s6LxxTCCE+S08yqKApbN4U153MFvckgIDUE+Hys8jUlBhemyByEugwRsPyw64UHm9dN588VQV3W6G7ztM55bKSQX00+h0jz/owqYY+zHeEDEPz7SehXa/wjH9F8v+LboomE9ParlgqWn/oiuR4EOXhQQ6U1Dn5Y4gsqsFB8LeK30iWsIyIR4hE1/whnz0OF3iWARj2Vq/kLEOYA/i/7zJZ1s9GtoT+c2uRzA1naFT/ftUFbpfuQH0uXOgKj/yu2khtBI9Ndr3I4uXgHTvVqhqN2naZlxWSN4xhJJd0HkebUZpWnfGIscIGbV8joAEPxtmdQLdzoUAo40I935vu00RwRmacw2/0BCZ7SsmzMpw3ID+U0Cnk2AqSevQBanfLl1/9+9D7ReiR5DXlX19Rh2tTWPpwrxx9EAc86Oe9L0GDBxuu6Sl5S5Vwr63WWYs+GgOP25ENvFM/PBPQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1184db34-e5e6-4bd5-db9d-08db57affd73 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:55:58.7302 (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: 9/BdJU6pbhVPTwS3P+yUwUxcCs/I+fYrpO72xrYC0QXJMsKUYGPTt3VsD0OIz/VKIdjk+tTXb/buNB4yaKU5ZQ== 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 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: SVv2g6y-nAsZHtPhTXCfHfpPbZIoebV6 X-Proofpoint-ORIG-GUID: SVv2g6y-nAsZHtPhTXCfHfpPbZIoebV6 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert loop type to ensure all variables are set to make the compiler happy, and use the mas_is_none() function instead of explicitly checking the node in the maple state. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 5b29d5a916f2..1e7e7249a0cf 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6739,15 +6739,12 @@ static void mas_dfs_postorder(struct ma_state *mas,= unsigned long max) =20 mas->node =3D mn; mas_ascend(mas); - while (mas->node !=3D MAS_NONE) { + do { p =3D mas->node; p_min =3D mas->min; p_max =3D mas->max; mas_prev_node(mas, 0); - } - - if (p =3D=3D MAS_NONE) - return; + } while (!mas_is_none(mas)); =20 mas->node =3D p; mas->max =3D p_max; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F736C77B7A for ; Thu, 18 May 2023 17:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229662AbjERR4U (ORCPT ); Thu, 18 May 2023 13:56:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjERR4R (ORCPT ); Thu, 18 May 2023 13:56:17 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 573DBC2 for ; Thu, 18 May 2023 10:56:12 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IrcP012408; Thu, 18 May 2023 14:56:05 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=da6ehd7axUic7ozbVPDbIbv6pwVFIrZh9LGE/avpY3w=; b=QGadCQ05E3W4uCHPNA4ZIhhro6RyoDzH8GZLM2EHTeeMmGSRseOYer7lJYcLTsA90au9 igVZ0udCnRLPtFsP7Oj6+36WI9r4NuKNFDolarPpZt243sYAwtA95hTVaBG9X0NvswrE a9uGWceX8sTADFEjcdBibuTL8AlWFjpqxpk0LRadJ/No7KR4A/k084UiQQ3Bqd+UoZ7n OFiZO+ebtUCwkB9dXqB2x3066GFWwzeWr8n1U0XN1o9/y1CZm7ey7qtIDnASukW7axDY bKB361exWI7B16N0kQiQeaAvq3b+m+xWgUX9/tUz8F2ZYEPbxkfFLyxGmnN+6vz3wVZu Ew== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjr8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:04 +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 34IE6YTd033869; Thu, 18 May 2023 14:56:03 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c7rg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQQn7MC5Zgoo5bCdgl/SiynRzo4tA4njw6oPha3MxD7ZjKJsjeiojWPg0Y3yxcLHz2pon+1MCBtelIprpAU5SnDUR2VWB3Q37h8s8fs03EJlXc20ESTIRRcN3hmXcwcEA7uuAyQEAFH/IhqafhRmlOa0nIngj9i7wZbR/mED1Jw9lmJDENd5Y6/L691GT+7YgXqdoKU8Tt4RdnFt9F597oEpSYlk8msj93ieuXhgIIq3BmpddiSzlZoln0SXQJzTsat3gGT8bmTb2hCWNJtqeURQbDus/PLMS+bV+JKIJXBNAP8lLsWYRqfdXmV+zGLV1DIyGJ5Lmyi13O5t+Xgntw== 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=da6ehd7axUic7ozbVPDbIbv6pwVFIrZh9LGE/avpY3w=; b=j7ThFABXUhHG94e2HEIdv5OlzKmt1K62k4hLsSgTBV9+WPNzwRrDUCZr6GXqfMFqnAyqeFEfAxQF3RIqJ3sOANnCkmWtbKzr+TqfksBEiVYGdUd9+6XIaSkU8LMd8iKkeVhqHuqjaEqKGP+lWhs9560moytxNx0w51/tFalN43KhD6PkdL87BNn9lqIuFFl/H1+aG9YD1gsOHA7EvL9MX0R8KCTAsm7DgNILQ4lbPKI79iyjqoSZMsUtG7V7wT7Ngjhc/7tOcEeKFv8ry+PaILMzTBMTz4CWWGTGVDzyZNKx2vkmnweDpZCQqb34/PmaOLmjWJv1VYPLHaeqKxXxSQ== 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=da6ehd7axUic7ozbVPDbIbv6pwVFIrZh9LGE/avpY3w=; b=lXyULhhCNdq9dohecBHtPudL31A5N91WXBXmPIW9pNRJ9PYm0fUTHmo4d+UjAVamo/K7Cnghn7XUVCZYKfXRxqa8MKFFX41qjdZQGc4Ak2AiVz87EM6xree6t1XsC8nqCEEKOGjWSY95G+uqXnuxlEEJJNQzRYGAcm6nHhky200= 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:00 +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:00 +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 05/35] maple_tree: Add format option to mt_dump() Date: Thu, 18 May 2023 10:55:14 -0400 Message-Id: <20230518145544.1722059-6-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0112.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::30) 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: 1d9d5a01-e651-441c-dc57-08db57affe9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gyhsSvnznNAaIQlo0UZs3+p1I65YiEqIqlYmGohIqlbeiv1VSGvDAMY2VixgwSwiw3j9u4f6rgXdfoQDbNz+m3DEDpqHIC4PmriJPaJ5YP8NnwHsGnXfPUTzD4Hl4Ugpvxp9c1gtctrHTVW/8Xg1w9Zj3PAyMbEWf/0k/b4nv0LDuHEI9iIBAQBeEJUkcung8K/iHh791FqaQhuZtY9tUUHa8g3Lkog0piM0YPRRiv7VqkrZYCkZYtLHUTz/YQAbVgz2THCoBF9Ge9mSDgCisVgfEr748oogBNwR7M6nq9337ob8M9nrNSbLRiK4sjVh1SlY5LIv8ab2fcvMdSVjgiRqHphHjtI8V3ZsBh4BASgYi4wt3/P/sI+gpCMby8C/Oa1W8d+GdemMBQJKhRVGW/OQkizE9xmYij2yejwpUKCxKKRrzJ4gFf2P4Gy2C9oKizBd3QUALJF0mAURdOSR8Jwuc14R1OCocQiY1+YRCHb7GReIQQOI+qqZta7NJ+fDKsJZJlY7q0RyP3xShpf2RdsKLdcCSiiRQaotwY/lmKIyL7JtGUDkFX8RjXuKETK+ 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(30864003)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uWMiATzmfxKtqxhYyZ3/PzZ4wWMFpPT+UFp7Be4344E7ROVnozC00eBi8AW4?= =?us-ascii?Q?FknXXl64DiWEkVHEqbfqVstmybzPRgWYQfkRyUcoFIAsSXkxTbWnGazvLzVX?= =?us-ascii?Q?34muunyB1HvbylfQu/bqdsVkxudBrDb1gs9jzKnhnFz84PrjvxR7V4d2oT1G?= =?us-ascii?Q?BX4ut2ldXlw0noC8NgOXQAX1ilUshfqPFerlSF0WePmC4v9uSLq9oXwgjWPr?= =?us-ascii?Q?gkeuBJRNzL5STOvPw5hv20j+kCp9bk3ebBHHsCTUIeHD36w6NoeeGUn0vn12?= =?us-ascii?Q?8irzGfLC9nLKuoytD5NwozxNqRjh3a9YPgnRW9bz4vUoeyG1srYnRX8P4Ft/?= =?us-ascii?Q?XnyZS1RHBybag4J2sl7zSZ3SOC81IpgIQBQ7g/AHK+RxFpQsDU9UFjAC7vfq?= =?us-ascii?Q?EXnXSx9+pt1aCF1t3Jbf7PlsSVu83gHi8YCX6pxp7EJZGG2M5LDx//P7Za+x?= =?us-ascii?Q?Uae8XEo88HyIU2zXyJCwNsfZsocetjHyvY18flxN2P6Tnl6PjKo52IvEGL7S?= =?us-ascii?Q?vmY61pNv/XUIA36q5sHCKD43akX3Ses+ZJKZdp2RHd9d9uOmzGwJ5D8K0LCO?= =?us-ascii?Q?BP6g7zGKQmI+ldrs70S0ct9t0UqicNXUIDZYDa3Zefab2ZahlOnMgNwKsdI/?= =?us-ascii?Q?mx2qWWiVuYynw06EWVS9LSGEvTQCaOYrlEMk6vDXjbdeVt9CNAPPJ/fgzjt0?= =?us-ascii?Q?T71JiTYqgAQwGN0EvIAu1dcFWBow52QPkH1+5NkhXSevXVcsTwWU04uNpkVH?= =?us-ascii?Q?p5Z9yorijzlL07tGBus52yR19h/pSdwSoGFMVDHTKYrG/+ajEG4VlBLIkig2?= =?us-ascii?Q?A5Hyk7Ny9fgG0Ael10RcKD+jgW4fehb1UHYRIiBu7HbkBjzoeKZRv2wHzty7?= =?us-ascii?Q?EsavkTJEulDEnomMbPV4pvMZTYHEzKeUXDi3/macQxivjwUYbQ4vua0AWpUs?= =?us-ascii?Q?8wfWPTmPCkBPIQskCOtmo6kGSqO2S0lbAPrRwrowjyzzeSs9w1GRsvsRvMc0?= =?us-ascii?Q?kdkRCGpHS52hsUpjUfRzIQYrFSnF3Dj4IOYbdCFcGul7c5qxTotGBMxYJB9R?= =?us-ascii?Q?+1rNR27m6NsMgL8qbJUDZgHnC+TsjEqQuCI4whby4wQsOO1JpM5iAHVVtz+c?= =?us-ascii?Q?p1NU0P7VxjDoVNbqoXLTZR8IyvduN/SHDhKeS9uWsaQAuuEjan9fgQaIHdG5?= =?us-ascii?Q?hIHI+n4gU8EEDsDsi559nJhjhLDlxhj9eFG38VQmCS3VN9ZC3AN+hipv8bOm?= =?us-ascii?Q?wa8CYZGld1y822i6p1DVQOwIHs4eqLzxge5k8rNWYfbUQalxGQmiA9I/J8Jt?= =?us-ascii?Q?/pa0OGi+pP32DVXIMOs411C9PuGWJpjy7fnJbrN+RA9MP0IpHeQWBiKnHqKk?= =?us-ascii?Q?8Fs9+9erLTEaZV1kMokL11UoJXIGAA88zU3X2wbS2ugVcH7GX4FCI5HB3BBw?= =?us-ascii?Q?+/fLMUTXYFHnJvnkpWppS2/7BGQ5wTbuJg+/Xsc4kWgjYaAtK+oFb35zbW0D?= =?us-ascii?Q?qaMyqeGOmH5ICcu81RPPAwQbG3EHcZYzuz0O4QlecaRQGxAe48835JangTAl?= =?us-ascii?Q?e6mXPQQ6x/UxlSxea3XrXrX1YsILtC7MU8TdiABzSCdXKwBQ+5np73LOun8e?= =?us-ascii?Q?bA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MWBWvEJ+tmuMAuEGeV63LlPAIqd8WZIClaNLHMKcLZI6WiJFEpmuZZWyQNnhemL9DFEwLH7dggJvt+7FZe2Z9GJuN0kFp4HTroFFiW3sUpi+ZzSzas5Vv6v7KFtw8rO1KaM6AKu4l6yWnr6SbNHPD9WQAxFkO6wPLGbtJ0PHrl4n+Ct2zyR6QmOQeqoS9on07UlD6eTiU6EsXr2XLXNeZ1qxsVkj1+vGbao+IgOE0vbrZGB6gpKTlgE3nzGn+bAlvArECXEDTDpMnY/RT4uBXxrypTACCx8BYKaO7KJgQZQQ7NMhLvsR8iq7DIrbHZCl3VKTPL9ertfpys5Szt6Uh0B3jJy+b/grW4AY2bgCsbm2asE7BO/TkgaBinH+ZmezKpA3Nx5dL8Tpt0KyoWO8F2TQj3HWCDbFPslgSDr1EXuxuecetppm7s603YwgkQyYGtkJSKJq1KSiKZ84ItxgCt6f7dkDz0TxSfB0UZBivX7LbrNpj6pZyEk4IAUbXb+ggAn/5ryTqhwqwpiSCZUat759HNN250dfAo6KWjHkuvn0UfXpU/dybfaFEVXU1r8zRYtrBLSMKm8Gwcvm86jHVzBHiFWyB+WvgtqfkumtV8R4SokMHOQtD4vTXYlkOWvOGxphc5KjgHvWMRYyP7Bt5Hk6JvDH271i/AmhYCcamaTr6q/71Q64xxBsv+bV4e+q9fUINqiwxi9w+FAbg2AQ/xFC30ThqhOOBMICCw8p8Uy4JeKR4kGr/ogE3MJ+p48AGnAIElhWQ9c9OZRY5tqrQd4ggxqxRScK2QVJhulqycAL03e5MqN/ZD3HU+28BwNpWP3uUa3UmALU6RRnNnN2nVR+YoJPhVQBEgjJVnRRgURWVSXCgmZ6RVJJOdA4GXE0vqBj5JZnrHT9QcI4cBL+Lg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d9d5a01-e651-441c-dc57-08db57affe9d 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:00.6930 (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: SBG9APpBe4sb65LMmXx2iF/0SrVIssFxchEEGMeTt2sauxlu+GX7qKLMB+uytKXXSZZarpKVdrPCdhC+w7ljdQ== 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-GUID: c7Ia-eVElTnO90cOCSIY9-NYyRUxkCnZ X-Proofpoint-ORIG-GUID: c7Ia-eVElTnO90cOCSIY9-NYyRUxkCnZ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Allow different formatting strings to be used when dumping the tree. Currently supports hex and decimal. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 9 +++- lib/maple_tree.c | 87 +++++++++++++++++++++----------- lib/test_maple_tree.c | 10 ++-- mm/internal.h | 4 +- mm/mmap.c | 8 +-- tools/testing/radix-tree/maple.c | 12 ++--- 6 files changed, 82 insertions(+), 48 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 1fadb5f5978b..140fb271be4a 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -670,10 +670,15 @@ void *mt_next(struct maple_tree *mt, unsigned long in= dex, unsigned long max); =20 =20 #ifdef CONFIG_DEBUG_MAPLE_TREE +enum mt_dump_format { + mt_dump_dec, + mt_dump_hex, +}; + extern atomic_t maple_tree_tests_run; extern atomic_t maple_tree_tests_passed; =20 -void mt_dump(const struct maple_tree *mt); +void mt_dump(const struct maple_tree *mt, enum mt_dump_format format); void mt_validate(struct maple_tree *mt); void mt_cache_shrink(void); #define MT_BUG_ON(__tree, __x) do { \ @@ -681,7 +686,7 @@ void mt_cache_shrink(void); if (__x) { \ pr_info("BUG at %s:%d (%u)\n", \ __func__, __LINE__, __x); \ - mt_dump(__tree); \ + mt_dump(__tree, mt_dump_hex); \ pr_info("Pass: %u Run:%u\n", \ atomic_read(&maple_tree_tests_passed), \ atomic_read(&maple_tree_tests_run)); \ diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 1e7e7249a0cf..084868865849 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5699,7 +5699,7 @@ 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) - pr_err("Error %lu > %lu %p\n", mas->index, mas->last, entry); + 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); @@ -6753,22 +6753,33 @@ static void mas_dfs_postorder(struct ma_state *mas,= unsigned long max) =20 /* Tree validations */ static void mt_dump_node(const struct maple_tree *mt, void *entry, - unsigned long min, unsigned long max, unsigned int depth); + unsigned long min, unsigned long max, unsigned int depth, + enum mt_dump_format format); static void mt_dump_range(unsigned long min, unsigned long max, - unsigned int depth) + unsigned int depth, enum mt_dump_format format) { static const char spaces[] =3D " "; =20 - if (min =3D=3D max) - pr_info("%.*s%lu: ", depth * 2, spaces, min); - else - pr_info("%.*s%lu-%lu: ", depth * 2, spaces, min, max); + switch(format) { + case mt_dump_hex: + if (min =3D=3D max) + pr_info("%.*s%lx: ", depth * 2, spaces, min); + else + pr_info("%.*s%lx-%lx: ", depth * 2, spaces, min, max); + break; + default: + case mt_dump_dec: + if (min =3D=3D max) + pr_info("%.*s%lu: ", depth * 2, spaces, min); + else + pr_info("%.*s%lu-%lu: ", depth * 2, spaces, min, max); + } } =20 static void mt_dump_entry(void *entry, unsigned long min, unsigned long ma= x, - unsigned int depth) + unsigned int depth, enum mt_dump_format format) { - mt_dump_range(min, max, depth); + mt_dump_range(min, max, depth, format); =20 if (xa_is_value(entry)) pr_cont("value %ld (0x%lx) [%p]\n", xa_to_value(entry), @@ -6782,7 +6793,8 @@ static void mt_dump_entry(void *entry, unsigned long = min, unsigned long max, } =20 static void mt_dump_range64(const struct maple_tree *mt, void *entry, - unsigned long min, unsigned long max, unsigned int depth) + unsigned long min, unsigned long max, unsigned int depth, + enum mt_dump_format format) { struct maple_range_64 *node =3D &mte_to_node(entry)->mr64; bool leaf =3D mte_is_leaf(entry); @@ -6790,8 +6802,16 @@ static void mt_dump_range64(const struct maple_tree = *mt, void *entry, int i; =20 pr_cont(" contents: "); - for (i =3D 0; i < MAPLE_RANGE64_SLOTS - 1; i++) - pr_cont("%p %lu ", node->slot[i], node->pivot[i]); + for (i =3D 0; i < MAPLE_RANGE64_SLOTS - 1; i++) { + switch(format) { + case mt_dump_hex: + pr_cont("%p %lX ", node->slot[i], node->pivot[i]); + break; + default: + case mt_dump_dec: + pr_cont("%p %lu ", node->slot[i], node->pivot[i]); + } + } pr_cont("%p\n", node->slot[i]); for (i =3D 0; i < MAPLE_RANGE64_SLOTS; i++) { unsigned long last =3D max; @@ -6804,24 +6824,32 @@ static void mt_dump_range64(const struct maple_tree= *mt, void *entry, break; if (leaf) mt_dump_entry(mt_slot(mt, node->slot, i), - first, last, depth + 1); + first, last, depth + 1, format); else if (node->slot[i]) mt_dump_node(mt, mt_slot(mt, node->slot, i), - first, last, depth + 1); + first, last, depth + 1, format); =20 if (last =3D=3D max) break; if (last > max) { - pr_err("node %p last (%lu) > max (%lu) at pivot %d!\n", + switch(format) { + case mt_dump_hex: + pr_err("node %p last (%lx) > max (%lx) at pivot %d!\n", node, last, max, i); - break; + break; + default: + case mt_dump_dec: + pr_err("node %p last (%lu) > max (%lu) at pivot %d!\n", + node, last, max, i); + } } first =3D last + 1; } } =20 static void mt_dump_arange64(const struct maple_tree *mt, void *entry, - unsigned long min, unsigned long max, unsigned int depth) + unsigned long min, unsigned long max, unsigned int depth, + enum mt_dump_format format) { struct maple_arange_64 *node =3D &mte_to_node(entry)->ma64; bool leaf =3D mte_is_leaf(entry); @@ -6846,10 +6874,10 @@ static void mt_dump_arange64(const struct maple_tre= e *mt, void *entry, break; if (leaf) mt_dump_entry(mt_slot(mt, node->slot, i), - first, last, depth + 1); + first, last, depth + 1, format); else if (node->slot[i]) mt_dump_node(mt, mt_slot(mt, node->slot, i), - first, last, depth + 1); + first, last, depth + 1, format); =20 if (last =3D=3D max) break; @@ -6863,13 +6891,14 @@ static void mt_dump_arange64(const struct maple_tre= e *mt, void *entry, } =20 static void mt_dump_node(const struct maple_tree *mt, void *entry, - unsigned long min, unsigned long max, unsigned int depth) + unsigned long min, unsigned long max, unsigned int depth, + enum mt_dump_format format) { struct maple_node *node =3D mte_to_node(entry); unsigned int type =3D mte_node_type(entry); unsigned int i; =20 - mt_dump_range(min, max, depth); + mt_dump_range(min, max, depth, format); =20 pr_cont("node %p depth %d type %d parent %p", node, depth, type, node ? node->parent : NULL); @@ -6880,15 +6909,15 @@ static void mt_dump_node(const struct maple_tree *m= t, void *entry, if (min + i > max) pr_cont("OUT OF RANGE: "); mt_dump_entry(mt_slot(mt, node->slot, i), - min + i, min + i, depth); + min + i, min + i, depth, format); } break; case maple_leaf_64: case maple_range_64: - mt_dump_range64(mt, entry, min, max, depth); + mt_dump_range64(mt, entry, min, max, depth, format); break; case maple_arange_64: - mt_dump_arange64(mt, entry, min, max, depth); + mt_dump_arange64(mt, entry, min, max, depth, format); break; =20 default: @@ -6896,16 +6925,16 @@ static void mt_dump_node(const struct maple_tree *m= t, void *entry, } } =20 -void mt_dump(const struct maple_tree *mt) +void mt_dump(const struct maple_tree *mt, enum mt_dump_format format) { void *entry =3D rcu_dereference_check(mt->ma_root, mt_locked(mt)); =20 pr_info("maple_tree(%p) flags %X, height %u root %p\n", mt, mt->ma_flags, mt_height(mt), entry); if (!xa_is_node(entry)) - mt_dump_entry(entry, 0, 0, 0); + mt_dump_entry(entry, 0, 0, 0, format); else if (entry) - mt_dump_node(mt, entry, 0, mt_node_max(entry), 0); + mt_dump_node(mt, entry, 0, mt_node_max(entry), 0, format); } EXPORT_SYMBOL_GPL(mt_dump); =20 @@ -6958,7 +6987,7 @@ static void mas_validate_gaps(struct ma_state *mas) mas_mn(mas), i, mas_get_slot(mas, i), gap, p_end, p_start); - mt_dump(mas->tree); + mt_dump(mas->tree, mt_dump_hex); =20 MT_BUG_ON(mas->tree, gap !=3D p_end - p_start + 1); @@ -6991,7 +7020,7 @@ static void mas_validate_gaps(struct ma_state *mas) MT_BUG_ON(mas->tree, max_gap > mas->max); if (ma_gaps(p_mn, mas_parent_type(mas, mte))[p_slot] !=3D max_gap) { pr_err("gap %p[%u] !=3D %lu\n", p_mn, p_slot, max_gap); - mt_dump(mas->tree); + mt_dump(mas->tree, mt_dump_hex); } =20 MT_BUG_ON(mas->tree, diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index f1db333270e9..d6929270dd36 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -219,7 +219,7 @@ static noinline void check_rev_seq(struct maple_tree *m= t, unsigned long max, #ifndef __KERNEL__ if (verbose) { rcu_barrier(); - mt_dump(mt); + mt_dump(mt, mt_dump_dec); pr_info(" %s test of 0-%lu %luK in %d active (%d total)\n", __func__, max, mt_get_alloc_size()/1024, mt_nr_allocated(), mt_nr_tallocated()); @@ -248,7 +248,7 @@ static noinline void check_seq(struct maple_tree *mt, u= nsigned long max, #ifndef __KERNEL__ if (verbose) { rcu_barrier(); - mt_dump(mt); + mt_dump(mt, mt_dump_dec); pr_info(" seq test of 0-%lu %luK in %d active (%d total)\n", max, mt_get_alloc_size()/1024, mt_nr_allocated(), mt_nr_tallocated()); @@ -893,7 +893,7 @@ static noinline void check_alloc_range(struct maple_tre= e *mt) #if DEBUG_ALLOC_RANGE pr_debug("\tInsert %lu-%lu\n", range[i] >> 12, (range[i + 1] >> 12) - 1); - mt_dump(mt); + mt_dump(mt, mt_dump_hex); #endif check_insert_range(mt, range[i] >> 12, (range[i + 1] >> 12) - 1, xa_mk_value(range[i] >> 12), 0); @@ -934,7 +934,7 @@ static noinline void check_alloc_range(struct maple_tre= e *mt) xa_mk_value(req_range[i] >> 12)); /* pointer */ mt_validate(mt); #if DEBUG_ALLOC_RANGE - mt_dump(mt); + mt_dump(mt, mt_dump_hex); #endif } =20 @@ -1572,7 +1572,7 @@ static noinline void check_node_overwrite(struct mapl= e_tree *mt) mtree_test_store_range(mt, i*100, i*100 + 50, xa_mk_value(i*100)); =20 mtree_test_store_range(mt, 319951, 367950, NULL); - /*mt_dump(mt); */ + /*mt_dump(mt, mt_dump_dec); */ mt_validate(mt); } =20 diff --git a/mm/internal.h b/mm/internal.h index 68410c6d97ac..4c195920f565 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1051,13 +1051,13 @@ static inline void vma_iter_store(struct vma_iterat= or *vmi, printk("%lu > %lu\n", vmi->mas.index, vma->vm_start); printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); - mt_dump(vmi->mas.tree); + mt_dump(vmi->mas.tree, mt_dump_hex); } if (WARN_ON(vmi->mas.node !=3D MAS_START && vmi->mas.last < vma->vm_star= t)) { printk("%lu < %lu\n", vmi->mas.last, vma->vm_start); printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); - mt_dump(vmi->mas.tree); + mt_dump(vmi->mas.tree, mt_dump_hex); } #endif =20 diff --git a/mm/mmap.c b/mm/mmap.c index e96f96c69c34..76eaf12f1390 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -301,7 +301,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) extern void mt_validate(struct maple_tree *mt); -extern void mt_dump(const struct maple_tree *mt); +extern void mt_dump(const struct maple_tree *mt, enum mt_dump_format fmt); =20 /* Validate the maple tree */ static void validate_mm_mt(struct mm_struct *mm) @@ -323,18 +323,18 @@ static void validate_mm_mt(struct mm_struct *mm) pr_emerg("mt vma: %p %lu - %lu\n", vma_mt, vma_mt->vm_start, vma_mt->vm_end); =20 - mt_dump(mas.tree); + mt_dump(mas.tree, mt_dump_hex); if (vma_mt->vm_end !=3D mas.last + 1) { pr_err("vma: %p vma_mt %lu-%lu\tmt %lu-%lu\n", mm, vma_mt->vm_start, vma_mt->vm_end, mas.index, mas.last); - mt_dump(mas.tree); + mt_dump(mas.tree, mt_dump_hex); } VM_BUG_ON_MM(vma_mt->vm_end !=3D mas.last + 1, mm); if (vma_mt->vm_start !=3D mas.index) { pr_err("vma: %p vma_mt %p %lu - %lu doesn't match\n", mm, vma_mt, vma_mt->vm_start, vma_mt->vm_end); - mt_dump(mas.tree); + mt_dump(mas.tree, mt_dump_hex); } VM_BUG_ON_MM(vma_mt->vm_start !=3D mas.index, mm); } diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index 75df543e019c..ebcb3faf85ea 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -1054,7 +1054,7 @@ static noinline void check_erase2_testset(struct mapl= e_tree *mt, if (entry_count) MT_BUG_ON(mt, !mt_height(mt)); #if check_erase2_debug > 1 - mt_dump(mt); + mt_dump(mt, mt_dump_hex); #endif #if check_erase2_debug pr_err("Done\n"); @@ -1085,7 +1085,7 @@ static noinline void check_erase2_testset(struct mapl= e_tree *mt, mas_for_each(&mas, foo, ULONG_MAX) { if (xa_is_zero(foo)) { if (addr =3D=3D mas.index) { - mt_dump(mas.tree); + mt_dump(mas.tree, mt_dump_hex); pr_err("retry failed %lu - %lu\n", mas.index, mas.last); MT_BUG_ON(mt, 1); @@ -34513,7 +34513,7 @@ static void *rcu_reader_rev(void *ptr) if (mas.index !=3D r_start) { alt =3D xa_mk_value(index + i * 2 + 1 + RCU_RANGE_COUNT); - mt_dump(test->mt); + mt_dump(test->mt, mt_dump_dec); printk("Error: %lu-%lu %p !=3D %lu-%lu %p %p line %d i %d\n", mas.index, mas.last, entry, r_start, r_end, expected, alt, @@ -35784,10 +35784,10 @@ void farmer_tests(void) struct maple_node *node; DEFINE_MTREE(tree); =20 - mt_dump(&tree); + mt_dump(&tree, mt_dump_dec); =20 tree.ma_root =3D xa_mk_value(0); - mt_dump(&tree); + mt_dump(&tree, mt_dump_dec); =20 node =3D mt_alloc_one(GFP_KERNEL); node->parent =3D (void *)((unsigned long)(&tree) | 1); @@ -35797,7 +35797,7 @@ void farmer_tests(void) node->mr64.pivot[1] =3D 1; node->mr64.pivot[2] =3D 0; tree.ma_root =3D mt_mk_node(node, maple_leaf_64); - mt_dump(&tree); + mt_dump(&tree, mt_dump_dec); =20 node->parent =3D ma_parent_ptr(node); ma_free_rcu(node); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11231C7EE23 for ; Thu, 18 May 2023 19:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230208AbjERTCZ (ORCPT ); Thu, 18 May 2023 15:02:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230201AbjERTCX (ORCPT ); Thu, 18 May 2023 15:02:23 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D2ACA for ; Thu, 18 May 2023 12:02:16 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JDwi018330; Thu, 18 May 2023 14:56:07 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=b6NFuY1Cli4ZxcQEF1wHnuQb58sUXliXR5M9M7xX02Y=; b=yDwp6wmDBM9uW6tcSjWCdUd9ZTDYfLmtHlYTXfcglePt4veqm9MsRt9h5gLFNslNerda vZq6ogYU+wbhTXQkGeM0tYCkeQucy5yQB/2E4ylu8IMpH5WgcPGfm+7V/5MAp0EmyO9Y uO4aHyk1i+flPKbB0Ll3Azyv8WjOQq/hkRd5SkARsFOiiO4SWene1qpwavTfYLO277J/ KUdTji62eUb2c3056xCQo6bMMbuRaoY0QpczDQSiD/uQ3jLoeGRMMzsTjR0dAMPZF0DA wIOkRjmcRvYugyZj8EFB0ONQ/pCavLg+LzL7Q9CEXEJkRusTaqO2I+YCvPcRgwA0+nwe qg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vnb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:06 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE1P74004143; Thu, 18 May 2023 14:56:05 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d66wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PBGPGOfrbZ3zfrPoMRq1esGh2bwI6bbJwt0TGYOA4K1IYtRG8bpnSeW4ollXATZ3OdCLQqWmitH24lKsqW7F9tkO5f1Q6IOP3T8nkNIzoMP7sRTqr10ZfGRON8lSOZ3ZmPqN1NiLSM0SP1mCwJ3yTtR2DW+DYjc9ubIG4Z1AVYwzUD085C0+8DWPoA6FLzKS1hG20Ht5p7qf5w76FFs/UG9vhJ6IKzrh7MRSwL1/lx2QWs05tJwU61a1hoLmq4KamNpoNCy/9XHEcXI2ptVOoot2wq8zafqFRKwBu6d7mrHGgXIc1RWe4eg/xVIkQkgVMXGmB6uaNX4GO9DufNYIWA== 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=b6NFuY1Cli4ZxcQEF1wHnuQb58sUXliXR5M9M7xX02Y=; b=UGwxfDxGZ4GJGIeyk6v5aniHTxSnaZeyZPwTsbv82FAVsbHWQdX9+G5ew/NJ/NI7omVCHi6qNfcNTogLoQoA6r5CRhjPbX2Rf04E6+0ZFHaFYQZ2eDUKQ6vJbPJc3VXl2suBRNjQTmPkx0e9M3aimwLZ77L65/mQKkEHSYojuH8AnosWWhZjfuI2tpHColUL6oZy9kD0H4TLwChAI2f9notUTvhhNkF+wp4QFaqaLk7MM2Q5PkJ0jJ4nROVUH3R9aMgN/hakxCCxRMQPP15kmXMkIqdBB+OazPD5sUx/xB4PWS8mHs3a7IvNvK8SO2XEXb4ZJbhobbu84BvPbLgaLA== 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=b6NFuY1Cli4ZxcQEF1wHnuQb58sUXliXR5M9M7xX02Y=; b=NC1AfEUWqNr3kF1+QBHgbB238jZiGAGRE2IjLe88LWEBNyQPhBs48MgxtDx9m/sMeMJScKIFAuc6xpmu2+WAZBhqUNnFTSKco0lW4dNTlkFoPhLOlst3b59MRf2dI3OuT4kFIcxYCTu/K59rL3e8fPrfT4bXZmRxL5uVgkk/ShI= 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:03 +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:03 +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" Subject: [PATCH v4 06/35] maple_tree: Add debug BUG_ON and WARN_ON variants Date: Thu, 18 May 2023 10:55:15 -0400 Message-Id: <20230518145544.1722059-7-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0290.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10e::23) 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: 4c6a7bf0-50e9-4a80-c2cd-08db57b00030 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s3UOWhFza14ewH+TPTmENd+LGzNdwxQSqJyDFhl08B3GcFZwFOh8SUKpACoMcNug0Wzo6RLsxzU8UZVCYAqreNQocyRQ0NJA58XzRES14lIeYuzfVs6eNmqPfW81xOGxyt5gTaQ1qgPmCIrZob/lEoKKz91cJgmHfqsftXPl4OASjR38SSAE46hgmjo8BweCl137S1hsOXtwOJRmdrdvX/Goykqex4SkEqzIaYh5TQA9LtGBra4/bjZtbwyvrWcrVbwRAvT69uYr1HW9HkTOWUb20CkVZ49gixZSjSt0Y9ctQNTnJaogavbmUdz0ZIVrJmZUBqaIhWBOCzS3t3cYj+/fqcymRcDQuJXdAov+O/6PYoRIkihC+g2P3l5yAXHYgSFbppVF7PA9V6C0RIqWhAKuaaIZ8mMlsQNAsv23pCB71Xjq8BDqDVFjjrA7Uaqq2TjoWudbewM6NOofrZDtEAvY7XNoqdzqAbzMhS4VOBKGF/5bR+6pFFQQYDFr0LaF3f5DyXSRGyxX/p7k0UUAXloacZRQEBbsEGC9SAgBz7OKZWQg3AlK53VYyUxaPFJu 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(2906002)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1wqL+IfcoMPPn6Nm1UVuTqOSk5GjjVqcz3mh/OAG1npxoccOOYYrDZ1IwvcW?= =?us-ascii?Q?JORmQXyjaXcPJvTG8XtC4KgxVE1l6IodFe3sQ3PxMDjnXCC9nIuWlt8rF6CM?= =?us-ascii?Q?7kWikAo2KCfWOgy+Robq0VZMT1vfdL8s9xdTMvSCN0AoPRNmVcgJK5ai/2gF?= =?us-ascii?Q?pVlKvTbkF/ojl9DcYrYi/BtId+kLMF1nENxQJOflvgYLqFxXUU7fLbKCCFhg?= =?us-ascii?Q?D5bVzvtXBySWQrVqnxkR2ag9MC6fmHl+jYXM2MgF7cMWYI6kjAfzyVBdXmWs?= =?us-ascii?Q?Lzb9zhuI8wE/xy4cxlBt7t294toXyNttAv+fByrxdH1dkTtxOrNyQyakDyJU?= =?us-ascii?Q?15H8ETxAHsFitMJmFTlFwBWsKmd0LtjgijO5pAlZ0frJzOHhtMSsBMnBGKnb?= =?us-ascii?Q?89WBgDAeoddHeScn7Dfpw6L8DCzngwZUm6/Q09kbIybtAaWauLO2HmXSdJoL?= =?us-ascii?Q?zJYxYxFN7W1G1TqjKcOttymVfqAvO0xaemW4k5+ttx5hLQA1jZ0y5V2sFrqV?= =?us-ascii?Q?EfspkM/9R2s7wylHuKslALqcDbdFd9Eu9bGCVoj04mLlzOyRPXA/vzIi6y4o?= =?us-ascii?Q?eYGaAwu6F73uN+3y8EkL7DkpSPA8jqS/STzJh9zIFxcZ/oTtAj29DQck9tJ5?= =?us-ascii?Q?VApntyEGM58MIEPu+4e4BrcXyFopxU8kbRP9SPP4NMmt35Af9mTOR98rCkDO?= =?us-ascii?Q?5gfj38oMtl8V4yQvkQOPe4sHSU4eXG3HYH5Aa2pWIVyG1LVIkjLwlVn7Atrc?= =?us-ascii?Q?sreUVZMa/Mc64YYKByFe2mdFJrmiKoNMwBK1RY4eHgywder3YVvEiXJLpfjY?= =?us-ascii?Q?l0HndvbjXCInDLAnnR6NKgyzwVzrD/tgiDgSUFM9COWpvsiFl7uac0TXyBTf?= =?us-ascii?Q?+XTP+cq5VGsrLwxXut61utWhPmV0JpYzmPA82ZArjXUg4U91eon3ZTtC2ScM?= =?us-ascii?Q?NvkMll9bk4o9a9wKjrF3oT7hYAIoIaRmp6pUt7xEnFSKDZVKfBgWxtqzW3h+?= =?us-ascii?Q?cM/HfLI/HtV+kRthhbROCXp1E1wXtCdjlv+bxZY7MJqpIvYC/Xs3fzZCaufC?= =?us-ascii?Q?tS4vvcyfWTlsE9s3FVH1DJSDeWpuz2UnH6C5k30sfdrQJSpzmcjZlBkMEOyd?= =?us-ascii?Q?izn1sp2Z7rzzuTPhTsXZ1ViB0oQD7wlM9ptzsh7Jm5mv3jPl1Meo02UYGo0S?= =?us-ascii?Q?489gLJGqezzr9TZqVHrnrdeArD/QxzuU253LrDDBHFz6ZHr1oiRkmc96tqWB?= =?us-ascii?Q?MMicLLMUUFukxbRI14UQmkjSbAHpS89KNgc2/kwCzrW53DpWcPyD+igy5SJD?= =?us-ascii?Q?1wOFCeCKrR4+xvoc06Buu6vEs9vYkXJcg3QJTZClBT8svwVfVE0LUfaVLpdw?= =?us-ascii?Q?Jaz7EeOn1POHn+7590xbwot+d8Ye+1fVQAcrp+9rWKvvPN1i42LFQI08OTTe?= =?us-ascii?Q?60M9U+7/5jb4XLFWTf0WzhVZSXmGiOIronzjz/eKCD/o6UAiKmabjNFKK1vT?= =?us-ascii?Q?Vm24la9GJfzTIaUBux4B56aU0wOibFyBEFY+09OcLaO1rQJbsKqtLa8gPUr1?= =?us-ascii?Q?9SZJwpRO6BhY8vYQVwyKGp+K3gXJK81cD+iLd1oQS2tOBbnQ+2hbiExZkwvY?= =?us-ascii?Q?ug=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dDvc0x8Wxiyhw5Ib+H67gNNDbe6S50HBQ5g9jCY2NYrfynmMtGyo+i9n1exff+8dsrXd5J0g8pxDfc4nTjdZTXv693e834jRFfCC1DOVqqhAQvpJw5KeRulCcCpAZg5NoQQy8h/0YyDSq5Rp/y4Fh6Hi5ooZ2FG8j4rN/HCfRJyqDqQncxEHwphd1yQpZSq4LPEG9HDW4Ndb6g+H1ccm3kQicPt/VbW0zsfovAGCk/YLltrqCbHOMPcj2Y3H9/yPzu9TjmmJOWubeSmshNVogewouWURYzjA0kFaWnOMDl6DrFFQ81xOT9QnZ1qgdEQBokBEW2v1UU+AQ/sPq6jbEG7RaG/nGXqv9s/lFv7FyIfG7Zj3IQUhA/yTlmM/AIcoQ9QWQt7wbc7WoBKZBNd+nxKTXCL8NEJG23Cn3ElJzrSG5X7OfDuGXmi+qUZOzcjsXZRc9J47HrBegbzzloPduFeR0b0wuEiVAvT7vxYXQinXoJkbrU5wIdyXKWq3BZ+k3/KYnRvgq8+wtoRj09X7er7gwn/BAOPFqYd39s4FHGai/6bw7l5AvTRmzCHIsV/jBAg8aqv3QpopUD6Msww7flNgfWYjf78deqYSjusqr5K4fgn99ZGJ3cgsZWn1O1DUkGsHhfJ+3/x5VPd0prc7YUJZjtsHzXkb2ZCrkLwSDXX730VxJvfo3snZqnZ01Ai0pu7mUXRu4tl1Ww+MC3lrTM+ONjBRo31GLRpVkRN1E4JlDxBNixEA8OICPZMNOMpKFjwtFyw4Kh2V72KZ0ZJCfqGxmpJ7QXv6vIMg1N9kEni3IU2CgBEagFNtE01OG9cTgpOZSmAj1jP+LFbTaSvj03lTHs/7zt1SQZ5eC2mf4Yno54+6KMssG353wXCFXQdzUzX0iwRhETirweYATMCgPQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c6a7bf0-50e9-4a80-c2cd-08db57b00030 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:03.3136 (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: DkaUwxLKA75uVd48XIzEohHL7O4CUOce6j2dTVot5Ee4dXBoQryUbFgsXvNWGglwcRNsXAQDXCJHnomsq5RvPA== 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 1Jc4f_3Hm22FCjvyvbpPXhgK3BUVPG-Z X-Proofpoint-ORIG-GUID: 1Jc4f_3Hm22FCjvyvbpPXhgK3BUVPG-Z Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add debug macros to dump the maple state and/or the tree for both warning and bug_on calls. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 100 +++++++++++++++++++++++++++++++++++-- lib/maple_tree.c | 34 ++++++++++++- 2 files changed, 129 insertions(+), 5 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 140fb271be4a..204d7941a39e 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -482,13 +482,13 @@ static inline void mas_init(struct ma_state *mas, str= uct maple_tree *tree, } =20 /* Checks if a mas has not found anything */ -static inline bool mas_is_none(struct ma_state *mas) +static inline bool mas_is_none(const struct ma_state *mas) { return mas->node =3D=3D MAS_NONE; } =20 /* Checks if a mas has been paused */ -static inline bool mas_is_paused(struct ma_state *mas) +static inline bool mas_is_paused(const struct ma_state *mas) { return mas->node =3D=3D MAS_PAUSE; } @@ -679,6 +679,8 @@ extern atomic_t maple_tree_tests_run; extern atomic_t maple_tree_tests_passed; =20 void mt_dump(const struct maple_tree *mt, enum mt_dump_format format); +void mas_dump(const struct ma_state *mas); +void mas_wr_dump(const struct ma_wr_state *wr_mas); void mt_validate(struct maple_tree *mt); void mt_cache_shrink(void); #define MT_BUG_ON(__tree, __x) do { \ @@ -695,8 +697,100 @@ void mt_cache_shrink(void); atomic_inc(&maple_tree_tests_passed); \ } \ } while (0) + +#define MAS_BUG_ON(__mas, __x) do { \ + atomic_inc(&maple_tree_tests_run); \ + if (__x) { \ + pr_info("BUG at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + mas_dump(__mas); \ + mt_dump((__mas)->tree, mt_dump_hex); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + dump_stack(); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ +} while (0) + +#define MAS_WR_BUG_ON(__wrmas, __x) do { \ + atomic_inc(&maple_tree_tests_run); \ + if (__x) { \ + pr_info("BUG at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + mas_wr_dump(__wrmas); \ + mas_dump((__wrmas)->mas); \ + mt_dump((__wrmas)->mas->tree, mt_dump_hex); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + dump_stack(); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ +} while (0) + +#define MT_WARN_ON(__tree, __x) ({ \ + int ret =3D !!(__x); \ + atomic_inc(&maple_tree_tests_run); \ + if (ret) { \ + pr_info("WARN at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + mt_dump(__tree, mt_dump_hex); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + dump_stack(); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ + unlikely(ret); \ +}) + +#define MAS_WARN_ON(__mas, __x) ({ \ + int ret =3D !!(__x); \ + atomic_inc(&maple_tree_tests_run); \ + if (ret) { \ + pr_info("WARN at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + mas_dump(__mas); \ + mt_dump((__mas)->tree, mt_dump_hex); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + dump_stack(); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ + unlikely(ret); \ +}) + +#define MAS_WR_WARN_ON(__wrmas, __x) ({ \ + int ret =3D !!(__x); \ + atomic_inc(&maple_tree_tests_run); \ + if (ret) { \ + pr_info("WARN at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + mas_wr_dump(__wrmas); \ + mas_dump((__wrmas)->mas); \ + mt_dump((__wrmas)->mas->tree, mt_dump_hex); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + dump_stack(); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ + unlikely(ret); \ +}) #else -#define MT_BUG_ON(__tree, __x) BUG_ON(__x) +#define MT_BUG_ON(__tree, __x) BUG_ON(__x) +#define MAS_BUG_ON(__mas, __x) BUG_ON(__x) +#define MAS_WR_BUG_ON(__mas, __x) BUG_ON(__x) +#define MT_WARN_ON(__tree, __x) WARN_ON(__x) +#define MAS_WARN_ON(__mas, __x) WARN_ON(__x) +#define MAS_WR_WARN_ON(__mas, __x) WARN_ON(__x) #endif /* CONFIG_DEBUG_MAPLE_TREE */ =20 #endif /*_LINUX_MAPLE_TREE_H */ diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 084868865849..a28b021f740f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -240,12 +240,12 @@ static inline void mas_set_err(struct ma_state *mas, = long err) mas->node =3D MA_ERROR(err); } =20 -static inline bool mas_is_ptr(struct ma_state *mas) +static inline bool mas_is_ptr(const struct ma_state *mas) { return mas->node =3D=3D MAS_ROOT; } =20 -static inline bool mas_is_start(struct ma_state *mas) +static inline bool mas_is_start(const struct ma_state *mas) { return mas->node =3D=3D MAS_START; } @@ -7251,4 +7251,34 @@ void mt_validate(struct maple_tree *mt) } EXPORT_SYMBOL_GPL(mt_validate); =20 +void mas_dump(const struct ma_state *mas) +{ + pr_err("MAS: tree=3D%p enode=3D%p ", mas->tree, mas->node); + if (mas_is_none(mas)) + pr_err("(MAS_NONE) "); + else if (mas_is_ptr(mas)) + pr_err("(MAS_ROOT) "); + else if (mas_is_start(mas)) + pr_err("(MAS_START) "); + else if (mas_is_paused(mas)) + pr_err("(MAS_PAUSED) "); + + pr_err("[%u] index=3D%lx last=3D%lx\n", mas->offset, mas->index, mas->las= t); + pr_err(" min=3D%lx max=3D%lx alloc=3D%p, depth=3D%u, flags=3D%x\n", + mas->min, mas->max, mas->alloc, mas->depth, mas->mas_flags); + if (mas->index > mas->last) + pr_err("Check index & last\n"); +} +EXPORT_SYMBOL_GPL(mas_dump); + +void mas_wr_dump(const struct ma_wr_state *wr_mas) +{ + pr_err("WR_MAS: node=3D%p r_min=3D%lx r_max=3D%lx\n", + wr_mas->node, wr_mas->r_min, wr_mas->r_max); + pr_err(" type=3D%u off_end=3D%u, node_end=3D%u, end_piv=3D%lx\n", + wr_mas->type, wr_mas->offset_end, wr_mas->node_end, + wr_mas->end_piv); +} +EXPORT_SYMBOL_GPL(mas_wr_dump); + #endif /* CONFIG_DEBUG_MAPLE_TREE */ --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D951C7EE23 for ; Thu, 18 May 2023 17:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229654AbjERRxI (ORCPT ); Thu, 18 May 2023 13:53:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjERRxG (ORCPT ); Thu, 18 May 2023 13:53:06 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E559C2 for ; Thu, 18 May 2023 10:53:05 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IoKK006515; Thu, 18 May 2023 14:56:08 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=ZKKnh5tXR7cSv5pdvv3zTwdCIZvoiw2m8PYAGu4XPKg=; b=zusOND3jxNSaWdi6eSETaFyVoEGaqGs6TZGcV383xiFCTLKkOqWIw3EMMNih70A7/OnJ haksnh5BpVvkr2gldyQ3rwXWPzBWQJjeqoRBAXcMOTb+kALmWmKIFajehETrzEsA/JCE DbfU/UUZGtTpOBOJZ81EteI2uMgmXXTTXs1H/CZ9XqNetKVTknuYaM7uq49TbA4TiFxO hjAmSjHArvDLQnc0W69emoKIBLJCNmVnuJc7T8I1N68ukppm+AttIr7tiU7ruTM6/759 gjDYUOQsUXYqwp079sEydZKtx9zqZJ7VWgie+tedITxfelNODI6njGYFI2UIczfRN2Fc LQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj0ye82ng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:08 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE4MUs032127; Thu, 18 May 2023 14:56:07 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10cwr77-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YR1fh/Zw6PREDYM+jJJHKhPIR9xjXRoQjfYHiGCz23E9cg1w6iXXsfDoV5Ln/lgh13YAx480YA+dw/hO7DnahG0WoReRQ9toJKpXC9ruFTR6Ryer+9qVRQxivFdcfU8LmrWhcXarS7FTtq6Z8y+ujsZQ+9F3dCi+9yU1QB02AENcNnxDEvFS8hiOYV3gUm9RQ+H6cabG9ohe96jN12rrZI9lDYVyLEyWtjmyeTpmAWymu9HEzwAWyKaWPXqory2PHKAiqp/O5hfB9ief0ebP+i2AHj3mxMxWPkLS4AV4sw6Dv/N5EMSM3GCeolbsXGoRpv6WFzpaXDiY0Zwd+62kaw== 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=ZKKnh5tXR7cSv5pdvv3zTwdCIZvoiw2m8PYAGu4XPKg=; b=C/1PD2hMQAysd1RRSol/OuWE2KM5knbofysAgA741yYL6iQJ8WikrM8g+QwkCnZTRg3niVvEDbkPoTqMWTZ0KATXNel9pP7toko5cnTq8hd9zMmdiyevICaX9D0J9V0WsXxlpNgmdc4PHcsYczXxgsK3yvSB8Ynzsfje/S20mS+jo1YPD0TvghU0oZqFWC/fde9E2uq91kJHJrR5hV1Tj2o0vfR7+3EwpwBalmKoSab8ykiDibLOmX4cmO71/vegW4K3nRHhc7ThyxPSVocRxiYikAJ1FInoPPrtONl37z40KEHGEEQxvV6IA4OYTJz/rnRwGgcRFgv9bYGpiKA+nA== 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=ZKKnh5tXR7cSv5pdvv3zTwdCIZvoiw2m8PYAGu4XPKg=; b=gAOxYX0fsswPPsmwyR01feMKdIFb3ZPay9E2nS/Ehg+ZuVo9tNBEVLGmqoScj0ttx1D9FMsXtvWM3EI1ENh932kiCUaZv6BmsaF29ozcOg96cQwtidLDHvYIXLVfsbr3tz4dcFh7UHBrS5DnOYmXVkYlN+G/wxxS318NQMI7Sfo= 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:05 +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:05 +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 07/35] maple_tree: Convert BUG_ON() to MT_BUG_ON() Date: Thu, 18 May 2023 10:55:16 -0400 Message-Id: <20230518145544.1722059-8-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0293.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10e::21) 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: 8394f47a-ea65-474f-f901-08db57b001b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 84zeeMybTITJcJpGcGDGQ9GaAjYjlPuihbR9wLXAD2tWtwGMtEdDTArHz9CpQa5T2oPB5J+Ndvnr9dUazNBoeRKznp83ewb6WJddY1whpx5kVWEJfEZ5VaRW+ukqPFcSIiuty13j4xWcGY4kN5aDdBqZC1IbFGbY0l07Yl+FGZRAts6VfARD0opYVI2rr7ADhUNHmNbipQGz6krIcl+bfnYaTLI6ucEFIY/9d5MQ7/bRaD6kTNPPXN1S0VuRqePIxgUg9yn4u1ZeZg0wWey1GNafPEzpxLlxMeZI4E54cLkgmv/Fyie8NUW5KrzYBYPruGqGcxY3sqQqhwXLr2ZGh4rcOwWH6X/kogTttEvJhNYmBnlwo8irEwKyB1BDOpzjqNdWqoD/QDIeTLhaXKbr5hIbsC9MKL+yPxVjAwcjWJM1yvxpZoBD460Nl7jcDmvwwyenfFlzAuYod6G9VTNr3W9mR6dahp7Risgg7AYKImfzTorKrI5dCbVNN/waKy6Q/BJ4RHgKSKrfFePqABKx9sea0KNangMRUt74ZyO9cBcstRrDSHSM6C7mHG+o2c94 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ntedK5ZFawT9Jge1CXXN2Iux7HkdbxROG4SiPdjj/+UG02f+t2sjinnVEKJQ?= =?us-ascii?Q?9ByQoy8hnz17sUD4z+Z8+bdHZWuqk0B0vmlLNb3qZv9Fz/VTmZDOojkWBQRm?= =?us-ascii?Q?NgpPcTTWxhp3+EIr0+f088ElIYZMUptOJm4az2mmPlXwYVXkYS3bQPS03mhz?= =?us-ascii?Q?8l/nn8xw21wkDKXXLlJMWI92LlmPl3jtaajbxzifwzQtA4kfXESY17TkHrlM?= =?us-ascii?Q?c4DFC8K98Kwovd1qLR/27KNit/Kru2vuTSu6FO5ZhVH4bMUPGKNxreOiJLv+?= =?us-ascii?Q?q/qV0BFWq40TmvO5XYuHgUoSwxq7VZXTkJjudyIA0IATxtZTl76Z+T7wrZUs?= =?us-ascii?Q?cwlfK9jB3+IxzBZQfldNr75myC713VY0LQ7alwc8TaKBU2zscZXi9i07npCp?= =?us-ascii?Q?2ciGKAvWk8YpW9evon4Z4t6trJAaYbRW6vLBCnQHshFQ+h9jc46Stj10+BvM?= =?us-ascii?Q?uu1kkdKQzkjGinUwERZagjFmE1BBNf2q9eyjbbjsb2HsmfsptzxU3x1e9W/U?= =?us-ascii?Q?AxA09FajCsdVnV3DPG03RGqHnX/acEIR3Ihk9hU9nfmAxYJgEKr0P0gijoSF?= =?us-ascii?Q?0rPr8/XWewzz0Qf6kiqYZRKHPV43gQmekGdvFIlB7H/xwVsyiV+gwOLmrWMe?= =?us-ascii?Q?HIeaGfqOn2nUcugjoI2hCtwMENuyjPgROS/q5VGr73UKvD9GS9dXzbBumH+6?= =?us-ascii?Q?yrXre9zgP3MphG36fbPHTFriSo7+aDuJk8M/ZiajwlNJ+AR/6uUIz+i0bZJZ?= =?us-ascii?Q?XmM7DOtCQkObaeYB8JCi273xwd2jjU/3NgKAy2SfKe5i2XXTs743Ju81+o99?= =?us-ascii?Q?u3StW/oFiIVYk5EY+TlChJBwVK1UtwkgCkayEO4Yr8vmX5dFy4pc5/uGUeVR?= =?us-ascii?Q?vGAmahdFPnjcz0uwmyJSW39iyNiuyHKFwicUfN0kqBk6jFV1I5BrKxZ848HP?= =?us-ascii?Q?aJisCBQRPAaT3/BGg8AGujjaX/9iKN79iNdaK5AGTM58P7S5HV/DT251Eaa7?= =?us-ascii?Q?AMpcYN0IjCx/N5k+x3W1PDZZ/CJx02tHSO2NPuTmnuIxSKJ24RAeranzRdyw?= =?us-ascii?Q?paAuZahdJSj6Edu9tGxD7/rgsCxll76ILxxKdBGlbYzDc9F9b2zBWlAn3p0y?= =?us-ascii?Q?yQ7A/NxO9pI8pdv3Z2C4Euc8StaNW9rGbPM9W1bzKysOFMJnKpLPhiUy0e3C?= =?us-ascii?Q?/H5hB4KB2UWmcMfvb5FfnNsAZMdfU55YO0G/Szat6B9btRIzcY0Gq0MnbA8X?= =?us-ascii?Q?ElSe9QPsdG269gFhguP7wxZ21Goe0GvGWNkA6dhESowql3r50dZUWylH0q/j?= =?us-ascii?Q?bDsczM/UYuCjYsWXDtBUYvGusLk9iWy0oQGi/k7pwUiYbRhIRR3LrY8iO6Ps?= =?us-ascii?Q?HZoyPH/XFL8pqmp4Bv3VWPjsRnkgvVwVHW4TDJ66b55Ma9Gy9yMYwWRFt7we?= =?us-ascii?Q?2JIOmSDjgaN9hGUW6tUSSMu0ncKy3Bs+IHXKvYVkzkf5poOJNxLz+5xlL3Yu?= =?us-ascii?Q?vAc51sV8nKAukAN7tsoHicwLkHXP8BlyjTyldD5BAIMA0iqV3mkiKlZX5FVp?= =?us-ascii?Q?OuZYlh/bcDMSAaK1ISZ/wky7+eqwj9YLqiJh+aXDrK8me9pjTOx5KcME+j04?= =?us-ascii?Q?9Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 55gr7B/skj57uhRqs/0Vj3VKl3bt3FWl3mfAA29kuQ4c90lFh03o6SgiuEUbYUhKTYl52Pufh2f7OSchvTPHg6Z9yBZ9OhDeonx2CAGzF/KEcC1ZUbtnR1V8IWGOwWS732Jp+YJik4OxxhmCWNkzuwa9uMdxSjTCEn+bPY5oA6wF4GzRUHKLfrk5RxHp+hKTUQoGZfbqkii7KrJ9oMonBODwsyU5lENv7uggJSnnItslBFDyEvPr1PdngNEAk9Fr8nwCmK0r5NGMo2TiIqrTQSbA7DM+3AYgM3WvbqIEdZyy/djIkr7KY0qYayk4a6lKmNwX+2lne6MVsOEZc2fG4YYh4C4OI3e8GWf3eGFkSFkVzLxUbYpiSZXuyQuA3E/GlgGih5sJoX4JkVWSUFujyvwDHq9AVYye6bRLGEQWnjXOKj8J1CGbIkFZsfoPEIqxm3tENYF+I+O44et7Y/YumG+Dby8W6/5UnNR+EQDapPVQ6EjPp0QftxzGzAfR/p92l24rovnGrRAzBBKNzgWT1GinxQABSZ0K1nzZHbX22emgH715EKtfCfX37ie82lfXqZtRhwHWdibW3WIcMum80sT0sre2HVSc4ZTg3bltiXWLR8jbrbtcPHEm/DOrNQ66PVXpoPqNMvlx4FUzRDlOyAThtdAHJ4GcE7tschjFcGZVwRD/gm2LerQo549Wfz5atH6aboKI9Ay9GD2pvhfHJO/tzPY4uM5rfHyKT6MGgsYf1PYxqSvQBRnijh+DiSmwRE6Uld00y3sRwWqYYEESvFaV6lr5Zitw/1dEMavJXUcIV+Dx74+6BCQyDeNE/TyfFBdHPdfITa7Hii7829acYLw3Nko9CJRUl8xZqhVzNy2n9IHJLpYLncnW4WkpgfuM+DShss+Jhvyoow+mayViXg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8394f47a-ea65-474f-f901-08db57b001b2 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:05.8489 (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: f9dC7gzr0U8yNqj7CrFvf2Z9ttdvrlWmd4XGusBxDJXrAmRwnFRraO2A0TyYemV/BancYHmsS56SWqSX3oJ4nA== 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 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: hl-By1MQmLTQz3hIRzHjeqrYZ4p58ndK X-Proofpoint-GUID: hl-By1MQmLTQz3hIRzHjeqrYZ4p58ndK Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Use MT_BUG_ON() to get more information when running with MAPLE_TREE_DEBUG enabled. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index a28b021f740f..c3ce2bc59412 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -194,7 +194,7 @@ static void mas_set_height(struct ma_state *mas) unsigned int new_flags =3D mas->tree->ma_flags; =20 new_flags &=3D ~MT_FLAGS_HEIGHT_MASK; - BUG_ON(mas->depth > MAPLE_HEIGHT_MAX); + MT_BUG_ON(mas->tree, mas->depth > MAPLE_HEIGHT_MAX); new_flags |=3D mas->depth << MT_FLAGS_HEIGHT_OFFSET; mas->tree->ma_flags =3D new_flags; } --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62AFEC77B7D for ; Thu, 18 May 2023 14:58:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231567AbjERO6m (ORCPT ); Thu, 18 May 2023 10:58:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjERO6Q (ORCPT ); Thu, 18 May 2023 10:58:16 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7699AED for ; Thu, 18 May 2023 07:57:46 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IpcF003885; Thu, 18 May 2023 14:56:12 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=iIEqoKHCtZVIcHQcln7ub7Fr3AEamO8DkcUXBPgJVW0=; b=KLLtgtxuOqobTuSqI6fvrBtxKQ7Uz8G/beucSIIJX3X+tNRguA+cGpEd5kxX/ZCy58q0 zGmyOyCxNQqXnexctByZu6vzEtCdjypZJVb+UdfhUbHH0KGXc8QbMHnPjnynztWs2Ztg Rbq7soGTwaWKnqulxq2Ig1PlHC007cmGxA0zmanbbvWn38KJHVEKbchZ6k0IaqRCHpjK Rj2ncStexZQ2YoHLhMB7AO8dLGooXZfSV79VNrgqXQKmjaH9GuptK5U0FLBKzwZcir5D L9xkwGVqEETFLuMPksIh4sI6WfGIEKG4TCk/55EpTFK35hdo8IVDlOepr2RWMKnaKgf7 cg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj33v043b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:11 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE9Wc4025017; Thu, 18 May 2023 14:56:11 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106vkvr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TSI2vh65brkq1vEIPyyT0+T2t5gbfIDrKZXmvhflfe9wkRwwKy5j93nZFISN/UR5tOgoQoRY3QNfCciNyGLM+xIFsvHp6McJP6yRDVKhUsxV646UErCkGg/f7CuQnD+U6VRDMrsRGRlSzn+Owe/PCSwBw024KtKy1wlNxbjeJDk429kIaf9OCxFuuNjRRYi3hHxlmahCJ0ZqbcjvmAfffdEM9NCtAqU1EF1Mw12zIeurvvGmmx4v1OnWBaEXl8R6xbh+pZd7lKXM9QMeDOoJlDZNgB5I2w1jHNm72QTF8OCaluymlfFjrSJcSPt8WcmVfCtfs/XcRbtT3eAWuxwfbw== 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=iIEqoKHCtZVIcHQcln7ub7Fr3AEamO8DkcUXBPgJVW0=; b=WFSTtgQLvtPhD9Z6ijt4N+opsQkduyjqvn17lTL10jC6g0Ci2x6fw8EZjd8m7roheDPb4IimBq/4B4yeRs8nrWIYNI4TfAJXprt8F7sQa7o0rCvjbqZ3leTuFZonrnRmcvGbOD935bEmvOYLh+YRYmcjYDFRSC9kAd6fShoSvXnECEfvZXS0499REPfC2jrzmG2Xzsz6eznAWDYnt+CRciyINxRlBYnTcB/2jp54W15PQ/1+ouZBYZ+sY22MfmSijxGhV9T1ED1qq1JLcfG/w/G8S8DF17RmDHuJfozKvC+ZTnmejsEZHApXrT75ttEUOmVy1UiwZM+NEwV6VR7odQ== 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=iIEqoKHCtZVIcHQcln7ub7Fr3AEamO8DkcUXBPgJVW0=; b=AeKmOlpGsjXg3Ro4DlzUUDxuaScIM0N+BZUba5Z3lM23T7VnDQVGiuBs3hIn7bpV7cDHQ5LGwT3Ex5KO9WBZh3IJggxZV/p3NKYo81dJIBPt8DSJoCmeEbAWzYY7VP8BkmCOxID2S4sok6VhxWedKR4PBGojj38pBfuk7LMVeE4= 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:08 +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:08 +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 08/35] maple_tree: Change RCU checks to WARN_ON() instead of BUG_ON() Date: Thu, 18 May 2023 10:55:17 -0400 Message-Id: <20230518145544.1722059-9-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0085.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ff::23) 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: e7048e49-2387-4cfe-68aa-08db57b0034f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gURmUyVULnU2pzDkWml4HZ5MjgeCIytIM5T+jd8eMcSA9+nYaOZ61jW7SMrhNhxEQ2F44Sowr1MI5UNhAuJAnsaxMJ7O+voSyWMepKTZT0KXkxBi+bcX5J3u6YHmohLHa0GA41cNcbESOl/0zR7iwiu3xKOovop1xbjetYEFbYPidwK5zm+IFH79mooz4t1/ZBsRGm1PTcd0w19cMK/Dv24dcClwQBg7rxruxA9+1krgIZZicELFiXZwvzynJ3Cb/bOYulORnd48DujABkqlB+SrpErp6Zw8K7IuMBddOT2nVR8rAK4dyw8cIIx85DIdOBvPiFM/p3hisGrlZEG+p1a/5ZOc59wNYfryjDuKUihSz0y9kETfQaHcszIPgV9rwN+Ddo4BvMVPlAlmA/qsfvY/BPjWssfGGE9YygdQOyjssyAXBhN+xcfyaDnOtm7oFGDdxnFuB66NSsPqbOVl/NC0di7OJdmMNGXIXa6ItJPBmyoWOKPeXepz45PTS2QO4rmMByDcrViSPPPKSr4Y2QbEZtW/dAELeM2JA3w3ZXbJRNP7hbFwnrar4+LBL78/ 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(54906003)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AVJRa0ito6gYx+pqxxttkC0oOVguPwViDw6P3+7mZlMd0L60zvmI0jLBjP5k?= =?us-ascii?Q?+CFuGQSY9BeUpVKcaaU/c9z7XovBqCJ6Nd0Io4zByLyREd8bheZxnfR3/Sy5?= =?us-ascii?Q?amtFFNgz+Ve177XNMAWWydRdnOQfCrErVFyjwj+JCbqDy4sARnBGMn9S1C1i?= =?us-ascii?Q?v+ojtj7fz2qaK4Ve1ayv9hbG8yYtNWnNrNiQij3yJttwPVOJ5NqRXgLtR6hg?= =?us-ascii?Q?upEgRJmFW4xNTnHb0mcIpXDYQa7GZchgla04aH6Lt6w3/Lk92djrgUs6IoOq?= =?us-ascii?Q?GrzjcAUmdP4wX2j0+9PFUI8WAr6O8+b8BuVzkuw74SUPqHAiQKLRJ0PYMdJF?= =?us-ascii?Q?P/C2FRxC5ZHSeahsyoOk3v8xwGWj/ROxhsOuVp8jIOAYnMUkJgaFeiEL2A73?= =?us-ascii?Q?hCDZmMETm97hpRCEuDTaFcYXwNGb4m9RAL8e9OD185OD6GCp0/SOQsQINbyL?= =?us-ascii?Q?C8N6QTG81XkJ1mGN0b6odIsm7owGqrAi2mfSEziDOjLMO2KrfuxNYdv7G83c?= =?us-ascii?Q?/64nOyJt1Fp55NXme1k/CAD/WD9QK38xwLVQuCoNkEsgdbm7H7LQ3x615+3y?= =?us-ascii?Q?k8r3FOkq6UzFi2zzW+VK6jHtrJDqkAA6iBftdINVass4otx54pJVXvOxPdfy?= =?us-ascii?Q?fI13g9pYZojq//QrNWu6iRDYhSUsY4RgJjk/8gCdkzfxT0TXpZ4qfYggc1hh?= =?us-ascii?Q?s2Um63x/N/K4kwHmtS/lmhtKRuGApl2MJKCwZcz8uBpFS2B8bgFRJF0ZZHtd?= =?us-ascii?Q?O9piqSkRvNcoP0zcH6T7dzKcjyI2Qnadd34416bcu7bnPcAdXRQ3riRsbVIz?= =?us-ascii?Q?bIjzq9eoFY6r5m7E6O0Q/TV/U32EcX2bneGHK/cQUYbz1+/MPz3Qh3rk5o6l?= =?us-ascii?Q?24AS/FypXHJYPOfTNLj1jFhXzvfHnewYuoE1PaBl/HvUkqn+V6VCTYdjNdvf?= =?us-ascii?Q?FqMmBEPNEAOq5X/p4r6FvoA9ROagEZbXPEWZGGkiIAqNOraeEUBqEXXHpExB?= =?us-ascii?Q?0IrzfSBKW+x/q4mmgJ/MoB23FKkG3uF9llrF+Dj65K9pJJDi7mYw4BdzeJ77?= =?us-ascii?Q?lNfc+finPmIazkO3gzVYbEmXKUxBsNOfa22yO2ZdF799tHrDUx8dxIyTvbTa?= =?us-ascii?Q?q6LzAU8ONgFAcSwL/NPVHFKtprTPVPj0L8fuPL2CCDviRgFwwoTuRPDvZmuk?= =?us-ascii?Q?B/edqfLgX4neQNibG6Fm4KcNI+XQwtLqZmXyFNrnE6X28vWFzE/9zWBG/Wal?= =?us-ascii?Q?VbSeSLq4+b7XgftpyxQPPgGDfpBonwaS7WilN6fCoZUJbrfjvSVuWC9ZuzEO?= =?us-ascii?Q?06OQQTMzNVeWm5SHVeMqf2Z2NNmeMnKjz77QeQguQ1bq+F0VWEbgifh0y4O5?= =?us-ascii?Q?ZuuMd69KzyLBPOi9N9rcUG9KTdmbpyBXxPgPf9fZ3eBjk3oc3Gs4jaFCM3rQ?= =?us-ascii?Q?slWmJAWPwTw1TZ44S6DblsGEhQfLyofAhznTDddZg+xbdsr5/8Gg//iSkV3v?= =?us-ascii?Q?B3FEA+eVMDQZ+v5lhRi0VLwg2elZz/6mLZSIMZYdx0r/2U7ECaabnZOC+bAj?= =?us-ascii?Q?iqJZLnH8b3OtoPm+NtyqktbfGeBZnBBdmhe4oVs9rKO1IhPDyeZUxPurdfrm?= =?us-ascii?Q?jg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: iBFIpyX72C0fecrmnGMdMAn9d/cSJNMUz1rgUlazJqrCWZJngaNdkhm9Y81v2/ku/rHH0hLj/WgbH4RU9kLvvOb6SmRDaYV6y3SeBqv+J1031aKnySG0Upyw6wombXu+jLU15+f6kIOaIEP/vd4iRKmUX8xJy0+KmXAbmC9I2y/hTVoWiDNWtQ86NwdS7WhzwB3Vii5+jEgprYatMh48hDqUSraIgdNstwMru6e0EG56bo0FvLzAB8Y+ysGgepjJDdDLQh8OpWMQH+8oFOZtMuqqmM6gWdTOpqUtkyGJx/jhxqfWn1g2XDvb3mySVnc1omm0jiP3Bqe6e7y5k82Acm8VA7ZsHWtGQwvHBt2DyFDA44yZ+inI4AdZSaCdkCpQoCfrKBbNPIZkuAl85UoapFDw6ynK4gn/MyzLUv4ja9eS+gAJ2mYVsBPfeuZzGDLNsWQvF6+m2HbSRth8d9bJ+/xKS0itcWHzAqaiPH5lKGhsBo3Gl519cCEervcPqzJf71bn/rnDJ8rxMVgx54e7KhRUPnhVq5O/XzRe/10Y9L7deeb3y8fdTVvHBOvJl3p/74aIdTug83a6sjgnBoENqodiSaSk1dqPismTvnemDztI252a4n8NGYFWufbWiLMrojpmRs/lhB7DR0nHbf0/T9EDP1j7tokvvt3gbrVB/dHgHU//fGLCFy8TdxBM5j7MJkOhzPzmozj9PtoL+jDTxUcQAOIdky5PoWOCuJmIWTkhxPgadbHWkAq+xbOQY7pOxcuioC/DrdbjJ1XS1ze3bOBzQc3mgqzfWx3E8F89NHZARd9xNykwipuLmQUMh8TbHXxNXS9dnk9eWKYUhIxe3zKLl3rzg/vCe63Hrh38+ao6ioy31pZK6VcrQhCrAgGyMPba54FMCHPOcJ90lpyjDA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7048e49-2387-4cfe-68aa-08db57b0034f 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:08.5456 (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: HLzxDBgytF2pxu6pEu7v2yaCuLtmr/IAn6frAoGIqdR0RrsGXhmhSkSm6Vbs6EQJMSM2uAUSNE5vqPQoV73Uew== 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 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 6RaQFkGPGvNa87k0dyIPuXTp7jIgsqPz X-Proofpoint-ORIG-GUID: 6RaQFkGPGvNa87k0dyIPuXTp7jIgsqPz Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" If RCU is enabled and the tree isn't locked, just warn the user and avoid crashing the kernel. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 204d7941a39e..ed92abf4c1fb 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -616,7 +616,7 @@ static inline void mt_clear_in_rcu(struct maple_tree *m= t) return; =20 if (mt_external_lock(mt)) { - BUG_ON(!mt_lock_is_held(mt)); + WARN_ON(!mt_lock_is_held(mt)); mt->ma_flags &=3D ~MT_FLAGS_USE_RCU; } else { mtree_lock(mt); @@ -635,7 +635,7 @@ static inline void mt_set_in_rcu(struct maple_tree *mt) return; =20 if (mt_external_lock(mt)) { - BUG_ON(!mt_lock_is_held(mt)); + WARN_ON(!mt_lock_is_held(mt)); mt->ma_flags |=3D MT_FLAGS_USE_RCU; } else { mtree_lock(mt); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6B5CC77B7D for ; Thu, 18 May 2023 16:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbjERQUf (ORCPT ); Thu, 18 May 2023 12:20:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229701AbjERQUU (ORCPT ); Thu, 18 May 2023 12:20:20 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 493E8E61 for ; Thu, 18 May 2023 09:20:15 -0700 (PDT) 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> Content-Transfer-Encoding: quoted-printable 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: =?us-ascii?Q?EW8ci2CTAWH6+Mb2mhENOzU+LYwG8KJMK0yo/8dJJpao6Re3G9YK7uKwo3wq?= =?us-ascii?Q?X52uKdGJ32d6pBiuUnyyOGqPpDc8SlxXHyRWg2s0NPdM0UTTi4vofClWXOsF?= =?us-ascii?Q?Xe2GoF76ahOGEJm3Wqi2ao2Jeaht9MCIkjo246TCdm94gTawGe/fhwrb9jPn?= =?us-ascii?Q?JMhm2xfmk4rUCJtsIDD85LvjRBBNVg9RqPV2FMxRm7JE4HQdqxsMKXt504Pp?= =?us-ascii?Q?ps4tqI6UaAu4DT4JjGrETTxCSQnNSQDPLjq6mJkqPBqvRyFEKI3eig9f9RjI?= =?us-ascii?Q?y0oDNVQdaIVI1RHH+5V7SX7GnEH3SPFUE5x8bzALEGZRfLmGd9BPJKe4rOLQ?= =?us-ascii?Q?fESTTNTr0avG1EJN/s+rwXlS/C7DpYqQR/ng4Nfo62avfHGUsGjjulLp7ut7?= =?us-ascii?Q?+B0tzRzobiSGktOB8gFbYnzzl18/XOnKje093ooqI+sogy9YAJ5QsgtJXmvm?= =?us-ascii?Q?rwvHsN8AfncPKeOuED7LqVYtGVhss7rrGA3Oi1YAVF5y9rVDq4M680vVfVGi?= =?us-ascii?Q?S9W39Eez6g8XrabHFki09ywzJrUemm1Qi8wJ9XvfYKdU27gOLsSzPhqvoKtD?= =?us-ascii?Q?enPutEVHsKfWA2+rxBvw2jkfxIHZxETFdc8yWHQbkYJrAST30+ske9qWVyzd?= =?us-ascii?Q?D0+dTWqmABkuMvqPKNtw81bxDOJ+vozoFN/l8bZ2xvpoBRkqFYXtzB8V8dMB?= =?us-ascii?Q?FySkCqrcsZdDcJ0YP0TK5f95v8S5L49jAHXRaKjmUYy33BAW/oo48kJCu0jr?= =?us-ascii?Q?SIUCFBapnI6V0UxArFC07EMca7i4Exy+0hqagfK+LelFPeTh/blwvRdeFURn?= =?us-ascii?Q?T3w+iYzb4+y0GZpThyWnRWoTXnnfq/pzMN0EvbHN2nKhJtICVxBwFLONgeGd?= =?us-ascii?Q?2CaB7PWgYWrY+xD7iRUyvmmbBk8qEoHAN4NCv+qhBH44tkplR6jJX5mfcDke?= =?us-ascii?Q?HJneG5nIY1FjMZcWEOEvOrbO/UfEmjVdbefO6jcuc9VwBFir5ypXAGlxpcl5?= =?us-ascii?Q?TdwQfnk8WururwJPiF5thBPWI/s18HK/plGjfJRUIpOwTg4Nuj9fr5Eg6Vmy?= =?us-ascii?Q?KM05THxrUniKTJdCYG+yG5yHUezmq/Np3SbLl27r0y+7uuvJ2q7EJ4kUP4uf?= =?us-ascii?Q?VLcl7ijzRofSivmINMSLWiTtL/paQ2cpfgO0y5ImyZnMQ132lMcKQRgVDUYi?= =?us-ascii?Q?8/gmDGO0G+fMlVzI3B5F/8dGtkmMT9KdCyKg7iNcDtfAuha4CT42/61a1f5Y?= =?us-ascii?Q?eDNVjDQmNHNoI1CoWE4DVWAlWGpz0+uvyEjtpKrGgkO/OKLOcfnX9S5wX5bV?= =?us-ascii?Q?SQ31c/zPvN+fMljgqguVRS9gWshUBmoqrG/mVHwtIxmCTz+n7ZBHrH5/QhCF?= =?us-ascii?Q?685pT4grd88igmNdIWnY7liAPDVGdeuezlPrKuc165urH53qorAy4jPR2S9o?= =?us-ascii?Q?7p0DrUKmgM9ltpOfssxd4w9wIPTaOrn9NYCjNkp9Cr0rETis+a/UF7VO3Fqy?= =?us-ascii?Q?eBpmuSS/yf4txpp1s0SFvsF3IWAgceVTVpsTLFtgxhyWYiOqClggPNej+XX7?= =?us-ascii?Q?P311VQiPo/LAXVBYO4hq/fLBDhrn8rf1cWMSrxlmuAQMOvbCflzZyFKDGtjf?= =?us-ascii?Q?fQ=3D=3D?= 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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) =20 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 =3D mas.last + 1; #ifdef CONFIG_DEBUG_MAPLE_TREE - if ((*index) && (*index) <=3D copy) + if (MT_WARN_ON(mt, (*index) && ((*index) <=3D copy))) pr_err("index not increased! %lx <=3D %lx\n", *index, copy); - MT_BUG_ON(mt, (*index) && ((*index) <=3D copy)); #endif } =20 @@ -6678,7 +6677,7 @@ static inline void *mas_first_entry(struct ma_state *= mas, struct maple_node *mn, max =3D mas->max; mas->offset =3D 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 =3D ma_slots(mn, mt); entry =3D mas_slot(mas, slots, 0); pivots =3D ma_pivots(mn, mt); @@ -6689,7 +6688,7 @@ static inline void *mas_first_entry(struct ma_state *= mas, struct maple_node *mn, mn =3D mas_mn(mas); mt =3D mte_node_type(mas->node); } - MT_BUG_ON(mas->tree, mte_dead_node(mas->node)); + MAS_WARN_ON(mas, mte_dead_node(mas->node)); =20 mas->max =3D max; slots =3D ma_slots(mn, mt); @@ -7133,18 +7132,18 @@ static void mas_validate_limits(struct ma_state *ma= s) 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); } =20 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 =3D piv; if (piv =3D=3D mas->max) @@ -7167,7 +7166,7 @@ static void mas_validate_limits(struct ma_state *mas) =20 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) =20 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 =3D mas_data_end(&mas); - if ((end < mt_min_slot_count(mas.node)) && - (mas.max !=3D ULONG_MAX)) { + if (MAS_WARN_ON(&mas, + (end < mt_min_slot_count(mas.node)) && + (mas.max !=3D 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); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74785C77B7D for ; Thu, 18 May 2023 14:58:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231643AbjERO6V (ORCPT ); Thu, 18 May 2023 10:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231130AbjERO6B (ORCPT ); Thu, 18 May 2023 10:58:01 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB4F7C1 for ; Thu, 18 May 2023 07:57:30 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6Iq3r003901; Thu, 18 May 2023 14:56:17 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=VDhmyk7oP/1stbX6BGTaGlN6dqJtXdNwYcxrzUyCvQ4=; b=uXvGufey76lIxmWIIu9PdtjVtsJavWYY0V92QPBvkPtFr6qIhnRewOmOxmyZbBXMUphX gYqe/vwgjNY0V8tIxBt9kyoCze/xjAhF20kA/jVZvi6yWpPidSVhbVIWdIrVenG9EYAR FMw+Rkrd1jGDnQ7Scf99VN21c0ouxU9OLOaALDpLjJpleaBBjOWZHe++kkhQnbmRQ0cf eUYHD3hr5WjbQMT3duzPd60PXIqlgP87jryzNQbDxX8O+bfa9bBQTaGwwXJmdz9AggLs 2rQUA3Ph5EVxo8gqw4pwBNtPDcU25sRUeDDuYcfeSdBFtz1vCnp+73E/MHr0KontL9q1 pQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj33v043g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:16 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDsu25032190; Thu, 18 May 2023 14:56:15 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10cwre5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IrwxaCgRs+OFVFbUGLeWsIXSsgrrPsTObRjWcgpVIUCw/BFVGByyT1Ms6YaKUNlW1wt7G/s/j/ICo/ykk/achYg0zLyJsqCMgPDbPhpyaYuHXlwT6lNsMEdYgUNBIRBXFFapzGDEUaoKjoI6d+KqmScUlhLFV7JAWiqSZsUNSdqyiwjw8CrbbsLc21OfxecbZ/nv8Cc7sFvjLuhkRFxwVFuTwxK1nT1wc1SEqtSnH6BpYrbEK4cJxYaTmlK2322xtB82UOMyW/kGZ6L8m8HEmpDnOmx7u0Dx4/yLDlWY2IWzyKvLtL7xk+LQiY7osq2l4u+BOwASgRxlz/00s2igXA== 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=VDhmyk7oP/1stbX6BGTaGlN6dqJtXdNwYcxrzUyCvQ4=; b=gpNwzK+M4CnK0zL77dxOrhjvxT/kkxnTzbm4o4KvEdPC4gJd+h/ByYgRkLHnW6mKbzzd7qF+DI14PHqsy+OToZHea4rVTqGHlyLvjsHYXRokWx/8yI4ml7FY855kgd7/VbyazxuIxSRb7WgKX5JBOv2Qqj19lGboA02yz8L4tSf27qtCDCSY08R6Ks7cZ9bPHcipTlExGAFtEFcnC+AN59xfOW73AVDAasr3RqvGUZbEnVvWs8CTzx+A1AHtbXHeaB12z2a1XYjlvIf3zt0ZEUA8QiGFDIjeN/AKpvaCeb1e8yl3L3g6Pv0j/ULbUt4GzCmGmPaAjEqf3vj5VZ3l2w== 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=VDhmyk7oP/1stbX6BGTaGlN6dqJtXdNwYcxrzUyCvQ4=; b=i+o6F0/KaBwjyiRvbcaDkb5x6HDis3vbY82e/ee7WJWF8vClabQZkRNWUmDYL4CWoxEcg/u1nvIhsjj9K8LfhB5YsXaLZZr93bZlCy+4vVAd6X5itMjWlrrxXOU26WmWgeXDAkvToJcRfjDO6ZKBGXozVf0Dz+vbrmg1drBxdTU= 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:13 +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:12 +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" Subject: [PATCH v4 10/35] maple_tree: Use MAS_BUG_ON() when setting a leaf node as a parent Date: Thu, 18 May 2023 10:55:19 -0400 Message-Id: <20230518145544.1722059-11-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0004.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::7) 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: 4269abef-2577-4133-663a-08db57b005e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZFuZi2t9sqcZDDNzCXCIuCDYoQnBf5ovDh1xu7cDDGGys7QmscK5VmrOhrsKRebNwdQeHonGJWpVExepa8v7uCTbuVdu6nd9RqgkK26+gOoaUupvbaO52hQtouOKU5er1TXfKtrx3IhYhwwiCZw3Rir+GPG2addSRz6U01xSi75gbXAe0t1m/B4Zcp0x45PJ51BU+B//ntUmnKq9oyGhCkAZUQH4BkIhKBLZ+bZkHVXL715dT/gSbZ3AMoLwttjmHHnBEr/de8DjOOr6T89vSMX9lQN7bKYCYdeIxPqWaD/4bCsq9ijTSj9nTvEiVyMhv6g7g5ynXU1FB2zbgWlSckLGs6jAuWA9W6hUAY9qFvozURGs+ar5L7sM0cqyATBaklwl5jmESZakp1CFCGI8q79mEirglvlN4vIxL/xHukM3/t2NgEEX5oNAj5yUsR/gMD6T+GPCiabTBmI+7mcW05q7tFPJUi+LqTwsY1M6SYQCeStJW/eCLrg3GdN3SBdUZihxWrnrI37owGRHadeXjBdYcpmWz6Bjj1t5DKlKmi5CjFYD1rh8C9sjMyHVmvpE 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)(2906002)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?akrhMQMkoKvHbkXyr69YxpfK7W/CnLsWe2uelHEVe31arPXwxxIuQchDFzm/?= =?us-ascii?Q?mTQksOsDYfpFtLzrOHk44TYDx1iXlzIyfv7hut1O7X9Tm+E2kOVgVZ0rqIhV?= =?us-ascii?Q?Fcr5cUOEq8JCuju6XqQAusKSdpIWrCGTlRQuOhuuwjdr5nbjuWPE769bFUKu?= =?us-ascii?Q?ByK11FhYRSPFLB4rCGI6P756dphVzvNiaMmZQELjg59I9qKtPP652MNFQpiR?= =?us-ascii?Q?B3VuRqJ+0Zn49X0tK8X/WdWHXefE7y2m3DzrbSsH3gGqPjXHux/lwWN/Bcan?= =?us-ascii?Q?uKDIz/hG21SVfuXYPC46c+HWDrGQA79ZUFYcyxOEDMdDo08+B1XG8AmefI3H?= =?us-ascii?Q?OIj6cVrYjpMZI/m4OFnTQn9ENpHJnETDlYBoe84mfnyi0+j3rUU9RY7WPLOy?= =?us-ascii?Q?+SEgNkrFPcBWGNb6u59rcHfu2gjkLQB0Nk8eqc8eL8QayzJIa+PDGncD0hNX?= =?us-ascii?Q?r9uuK4LRSCzLLQxgSqcbnerdZ0fdUEDHvCczjQdArumL3J5OaykEEvBJX+Vc?= =?us-ascii?Q?Z0ZqWst7ud7B+NKLcmUyiBTH1rQjUFlzogaZj/IoFQKs/DoHrjqPMcbwKhaM?= =?us-ascii?Q?XhjN9KfRW6LfowW45Z2c6g59/IL65aX2QetY62QO9ftmw6bhWt6majcbfIpA?= =?us-ascii?Q?8X1mdocbmIphLNZ+yEhHqP6y3PnNCypBUOXtjCXa2ItUo+J/6miCmEPuT4Hm?= =?us-ascii?Q?EK0TPM8L2kYc2opRdAccufcj5qV1w9NKjMelB1lcvO90MUJ+UU0Gw54A4vC5?= =?us-ascii?Q?FaGYP52i8VmOCmEh0d5lLc5Xhtuq0fOmhlYtNlcO6NW4eb+86SZA6OfW3nZC?= =?us-ascii?Q?+PbviqfYEJX2CH6O5/BY/mNA7vIXa2odb/FJqo2JYEHelJCinXE3VGL+5IAm?= =?us-ascii?Q?GzDHjtOv6eBmZ+aC8hQdqlj6KS0Ivm8kELeH9n9CwvbE2aq6QQec1MHJc25S?= =?us-ascii?Q?7SQQ8CcjKtK/KniPS9Wh3GBDNRXEaAlTHNIhGsENUV7jz+ozSePj/rKjb6Hr?= =?us-ascii?Q?L4DCWSx1xnPppR8ex9glzSTwVzuf9uaF99bCvFtW0oXy1JM/zBDYCa8zc+kP?= =?us-ascii?Q?KIl5TOML5pNLUsqXpaumyyla9v5Ot3Hyb7Vz0jyDen8hnt+9v1EVCyeQq9IE?= =?us-ascii?Q?sp+nU3umz0hqiwDTY3njtHn0dIBfRiNEzZAVxEz53h/yd0vMYKkGfecISUZm?= =?us-ascii?Q?m64Pzaj7HDQIKeFbex0eSf88h3/aohNi69JPJbE61A9T8dKOJ2sWnqztaLZu?= =?us-ascii?Q?UvZOs4ej8Yse3ifJgmCo1Bdin0VCUz+BpqfUERBoPtNefWR28GdFGTc9qCRw?= =?us-ascii?Q?ts6H/6hNNRvl3k91fcLM8das5fuuIBHZg6zxXAU/6rjy4gNoTfRRmhTqR4zr?= =?us-ascii?Q?H2p0D5dvVO3rkHDUhRVANHN++qyYcANccp5uly81K4uvtxVlTW45TsgC3ker?= =?us-ascii?Q?WrVChngRk9VIoRhYJ/2tTemMWvLmbTIKUN+vY7A/fVaWs4vq7ZXWrpWl4bZV?= =?us-ascii?Q?Y5hVN0hHaxV25/TLGU51QbWM1JfeqGkhhPeD2PmJ0P6iFNeT227Eas7urvEv?= =?us-ascii?Q?40+a3ygOEc0dbAHtKFt5WoYTUpWI1Y23nnf04QO69aGyUQrPipb1Gz2pT4WA?= =?us-ascii?Q?lw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: wuWdz9mi+Cm4eBF7qqVJ+KFTs84aJDsblgSnBG6DvH/wgCOxqxr3y2kLPw2DX4Q63NENRWDUy83f8v6WtDtZQuirK/vIRB+T1focj/wVj39OM5NtbZ7OdiDorSBbTm83ujkC376khVNNKM/Ko9UMdspsh3CPvDM/8n7eFqIXIgk7MDhFyc/tk6dvIOsGdiF55/p94CuwbRETVTIH8IX8lXrd6H8jSHljk+HIN/4Vf/vMHzbUY2wiRB8sG44K08luNWDRgwCdKkHSIay2Mu6BK1gMka0vxCuM2uIy/KPtQ4gNi1XBJO6qYPYMS8DE9P7e3utmopV1PRG9KTqIrs4t+D6jLzkyYeRRmVZx639ENPEK/3MHvI3Bgqkcm5lSAqfKiWf9x8+bFeFeC6WSU+BwOp5pc6U1mvEu1yeZ4xXtYTJwYMvStxwzHhR3CjdSG3hn5PrO67eLvGmd96NJwr9X5w5RhzmxbD3anSeVFxD7rb63TTQ1F9EbyTj3QOKZG19Etvjb+9WdDHUa3q0g0c7zMYvtp65/0qaTI6G/TsZS8NqeES7T5PcraUQC9nFICBXyqWFkAt+TRWgT+o4gEPQUxatlMpy8Xc7T91FbcPMwZ8Iygkz6iOQPDBKMxzR3gZX1mfNn9eoZ3aW4tld3fkAW9zGWlLwEvJxpWr3n40sCOTLOYXOUMn+S93hWMibFHD7LrNNlDcrwSRPyWqe1tJpkexV1egJVYmSF4Dr5MtqWnwxaTEvglP2sf6aOqghktrS2CF6dsMCHh20IQFKyUWuwMkKuWiBpEgxZlPuTg2APbXUwVXdwri7tZMKZignfQDqVZ36Ncxy+yadz+7Zk0IlEdLH+miukUeVJbxgmOuzZvCuF9Jt+eZZD/t+SOHFXVPQeSVG6wJkMpZe9mtwdKdUp/Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4269abef-2577-4133-663a-08db57b005e1 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:12.8567 (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: /dXxUaLB+wtr7cPtm++CVNAso55KOTv7XRzAv6c0zoMDD46HqUFg3UZIqW1TLT/OEhzNthwCXUK3BMtS147qmA== 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 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 37e9NwwdYmB95Jzq96JnACwfoCjKWzpd X-Proofpoint-ORIG-GUID: 37e9NwwdYmB95Jzq96JnACwfoCjKWzpd Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use MAS_BUG_ON() to dump the maple state and tree in the unlikely event of an issue. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 8fd83f21caf0..a594f1d88d06 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -453,7 +453,7 @@ enum maple_type mas_parent_type(struct ma_state *mas, s= truct maple_enode *enode) } =20 /* - * mte_set_parent() - Set the parent node and encode the slot + * mas_set_parent() - Set the parent node and encode the slot * @enode: The encoded maple node. * @parent: The encoded maple node that is the parent of @enode. * @slot: The slot that @enode resides in @parent. @@ -462,16 +462,16 @@ enum maple_type mas_parent_type(struct ma_state *mas,= struct maple_enode *enode) * parent type. */ static inline -void mte_set_parent(struct maple_enode *enode, const struct maple_enode *p= arent, - unsigned char slot) +void mas_set_parent(struct ma_state *mas, struct maple_enode *enode, + const struct maple_enode *parent, unsigned char slot) { unsigned long val =3D (unsigned long)parent; unsigned long shift; unsigned long type; enum maple_type p_type =3D mte_node_type(parent); =20 - BUG_ON(p_type =3D=3D maple_dense); - BUG_ON(p_type =3D=3D maple_leaf_64); + MAS_BUG_ON(mas, p_type =3D=3D maple_dense); + MAS_BUG_ON(mas, p_type =3D=3D maple_leaf_64); =20 switch (p_type) { case maple_range_64: @@ -1740,7 +1740,7 @@ static inline void mas_adopt_children(struct ma_state= *mas, offset =3D ma_data_end(node, type, pivots, mas->max); do { child =3D mas_slot_locked(mas, slots, offset); - mte_set_parent(child, parent, offset); + mas_set_parent(mas, child, parent, offset); } while (offset--); } =20 @@ -2705,9 +2705,9 @@ static inline void mas_set_split_parent(struct ma_sta= te *mas, return; =20 if ((*slot) <=3D split) - mte_set_parent(mas->node, left, *slot); + mas_set_parent(mas, mas->node, left, *slot); else if (right) - mte_set_parent(mas->node, right, (*slot) - split - 1); + mas_set_parent(mas, mas->node, right, (*slot) - split - 1); =20 (*slot)++; } @@ -3104,12 +3104,12 @@ static int mas_spanning_rebalance(struct ma_state *= mas, mte_node_type(mast->orig_l->node)); mast->orig_l->depth++; mab_mas_cp(mast->bn, 0, mt_slots[mast->bn->type] - 1, &l_mas, true); - mte_set_parent(left, l_mas.node, slot); + mas_set_parent(mas, left, l_mas.node, slot); if (middle) - mte_set_parent(middle, l_mas.node, ++slot); + mas_set_parent(mas, middle, l_mas.node, ++slot); =20 if (right) - mte_set_parent(right, l_mas.node, ++slot); + mas_set_parent(mas, right, l_mas.node, ++slot); =20 if (mas_is_root_limits(mast->l)) { new_root: @@ -3336,8 +3336,8 @@ static inline bool mas_split_final_node(struct maple_= subtree_state *mast, * The Big_node data should just fit in a single node. */ ancestor =3D mas_new_ma_node(mas, mast->bn); - mte_set_parent(mast->l->node, ancestor, mast->l->offset); - mte_set_parent(mast->r->node, ancestor, mast->r->offset); + mas_set_parent(mas, mast->l->node, ancestor, mast->l->offset); + mas_set_parent(mas, mast->r->node, ancestor, mast->r->offset); mte_to_node(ancestor)->parent =3D mas_mn(mas)->parent; =20 mast->l->node =3D ancestor; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0751FC7EE23 for ; Thu, 18 May 2023 14:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231267AbjERO6R (ORCPT ); Thu, 18 May 2023 10:58:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231849AbjERO54 (ORCPT ); Thu, 18 May 2023 10:57:56 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CA6F198 for ; Thu, 18 May 2023 07:57:27 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IqxI003904; Thu, 18 May 2023 14:56:18 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=036u3Np0Z36ocna1vzafx6uHq45BbcXy2glhvh2TOgM=; b=hvi3MrDefed2tIKCpvjfMw8Unh25ICT7jpd/IQacZE5ou+xh/vA/gkMCjskNmvg0yzR3 P1IsezX32l3Y/5iESrD66yjYoIxFv5OgvSo9Uu89fiB6Z1uNRot9FwOGsgI4sUoJnYgH do7XI57TtIdQ7o3GSQAhdehBpbuYCnaGUROqsxtBjemcNl0Tck/8FgQCXJQbeNwc2PyO DOIoo0HMVVBLrrCNehS8aFG2P2BcC1S6DA8RHresZ09cdQ2NgQqTEih+4BC9CO719hVx LtZkRDgf7g1LQEZxKHwTQXX7Yh1ByEIsAVHT7gvZgFxkWcHgtaXwjmc30xFp/EsREoZQ jA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj33v043j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:18 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEIxHK032121; Thu, 18 May 2023 14:56:17 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2106.outbound.protection.outlook.com [104.47.70.106]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10cwrgw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nHmiyYdd4foSjSoIL/OPxP2G885OV4W+xpoV1yEJh6a0Mziyuvz6alxnEctmad+3L2uRt54376gdS4w6zx+iRMcBfF46u5LKi4fq3m5AjyYPOoOOTWzWL42dqc+G7jBYQupAb5kmcHtcW2KEp7KYwK/1Txd0IBVoFy92cDzK2vfR3uiajvTEVDA19989SEJJ1QqcdoxWRfjl4AMt0PcCLmQ9R+cp6MRbCSS7LL7aArq1wwkbo9HcPMh+o38eKH1XuIFLJ19gxMkpD4J9Je4H5Mpe2yfntUFJ2RgjUg1XP2OMRy/k7d2EtSXZtE1wpwabK5/XR+ykiqkoEbrMZUXHVQ== 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=036u3Np0Z36ocna1vzafx6uHq45BbcXy2glhvh2TOgM=; b=jWHvhzSEgjfKgU7zCAWH/QaQoBozHO9pAZBFXhZMEgwspekVNOGX8+OJSi974XpiB2K2bZaMxC9G/JphP8LNqRLx3BC5ugEKYXFkTClXnmRIUQ2kXDHS3tSF7tIpRY7mAuDI1qq3rmEt0vmBXASAGKO3vJp60BTui0hYvvXxiBQT46ydHcGyRc/BJzbK2qPiLDIZhFa/WXfSZa9BN32cbEggLIhxMPTVheOr5pZRRbBSCnps3z2NSw5lI6EEhlKGh6+uiPOyPiR2CgZT8mBzm6MuPEddDSfAuLzgvoKGgL6bsOAm2XFY0dADGwzxPizVulMzAGfEeSUR3vJUGwaieg== 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=036u3Np0Z36ocna1vzafx6uHq45BbcXy2glhvh2TOgM=; b=NRtpEKvzcS+UI7ZQ1HFjA0EtT8YIud1i9Z6HYnRAHOrosch5H7a3boKhSFwdhIfhc+ldjXLNx5DiieUla3vXqaTi1/gn1XDlaK9l3HKm7xE3AMoPwZ3F7mQONIWTEXLfdraBAAFkVAOQZohvbCpG/o2dkdZ2MZ04dIc8b1/0oCc= 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:15 +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:15 +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" Subject: [PATCH v4 11/35] maple_tree: Use MAS_BUG_ON() in mas_set_height() Date: Thu, 18 May 2023 10:55:20 -0400 Message-Id: <20230518145544.1722059-12-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0009.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::21) 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: e2a29ebe-abf3-41e3-fed1-08db57b00765 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nNDX51mYlwmH6P9Bq4jaBsMufTuAhpUd2rmtFj9d9XGEnsuvkq5gf0Y1Ts/5bKtlZD+waZerMKgn+3gamFj6Rw2Vsaj6WzQFtgjZ+H+oS+A6jkq+t6N5cnhBZsGEyXpqJqF8LaMEN0Rm4O7XjP8dl2QMrrBqB9IvA1HJ/jr85b5ybNRMSLt9ymnq3sHpKQv3iCgy4PnVHNliLjPexwm2ZLhd8NnD/moxKexSAXBoXTpKiraN8WX2u8AwB+yrh4xT93b7cAvvR0HQm4BfpCbDlew0dDoyaXf32yhxXPaIZVGYiYEIIHyn0/7IdphHUQ0VvunyUmJR4LvbShlagk4q3w6/hfqg69D6SAkYRyewiXFhxoFEPxuN0K80j3FrM7Qmrm3zFjCflQKd4kkp9DR58/cK70UkBvWWwTApk0VG8iyA1zj57SS2Kpue5YRHz8EXsoQlX9pauLdCnVIVeekLlu/k8wAjCL/d8Xh9iuk84fSynCt7V2UYtdR8asRr9zsIe6ySy1m65Efzllo9Rrr3stD1JPun5eA/6nS0JxM45tGbEmklLqF9J0oca/ViDcMh 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cg+KYeQgfl999tunnQdsbEfXaSHz5XpWFuN+X/ZGfn98vS9GW2riC57d7+AS?= =?us-ascii?Q?QdHb51goZI17ONwOAdG0bIq8t1fmln6So/QuDPiwBl7vWFm90AnoXe1/rUd5?= =?us-ascii?Q?fhN2eJDEnTEyTiVt+VoJarn8oz+T8ld+B0OJxeLOHiMWpPKUXGIV+YHf2jQJ?= =?us-ascii?Q?2Mk//65wMyh7uBY/KijBk4bESWKkhviGJFAVXwx5Troq+UeYgL52ku8Q73i/?= =?us-ascii?Q?IyHhJMmb3A6rFlGCysLQLK92PLNxpDGD88+bHSE8CNY8ZiKEIjQyKB8G1mOu?= =?us-ascii?Q?NqAMO+xigfACafiuZt+up4JY18mltUU4m4TulPujYGJmi8vIChO6vFWe3SDv?= =?us-ascii?Q?fh/DnFHZFwTkP2Y5GuM7ViAE/0Um2ZwKLbjgh5eXji1WFGm9AF4qkfPuvhHj?= =?us-ascii?Q?zVwk4xxtw/+cJb9re1lVvhMhK5QC5/jGHTt0oQ4tZlVm2KYs8lI7RF1AlKCX?= =?us-ascii?Q?YhvrlyEPmlxBjEraP+93772Nm/iWr6HC1B2e5pPpakBubUvRxkWCA6quPrw2?= =?us-ascii?Q?RCvT0zDOx4Na/qhu265Baip8rHLCNCrUkZ5dXnmPwTnJ7T/1hqrJfpg+NqNN?= =?us-ascii?Q?v4zI5g8k7QkRgiLC4dYLCgKWiVparffs65CAfA/5Dw2S8RlUgKmqSBOLR9XL?= =?us-ascii?Q?7xy2OA+3SsH45OqlMcaaaXVvoTuWzQ8zzniDBzEyYJ2ISD7fFRW0WE5oZW6V?= =?us-ascii?Q?RTU55Ey5pbhV8Z7DlkB2/XOdjRpVZ6YoVbwuzVuH1xWHifRlMVUhr9uyw+4F?= =?us-ascii?Q?czUUOKHkfX/O/JwyK+Y2paSzhp9OSNVYwkAha45B6Q+9bGxgt8otj/x/8JNt?= =?us-ascii?Q?W8Nb8b/gVbXeH9sJ5U5IcXW8N/YjgLctxlF1t48TEChPQbmW3ayNjPA2LqJv?= =?us-ascii?Q?4eWHLOg7j9t36EGjlXuwhtb8g3uaknn42ZfKheS0QObqUCiJXrEPnnf3fXN9?= =?us-ascii?Q?PHVGhLJDEFgZ8b6AvLqZxMvnZsOboM04QkCkjYCkrSpx1U7AgBtwJePwRsCB?= =?us-ascii?Q?X1QkVMFWSwu/Ebiu+1PPiggoVvxw/Bn2RYrilrJidp1DaO8FWxx9HmnPTYR2?= =?us-ascii?Q?zqTmx/psHmXJ2Wmua/F+Yf25PV9tco2AvqqmgJ3VV+OgKkhV4FDy7rLFikgA?= =?us-ascii?Q?xIe2W/ToYykIEjj76dQgAr5ZCaeiwE08z0Hv0eDs2kgAfZuOMPuXMt1N6GZc?= =?us-ascii?Q?sSi61rLvowBuaN9SCXPkE6//2OoFyIxmzg3xB23CKRKYkjFptW/cxXSTtigw?= =?us-ascii?Q?EyjYhVAJW8CXneLcorj+OHQI6kDsu5R3Zh8Ff3kPwn09XATv0v7XTAZPZ/4l?= =?us-ascii?Q?TQruKZX0zOkI0WOe7RgTaivaklPOq6/W3i/MCx21QjMpzwk+aqo7V3lzzuiz?= =?us-ascii?Q?6Qa50tAaK4UlXZWtC7sdWPqQ1Slw8/HyCBBaw2VdYIU0Y+Q2j7CMEuFkicjK?= =?us-ascii?Q?rV01VvxQrmhI8rm5JxWgUW0tSLZC/vjil63Soy0aZwFNQP7RMSNDd1Ii9euq?= =?us-ascii?Q?LYApYz4IL5SBQZEh/p1pefnzXBG0juPZ03sQzRreIa71oaS2TLI+TIed2Mzt?= =?us-ascii?Q?x04sQwQWMZuvgiJv4NMjsS483VoO+ga+kYCmWFWeuNlOIKMjCaDw/Y0NSsrn?= =?us-ascii?Q?/w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 4xqJzALnbbxx614B1b11DEfhjI4zT8OXeSRqttNsCvXhNLiSZFwVk13Jeb+GNpYfg7dAlU/CCHCig+8xHMEw25YJZpcKYBmYWQFggwJzOKxkKeX5Iu2KWdeKOl8+Vj4R2s5O/n8DuJhpoeQNiCeevlNAm3idrMRnYwqAG97ctthcF91Isq7RCCHoSDJBo4/9G0Ojn8gOYyaysjhgyQJZQAh5QlQf9oCV+5CghOk/IknUJAuPKC1PtDU4Ahg5rRu4TTGRpKr6meideotn3fYPlZ6B1WLyy/B71Ga9bKnObX6laSBMD6aocWtvV5IOTcs2p77umVJpmA3KtNLBjmsadfVRFx0V7gjzd7RyNL6T2yOPbnWRPsfTLbsel31dNKOx5XDSrXWUn/W/o7Hi1GFxoVnQTq/ddNoOu2SxbMO+I3ML5Gx0ntM3J1zsP8HfmGGhmE7vYMElt3DDb4mJhv+Xh/wBfnIcRGkaNYdwv9yjwde7Aa7UgvkTNsHthYWnx19VQoWrD2qH0p0aX7qc5/K/qXoceNnw57k37ciNqhRoWH+ub+Krw/ev0JBMQno3MVu3vChSNvKVU8tC1lR7Y7+/1YSmvHiDjsA5oI9YXvzRg3tTuxkSVth1NnE1CIkZ6henR2KO4er5r3nnXorrfXHjk0yWjjY/e/jc5pTr5M68zcmPuV5Of33/VkDjNayPHHAj86PgZ+6GtKKVJoZ3Oj/vgRCa1jPR1ZUvi/9ckY1ezW+GSxftHu+s6CRgyUhRg/OGLwiOpBTYUMF8/8cPCMgvdaSgFEXwnlrTNQlTQwPhAffjHWy6kb0VdENcUSsVNODcAhFBfAGUhIxvFDFTS6FosgL7/N/mLd/krRX+2a0YIdlq7BnvlyN+x++H8XzSKmrHyqQMTgu46v67NTIhOGFYbA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2a29ebe-abf3-41e3-fed1-08db57b00765 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:15.4056 (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: FNSUg9jAvQWqqDCnIG0OmbIvKPNxnP3c0I0sHJSAraPiLd1a2WcJfn9lxfl4kFlzrrIB6rdj3QUR1p89DgRakA== 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 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: -pMsodl5__u1cw-MHwCjLQ4WtzyHTN4z X-Proofpoint-ORIG-GUID: -pMsodl5__u1cw-MHwCjLQ4WtzyHTN4z Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use MAS_BUG_ON() instead of MT_BUG_ON() to get the maple state information. In the unlikely event of a tree height of > 31, try to increase the probability of useful information being logged. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index a594f1d88d06..da441042ec8a 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -194,7 +194,7 @@ static void mas_set_height(struct ma_state *mas) unsigned int new_flags =3D mas->tree->ma_flags; =20 new_flags &=3D ~MT_FLAGS_HEIGHT_MASK; - MT_BUG_ON(mas->tree, mas->depth > MAPLE_HEIGHT_MAX); + MAS_BUG_ON(mas, mas->depth > MAPLE_HEIGHT_MAX); new_flags |=3D mas->depth << MT_FLAGS_HEIGHT_OFFSET; mas->tree->ma_flags =3D new_flags; } --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30BC8C77B7D for ; Thu, 18 May 2023 14:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231887AbjERO7D (ORCPT ); Thu, 18 May 2023 10:59:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231817AbjERO62 (ORCPT ); Thu, 18 May 2023 10:58:28 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A75E186 for ; Thu, 18 May 2023 07:58:01 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6Iv19012574; Thu, 18 May 2023 14:56:21 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=+1Cnymg/7mO2nO6mlpzfBpp4aHgiKpcmRjtkpJNYvLU=; b=Wm7+RcP6psDXAeM8Mr328Gyj44F5Ujrsdo/HbZhmXffZi2zhE4pTfARx7TfYVJOEuONw S+ZxK68wRQZe6ZrNHEsRZthH48HSWOgtFi7WJ109M5OeJ9ZxUgKiMu1xlE1j1u7233Ti KLX77RWq5xt0MkaPim8nYULZYGXqu3QxzqE8k+wJtVimo3WO3G+ShiUVKfpuR1+EbRqe avsfJMIB7ZFewVoQVZqN6Z954VICBjrq2V0YXFUV6OUburx5kq7PV0sBgTLD6x5Nda4J DURd/fDqEejJtqHLzcfbECpl2j2EdgwdtMaYaqrTKjIQcjEORFbWQgaEXW1bmcoqvZ7c HQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj2kdrgxc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:20 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDMtjY004153; Thu, 18 May 2023 14:56:20 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d67c6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hKphV88DHwmuTQIXLpPqtdKOc8PgYy1ngTJ+Q68mQhdwnIZvZFY9pYAD7gHvNTJ+h6znbj5AmPdQeL0td6/I6bAge66PQmxvTeVFtQp+vKwzYpWBiRM5h7YSh4nJ7xzpKoJbfRUtBRMhgDCqPwEMJtEN9fQdLOy3bnHpFVc/wyFNJi3RCPkI66DK8RK5bQhRXU5GBRd5z5D27sSQl9BLzX+DGpvb1Sv13gQWs2bkgV35lPg1cX0PCBPHBwXMP5rqIjMM2zKK7OtyAgIsYRiYBgBSEAyg5d/OU4OSmp/UfoyoL4ZGjejAT0Kb7D7LC62ICE19GgkFYsYFbFC70gRCPw== 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=+1Cnymg/7mO2nO6mlpzfBpp4aHgiKpcmRjtkpJNYvLU=; b=HkbI7rcAY9HAhyJks5+bVXxDIblaHEbYYhUWiDj8axOCPNNwbU6X4aQ8CWWQnlO2WA160JBk3fAaIqTcuRdHMu2U0GnecJwKv4bvt91Jax647dvPny04uyeQ016+AYqx0gp9tyAUxAvZmxP8UsYadqxyM9RS4LxqzYZoJeO89+4ADmGkkqWZQnGzcxB0Nhy3KvYLiWNUjAlxhrix60BKAvKOcyjnAZ1JHAO32x+e1/XODVPNZC6On09Sin6r92Z2N8v9KqwhYtyNmJK/0QSXnZNixTTRJqadUQiYHVlm09IAWSXw1fx3aV9G7SUbWAc4NEq01FHLxUwc5iW/GJvvZA== 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=+1Cnymg/7mO2nO6mlpzfBpp4aHgiKpcmRjtkpJNYvLU=; b=eoa1fJSok0ZweMopdFVzFu6/FUmYifE3vWlhI0FnoyxUiGS9pMEyVQnSWJp5u3IoCagvwSXAcCvmstt92na0v/3Ridvrj5+5yFS0u7SAo83tPtLMNH+HpQusiHca/E2WFII340VARA+iqS7fhGxNezzNED/mYkXbEQPDO0e+A/w= 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:18 +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:18 +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" Subject: [PATCH v4 12/35] maple_tree: Use MAS_BUG_ON() from mas_topiary_range() Date: Thu, 18 May 2023 10:55:21 -0400 Message-Id: <20230518145544.1722059-13-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0008.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d4::13) 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: c1fae5ea-11d1-4c0a-df41-08db57b00955 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7fSbEg9awxoHeKFAc0ODXlmPmWQ80DWHn6JX2jUIz7Ka3uAQ8DRW6NNp9txjWHK2aPgkUV5s278rsN7114S0hgGMdmcqjU8op0VBkdkgLc5sBYNh8gluMCvXxo/tosACNgydlfFzZta6UnfWYK3BQU9cgBEQXbgY5QNILClRt06LMJzDvJB/onPvswCqzm8DNtTxwvJkqfDOMtJS6dsPvmZSYytpw00hXDocVyTDpHVmowVNKg3nnFJz6MrHZ8dXBuwQ6Fd5YGtg0eQBGwhfW0yPzu/50J3o4FyU4u0B6+zq9qoyohzcAjxbN6t+p+jJTyCDgHWEItUbcZXSg8QtWDeOvA37M4XASGCn85m1TNpPXviH9WlVc2SZf3v9RsfPY7ZRqCi8ssY1vawmabQ89CxZCE/SyWUP9g4SVV88ouIIWib7OLthUH3QQ08JCzWHW3Mz70P64dnp14YIchrMmSqiNTKdu9IN8B18Pfs6Mbust2l/7Q/RkL9xaZDluAQ4SweY23JB4TAVDi27BDXAHqnYbmRPWb+B2w/CPG1r6T48A4ZPaKoGm3QgQzcJzc9q 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)(6666004)(26005)(6506007)(6512007)(1076003)(6486002)(6916009)(66556008)(66476007)(66946007)(316002)(38100700002)(36756003)(186003)(478600001)(8936002)(8676002)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p015azz8/5xBh4eRlQJTMe5RmYh3YNN84I7mYs+ceT4i9ltDTgcgGT/tji72?= =?us-ascii?Q?HX6LdSXuviNij7xlm2hmoPxvB1VLgRHvsAP4Oo8lT4ixkYT5pWj38LDA8N7m?= =?us-ascii?Q?MhGUFDVDrACT0fesyD4x2wT5EYP5AMEmRjReeMAAwj3gQqbJSObrz89qEk/b?= =?us-ascii?Q?0zzwy6n6L58vFrjWCwCtZBSOZmFa5+1rQ0s8TcRfKWscSJSo7WsZdsliPJcY?= =?us-ascii?Q?PETadDoqw4v8xMVtfMn2yfSXCXkCwyzoCxrUgfWpVEuGFHjwUmSQMD7WsUO/?= =?us-ascii?Q?DA8SGHK7uLBoluuXtEPZ74A1k1BGE9RY0NP014dTxE+0HfvfV6sK+0J8aa5z?= =?us-ascii?Q?FoBLx0ipGF0y/4oW8PZpAO0FNFUjXnaGwsfw2pNmDEbpbZrkRpbrUH89cvJH?= =?us-ascii?Q?BQYvjH3njG7/ZSDXDq74ioiyg0j2MSTNBTMqUirFVtBK2wNCiH1b3oB6bFom?= =?us-ascii?Q?N9eqYNq+3eE44ytaxS2+iJ/3IBMwCaKM9OFkZRJX0W/FhNFDI3WoRviC1NX2?= =?us-ascii?Q?W3Mo2B2afacKltjbxJkGtOWTnkvFJXlHnUatbfNXNXF+um95+dL+VGu9Mh6l?= =?us-ascii?Q?1cvbu69WQvMa0LOPdxnCZiXzF6f0DvbSmoe0B3JBshGOzcYPh1TykbBJxoxR?= =?us-ascii?Q?NQN+Ezw29ZRHLI2FuXs29aoSS2UIGCthiarUjy2PPvgeCotIYX+0YySZiLbm?= =?us-ascii?Q?ewhsXdgyKfKcqkyOc9RMFBce5rR6PCLW+ZdYeVWc9L+2O9uVsDT1H7V2rUGI?= =?us-ascii?Q?muHGMg5ksgqt9gEwpffiUw9obGcJxpHkfS0DNaWP6AJdnILS2sIxtHD4n6vT?= =?us-ascii?Q?aN81jCInQVGR3wuach354vY/0qzctxy34thfFxgKIQRckdigb3pwEDBfJaiq?= =?us-ascii?Q?jnB+5Qahz59MAiQ/uSriELWoizUWjGG9zhx3okESgewtnV+dH/QzZGqHfZ4/?= =?us-ascii?Q?sQgGkfS21GruAZ6tTzmc0T0QlgtXFICDXX6ObZ0+P4SKlWI4uLEmfAhu76xK?= =?us-ascii?Q?K2hlI02v5kCafd00fTMlC85m2NG754hi8UoIUJLetXO0RqJgZ9k3ccCdWLkW?= =?us-ascii?Q?8PvOvzFgphkq0HoAF3ZO9mlEZgJiwWSnSP/xNC6N7mHPO/VsDeA0lrnhcPjG?= =?us-ascii?Q?HIY0+nY98tWCaYkvyewFGvGsFXzFbEynokigk5gCpexkjxJqZtjQBgq1ajQ1?= =?us-ascii?Q?CUQzxT0dOBpjBVCElzgM+J2cL2QNy+Bw8h5VhqMzvqe2X/sc4nlO5S8Ew/oI?= =?us-ascii?Q?YWGnc+T1epikp9u8E8trVcMZh7DpTylBTHq7PyfZh2un41mGFr2VvGNhVBpW?= =?us-ascii?Q?pA+xoJNhvrHBP7N1UzFKef/1+jz0rvN4uwWTVzipthFpTFwQ7q5JrNMqndgx?= =?us-ascii?Q?p4lvaTJRPrpsmgQSEnC9XSDe5XFIXXoLdLU1GTljGupMKZh8bG62wmld6iZc?= =?us-ascii?Q?A+YtnXiLUU9eXZCI/hV0/Nk04AZkrmLY5cC8oBvevjniTogjn5ivExd0uA9K?= =?us-ascii?Q?HimOyMuObvG7D69Sx+0yYRCqohBVLBkKo7Dz67UJcd8j7rTA9D44UsJfdbzr?= =?us-ascii?Q?b4+B3UbqQ3a2c75jGWAjz/8VZ5NMqF96HK+NwySoLIz4h2cdHnB2MNCseSJn?= =?us-ascii?Q?9A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: pYhbGgMyRLAQOy51i9K/BeAcWlMIPohrK9AltZ2+va/01BdxSkp61r2VOWVzDU8C7R7fRTTyPXwognl6wtISRGS+sXUboS9+dLgwqtu98o1obd4SZSn1OfY9ibFD1jylrYg5dDt1kh9Bx0wmQXwAOAqmSAYHHSzhDRjHAbbyWBGAaq9FUDn9tetOwIHBoA877C0JVW+OJ5UsPe8ws79q2L6XcNMQlOjksQyMuque+7gxTLMJ8B09V+G/wF1jR5jlvxF/j5i/pgCKNs4ItzutiRGLEwLCnGVM3dUqjQ6d8ws2Fc8/8naBONvZPAclnokeMx8KRPr7Nueo/YaD/lk0KODF30mAN7z0xr4slWrtbkJCH/t61Kxp23mHvc0vabP+dQHQKQvpPb+9QJV8WAJjM9aWFWEgn8jttPhVljA4F4ArzXvXMd+Mnjuav1X0kEu1/DG/xlcniwLvnlIR3n2p+dCIAUhUkzWQcRdSK5WwCGj3uVUE5j+3Jmkzz/5O4PFRJr66TNUWExGlulDQoqVIZW/PLyImdmrehYFgnM7tpdzBWKL9zEagZORl7tu5NTl7ndI/Vw7/mcZqzyGV4hUClj+FjvDHdAyj9OviYe3d+x6aunvXFwTrbKmwwykJ4NvXpWaMOK82UQ4mkNkB3s4k5hX04G4It7W8VqzBLiPYB6gmB/woR+JOrkWmWvzz74o7KabfHJvCepxjmCUziCDMogdx9a/hjZMUAgK9VnhNOibJPmfzwefXDSHQpMP+iMtI6u6FIEa7WlsxkwKRK55I7UqsoYYG2KcJw9q8WhR/0ymNIwKEQn3cfHNkkHNsc5jnlB9DHvMuO3KwRRw4RwMj0u+b+k347ok+N9QRoeOoKpvHeyf4RNssub3pU0GJLS+5zY9MF+SOyrELPF1Chaezag== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1fae5ea-11d1-4c0a-df41-08db57b00955 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:18.6545 (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: Ru3PJnR2uupRfvvz7OinE9R9uYU4e5d/rjnvqawPBib5+Ht48vClmwcpVLL1g5FeeMDk6J14AVlsM13gjmFbCA== 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: X8EkVB2_hK-VlevvEUyDX4q6VxMad7mM X-Proofpoint-ORIG-GUID: X8EkVB2_hK-VlevvEUyDX4q6VxMad7mM Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the even of trying to remove data from a leaf node by use of mas_topiary_range(), log the maple state. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index da441042ec8a..824967872d42 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -2345,7 +2345,8 @@ static inline void mas_topiary_range(struct ma_state = *mas, void __rcu **slots; unsigned char offset; =20 - MT_BUG_ON(mas->tree, mte_is_leaf(mas->node)); + MAS_BUG_ON(mas, mte_is_leaf(mas->node)); + slots =3D ma_slots(mas_mn(mas), mte_node_type(mas->node)); for (offset =3D start; offset <=3D end; offset++) { struct maple_enode *enode =3D mas_slot_locked(mas, slots, offset); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40E14C77B7A for ; Thu, 18 May 2023 19:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbjERTLn (ORCPT ); Thu, 18 May 2023 15:11:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjERTLl (ORCPT ); Thu, 18 May 2023 15:11:41 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C8BD10B for ; Thu, 18 May 2023 12:11:40 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IrUj012412; Thu, 18 May 2023 14:56:24 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=3HZ3vbj+BcfPoHJq+Bw/aAHXzvJwU8JEeXwDTjw2Uc4=; b=Kec0NXM08McgcKvYxokypQiz5Mh6VOwzts7DxIICGDOSxb2/Ji9RfmPW8VkVWlq5hms3 4utRGqXg8wUc5SaedVgWgP/NUPFMg/sMX7eyz3dzjxkfKP77ZOSnQ/sD9GS+06ILDRCc RaxBl8uMBCUBJMIV28PYsgxfyeAwsqTgL5vr9/cGk+/wKqrDfsVtq54pyAlptl+DHoQ0 10W27STh3u/27ZxIaGpGPWh1d/JMzqqjN/oT8OYMnJ+9ZTP8tPQoqMwDfWrsDvPU+Y34 2Z8SzRDq/AedM+WbQq/QykhWaO3slTZ11AwqpuSOayj/705vgDdbiy8DkD/QFH6JB3Hh pQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjr9k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:24 +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 34IDWkZr033842; Thu, 18 May 2023 14:56:23 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c8bq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FolXvrm614XRmiKjY8/B+DjLPNmUBNqdOCdSIS46PpPOalmhxOyFuGVi9OiwOy17RQkQpnG1ES5NYgUG2yWYKXZ6GIcPxczV0cILWexOmv5lWu8/HVFr/TYvij46080KHhYjCKiJIFMYp072l6mhP1BE/adlEgjcb5Mw8EAu8hvz2GeOLDnx8QIp4Vft0RlLzBqqyM/KKxkZmuFHCd+fv5POMzlROb+7XeH3jLYavo1gI3LGKyil3P+SPyb6UwrUm20HhO1aKH1rsIx81mk2xdT88ikfyi7fp+9YtOzdBvZ2KzzQxcOdM/APwv44ETsI4qF0TFIsjXirH4OqIdWLig== 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=3HZ3vbj+BcfPoHJq+Bw/aAHXzvJwU8JEeXwDTjw2Uc4=; b=CRXpBuk1flYLCYs8irOCbpk7xf9N2zlbzm8u9BzGSu881Iz/wglo5ZfeY8qoGm4VbHKxgeaAyKSkpFvpndyIDdQgEp5oi+dt0YAAS0mRht1fuoI/BUcaODMX6COLvwOM0S80ltnC19rqRjZl8Ru1gm8SNAtNhhHYk7wnPzYttqe4crzM8KXEylnpgccEHjUGEkMp8oYf6Pz5ZXGLsy+NmfH4xzNGaRCPA0xcT5bB6vFT3sw6NbSWNBkX4lh+GJgwv70IaYoCBLF/PFyi5tg61b9v05M2yXYZF4YkUA+BSP93RUa3JyubARWmi//JfyNKjgXSt8E2JofyqkE604ZqpQ== 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=3HZ3vbj+BcfPoHJq+Bw/aAHXzvJwU8JEeXwDTjw2Uc4=; b=rzJIsnZOjzyMyETxBtADyX3KdZkjF8/WG5f0jtGOSpdwS7sQ37R2zKfGIXFEOBn48Tr0LZnVIT2BVSmgAyF+u8ZxxNjdhbMApSaYWcLbtZNWlbQZSWufyFovMnKh60sDtc+0i9SLLTvqT+zyCEsC2zejyuqfffDlQ2l5+zZFL1g= 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:21 +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:20 +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" Subject: [PATCH v4 13/35] maple_tree: Use MAS_WR_BUG_ON() in mas_store_prealloc() Date: Thu, 18 May 2023 10:55:22 -0400 Message-Id: <20230518145544.1722059-14-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0347.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::18) 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: e19e0982-f26a-4352-8e4d-08db57b00aaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0dRB1YHTU8ZTFcJHQlY4p6dyKep1VxRGOqvbo7kAFjhvqL30fsAcKwF8df4it5nifMCHIxT1B5oo4SVmNbM35tdovYQ36+scDbb81tzqVkCEvgsb2+5GAR1X+rcRMkOJwlpYRRJUx5ubshIaHy5UpHElfjRtCif9FY2N7QhM5mPRjbm03EKJGqwf8s8IaxkiEczQoFxelBQmXe0mPqumkKs7wX8n8SmW4kJB+sM7kpmG7mYUI/hOxcaMdRdmAyHmkZjleR6Zd+hE7bbdsgIH+AkusP6t3Y9lhZN5KFUKvnsDFOAykEN6JrCXa9qcjEPL0kx38NMlD65sNiGUxEmycQcWiABccN8lPHwF6OzDWcYaE+QNJW6igtl1AN0Jzbjc4/iMdkMUFJ/aWDv6g1zO4fcXdzAUG0vOHUqd6aN6+OlUp8tlvQLtNg3Cn3gRGt0C5zfDrg+hbYONyedLn8E5CdYxjdc7SsPBbaOMxR+cTUoMVWdgVD5QOXltBWgwqTanqIKvgTJu42Zehz67bn5Y9RV6wN5OXjxtjRU7/Mhz+MiP+UsSkdxPy8kq0dV6RVi 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)(2906002)(4744005)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ds10f34JKXV23CENgh/y5uOtbPcEOWqyWtPiGe2rLyBvFPb97Ooxy7D2FlSH?= =?us-ascii?Q?K0YS2U/A0kFu6VXGJvNbd14UY8C4qYxH6RAgan+WtGJUr5urcIPbeBAJXH0R?= =?us-ascii?Q?fRppWMBsG7xG0t7ie6AWmn88sV1TGuEjRXLzjks9NZ3cgYAP9nTe8yYh4Qew?= =?us-ascii?Q?J6LfafjUgaGH4bNZ3xf6PcMO5vLVpmUywnD9vBKdf/FXhFTzP5sBZLmQ/1s2?= =?us-ascii?Q?BaxHXfHZI4NqNwV/6OJBDlgssVddo3BGgZe/YcxgFA7+m5FE03BYhsoISI+P?= =?us-ascii?Q?n3bpGstgKD0/1CiB7X8pP2fhRkiZeHCfc+j+vWDtNkrR+llnsS5IWYPFhO7f?= =?us-ascii?Q?VArk0mXiV4XnQrEZFeK5CFNdVaqcxWEsGYo9f0CkaT+AEntLlJvNEIJFWozd?= =?us-ascii?Q?IbKYmv+Cc1EQyQ+Z3hDEFv7N/V01WZ9P1W4my8qmRxUVO/g3125VqIRAlIwO?= =?us-ascii?Q?U96TXoXtK6A7w6/wTUE7ENYICXZkHMKsZEJHQk6LMIzF6zGKfwG18iinKyQ1?= =?us-ascii?Q?in3+14g4TiQ1jvUdme2OLYzSkjfUt3QBiQRcc3hEKtAZxpMedQrWg45Ev4SL?= =?us-ascii?Q?GGiBgcyqViav0hs1sqy81Y+dNtVPpLZ7d3hqAy1o2d1F1FeLBLw+VcIdmKTu?= =?us-ascii?Q?BwLH9u+KvorP20wV2/jQ1/yVeAkXKdRWJO4zqohcJVSsS8eBbroa3w9IxRpC?= =?us-ascii?Q?/MT3dMVy6S9+32/yEtuc1KXlk92ywUBApIECWOZ3N514udzyqHQmaAZeJ0KM?= =?us-ascii?Q?VuAvjGZIXm7rTGRnvei9UiRCXt5lqjKhPDaFQZqZ3TrpxxsnIZNIW6hw1GEt?= =?us-ascii?Q?Y+QXJfDU5TEL7bjYKzMXZ351KX+RL8DymEMESaP5ePKAbCirTuUMABf4HYkt?= =?us-ascii?Q?u3CBZy/Ggpa1Zm2+H3gMJxZp6+N5iVWwgzdjoPvr1WdBFEjGiZJna55MwFuv?= =?us-ascii?Q?yLt77WBHHoYtdgHrHYMduOUrfLhJZgcFHniYmaXECqRN4IiJvrPKBbAoEXoF?= =?us-ascii?Q?9zkizmkbgc8WJZAXOYMgzO2actntEqcwmeDXbq0Fa+ncA1JwaRMlHC8LXYAT?= =?us-ascii?Q?uZw/9gmxWvVVxYRNSAv36g2/ezmZFXe68pwsQxequSZYgiPtorqvaROrybN1?= =?us-ascii?Q?Qaz44iT5BebB8gkJfJhkoezo9lYDQyGlYGTmolBuWRr2DePWdZTCSMhBvYGb?= =?us-ascii?Q?KRsTbOvHrAEYQuvJ2aeMv/oRFUji6DNKf/BMkj1gmNNT1227IIY/wC2aBeS/?= =?us-ascii?Q?B+3SmzsMw/0cXH2Bl7D4Z0JcFY4wkgkclDVzgGs1Can2QjwRkiFvDCZaz0wd?= =?us-ascii?Q?dI283mkQ/BX9S1T5LvOb514KYK1y0LWYgV0MEVd7VFEeJX3pVCjzVfEh5KEW?= =?us-ascii?Q?ThVflawGlgr1JHK3BeaZ5CgQlRgiuwJo99J3vldTTMc//+6JpeVKBcU7u1No?= =?us-ascii?Q?g9tT4OS4QiXmb6NH3VrorG7kMDtvcxAvj0JYiwI3D00bXy7BwabVpUTfv1lk?= =?us-ascii?Q?xq/ae6Mhn/8trjk+GbU+pEuz3YBW/hVxUCpLOjGesa21ysy3SntEdXLl65AH?= =?us-ascii?Q?CrxUiTCeR+KnuH7js5GFg264uDhoQeXnSHsWXojdan/RMzu+YHlgy2yUxWmZ?= =?us-ascii?Q?nA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Om/Xh4NSU6Rsn2OX+fw9Kb4ddSQJPpsOlQGfh1lteKiqP3UvEuzEqQTe1qiNWBlWCxilMQGzyd1zVCRvUbn03MBK1vJ6XfrNj1j/Jt9Gqh2R+AL9dQ5DeEeZQebQL0X/0Hy2HPvqyYkcBI6C/3rQExvAeJiqIAg5u2o/wzuZCoSwZoVj6dSvEq2QQUkiDMwPgtRlXgDUt6kDbWmf5EU/BzuXN5WqcCkPAqLNpAYGiCdTGG2+6cv5KPUQK/R3dNEdla6HbW5/jVbaDkMTvPqb9/KkNaKN3YMfOsvrBRZTrfr95WBlGLjbJqDgbLvP+RMIvDySZWewLTDbkrlFwiAAK6jwsKvCugn22JiA9WXAIq2I3Gcj1y29l2UDHWUse5tUAYFD4AEiFAQzX99XWF7vPNNKWwuekzIBxZVI7+ib9NqgXo7tAOZnYmbz8v2nlqGBv5O5rXW2/JTb1QJqhD5YnKJO3aj5IKp9RrBhs65NU1pVDcPKR3ZJ0QfEyWAlQD5V/I+eHy+fGjfuVMcMPAVkFWVm1xpgnfrck4rYaGk5XNtPfwrfB78pJUyDK7iejxEK2S4xIYItc/wsXib66gZfr2sBt2+Z+KSBzQ9cYWo3/e9CG3A9yQVPNrZlAaPYSxIMhXuiuxvfGEkQPsINLAXgtRtaPPCEPV5oqbCr3oLMZa3GWKOIvMlq5bnyROwLBwglmGAuoqKYBBVQUz/jS7+iNI4YAQmIjvg8/jOgxGDD9o3IBegw7eaQ3gnF3W2O03uIn4QmLSwTtVLo8Ux++ePIlxGlYpXKpuDYz9ReDHIIWoJJ2PUD9T+e1iDgNDXAEL+U9zohRr3J884MtIJE6WIgs5vywG3HLfrCpatFyyOEHg8944yHPnp5mAXJKa3oj6tttYnz9u5v5etpH/GxKeW4eg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e19e0982-f26a-4352-8e4d-08db57b00aaf 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:20.9293 (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: tE7Y34mP2LH4eYyt1yxuObywh8WR5cHt7wlifiCz8YnyOklgSHSCDCk4UIj/1DUscMaoWDSw8KDrr4zj/SxzEA== 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-GUID: JMHvIFWRoDdEUObgdpQx1OtigJrzvK8m X-Proofpoint-ORIG-GUID: JMHvIFWRoDdEUObgdpQx1OtigJrzvK8m Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" mas_store_prealloc() should never fail, but if it does due to internal tree issues then get as much debug information as possible prior to crashing the kernel. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 824967872d42..d5ccf7bcf3b5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5761,7 +5761,7 @@ void mas_store_prealloc(struct ma_state *mas, void *e= ntry) mas_wr_store_setup(&wr_mas); trace_ma_write(__func__, mas, 0, entry); mas_wr_store_entry(&wr_mas); - BUG_ON(mas_is_err(mas)); + MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas)); mas_destroy(mas); } EXPORT_SYMBOL_GPL(mas_store_prealloc); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3FF4C7EE23 for ; Thu, 18 May 2023 14:59:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231921AbjERO7U (ORCPT ); Thu, 18 May 2023 10:59:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231841AbjERO6j (ORCPT ); Thu, 18 May 2023 10:58:39 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6125E1738 for ; Thu, 18 May 2023 07:58:12 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34ICEtDO010660; Thu, 18 May 2023 14:56:26 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=Loeg5K+AxFuoMDuc5bDgd5qopMfTkWVEkjprcxbfs6Q=; b=wyQWfPo5jw+2YeoC9iwo/3lMYObpL0nKbARz9rosDIYXthg5Ky1n/LjF0g42yczvVA4H wFcItkynoCwBk5eZsClOpjMv1rz1fmoPWPslvt9au16yXy1SaTzGDI7dLiqmFvOGvWc0 DvVHspAVpyevr6z5rcM3i/dtjobGcIS8b8uozuSi/eYxD0oWepUyjmTbEfmaE1Wt+8OT mYzdIPqgKYog0h6ct2p/Qlw9EhGAmOqDNx6Qk4HFuX9OO6RFUZw0L96Sial9S4U5QKf0 qDVM4h7/hZy68FbHXmAn19sfGnOOonQg8NKe7e8H0UlJJykFiQ+gRXsMnxK3Z38Z65rB Bg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qnkux8ak7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:26 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE4GjC025022; Thu, 18 May 2023 14:56:25 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106vm9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jk1e2pUDdctgicmGdak76FX1biAeBLxoBXN4Z2txfuWPxgtbgWEw+eThyvDwzOHx+6IHfZRqQQvZS3/7DGlUQB/gLWqkMGI5AAUdR1co8FkgGC5+Ucekbb2MFE19paYZ6AFOGUE9qz5W6sCosybrv7RGPIZl8eTxD9o25fqwKd569A+4m3DwCuovXeckqymzaEGwwJgFHC/3jJXwNJkuVmkJ8+C7pzD6f4gs71Y8UvVWkYncbe8sDn85Qx2wN0rOSfeLEnFV8gpeOlmMP8v8hVaKO0J4s4tRGVGZSh58R1FrRVWAfueivfjTv5j8w+9M/DWpUC42fqWMWIpbL0XfPg== 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=Loeg5K+AxFuoMDuc5bDgd5qopMfTkWVEkjprcxbfs6Q=; b=U/0NVb9KSUSh9gBjeqhJV9F4aDP2n9vi2zFqKhj+Y/k3p+EJ9TojvruSmTJ4e5bIB6VPcP8FXS61dJnk7sf98OMQgNMJ4cafto7WUEQWc7Hr1ernzjzRzMDcPlzOKDCueZpITCsnBnk4hdJrtCCvBjhek52ZRVv51rm43VqCzzSWCmUMP7rtEW9GTTKkZENULm7rw8QpWALB6znje2hcaoxzZKD4l1QYY1mYF1oaYqKmcUSTNhJjOEyMiNUNiK10Pd+L30Gb6LhlRcI+SjAu30p4yRc1Z7AZXxJJYsrbP9pJDdGnMdQKZaXGj17XhMtaSL1CC0ONGUkyzx08EFdw5w== 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=Loeg5K+AxFuoMDuc5bDgd5qopMfTkWVEkjprcxbfs6Q=; b=zpn7uxSx/vqHUYWk5n72UYwpjhy92qbM5X9WlNXvUGVhAHuo+H93Y1SJ5v1m6YlGhq8QbOGGvm5vIwzDmUngPvncovxUppE0dZd5QtjHPs5KDT8ckQLvdTYTT7zmhiX+x3nkYzYSi01/yEOZ9C46RtFbRiznfjG4NgyDQPxtVJU= 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:22 +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:22 +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" Subject: [PATCH v4 14/35] maple_tree: Use MAS_BUG_ON() prior to calling mas_meta_gap() Date: Thu, 18 May 2023 10:55:23 -0400 Message-Id: <20230518145544.1722059-15-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0108.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::7) 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: a2aeb6e9-7406-4004-05c4-08db57b00bd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HWXZdMbxWCy+NY4XjImZXS27mW/r28Bs0fABoO2U0SJr4+bt+Az6iRmFBTfP4i6lOnXSB/BImTX2b0sbaf+RNP7zrg52PPeSL8UDDNf+Y0y+oShCyFOUmLg8q3k8/5yWFCGyfKHbIPe0uScy1uugDvEyIscgLsasMmfzY3omGq5aIqI7MixqsDIVp1BAiYrT/WiCe3zDPgqSu2t3OacKyuE2jfm5P+F9wGwgkSI1RRB7CiGNWXw9NoLq1fZm6GOAyQLOwkiIBCTdNoHaoa9DKgv6tPuUCtMWdh2BUA+aLeJ83D7PYFsZJZRM2lY5gvkRE7DWtjivrh602veML1bGec6IPwH6XfKC92h+Kc7uSnFgbPPOcwBu60SUjFqACUf0fT9yhqMkkmCI8jYaRUmnnVhGIyTEEHYdrpZibmQjAEheGFaPdBCqfA9XJSMISdcbksY/euSBBBc/pBHGRrwJtQpMY+DkRyacS6phj9BS4+HNziRv4IxYICiQq1JUzgN2d0XzIlzJPh3hh0f+CK0O3mklsTZbYnX/iE26KPP8r0sqWyNcxCrK6Geexci37v15 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)(2906002)(41300700001)(107886003)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VVWpvfEsmBpmTEuKp2WMeWipyU5IXrFdJcz5uvY6RCrwoFbeSPoXHmMHQdRR?= =?us-ascii?Q?NV+V9YlEDW7dA5uuHieuK8PvbOepGePo5LGhdd/z2fDeTHu84v/TXq3mpGhE?= =?us-ascii?Q?QMGMeA3tlq8bCK6iMXJKHlZtNjx2b6xCgnIS1pfmDvcGxVqp+OzEoHHgDlCV?= =?us-ascii?Q?yd0uPurUml0IypNR6Rt9dfd68lThgtsXFb9ZecruYW5gCWZCqUm9/ZitmvU6?= =?us-ascii?Q?gmSwtvxGySxIS8K9lD6PDAe64aqzDizETFL5bU7cK8VWSi2GgtJhttmYXnrx?= =?us-ascii?Q?NZtODL5vxqbuULy0IwHOS7xntEuslAXRoCUTqWENVpf96sSpruNLg2eujSb4?= =?us-ascii?Q?IqYPbzkHgnwwIufeG6tVjdQ+fi2CvRT0phL335x0xWSXxHEsYM9fg7IUuSlU?= =?us-ascii?Q?FxQgGtQZ6EaRe+mPD9ngg2TuYeMUYXxjTkDDZKRVWYIdH1qyKVutTFhAZbgA?= =?us-ascii?Q?0zxLxsKYE1jnBP+nkk6WKv1UnqQ7uyN50fH9ksqKJ5WEqkjdmd5/1XAAmtXV?= =?us-ascii?Q?Kd4S4cx8XTBv8z4qWd4dasd98Yeg0Q7uZGNvRSfBHXWTEHqEv0fHdfPXOEwl?= =?us-ascii?Q?Jkqlr/sMmOJTrbS3IvJoWj8lMF6tRmDFvSb53yDQKY5vf9FMOADuihoBXNzQ?= =?us-ascii?Q?xiEbZLLqCLrdNk4EhKGYObqXZLEmLW2vwOQyq+k9IRVNH1Eg5iHSqa8zEzgU?= =?us-ascii?Q?sXGzviZunTJjWU/Iost8aDGp1mVwO3F1DNPiIO5sRq93BAOUVuf1MybB4qP3?= =?us-ascii?Q?MTvm7VJVwEI7VX5R0ZjNlphj3j/vGsp3Ro25y/Vv6YUB92DSq/wUfODZF+Dl?= =?us-ascii?Q?3ZpuQTFxtv5PW0jo4gTp9I97C270dppysneo8KgaXvlitQ7FTYBds/KUjW7J?= =?us-ascii?Q?8jkC+UEQ21o++pwiAZGB2p/T60ckDQw5Ug1xbHCNUWO/ynXBjygmNGiNGNtM?= =?us-ascii?Q?uuWSUwNG0QaD/+w7iyV23exbOTz5KeoJCDuDCwPjVd3CBc/d1h48iJUDCFf6?= =?us-ascii?Q?uWlcSmT+Ox9UFfpoyjQhOROkkO4YBolZFpcQlbmAlnn5295truEDOxMFvBlt?= =?us-ascii?Q?xvxLQgyFo81TZZ+eOTockJdbZIQbD5JJ2qPBpDGu8E/qBIEMsr0GRAdSPm1E?= =?us-ascii?Q?b9T/adrd1SrX9VAtD45HOkO43Do/xj98wezsXjVwtzWuK1GBiKtfQIuiy+8i?= =?us-ascii?Q?PbsFaGOqZoFGcCZCwS6ze2WMMvqBU8RbWAm/llUrX3Kebg7TshDFS+igDGMA?= =?us-ascii?Q?jXWh86l/DW+qbKFoFn7x5RvyfbPA8ckR7Owc2bIP3+AmdfmpMqIqwioG583I?= =?us-ascii?Q?EkDG5iS0p36lQfUxNmjiEtscaQfnLISji+dzaP8bysufZcM8KVrz4WvYeMSh?= =?us-ascii?Q?KnCtdiLitKkexvC0R3VF3bmLzRNqLgOsZKMzvofTG0SpAM6ACfxUrc9UpJM1?= =?us-ascii?Q?mu/wMgR2gKLV2fv0wx1JRUBd0zKbkvvDBTYZVBIQNC7aYOgYhfM1WLYqbvpk?= =?us-ascii?Q?CKJV8XBqJQJeVZHFXp131TVaskisWCxq0P5RtSOW8VuLy/i9h/1TQjc+5OM+?= =?us-ascii?Q?wgC8cBi2ddmPWAqWARoZc+6EqyCiuXKNGZU9lYDu6XvbGA33BviQEKt7qbol?= =?us-ascii?Q?EA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9sEC34dFuew2JZ4yQ8hNGfexZxdgbV/AxIkjDuV2x3S/oInh0MjzAL9fUnwiSuVDiOx57aIA/yWAu+yXlO6oahSWO+pGoNAa7ENh72tJao1t2ClrxVIllk/qCqO7g+u6zWs7BVJHEqJb2F3BUi0y/2gt45zpDPw3Lw3IWuLfgkapy/fSGaYG5Wsa4r1dHLcnsP+yNp9EPyYjzM7CTX9K2Ln0QOb0fk3SLzdonj7aTxSb1ea1p/rXr+c5TDSStSX35PySZQzDZi0sNoJl+kJrx4hjVMcqDlPRvug/S0uQB1hUJAys32rl3d+knFEkOayJZhwuBcX1Nymg1XvI1s+gtLAYvnv6DCn2X5jOZJnjTQTw+wlwDYRnY07OfHT7CkSgBL04Zr2S0n5+Q8yyM3IdcoFlt54xe+zYj2qB3eq/N1/AYlWu42XWawhcGjJ2DHUxygAlhznUkIyNigv4WHkaLW+vh51h3+A0VQSWhjYTiNiiyD+AYYpZhZYMGgcs3XbP09SDhUO+sSou4vVYNVlJzqPEdTnPHeLHlbezV42PbEp9AdrShNEjNGZnfVuK3LIsimnmeiZhBBHrfWO5slvB9H2YWg6Y+xFuwOlIOXmMolvcgp5r5RQGjBs8S+lGJapiSA5Y4+kuqSn6gI9aZ3TZUBY9QDOruehSKVzANsQ8p3NcUf8293LHC2fA20LG1SCbscPiULaXaMRvh0PshsgdfCqpijblQuNZmOleR6yZm5RrLwcWr52wfe5Cx9/6BDuikLw1o1xA6SnQse8+AF6oS0bbyrnlz1SkLNTiML+MiySQH5Bl8DDeE5omBUvCmW6im72/vm0L7afUwN00clkPG3oJAx0dbjLlriqi2lgA5iBj3MEQ3OIjG+V4KC0y50yTqqChuB34J7a5003UnI56nQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2aeb6e9-7406-4004-05c4-08db57b00bd0 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:22.8113 (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: HWBpC/bGZY9Mcd7Aira1dXfUKpOi+HtEkgsNZ8H3IKa551kLKZeBrwvF3US0Fgln/p7e6wc5DTRRntMSrfUsmg== 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 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: hCMlzqsSuwi1bxTbegoNwJmik0KNaLfn X-Proofpoint-GUID: hCMlzqsSuwi1bxTbegoNwJmik0KNaLfn Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Replace the call to BUG_ON() in mas_meta_gap() with calls before the function call MAS_BUG_ON() to get more information on error condition. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d5ccf7bcf3b5..d7809a7000c5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -963,8 +963,6 @@ static inline unsigned char ma_meta_end(struct maple_no= de *mn, static inline unsigned char ma_meta_gap(struct maple_node *mn, enum maple_type mt) { - BUG_ON(mt !=3D maple_arange_64); - return mn->ma64.meta.gap; } =20 @@ -1628,6 +1626,7 @@ static inline unsigned long mas_max_gap(struct ma_sta= te *mas) return mas_leaf_max_gap(mas); =20 node =3D mas_mn(mas); + MAS_BUG_ON(mas, mt !=3D maple_arange_64); offset =3D ma_meta_gap(node, mt); if (offset =3D=3D MAPLE_ARANGE64_META_MAX) return 0; @@ -1661,6 +1660,7 @@ static inline void mas_parent_gap(struct ma_state *ma= s, unsigned char offset, pgaps =3D ma_gaps(pnode, pmt); =20 ascend: + MAS_BUG_ON(mas, pmt !=3D maple_arange_64); meta_offset =3D ma_meta_gap(pnode, pmt); if (meta_offset =3D=3D MAPLE_ARANGE64_META_MAX) meta_gap =3D 0; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D188C7EE23 for ; Thu, 18 May 2023 14:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231907AbjERO7O (ORCPT ); Thu, 18 May 2023 10:59:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231833AbjERO63 (ORCPT ); Thu, 18 May 2023 10:58:29 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65DD51717 for ; Thu, 18 May 2023 07:58:05 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6Imq7012468; Thu, 18 May 2023 14:56:28 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=4MZtDw4J06RcQX0cknN/oceBJwsIK35YZxd7Ng4DHGc=; b=UTPS2Nug2EG4ACSLkTFNvodooAe8r15AhwAV/HfeM4h9WbvIk9sAIqSWDmB8bzgIuOrd nx4Gjt9hRr5Bu/u/rbmUEJDE9XjgjhOAFKiNjEhbr+KSp5w4PM/6X5k79mHcemImmIMR 5af738nkhZCDBh05Dj/RXYCZi/bD9I0QvJQd7pzXXVYr91byP73DV6q74wtoJYIbphSh NMpUxRP2sjwMJ5IpWzQ6pDBqv7/1AZkpusJ0jRMoOt9jk/w40HOgvin3yaE/+VuPLktD BFL7taiCBeQ3gXXIL4R8CIDEqWkS4eDRnJezOIU7j+BAVze7Wk6VdpISlprrReJhRHr9 Qw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj2kdrgxt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:28 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEu7OT040086; Thu, 18 May 2023 14:56:27 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2104.outbound.protection.outlook.com [104.47.70.104]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mpsn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D6ji0btn6nba4r2FoksNEv03LqUmjTyzh+mesX7yIQS4RheQV1zqls5tUuyw75A8yjT+l0FStzc5kIAn6jQsmG1nBWs8+lZoyKynXLUBcAft/H+w1VaKXLtNCvUEYLvym944iGMgiOc2xQjplhwITXmW3HNzT0tA+yEcdf690LMIZcXf+T6m0EwIETxtdnUyWasBMMCCx04udpQqEBlkC2tr5uZ33MrmxuPPbyEM/VZnYSOaOGuCeL2XCLzwL1k8wmP0+ihCwFbzf3yHMcgOyyQTHgTpD+z8zYYUxWZksJ1ODe/HrDKF5p+VBFdLwy9y0VGfVYHGQ+2P6wiydsPtMw== 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=4MZtDw4J06RcQX0cknN/oceBJwsIK35YZxd7Ng4DHGc=; b=DojWTmu1jukOhwfZWhArcPjKfYZrpx0XP5qg+JC4AE6GdHsh57Mqd5PCicsPvrZPCETlCVQBYtHw7ehuYJ+VBdPd7s+OcX9/0mctJ1HWO+0IpFG4cXyzRyjdqnrxU24MvXNrdI/OQ4xjYTCYlPGX2WcQoH5088L1Zcv4o97b/jI2X/eOavEnDEod8Q2WAbX0xfSbSf36otIb6qEJrAjJ+pEjJp9tk2zEy8XdTnvLdnwOK/Gj9dBsjGn4FNHHNdZxK6t+EFaGm4U92tQdbabmFh/92dxt9IB21uA3FAGPQ2A/LtvZyM7MzVJQDGbp6GfGNqzSZfAswwLeTOzHme+IfA== 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=4MZtDw4J06RcQX0cknN/oceBJwsIK35YZxd7Ng4DHGc=; b=ltpZv+K8nTHe/OTBMJD1TnXVgeFaBOrTb64lX885dnPfglFCV5J7sC9Bytv+hmbJQKee1cpd7n4XceM0l2wPFdKmXlg4QVn1KoZm9wEN8kHA+qfQIEjnrVdck3Yum/n9QQZgUWQLFXgttaBXIh+3uueLXAyrODoBwGtfXvJEPgk= 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:24 +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:24 +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" , Peng Zhang Subject: [PATCH v4 15/35] maple_tree: Return error on mte_pivots() out of range Date: Thu, 18 May 2023 10:55:24 -0400 Message-Id: <20230518145544.1722059-16-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0110.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::6) 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: 0e490de1-120a-4e1f-41e7-08db57b00cf5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HK08ziRtqxRwF91OAShqgIea22V+zaE1YdBdpF38+9CYmhmWb5DUGTLFSk0Dgw/Xvc3vpYkKlCkm0cboHSkuH4zFERo1naGFzdOsLavt8DnPLochgdW3LE0lQ1ibF4By3/YiLdBbzoQJmtHdr9KfhRsdIreRIwzvbCQ9qW/P6KuomwffyA7hHwu0lWfcB+FFkd6IOT10zZT8Rvw0riUsgVTsaC4GvxIswUyANuoYVmbg0COzYXUmmlU2NFDqMIGdDlGssjofoITpn7q88/bCeU0RM3jOpwXnfluaNNW/DiKBH6hV278FSWSXKohR4v5wC/AOaEVv58Sa03AZN17/ftDlxCwU3DaApYMPnkd/sAcaVfzhAOdi+owEZcFezAoguuwb6OW8JfTINouf5NONPVcZ9mSttKjsZTXVGUYb4rpJbhrwZo/5QdWiAM8G/6LsI1/yiLXvvvdwecr/dDYY4mqXKGebDcbh91vnLhKYD+m5WtOnA3kF6qhgiadD5k87fDAo3vz/Tf2RmzoW3fKcIWwVgchUQ2CbNvVkBGZsGL6PWy7n0SnxISQkpD/mmgCG 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)(83380400001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Cbzn1kSabOocGsfkNJFP7931oJQxQqIAFrnvFG5PkH31JSQ3fe8RTHNnoMGt?= =?us-ascii?Q?J5Qua0aDLxtrcRPLiz1PbLMVVlTrg/kp16gX0gOYYtVtDyS+2FZUEMG6z+uU?= =?us-ascii?Q?/sFlCGpvfQSCSAMpSwfpgBSXxm9lS4TRTHEVZ4mVgGL2GczAI5BcIkTPZctD?= =?us-ascii?Q?H7jdrc3eFLmYWjDS42CnVOpZTXAyoXSIhVr9d64srul5QDhMZlfuT4lmaioG?= =?us-ascii?Q?En64R3wbYbysR5BOShCSOYzM06dg47AYuCGbtBU3fQZzTBTvDGvwr6smgpnh?= =?us-ascii?Q?78tzfnH25lRHUnujbjxaEA25HKTSBOcrz5S5IudUk2FrMXJ0ijkELqVQriDT?= =?us-ascii?Q?5BlPlTyHla1zNxm7EbnQ5HcvIigCu7m8DDD99wSPlJPG33JczXDnogT//WLg?= =?us-ascii?Q?aLmKNEG83LFnRchMcd1P1ORqGl38nBLkMEJ0cj//qwnKp94cQbNThec6b2Ca?= =?us-ascii?Q?7kqM2mnoIMCjg6cpbC9wnfezxL0rEA4lU51p2P3KGO7ZgFb2UnhTkA8ySBrc?= =?us-ascii?Q?bOuF8615qFcjBf4vW9WQtBQFhZ+qVDt79ggfqHEKENP8bsbF0nRQZ/IGNyO1?= =?us-ascii?Q?hy0P9v6FYDimyQ7sxT8UyO9AGhxtdeLfOn6BSbOM0fsgg/KBosMB7ZZkSqRD?= =?us-ascii?Q?1dP6zRAZL7obkEO8URS3ShdK+6Gdzh19ogGP9jIQitLbU4pVkVEqUMuk/vTq?= =?us-ascii?Q?h2D7oLgWAiAK2IZKBKS/GFG1lUqD9Qv6Scsv0hLyu9aUcw6ucI7WH5488S+k?= =?us-ascii?Q?RIRKNbbJv+CdeZ8fU3oSYlNL+LMdfROt5sMBNMCCbQBNQJ0vStH3vPIsHjRN?= =?us-ascii?Q?UBfPxe/prg+b+COtsKjYCHfJu1MboNgAJcF+A07gXIlmDBTGFqwTek3rz/zi?= =?us-ascii?Q?36Nkf25bJt+S2ILxmvUe9F6x2Vr6MOyb9umqp4L2LPaXblsrXQkPYkt9vgkp?= =?us-ascii?Q?m7MTUSUyRGTJN8PfoKKDpUUfHrg3QfnJ4WQ/bR9V+m5ZywqSE1VrWv9AQzPs?= =?us-ascii?Q?kvogF0lslz/VE/sqKGBcU1gCkDOKY934kbac1PyoOiurfr+8rro6Dx7oPp2/?= =?us-ascii?Q?uNbE8DbXAgcdv7FSrEdawhdpSELg9FC1t+H4vkAaFexQ8xhn4+v4pdTlFnpE?= =?us-ascii?Q?Uzrf/88pV6dQb2APPS7lJM2Bw8slw4Ag3J+hVc4h4nKIMllhP8Fu+c+r9A2L?= =?us-ascii?Q?XWoTWnTDBBzxpjdmn8QxQ2uKJpjige5i1FyzhuARFhrFumc5OvrgvmpovRkx?= =?us-ascii?Q?UsfFVTWOqLDguCOuNdYphw1zgU1s0S7bg+uuMFrQm5zhbEK8Ml/8Ird4xFeh?= =?us-ascii?Q?UQG9/Pj/4trkLXpspDv0qvI4sLrMrbK18O0zUkFC9IbFsLgAZUHVpuhcY2jh?= =?us-ascii?Q?l/l/yiCj8QwUPquIkPBMpO+W38Sj1UJBXl1nv0mmOy5gPfGP33ieFJeSgZVe?= =?us-ascii?Q?LpNxF5uxon0tiKNEZBg9wwmJQGYDFNV7tbfB01Cr2mihIA2dHlBg1+2JcI6S?= =?us-ascii?Q?dqoAj/x2mnoKPjTOD7ehvBigpLgK7oHX68cZ5nPlYYYIo4H+v2HD6vVce27e?= =?us-ascii?Q?THfqQK2hS7k4jMF3k+FT/a4lAlmz8LUah+hbaT5RpNT8RrW7eqII+Dhlu44p?= =?us-ascii?Q?eg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?nPHDj2uhe2ZEgZU719VvmF5bdI62Flf41ivoOlW7FdJFVHUy4j7yXqIxAWtW?= =?us-ascii?Q?l56kn81aNoiCEe5tZWVuC1wkbKtS5fEwTz5YchLBXysldHLaQEhBrQu+bj5n?= =?us-ascii?Q?DkzVt3UutbsJ9NoEjahshQ8lzNdtAf6jeb0zX6QCDLuriAXUVCI4s9s8IPlx?= =?us-ascii?Q?sVlvwy9GAt1vpHfJfgBFcva5sGEJefqPULTQFhCwT9RA5nB3D8RflRvwRuJI?= =?us-ascii?Q?Cj7HU/VE4esJ2C7lF8Eu04G3UjBM9LNfobJVZIzVWP6EEp8v5mv9I1U+zuez?= =?us-ascii?Q?cH4nvNnz0G5dqUL6aOxWVg+4gKDRZJmHlaVN/9lKqaUgzxQWkfsCRoF1Z0iD?= =?us-ascii?Q?3q1VAP3eqGbFsXyf1ekAJwi0SIuVjS8Oea4DHMt982a3i8J5MolhxPxa44+H?= =?us-ascii?Q?RRwv3LX2CKBCt2CSMZ/JXn5cs7a50tx991Mt0n7CgcWMGe5E6rHW+5d1RWOe?= =?us-ascii?Q?EHA0R9TlB9njo1mNGkPsfkiVCjrGXX49aLSSod/xLG5pJuDbomAIYpbKRhHW?= =?us-ascii?Q?8wkg4gxaXvzSIwO/OeHV6jx99gCia/6Qzh/2XuIT2fjQzkFn7cRJGaDMTCKW?= =?us-ascii?Q?TL42njSKc62Y/Bck17ri8Gc8i90tEIgJZApl02FH7nyIZuV5uh/w4280I0ZQ?= =?us-ascii?Q?S8CZhy2efFpZ48rcYfOoCTSYyNB5ripZR+lgI5Xjh2FdcDcXjFHmBQq8BAAL?= =?us-ascii?Q?jAUIzY4J4gGIUTMsT1nk9kFmwCJd9dt0L6vIXbonfCb9oK+keAyrhQuBnK3N?= =?us-ascii?Q?Tu9B98xLNA4QvOdmRGyyDm4yLg1yPoGBGR+2R0uQP+I0WPQzLuAnJiUqFUZ9?= =?us-ascii?Q?yzABdvDLtOrUmabaP1SpyDRMfMyjAa8u/QM2izYq7dtH6fmsj3Ha9RoCMLNQ?= =?us-ascii?Q?pH2a0RVknLOBqjkPLA0rRi6inZPEITIcUD9D/oc9yVo4d6yxpgqlVPL/GWSi?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e490de1-120a-4e1f-41e7-08db57b00cf5 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:24.7288 (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: 8BuU7IjxRUEzZ0Vk9JUDPnyWEFwgps2aXefEkPcMBZr2rgA0vsQ2FVNteWkcmg4G+JcmTDX5jcJgwP9rjCWSdg== 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: v33UtgKjWn_jLqCX8-aT7Wi3ERorXtG4 X-Proofpoint-ORIG-GUID: v33UtgKjWn_jLqCX8-aT7Wi3ERorXtG4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename mte_pivots() to mas_pivots() and pass through the ma_state to set the error code to -EIO when the offset is out of range for the node type. Change the WARN_ON() to MAS_WARN_ON() to log the maple state. Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang --- lib/maple_tree.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d7809a7000c5..9f3784f4a5b7 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -663,22 +663,22 @@ static inline unsigned long *ma_gaps(struct maple_nod= e *node, } =20 /* - * mte_pivot() - Get the pivot at @piv of the maple encoded node. - * @mn: The maple encoded node. + * mas_pivot() - Get the pivot at @piv of the maple encoded node. + * @mas: The maple state. * @piv: The pivot. * * Return: the pivot at @piv of @mn. */ -static inline unsigned long mte_pivot(const struct maple_enode *mn, - unsigned char piv) +static inline unsigned long mas_pivot(struct ma_state *mas, unsigned char = piv) { - struct maple_node *node =3D mte_to_node(mn); - enum maple_type type =3D mte_node_type(mn); + struct maple_node *node =3D mas_mn(mas); + enum maple_type type =3D mte_node_type(mas->node); =20 - if (piv >=3D mt_pivots[type]) { - WARN_ON(1); + if (MAS_WARN_ON(mas, piv >=3D mt_pivots[type])) { + mas_set_err(mas, -EIO); return 0; } + switch (type) { case maple_arange_64: return node->ma64.pivot[piv]; @@ -5399,8 +5399,8 @@ static inline int mas_alloc(struct ma_state *mas, voi= d *entry, return xa_err(mas->node); =20 if (!mas->index) - return mte_pivot(mas->node, 0); - return mte_pivot(mas->node, 1); + return mas_pivot(mas, 0); + return mas_pivot(mas, 1); } =20 /* Must be walking a tree. */ @@ -5417,7 +5417,10 @@ static inline int mas_alloc(struct ma_state *mas, vo= id *entry, */ min =3D mas->min; if (mas->offset) - min =3D mte_pivot(mas->node, mas->offset - 1) + 1; + min =3D mas_pivot(mas, mas->offset - 1) + 1; + + if (mas_is_err(mas)) + return xa_err(mas->node); =20 if (mas->index < min) mas->index =3D min; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 220EDC7EE23 for ; Thu, 18 May 2023 14:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjERO7R (ORCPT ); Thu, 18 May 2023 10:59:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231835AbjERO6d (ORCPT ); Thu, 18 May 2023 10:58:33 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA8001725 for ; Thu, 18 May 2023 07:58:08 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IoeR006514; Thu, 18 May 2023 14:56:35 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=AhOimAGqg4GYCjDL7HXRxE6yLE8kYlwv7NuKQQsWpnY=; b=m53dTDfcFuVO1WHNG2hQG/CI9cHjTnVSdu8D1mnmz/Dt8VXASMhBsMBgcZnlzoXoEYc+ HthDK1cg6d68enBogNuh3inI+zSp+RLg0xj7GVLPapzI3irYcCbJf7XhwKVBddHW8vPG 0nTItAuwVTm0K85bvMoHud3N5Yd6NI1h2ZWCQKczPr+qjNf/f1HAfgXqBSjOLK+JgeWT HUsMnCq9vLD7oO6YA/ax5jMT6G0grHDvFFtskapsXNGrKRLdRWyLxNrwRZQInEiPb0T1 1q6vlhmMkLRnxsIFMYzT3BvwcTbSSqcJefVjMNWSzKqzzuejy9FwkYwsg+RdV9LrUXyt Bw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj0ye82px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:34 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE2jRs025047; Thu, 18 May 2023 14:56:34 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106vmg2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K2mU2vKrYO1S6FzRw3TzNX79e7C91GV8wF82rzbx/TBb1rzjh6QCuYSsq4s72mG/UxBiyyr+blbvV61oilTwM0xsLUwT4Lpn3AhcffL1bmYDfgWzOFQRHjgJTRRqkd4SpukVWYk1hGwBtdQ0OlU65ymykfVjv9eYVbFcHqQyhatG/QW+h53lUw24Nb8NDqMQ9X7LZ6Ggbowo7TUyje05Duep38D1/80lNGyBm9t9Trlfx1OOBWhIWZ3B1PSMiC+t1ZpkLX4n7Wlj195sywfKnF1NA4LoOmhLTwrZh5dHiIy0hBR+HgZOVnsExN3DM69GZcvHcpf2B0ca7SSeFvVo6Q== 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=AhOimAGqg4GYCjDL7HXRxE6yLE8kYlwv7NuKQQsWpnY=; b=F4J5TWW9Rj38hg8f0rPBziSyLRQcMGri82nNVu98nTwe+rsUlyFhDG2MknL1UL3GDlzTrUZkBtb6gGazLmzs00Vuy2csiARkbvx0TmEWtyLcRO1qNXCeAe9bfRgTKcD+wTlr8MoOZt6vTYH1Z/lsbfalY5bejHWwqcA9/V3SOnzif5ydA0qTJjjebKOKyozE6VRRIlgogpt3mzILCP+yTDCn2XUjREdsomX6sMzzsMvl+X6e0Q9HGoprO+TWh0q3IrYia4KK9Y6VlmQvJ/YtrDYF1slJUaxp6BtsimlS65RMnAXh2kb6PFJ98gDwBfZS8Da2haT4pfUvRI3i7vxW6Q== 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=AhOimAGqg4GYCjDL7HXRxE6yLE8kYlwv7NuKQQsWpnY=; b=mxwAgGUcGq8xW7mI6X6RgdUlkgioJIYiReOPdMC6vXu9pp9lkQ4xzzrOqGujQPAq2/uMTMp+alZFJZmug1krWuJmqVdhKgSgguti4INDSopiVzGXSX52Cj4wtHeKtW/zWGzLzPlnF76awnZANKUA3OsSBi9tk9vSk2TrazRYNLo= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:28 +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:27 +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" Subject: [PATCH v4 16/35] maple_tree: Make test code work without debug enabled Date: Thu, 18 May 2023 10:55:25 -0400 Message-Id: <20230518145544.1722059-17-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0436.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10d::8) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 14db782c-ec00-42ba-c60e-08db57b00e85 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s+gHL4DrrQLrTIY/+aieMrc2bCLNbBzOptUH/dOueNV1/DVaKpLraqyIXdXOHmInJNRvIYD3hOrUXmVt3YYYSFe/ITXhPI8UFnJ3131CmZgDBBaTycRXGLtfrqp7bpd7V0n10WHcRPhjpTcKo2dYH1OCPF28jLU3thxJhoyugOwc+pOvkSVsdu++ZEhEIxuYHxtvAYzH93uQfK9hMwmYTNXcmIBSueG/Q7kfikbcX7FM+KtLfDMTgLLYc0UThFOoU+L0yJ5t9ORpTJO/DR/8yh4qGp7EbpypldF44cdkw8l5REZy5ngCww8zwAHqlr44yZIU1OcJdPRzJDOzHYz9VhViLJ1NDo3M3B1TzrFcs1ZT/IBr2AC0Eq0YOCRUol8dHxxAqEkDd/FNRLd5N2gs5KGM4WruQLwgl33rX6/tWchLzjDSzVwD0b9KZ1/IGoRD2l+Ezyp/bdS5+/oLAWT22tiWnmHPWqh1KwgBLQlCeDqOTHD3/LHmQTyQvFzv5HJYd/ungeOI8GoB9q14SG0UfqAIHkoVpa7p3nRyVLv4Uk+o/HQ6MTbfkOSqZBK7xUyQ 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jUalHPnhdcefBAdWO6u6FJ+DJWez0/QJ+S5rsWf3azbLL8YFxwmtgWSjO3kk?= =?us-ascii?Q?km4eHPMlA42PFZwVpPB4wgELfe2gQnWMYTsTSoYBBKKFVLmJg9VTiNkeuzYg?= =?us-ascii?Q?CVdWkp2RxvP9AHPpQDglwm2vic4mGkFYFAxzkRr5oQUyUZs3uuCYizhOPa2+?= =?us-ascii?Q?CZHRXFvCmopqqh0d5yozEe4csZef6iA9ZNL5tkvvzAnUju5ZpXQm5lR/BkXW?= =?us-ascii?Q?tGf0kT5gLKwvYQ0fMaNNlfymPu4IXoGIBbtyMAM1rLzsZYoFWdN6gx6rKFov?= =?us-ascii?Q?nvoj5MlLHybZjdAtViKK0NbJHcsWjPIaOjjadJqtBevFw7oe5ppXa37SDyyW?= =?us-ascii?Q?gEf5EJJKYIIIR700+q0ghHZGQs/AoTy/BUySu3He+BVHxS2L/+C+f8Rfo75B?= =?us-ascii?Q?7ljlTwmCpVVi5lu5TMfn/jAHMio8sDInfBOId+cPmO4/GcHlymgklMt5xfXh?= =?us-ascii?Q?2WZ4RWP7PKXCbrmqi+DwJvdGviGPmyVYL0x/xL3TPdmdDqy2NKjME5YNnmop?= =?us-ascii?Q?DP96iyNGUBpd8XkDkIyfE/wNaTGrhSciUE+sVwV0MivJVWfMQt1A0kyM2d29?= =?us-ascii?Q?xRZpTMnXh4dxXVgtM1RfcnEkiMJqrN4wrDoIQyV52ua9UY6H6sp8rOvZPLBV?= =?us-ascii?Q?kx6EfIgTLwhqUndBT7RyaVLsvpd9wwD9JMlyMteGSjHP7hkahR1ijS0MIBiR?= =?us-ascii?Q?ELqdX5UzTwy6Oh5S+xSMvGz/tgUsjun2ec0RO7zALvgH5HYrduT8GDxkOJJM?= =?us-ascii?Q?QIED2cCeIFp+ecMuS+1Fzj4yNIPOe7KONeQhIS7Qc8fFLGiZbGQbcwJs2o6z?= =?us-ascii?Q?D1bBz4vHinXFJwUWZjKniIa1IDdotdNCY1MHhInn1gGewlP5PCsB6NopZELa?= =?us-ascii?Q?D2yeWeJB1EpG8wsVyBtbTQGsyCh2Dqi99cqT00lOFKTZm8FdYZeARauZxb6L?= =?us-ascii?Q?LhRdkqQ7Zm8YVmcf82Db6famO/SUPaySo49iKoCG/JhtqaS+Cy7plzQpFeYQ?= =?us-ascii?Q?0Dg5AtD3E4J0FuUYBeZDgCm2LZN2WFW88WLKTq1l/JBGpxCk4+5690JghZSd?= =?us-ascii?Q?UnDsi4XIFOkfWCIGEFEgMndIpyZAowWDihm4dwnVjo718LMqUwsHqmIIVbQH?= =?us-ascii?Q?oeTj+naxtv3bdBYmA4BSGIbKswuxw0LGLg0999RpjH39TrRCPnyORf+EL6M4?= =?us-ascii?Q?tkhkd50OCXZgk4bunduju8z1xgn+YXunXezKI3yFg6dQGW0r8KYoQoO02+oc?= =?us-ascii?Q?E2242aj85K5BHpOq29qYRMeJS+LxU4Xtra55SK7/Sgnv4jLO6fI9cNhHKmUC?= =?us-ascii?Q?sa8Kac91yUxIMUy9UVpA49WdS0nPxiaPoJnMENodsojrxGtrZbZEz10/eRyE?= =?us-ascii?Q?CcIoxELrH8fnvj3OTUTgrLcKIIwqrBMUm9i/PIXAQIoeFUnjstvstv8XPtsL?= =?us-ascii?Q?bX9MhGDqMRGkEr8ejc43JKfs6btYrH8rjfAKyNhsTGY3HMpevtkWgXr1K6+P?= =?us-ascii?Q?yCyNuAnfQ5DN4WI8q//dZzYjxUaJ8GKvMAoezxInbenLxrmj3AG66etxOrvG?= =?us-ascii?Q?mGZ575R+MPH3Cns2kLWvemnWW77UISYw3pBUBmaZbNytQpEmVaeK22aiOAt3?= =?us-ascii?Q?oA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2eibDAgchlskSxe0ANecozq+meaClm3AbBuHZlH5b86+HGOQMfOKn555MVBfvqM/4htMUUcFFEP+gjYFCtoEN5KDQHwz7c1LWZ9y9PIljbN38SciXCUTMUcURcKhPgCxfEB33KsEGFjPmbB/X+WfDloQ9Ja3K6Kes6BQCOrSG8iMoz4ByAffDdywDE1rayScZW/ESRCbDFiKwqqkQESeGwuOQKzazNZEIrQzLJYn1I9Q4KHM5WvGdEQsqWPbGheEcRCj2KFhYNis+7QkGkufCqBZgb8A12hlSScbGazidSlx+Dd0zE2qHa1Zly7Y6G3rMeH5Cb4aa3CNdiLHJHsciDQMMIalG9LkcpxvIclepj9vO3SUkc/AN2C90hgkrNYcAkoiUjs5r6yfkQ+JzISouooVLrHMd43P2A7+ZWi+LQ+a+PFbYWNuqwTzqqLL77UUK0oQTYkG8anvaLAWJeBGTB0lvkoSCaF6WivTc6so2CADWE/ZK7/ugGPfr4N4E7feX+9aaZyLv3UPC0hnsRx6Hm/Gq+Llt6G+seKjrmEqScnDjAuzvG1j/pzJIDnXJq3yFWeS29U9LmGXvLMQ1jkVNJ4JT7wGRXmrXYtFbOyzGafWg8FtexLw/LTpJdla8jAsbYTGgewNHkTEmwPHvER6B9twLoTPIb9wnPwyE4juRLhCFWuMsA6lj0asVK3KF85RmpvX4v3JPmbpFXDI+y3Kbw4Wq7bq6pDvHKHfyDBJnD0ruFQDlYMv5N5lTVQ2Mca1BN5Z+Z5U3c4+6JO4eqQ3Xp9NFl7CAatQ53gvwY45hjjewn7fRVcKm8pH52MJMvud0hbd2gRXEE9aW9YgFjqzY2jr+oBngm+CtlwRe+2Qn+tOU/1/wfC2dB7M86pNrIg3PCUNrEYTTJ8FkiBoy/jeoQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14db782c-ec00-42ba-c60e-08db57b00e85 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:27.3733 (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: eFcsQE6dm2uDjeAHU1qcXDXJNUpuDSIsSd8U/7sXwxs97b7lQpLfBzMVzhVup2Kv4IoFaR5vG+Zj/qGZf6GigQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: 9aFzYIoYy03ERcOjivn3eoHGHrdh-XxE X-Proofpoint-GUID: 9aFzYIoYy03ERcOjivn3eoHGHrdh-XxE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The test code is less useful without debug, but can still do general validations. Define mt_dump(), mas_dump() and mas_wr_dump() as a noop if debug is not enabled and document it in the test module information that more information can be obtained with another kernel config option. MT_BUG_ON() will report a failures without tree dumps, and the output will be less useful. Signed-off-by: Liam R. Howlett --- lib/Kconfig.debug | 10 +++++++--- lib/test_maple_tree.c | 27 ++++++++++++++++++++++++--- tools/testing/radix-tree/maple.c | 1 - 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index be272aa2fc0a..17ba96a3c7bf 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2293,9 +2293,13 @@ config TEST_XARRAY tristate "Test the XArray code at runtime" =20 config TEST_MAPLE_TREE - depends on DEBUG_KERNEL - select DEBUG_MAPLE_TREE - tristate "Test the Maple Tree code at runtime" + tristate "Test the Maple Tree code at runtime or module load" + help + Enable this option to test the maple tree code functions at boot, or + when the module is loaded. Enable "Debug Maple Trees" will enable + more verbose output on failures. + + If unsure, say N. =20 config TEST_RHASHTABLE tristate "Perform selftest on resizable hash table" diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index d6929270dd36..93b40a78c4f5 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -11,12 +11,33 @@ #include =20 #define MTREE_ALLOC_MAX 0x2000000000000Ul -#ifndef CONFIG_DEBUG_MAPLE_TREE -#define CONFIG_DEBUG_MAPLE_TREE -#endif #define CONFIG_MAPLE_SEARCH #define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) =20 +#ifndef CONFIG_DEBUG_MAPLE_TREE +#define mt_dump(mt, fmt) do {} while (0) +#define mt_validate(mt) do {} while (0) +#define mt_cache_shrink() do {} while (0) +#define mas_dump(mas) do {} while (0) +#define mas_wr_dump(mas) do {} while (0) +atomic_t maple_tree_tests_run; +atomic_t maple_tree_tests_passed; +#undef MT_BUG_ON + +#define MT_BUG_ON(__tree, __x) do { \ + atomic_inc(&maple_tree_tests_run); \ + if (__x) { \ + pr_info("BUG at %s:%d (%u)\n", \ + __func__, __LINE__, __x); \ + pr_info("Pass: %u Run:%u\n", \ + atomic_read(&maple_tree_tests_passed), \ + atomic_read(&maple_tree_tests_run)); \ + } else { \ + atomic_inc(&maple_tree_tests_passed); \ + } \ +} while (0) +#endif + /* #define BENCH_SLOT_STORE */ /* #define BENCH_NODE_STORE */ /* #define BENCH_AWALK */ diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index ebcb3faf85ea..cf37ed9ab6c4 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -22,7 +22,6 @@ #define dump_stack() assert(0) =20 #include "../../../lib/maple_tree.c" -#undef CONFIG_DEBUG_MAPLE_TREE #include "../../../lib/test_maple_tree.c" =20 #define RCU_RANGE_COUNT 1000 --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93A66C7EE23 for ; Thu, 18 May 2023 14:59:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231928AbjERO7c (ORCPT ); Thu, 18 May 2023 10:59:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbjERO6l (ORCPT ); Thu, 18 May 2023 10:58:41 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC73D173F for ; Thu, 18 May 2023 07:58:13 -0700 (PDT) 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 34I6IrCb028533; Thu, 18 May 2023 14:56:35 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=jgzmmTEKWB0i9WIDRw5vqMkC751jSozh6uHq83GAlk4=; b=VC2L+VcrC7WzM+4LH4i8df29aNJ3iplg8P8ZbAOqAkBELEb9Oz9A1O/cBgj1tOAhWzPw mO4Ejk6QUEdFNqsYVD341lM/NUUlDShibj1eF/Fnua+/eBaYMZWu4mDVr3b4fO1cHuO/ +ysgPLCIGVl1zIbZ/c2STX1w9kV5FfARbvCcuT9iMnU6DmLhmTLsUAAzbMKhUzuMo691 uYSjpHyJWnXBoEM76MJOyxdEPFRGwVAibrnblKtRx+TPak0kPKOG4SSpg10cVbQZU5bg fiARZzriec3xOI8tQ/BTSaG9ln1P0DmfvNIh63uWmfELpaTS4LszUovjvknGTSUx/5nV Dg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj1fc8f9c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:35 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE2jRt025047; Thu, 18 May 2023 14:56:34 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106vmg2-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KqYkF1GKeYgayPmn8YAtC9CXx3d9PKt0yT1SPHbSH15iMOsHcrsXR52N0i6X4X3DegpKsE0bSKF60gEzFInnUNGAouVEFPoroYHBG1HO1aYbUGd7ikmhZ5ZjcsLXESg+8iQVBzOph+SPdGq/o4dMXeebNRr6Q2QomIwNWzHptBs569/bjWAhNZzIy7wqln1pcYdC0SN/mUURJWTnSpVEfa3pdqFnrlAk6cQeZCS7UOBVHoTGDO6XcufyLminaVsq2uWPFVDCmxchEVeDlt/GOaqfyQoQ+GRn/CbRASOrLyONkSjk2uzuMLstFruc4z9jpFo6yN9/v03sjRuTYoDSYA== 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=jgzmmTEKWB0i9WIDRw5vqMkC751jSozh6uHq83GAlk4=; b=f8maN9mvqxHhKFko/bHRuD3WWmmo7y5JbdaRrsWXa612QAO6gc/Tiq0KXfgpw+L62/hZjdjIGYNVu6CTV0nyB9b9G1jwpKPsaL3FyYxL5EKB4+UVtrhxmLbDW1v4m4znZTmIvIvk096qDXJWzZOVko1U1tM0E8z5MjyTGfzHjciciLo1HwRZWJ4rLOahnu/cspShlJfFkFBc81Y66PeQMHnbCJJsTVFYbnHnbEwrLn+fyh7rPG55WTHoYtUpJurWj6hh4JCByu/OqlDaIyJ6Suet5I5vw4q7W8IKO2wW8LCP+YdKhYGs2tLaiOSWvnxZn7tTDJhAmn20JhBBZVUxhg== 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=jgzmmTEKWB0i9WIDRw5vqMkC751jSozh6uHq83GAlk4=; b=0R8BP09wa2lZAJmKXApwO6FiUIOU1VVCQeQ/fAV0aBv+MVNoEpYhvtShVlbyWr+cuHzjy5VhKQxSdRYq40HVjy6BiFHB+jQDjOv7VQYyGd/sTwFsyjKuWkRaExusQut52uAMYAMUNCp5YwT/f+mIpLbnnlFjuUDEd3eQj+9FooA= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:30 +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:30 +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" Subject: [PATCH v4 17/35] mm: Update validate_mm() to use vma iterator Date: Thu, 18 May 2023 10:55:26 -0400 Message-Id: <20230518145544.1722059-18-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0137.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::24) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: b43756ac-f4c4-49e1-bedf-08db57b0102b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lLRnoW39v3Q9ppxPaQKXOWfYQSlOGmWrly3JVcTga3lKimcA7lq3Z9e7BdGLA7WCNt9oyoHRvmUFKRoN+N1v2/N5zKFQofp6xdFkSJz9V4l1+dwXVjYtTxcEPSMxP2XgOc3fhV0P6FAFzort/0AzyfhuhoeI2E858xnqV4hIucrl/ISmxO0vMiceUwVT/4lB/A5k3JK/dwTJwpJFiflmHsu00ram/4CtlOdzuBAwZBm3S6/HiCNN3OhijNL4dAgRXouy0AMpCFalxclcctd4NjGFrSRgo+PChKs88venurnZf5CibxTpDpsAsT6C2GeVVpwkCRCNgSDNn+88sscs3S0pF94xSNxsp1Hz2GtYTfLiFqIYtGi9/rTVwj3CzneSw/LwF+C5qAGc2OW5NDAJhPjnrV4q0hmX68apZbRjhDCunm6ZIn2q6iUCCdkov/qvM5qSPa+zuUtkWYXb9UCw6sIwzoyk/lVim2tofUKhhOFRJWOG1LNsgUt/O0r4sq143H/V+oKR4hlFVlMc/2Dc9lRg2bHK2m7MfIlgWuu+C/1+lJp/f3Q5a4qBr6727n+g 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(15650500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JO3nxuezhTFc78H7pJw7yssS43h6TSe/rKZp4PZ1LigUguiL4sG8lA2516tB?= =?us-ascii?Q?zI4ljq2Uu1gchBS8C8OQe6KCgHqgQqU6ZAVe7STKd5+pG1G8lTWJ30c1itP+?= =?us-ascii?Q?TJLZhF11ex56hYHK+a4pvD48nu0sLRINhxyDbyrDLt9RcPyuop3P4OtCwfQh?= =?us-ascii?Q?YobSbmGjb2Ain+RrnVIpJOoeejhnrC3rJjLC79AZ+2sLoe31OXka3+ZRzyb5?= =?us-ascii?Q?6K2R78QCB6JdxR9QLIraTfNntZDL2SwX5AHzctC+VbrA4bPpk728R3NY7xa8?= =?us-ascii?Q?VEWNJwvBCBH/0yhybkG/P2EJ883J1lFvXcjQh0esHDtvZGXkZtzYOkmEgT3C?= =?us-ascii?Q?9uW96+QJzLTnNC3+hyWpGDIOxTvmoUhWeFJGyh87TFpdpZT4rO5QGewEPs1S?= =?us-ascii?Q?hSQoKn3BQMwHv2cTBhcXl7InIOSSt0Cf3xlOl+1qRYFCedLx08oxbS5ZQ883?= =?us-ascii?Q?nGaS9PmXrrDowOLkY5eo3+bQ5jHqt6f+rZkuMam9LxTHSIcr/OAxqj524ngX?= =?us-ascii?Q?rYQbafUXAHsmmxYp9EU6kL+8QlnZ1Fo/CaGZt5Y3OQYmK8Y8yQphDQLe9e2r?= =?us-ascii?Q?PaDa20iWMVj/aQz+BqoIQNBcGqSd8cN9mhlXdSDBJgx3DUIppAtETztcalTb?= =?us-ascii?Q?o3aCVhaJNeFqWNAGra+lpIVU6+CFm+HI66BeJBeWaAqHDmssFBq6/eFwlWkZ?= =?us-ascii?Q?6nyR9hCcyUSy5F5Z2zn2LzaW1o/e9/mhM+Ejl0sAoOvIQUQoM1kHTMkviTh3?= =?us-ascii?Q?9NCXJKdnoXXl9iUFswGWo3gbx9kaKjMONjdiC5fJazZY0Y3/7v5sGNhwUy+V?= =?us-ascii?Q?wHBU2Ss0GGhJFGQOwuwakgk3iUnew42Hd8IzOJpAqyra0KQCiaGQLNK7pjAM?= =?us-ascii?Q?GFJ+X6AH4UwEliwroS8iDNFg0tC2/kt2IeU4KLRbekMG6Y7wZyKkTn9bQx7w?= =?us-ascii?Q?VuAJ7w6nDCfgXhQFNLX8QLw+fKhexafbFe5HMvSAgVdruv3QCf6grSGfCYix?= =?us-ascii?Q?MSphFrLiktiTLo8bcT6XeMXAQB6Vk3GsJkYAO9b+9w4NUAOni/uRmp8yItcX?= =?us-ascii?Q?okaM7kq/qJmICDafccBI2IL6h0SMj0pb3HUM0B78RObtfO0y7AZp9PIR0f08?= =?us-ascii?Q?M/aRDJGgrN0TwwkBkH8qiRXRxlAXPpOLnV/Dcb3SCOY+nHCsaFqchN0QmzP9?= =?us-ascii?Q?bWWy8efuSEfwJ9x+37j/8fKlzhts+nijBhJ67EvoJr1ldPa3Rs+yOTGDjdpD?= =?us-ascii?Q?sA+QsvMIP6c2Cd3fRFqj8h4OAST73cPrbMsVWXWjJHBRi0j586rfUiNG5KxC?= =?us-ascii?Q?7Xo82b7ls9FtDY5BuO6bGIYTY6JEzPh05MDRy7Vtr9zGpe+kGNClPx28vgbF?= =?us-ascii?Q?0SKMmEXND/GTG4SJorp3BLMyGftbHhouJvvFZeiCvFtfotbj9qeHfJs2H5vx?= =?us-ascii?Q?vUAEFoAaOi9TCl8NCoPBb5XFBRMXadh1KxrzHONSyVhhF2k+M/fNqDGxZe+8?= =?us-ascii?Q?o6N6i4uSD9qqQLgsg026PDuB5Pks1KtRiGqHgz88F5qvwYWARwD4IBGvvQQz?= =?us-ascii?Q?KylbugPXcM2itTS4zlpQma3CgqqVzHPGc0iobebR9XsVYiE521QtOFdpAE/A?= =?us-ascii?Q?8Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mGuAUgGs21mawc9a4GbGtQBT7H//01Es/wUVbgzRa5lZkkEKez+M7kOZsxtgPt08l5YG/w0+DbgArkW12fqMgZ/RL5WgBWvTOh5XYpjVp8O2XxlUWgHWcgiOvZqz2PkjrkWYbQ8FeKVEoYlKDPzOTBGnNnIFyCaXdHd58k52cPjJFD1LXPnA3VBhSQ74m6QDjZhvyEl9yrghQLe0MEWe21J3qbz7JMOnO8hex29Ylm1YIGwwUuF/ft4hM2uPZWe1WDWfyB2TM1MGnR3DTEmeQegyZMh0/lLd0Q9brft6jxG6QIGldC1+3enihDKkOiSibM4U2pmcgjUkAo1GnEhV7/F8m35BgOVIuAPqs+3SCorIsjl2s+QkGaeSbF0v+fEfIWM/Gu8pNEusUq+qraWl9/C8iw+ivFjHZlDbvE5b3GmB3FKtbU9k6q0YUJer4YBuhT67uf3b6pLX0LonEFQhq41pmtUFA+Zy4cWTfXAnJG6UxH1JufdCDJ7Ee3jTmeHTrQNeJJnzKwBj0MiJo7cu7oVmyHShL/8PAZFRuSTyigTA5dzs/1lpSvTxdcLaUtBplSueLXiGCONfBoBjZ8KQqLf7MJxAReHmjHeTCgH7fZMMVjk7SG50KxRHJThe9UQ7lkBCRbVG3ohr8bsE7JrnnP9+qptngb+5Blr7hcwsJzx3D9o8CMMXEbiChIuZwrlkT5FQ+t1uvF8UVLUhptQEs29JOXeMCPvKcmB1Xa5Ks+XUV6ivmTWbfmvPS4+0OV2M41VOa4Lzmub7FxYpT+K8Pt3YpCKepoEcPh8t0HpYe4R4Ht8frplMzgfAbSv2nrQcAViJ35JqBzCWQLBzMhc/WjfEkichybu9X5HuNp9N9uIvYJX3ytB96svqTkR+dvb6/yhvEoYYsW46LZ204M+0Lg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b43756ac-f4c4-49e1-bedf-08db57b0102b 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:30.1797 (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: RVCvdD3lTANcAh5bcTyM9xQIgeFMsVAz4hHoH/n0vUkG340bcApVES86ftSQbdnnevz7QtXxXSPeTVuBjCgowg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: CggSIR-pyJfj6SW50aFit6UDWGN4iRpe X-Proofpoint-GUID: CggSIR-pyJfj6SW50aFit6UDWGN4iRpe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the vma iterator in the validation code and combine the code to check the maple tree into the main validate_mm() function. Introduce a new function vma_iter_dump_tree() to dump the maple tree in hex layout. Replace all calls to validate_mm_mt() with validate_mm(). Signed-off-by: Liam R. Howlett --- include/linux/mmdebug.h | 14 ++++++ mm/debug.c | 9 ++++ mm/internal.h | 3 +- mm/mmap.c | 101 ++++++++++++++++------------------------ 4 files changed, 66 insertions(+), 61 deletions(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index b8728d11c949..7c3e7b0b0e8f 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -8,10 +8,12 @@ struct page; struct vm_area_struct; struct mm_struct; +struct vma_iterator; =20 void dump_page(struct page *page, const char *reason); void dump_vma(const struct vm_area_struct *vma); void dump_mm(const struct mm_struct *mm); +void vma_iter_dump_tree(const struct vma_iterator *vmi); =20 #ifdef CONFIG_DEBUG_VM #define VM_BUG_ON(cond) BUG_ON(cond) @@ -74,6 +76,17 @@ void dump_mm(const struct mm_struct *mm); } \ unlikely(__ret_warn_once); \ }) +#define VM_WARN_ON_ONCE_MM(cond, mm) ({ \ + static bool __section(".data.once") __warned; \ + int __ret_warn_once =3D !!(cond); \ + \ + if (unlikely(__ret_warn_once && !__warned)) { \ + dump_mm(mm); \ + __warned =3D true; \ + WARN_ON(1); \ + } \ + unlikely(__ret_warn_once); \ +}) =20 #define VM_WARN_ON(cond) (void)WARN_ON(cond) #define VM_WARN_ON_ONCE(cond) (void)WARN_ON_ONCE(cond) @@ -90,6 +103,7 @@ void dump_mm(const struct mm_struct *mm); #define VM_WARN_ON_ONCE_PAGE(cond, page) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ON_FOLIO(cond, folio) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ON_ONCE_FOLIO(cond, folio) BUILD_BUG_ON_INVALID(cond) +#define VM_WARN_ON_ONCE_MM(cond, mm) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond) #define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond) #endif diff --git a/mm/debug.c b/mm/debug.c index c7b228097bd9..ee533a5ceb79 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -268,4 +268,13 @@ void page_init_poison(struct page *page, size_t size) if (page_init_poisoning) memset(page, PAGE_POISON_PATTERN, size); } + +void vma_iter_dump_tree(const struct vma_iterator *vmi) +{ +#if defined(CONFIG_DEBUG_VM_MAPLE_TREE) + mas_dump(&vmi->mas); + mt_dump(vmi->mas.tree, mt_dump_hex); +#endif /* CONFIG_DEBUG_VM_MAPLE_TREE */ +} + #endif /* CONFIG_DEBUG_VM */ diff --git a/mm/internal.h b/mm/internal.h index 4c195920f565..8d1a8bd00124 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1051,13 +1051,14 @@ static inline void vma_iter_store(struct vma_iterat= or *vmi, printk("%lu > %lu\n", vmi->mas.index, vma->vm_start); printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); - mt_dump(vmi->mas.tree, mt_dump_hex); + vma_iter_dump_tree(vmi); } if (WARN_ON(vmi->mas.node !=3D MAS_START && vmi->mas.last < vma->vm_star= t)) { printk("%lu < %lu\n", vmi->mas.last, vma->vm_start); printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); mt_dump(vmi->mas.tree, mt_dump_hex); + vma_iter_dump_tree(vmi); } #endif =20 diff --git a/mm/mmap.c b/mm/mmap.c index 76eaf12f1390..bcebfd926632 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -299,62 +299,44 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) return origbrk; } =20 -#if defined(CONFIG_DEBUG_VM_MAPLE_TREE) -extern void mt_validate(struct maple_tree *mt); -extern void mt_dump(const struct maple_tree *mt, enum mt_dump_format fmt); - -/* Validate the maple tree */ -static void validate_mm_mt(struct mm_struct *mm) -{ - struct maple_tree *mt =3D &mm->mm_mt; - struct vm_area_struct *vma_mt; - - MA_STATE(mas, mt, 0, 0); - - mt_validate(&mm->mm_mt); - mas_for_each(&mas, vma_mt, ULONG_MAX) { - if ((vma_mt->vm_start !=3D mas.index) || - (vma_mt->vm_end - 1 !=3D mas.last)) { - pr_emerg("issue in %s\n", current->comm); - dump_stack(); - dump_vma(vma_mt); - pr_emerg("mt piv: %p %lu - %lu\n", vma_mt, - mas.index, mas.last); - pr_emerg("mt vma: %p %lu - %lu\n", vma_mt, - vma_mt->vm_start, vma_mt->vm_end); - - mt_dump(mas.tree, mt_dump_hex); - if (vma_mt->vm_end !=3D mas.last + 1) { - pr_err("vma: %p vma_mt %lu-%lu\tmt %lu-%lu\n", - mm, vma_mt->vm_start, vma_mt->vm_end, - mas.index, mas.last); - mt_dump(mas.tree, mt_dump_hex); - } - VM_BUG_ON_MM(vma_mt->vm_end !=3D mas.last + 1, mm); - if (vma_mt->vm_start !=3D mas.index) { - pr_err("vma: %p vma_mt %p %lu - %lu doesn't match\n", - mm, vma_mt, vma_mt->vm_start, vma_mt->vm_end); - mt_dump(mas.tree, mt_dump_hex); - } - VM_BUG_ON_MM(vma_mt->vm_start !=3D mas.index, mm); - } - } -} - +#if defined(CONFIG_DEBUG_VM) static void validate_mm(struct mm_struct *mm) { int bug =3D 0; int i =3D 0; struct vm_area_struct *vma; - MA_STATE(mas, &mm->mm_mt, 0, 0); + VMA_ITERATOR(vmi, mm, 0); =20 - validate_mm_mt(mm); +#if defined(CONFIG_DEBUG_VM_MAPLE_TREE) + mt_validate(&mm->mm_mt); +#endif =20 - mas_for_each(&mas, vma, ULONG_MAX) { + for_each_vma(vmi, vma) { #ifdef CONFIG_DEBUG_VM_RB struct anon_vma *anon_vma =3D vma->anon_vma; struct anon_vma_chain *avc; +#endif + unsigned long vmi_start, vmi_end; + bool warn =3D 0; + + vmi_start =3D vma_iter_addr(&vmi); + vmi_end =3D vma_iter_end(&vmi); + if (VM_WARN_ON_ONCE_MM(vma->vm_end !=3D vmi_end, mm)) + warn =3D 1; + + if (VM_WARN_ON_ONCE_MM(vma->vm_start !=3D vmi_start, mm)) + warn =3D 1; + + if (warn) { + pr_emerg("issue in %s\n", current->comm); + dump_stack(); + dump_vma(vma); + pr_emerg("tree range: %px start %lx end %lx\n", vma, + vmi_start, vmi_end - 1); + vma_iter_dump_tree(&vmi); + } =20 +#ifdef CONFIG_DEBUG_VM_RB if (anon_vma) { anon_vma_lock_read(anon_vma); list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) @@ -365,16 +347,15 @@ static void validate_mm(struct mm_struct *mm) i++; } if (i !=3D mm->map_count) { - pr_emerg("map_count %d mas_for_each %d\n", mm->map_count, i); + pr_emerg("map_count %d vma iterator %d\n", mm->map_count, i); bug =3D 1; } VM_BUG_ON_MM(bug, mm); } =20 -#else /* !CONFIG_DEBUG_VM_MAPLE_TREE */ -#define validate_mm_mt(root) do { } while (0) +#else /* !CONFIG_DEBUG_VM */ #define validate_mm(mm) do { } while (0) -#endif /* CONFIG_DEBUG_VM_MAPLE_TREE */ +#endif /* CONFIG_DEBUG_VM */ =20 /* * vma has some anon_vma assigned, and is already inserted on that @@ -2261,7 +2242,7 @@ int __split_vma(struct vma_iterator *vmi, struct vm_a= rea_struct *vma, struct vm_area_struct *new; int err; =20 - validate_mm_mt(vma->vm_mm); + validate_mm(vma->vm_mm); =20 WARN_ON(vma->vm_start >=3D addr); WARN_ON(vma->vm_end <=3D addr); @@ -2319,7 +2300,7 @@ int __split_vma(struct vma_iterator *vmi, struct vm_a= rea_struct *vma, /* Success. */ if (new_below) vma_next(vmi); - validate_mm_mt(vma->vm_mm); + validate_mm(vma->vm_mm); return 0; =20 out_free_mpol: @@ -2328,7 +2309,7 @@ int __split_vma(struct vma_iterator *vmi, struct vm_a= rea_struct *vma, vma_iter_free(vmi); out_free_vma: vm_area_free(new); - validate_mm_mt(vma->vm_mm); + validate_mm(vma->vm_mm); return err; } =20 @@ -2963,7 +2944,7 @@ int do_vma_munmap(struct vma_iterator *vmi, struct vm= _area_struct *vma, =20 arch_unmap(mm, start, end); ret =3D do_vmi_align_munmap(vmi, vma, mm, start, end, uf, downgrade); - validate_mm_mt(mm); + validate_mm(mm); return ret; } =20 @@ -2985,7 +2966,7 @@ static int do_brk_flags(struct vma_iterator *vmi, str= uct vm_area_struct *vma, struct mm_struct *mm =3D current->mm; struct vma_prepare vp; =20 - validate_mm_mt(mm); + validate_mm(mm); /* * Check against address space limits by the changed size * Note: This happens *after* clearing old mappings in some code paths. @@ -3226,7 +3207,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct= **vmap, bool faulted_in_anon_vma =3D true; VMA_ITERATOR(vmi, mm, addr); =20 - validate_mm_mt(mm); + validate_mm(mm); /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. @@ -3285,7 +3266,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct= **vmap, goto out_vma_link; *need_rmap_locks =3D false; } - validate_mm_mt(mm); + validate_mm(mm); return new_vma; =20 out_vma_link: @@ -3301,7 +3282,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct= **vmap, out_free_vma: vm_area_free(new_vma); out: - validate_mm_mt(mm); + validate_mm(mm); return NULL; } =20 @@ -3438,7 +3419,7 @@ static struct vm_area_struct *__install_special_mappi= ng( int ret; struct vm_area_struct *vma; =20 - validate_mm_mt(mm); + validate_mm(mm); vma =3D vm_area_alloc(mm); if (unlikely(vma =3D=3D NULL)) return ERR_PTR(-ENOMEM); @@ -3461,12 +3442,12 @@ static struct vm_area_struct *__install_special_map= ping( =20 perf_event_mmap(vma); =20 - validate_mm_mt(mm); + validate_mm(mm); return vma; =20 out: vm_area_free(vma); - validate_mm_mt(mm); + validate_mm(mm); return ERR_PTR(ret); } =20 --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F4183C77B7A for ; Thu, 18 May 2023 17:55:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229650AbjERRza (ORCPT ); Thu, 18 May 2023 13:55:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjERRz2 (ORCPT ); Thu, 18 May 2023 13:55:28 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B112C2 for ; Thu, 18 May 2023 10:55:27 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IoDI006511; Thu, 18 May 2023 14:56:36 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=RveCcSvwg4Nj9ioOmIG0jRkv1pBMfvzYki92JJYfpt4=; b=dOUc4NJxGf4jRm8jkoC4t9FJ04fgyDLT8qz6hRSRwjCmlisM4ouXsc7xTweLJMvc8kkA ntqbZR7SsKVQ4zHi68je/B0A+YSwk7XHUUTNfkGTCsyIQf0pk3vYEnd4wdsjzu06S75F ZctWSG6C9pCgoQt1fN/gm+19DHPswj9T6IzFqh7VTHXl+hw3RBCjO0eqSHXCDGVvujHP A8s/LR6fb1i0x0D922NjlpQtkFvsuaO5heTuC3RxMCaiTQagH0zEShCFVnpSd55LaT8V u21L40odi/OmSBIolXM/3FuLJFjxLH4X6RJ+lnIQWDPheWKIGlwU4OA/RiH60mBzmCdg 9w== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj0ye82q0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:35 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE2jRu025047; Thu, 18 May 2023 14:56:35 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106vmg2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sk2+3Zfi1PE2JV4TTCdnXCPw1v33CCp8afYud5/ZtTVZY3rPVwZ1qccf/R4E+UzE0SHRlJaRoi3GN9en5Y+bZ7K58J6Mo2hsUKiMMhLGErUxGaZ1RsyePzN2UDJqYUuV6zvSMyJnjmyrqtSLDd7XGtoLem4x8tEGXSUmyF1AQMgFRfO6Z3xxwZMtQI6KpDyshybJawZQDr1Osd+D+9Q0dSckz+vhXwqmY8oVTvhU1jd4VIb0J7/6bIPIlLzzqruQcv9zGOsvz+GwxvbrV+dvNdkPgvuErMacXPmNKuQ/cJZ9sV3qic5iZkXRK6Xn6EsWcq3y4F32icDOUw3S9DHbTw== 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=RveCcSvwg4Nj9ioOmIG0jRkv1pBMfvzYki92JJYfpt4=; b=e5HFn4Ivjgbp9X47X9ogmqCbEzW31AjhBUgSXTaHO7YHVcmH10ZC3R/vRakYzrEbnOLO769XQb+lwbjGxtZRo0lpaUjJ5ePmwVBDKj5vUEGh1YS7cYKF61BMCIf3EYgIv4UvffZOF1usRTvidBsSjf8anBreIwfR0MM/T/GjXryp3Dy/8fG8Wv7KUazwLTWF21grdjtzAgpruNmbSc27WiAROBh7SPVckt0MnPGaAUiNDVGu885p2WQuUpC7+WXBFjgOxpoj0uI4arfaMAsL2jAEqGABhz99h7h9iW2RGLPoyNNF5vwPd1RJhxBxsJeOYLvzp1boIb1sZAkIPuY/cw== 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=RveCcSvwg4Nj9ioOmIG0jRkv1pBMfvzYki92JJYfpt4=; b=QzSHztme4ajPtjSh00b+s6Pl5fBz72UvlFOUq92CP3VlMTy1CUjwLtxVtm39S/wVNowAbjWZGVzYG+mV1+Ujxc22jWdmvxSlC2FpVnDIP8GJmp8Hoe+sj5zg94vqFQl5VIdmRyUDetFxGEBTQUkEXv5gyl/IQIQCsNC7YJLBvYU= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:32 +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:32 +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" , Sergey Senozhatsky Subject: [PATCH v4 18/35] mm: Update vma_iter_store() to use MAS_WARN_ON() Date: Thu, 18 May 2023 10:55:27 -0400 Message-Id: <20230518145544.1722059-19-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0084.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::23) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: e7bfcd50-2003-4f80-94d5-08db57b0118c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xVau9lZyxifVZx7NT8ESzi+G/mvRqreev6gWamrHAQB1erShhkJXWreTdL/2rbuC/a7QXuAtLDgHJY+lZBkSHj/5L63X+yR/tSS5UEZJCh3dE1cpz+AsKOWdjjx4hVKHMAUuTbfBVmnRt2We/r/4H5sEYu2fakDcqVakqbYt/CAgBE9cmEP1pfGTDMgRF61bubZ+noMPq7h7MlQln0HE0y8b/Ls+eu9On2X5AkaJY6gabkbrYEA7zsC1RTy8zUGxhxq99HXGQK9AwYeGblRLIaV1/pi18gzhZpOYyJ9CDlgf2ShhcbyoGYz7OLU9WK0ACBhBC28Z8NrvEWzyv6FC2jhedfz5iY5Ux0CIOsLT0xn+bLbf/5zMRtNx6VLOJ48DAk/V8wEtvwRqvpJQR7/lfsKsWoG6s+krQCY04f2PeLhLp+AOinhu5wVprJi4AgBf5P4IivuuNq/c47z4UAGJdnqKK9g+ImKidvNjSH10b0hZKkDEV6Cg2qzQJMHQVxxluU3Sp5HaRkrdcSBsFcdf6WirlA6Kuy5q9vJyL1ysmR1kviWW0YnAl3lxnx3SVcy/ 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(54906003)(2906002)(15650500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K6tuF2EPsOT8UuOXvQBXUFeOkpb0HtJhKIbpx3H+u7egJUu14GZkAHFrakyx?= =?us-ascii?Q?VBtWj8TWPr49KH5iovfd/2fXWxqlj0Cb1HcI7VYjg57yIv294oAh29vWdU00?= =?us-ascii?Q?z3v62L4CKZP8GzLWd84lvr1yGNdnDsLY74O2GgAvCzQfZaevpLLT+Z9rrPLr?= =?us-ascii?Q?0OdeqWSUlqj0DN8R56gvwu2ml45gO+TPxXN6uuIEshjkgP1nyIFuq8Q4Y73j?= =?us-ascii?Q?u7qvd9o2F6EiabOCJfIaf0v91yykGB/aUjzZFrbVCjRsu7iQZ/uGw4tfGUhk?= =?us-ascii?Q?bwUQlnzabj4i+MzN6M9uasJPeIyzDu9yZQqQWM663WMfChvscCca9axXxSlG?= =?us-ascii?Q?Ccr+Tr2Q6MRV+5QwCm+YoOQ3EcN/8Yo/gORSf++odS8Fy/esiRBEyE1RUmO6?= =?us-ascii?Q?XEdvcjN0TBeftMvy1u/qrk5RcJDUeRzRDhv89EDTo62EWJYYSWGRgRrHZh7q?= =?us-ascii?Q?nzZPj2Z37yk/i0GBnywzk5RV7g1cP6WAT/T3z1bc5FAJjcwkerce8rApUNVK?= =?us-ascii?Q?Wc/nJd2RbjTKyROnMFLzdwE/WytAzO37XnObUtLFZdFlzmsIw1YueROtA4xf?= =?us-ascii?Q?z1EmwKsCzFtgE948DiptV6syZ5pi4qem8igKZK+JkdPKtAKMv0x49pfONePi?= =?us-ascii?Q?v+6Bq3Jkh+c5lwn6V/ve1TVLbJLFUmyvTRIrwOjt9brTD7F3HubjRGAE8Anq?= =?us-ascii?Q?LKBB+Ic3Pbl2lqQS03VOppQIfJmtpXImFdyyzu64ujj3245aLEfWCi59Q3WZ?= =?us-ascii?Q?E9VnJNRF5iUoEorXIC+Uz2SFnHg0kPEAm5e8dzhNxm3G5SOJq/ct3MB/qOPe?= =?us-ascii?Q?eJvYXKadSQN/Q5Fl1PXcp/oniXZAt6FUq0im111/ItFanyI3n6Y8AzqDZUWH?= =?us-ascii?Q?cnERQ0r88esm4ATYDPehSiNG0zIL/Ar8rl4ztm80iYxGux8oQ3BCz0i5CmZB?= =?us-ascii?Q?EDIK1CPrdAZzJ2TCBfn7oUbIj9VpEMVjCw8nbs+48WDYn7rnnBEPOeAkmxk1?= =?us-ascii?Q?pEKuOgnAV9AYmweex+Yt0Nfh+TXUDUKGUMuDVUYcgRmibjrJvzNRnV7Ze84l?= =?us-ascii?Q?lktTErtZo7ij0uh/mt24Zw9IloVGxXXSQQS5iulw+25sMQflA263Ei6+nNMA?= =?us-ascii?Q?ap3jdnlfE7V5u70tokIeRZytNatNge9rj/8JDfHFMLMmz2r7opyVEbjc4wFY?= =?us-ascii?Q?T1N58E6mncUdXHHot/5EGSDJqizHSnYa27f68BO0Yib7a69l6FQetceDAD5m?= =?us-ascii?Q?RQQ5OVhv2EW/i/Tw0LQJCp0bQjIE9QnUhjwxFYXIv8D2uWpH3yJCYF6p1fKF?= =?us-ascii?Q?yHAY9S/jkumiiR8oDvJQEduXcVKMvlJrT2Wa9CWOGkUekolyJCOASmioj8oK?= =?us-ascii?Q?QmRUZP3x+LwWayQZ7r0cUTsc1D+zri5EZUAjzOWFT7Ti0T6vQXd4RKwbHbU/?= =?us-ascii?Q?ZJU9jwtQKr6FSuWoJ9aXJDP6LCy1ihMclDfgAKzD1i4r8F/niBiJVppIhqkB?= =?us-ascii?Q?cPbF/8BIAxgeVdebQOBvmZ/kEy+GX3ZUnGBs1vN6PVTIjVuguV84QcmVzC6H?= =?us-ascii?Q?KN93e2u8LWQfXqBui7M1Lt5EJ8CTQzY579ef9N1tT9D/Ptw/52f4U3ISVxeb?= =?us-ascii?Q?2w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?wZy9wTR82rKCGijCkdawkTCtKWktxbluo+Cn03o4Ryyyaw0C/OuiYI1zOEfG?= =?us-ascii?Q?xuRHZ9JO6EORHPdX65JeTkSpi3edaz4YT+wGeeS3AM8/p18jL/tZtpYPVQE8?= =?us-ascii?Q?LrHmRMi98pBclJvvtOYyy2el72EekIGDz5nxcfFoDfX3C5iXBEJvR+J7oEWF?= =?us-ascii?Q?/1Fxyxf+2uAHiOwgDPItpYs8JwaoRNnG97F/wNQsgRx8JZtPcf9x7O2nuMNT?= =?us-ascii?Q?Uj69jMzvCqVqwgitqS8T7BXdcY77hvQBAstL7SFyV7aPefSzcrAAHTPDb/Pk?= =?us-ascii?Q?gVBfN766OfnZP3OPBzVmVAAGZoyx0kEsf/NCahV5Mw1j37imfEKC/sAuFOtG?= =?us-ascii?Q?BMK3YVLUTj6U4bOtCcWw4aZsGdJ7qhwceExt5yinJqHaaDv6/7Pd2MNKFWac?= =?us-ascii?Q?atVtqcK7a5R4q7Z54vxp9OJNTfFU/9XM/sx9XjxIYspd+Wb4L6jev8APLkrU?= =?us-ascii?Q?BRONjISEP02GVWd2VHpA01XUMXajoP7q+P+VQXsBmQGhm2EslbzIMBokwt1v?= =?us-ascii?Q?Y4flWTDx3U0DNM/UoSxfD6S6CyS+PnJ6vYEk9PhQpMmKH0128b2h3PRj/5bB?= =?us-ascii?Q?fZyr1dpF279FeQixdU0UZvO2MovE/rncHc0pirSpHKujwNQ/iuZxzhRpcoyS?= =?us-ascii?Q?kQILAe1pVe24G2PWCdfPJf4tasQTUtX3oTB4dyJTADO1aM8uoIAYdISCwUkl?= =?us-ascii?Q?gchMM48Hn/oANuex4JMEu+mBjQZBPqDIXcuHBGE4Y/d9yTk3OSLg48ctV2m2?= =?us-ascii?Q?dxem5MWVpVuqXTOZXAlhvQ4XP2Bo1fxTd2dej9wZpP9ua/8KL14VUqz0nPBg?= =?us-ascii?Q?JxdwX/cjJcR9lxWndZFde9/8Lx3w2AoHlj6pPMdyqjM+iHzBQVei+KpacWSC?= =?us-ascii?Q?OdCLDTVdrWx2Idjdkfqzu5urwhSM2h6kRzegJePO3s0EFyGUxlZJhOHvwQIL?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7bfcd50-2003-4f80-94d5-08db57b0118c 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:32.4325 (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: 9FtZeMrzo+fr9H6C97+KJZobZqjqON1RrAW9s3oeOC3Dwh8H88YLm0dbjJ6MXqgsj84phdUi5hvltqypauIwIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: TjvGn7p7v5cv94hSr8X2r-ykWeNCozLt X-Proofpoint-GUID: TjvGn7p7v5cv94hSr8X2r-ykWeNCozLt Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" MAS_WARN_ON() will provide more information on the maple state and can be more useful for debugging. Use this version of WARN_ON() in the debugging code when storing to the tree. Update the printk to a pr_warn(), but this will only be printed when maple tree debug is enabled anyways. Making all print statements into one will keep them together on a busy terminal. Signed-off-by: Liam R. Howlett Reviewed-by: Sergey Senozhatsky --- mm/internal.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 8d1a8bd00124..644fa8b761f5 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1047,18 +1047,17 @@ static inline void vma_iter_store(struct vma_iterat= or *vmi, { =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) - if (WARN_ON(vmi->mas.node !=3D MAS_START && vmi->mas.index > vma->vm_star= t)) { - printk("%lu > %lu\n", vmi->mas.index, vma->vm_start); - printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); - printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); - vma_iter_dump_tree(vmi); + if (MAS_WARN_ON(&vmi->mas, vmi->mas.node !=3D MAS_START && + vmi->mas.index > vma->vm_start)) { + pr_warn("%lx > %lx\n store vma %lx-%lx\n into slot %lx-%lx\n", + vmi->mas.index, vma->vm_start, vma->vm_start, + vma->vm_end, vmi->mas.index, vmi->mas.last); } - if (WARN_ON(vmi->mas.node !=3D MAS_START && vmi->mas.last < vma->vm_star= t)) { - printk("%lu < %lu\n", vmi->mas.last, vma->vm_start); - printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end); - printk("into slot %lu-%lu", vmi->mas.index, vmi->mas.last); - mt_dump(vmi->mas.tree, mt_dump_hex); - vma_iter_dump_tree(vmi); + if (MAS_WARN_ON(&vmi->mas, vmi->mas.node !=3D MAS_START && + vmi->mas.last < vma->vm_start)) { + pr_warn("%lx < %lx\nstore vma %lx-%lx\ninto slot %lx-%lx\n", + vmi->mas.last, vma->vm_start, vma->vm_start, vma->vm_end, + vmi->mas.index, vmi->mas.last); } #endif =20 --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68C77C77B7D for ; Thu, 18 May 2023 18:32:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjERScg (ORCPT ); Thu, 18 May 2023 14:32:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229662AbjERScd (ORCPT ); Thu, 18 May 2023 14:32:33 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D675CE43 for ; Thu, 18 May 2023 11:32:12 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IrW7012428; Thu, 18 May 2023 14:56:40 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=JRf5CpRos+iWIv/Z65CbUYb3MhzysGHLrb7+B1JTlcY=; b=Ue9frCUmsfuOdCDqknYo3GrfxturMCKbbcvl0z8nbDQSLmIfAwqdblDEAwAOAUw0gbST G+AXq/hjTiCWFngb7m+tgtp7AC6Z+CeLP9O3sq4D53ytoxnwkMPdEz06mq5cB6ghdRIn OeBMzcsJLp88G6OD0M8q0CB5StM4mIhqteakzg5ZwaJyJdo7U1Dn4I3ebhrs20vMgzTw yR1G1gjgKClEe+M9NsZIYb2rNiYuX5hHB+K5zVSJDkumTwvb5ncGqlF8HXo4ZsN3kDjv i2tswluyfODTgqjr9Ot4DOihLUg/J1joGuj7xKXKrmOLN/kUbChQZkMs2RrxY37j33SY 9A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjrap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:39 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEC28m040073; Thu, 18 May 2023 14:56:39 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mq5p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LnPosYn1YGOPL+2wiLUwNuiaWvsjxw829OIXsPSf9iKOkDhuj/h3RZLCLx5uNlPeWk7q/ak5Ndy5remhLIhtUbwhYPUbZXQd/9H3yaXD2lxP8M0lp+aTGG5gYFHAN3t3Qj60N9jJ2FtT0iB6TmzhLak0s8ZOmiTosbG6OCIUTzuaegx9eVmtt7nDQECbfOPpO7kDGoEvDv24RWGgNsIhORNeLbySZGDS5cQHAvsnWC1YDwsNCJQjw722FH/Co2i8IIYT6H07+pUyf+QCl/V4v+Lv4LCax4zaK0s/C1NkRxOTv5azOaEIKUcq0nZ/rXbm8BnexpOxXRE1c0rdWvX0Dg== 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=JRf5CpRos+iWIv/Z65CbUYb3MhzysGHLrb7+B1JTlcY=; b=UOZ67HRjeeXXIHfDnn4qduscIDzE93Zi3qsMGke9Z46BUnbpYrCLByvIm2uR0uwTHyLEnHsB2s9vmE9ea8DjNBUXp0sC8CG7cwkGXTx2jIZwXDrnerC72nSANp9150p3aHM3oZfk5F2N6a5cZArhRX6l9cHZDVEVJQjcqEptwq0I4siNKL10LY6dVWkFxCJNeYvMSukvg5uL37x+UXfat5JG5e+Hm+mumyBc4pn9kj0rVmAeE9Ac7k264ydkn5hk14WMXPJjyOYDVmg2Vs6k7sN1uu9FPyN++DvvH0FR53ZHpwhFfGOeKv2/I3TBYtzWlvpGt1y7rlf8SUGm+CKN3g== 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=JRf5CpRos+iWIv/Z65CbUYb3MhzysGHLrb7+B1JTlcY=; b=LS+RIyzkXJXU56L4a3XJYk0rDsd/Bj9LMyhp8cUz8Lyy97vARN+yuMmFumL/eoWEKKd26SZdneb0BGGTx4g+VfzHaebfSleMiqY7t1iLH6Vgf2wEXqVkDIm46p8e/U8oEGznBXRo7NtOYhJLZQu9TB5MOUcuq6bIa65ACajkn3U= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:35 +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:35 +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" Subject: [PATCH v4 19/35] maple_tree: Add __init and __exit to test module Date: Thu, 18 May 2023 10:55:28 -0400 Message-Id: <20230518145544.1722059-20-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0059.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::6) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 816aadc3-44ce-454b-c52c-08db57b0136b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dzJZtxg76/uNr96PFKSD7ySuSRGC5RYAmJ+tkfGC8Ke7KCQeXfdWtijXJvAVYXG1G4MRi671/8IKuxZD8DUsnInR5gfNGqwi2gfe6M4iJIy0uPdxSpltDXCQG6IdcsJBiaCDO1wxacvCT6Lt7U0w1XEgIbQyMCohL19qVW3linRatVi1/bqnQYxK/Wc9391FMPkBPOgidatRCywec3t7LfIDnmNwvilaBK+mFpL+F3ZtBRhLVpWqrbj2ApAOHowUzv0KkTTJ3oXtYSBqWQWHFBDpM/Pf2OLi8Ld7iKTFnDbkI4xeYRZNsrctg0J3pTk7lU2dDjnMPUeZV5OtMeX4L6tRjVPgMxdfH1ZxLhvj2s7BhmdkuqaYkLgIXupbtgZG7WP0LQJJrEhpTHNwFT9O9StmnmG2twkruvMagQiIAtqDK/fKRjVNhfB8x8s0psHrYXgJkCmJm/SJZJ4sdocLD6/y2ErgvUPgsBlhGvkv07YX0kbBA7oSF5oNi9x8ahfxjGOy+LQhRrOgOV45RfOIcjnBM8filfbSLhe2wJkX1WDw4p1VK3q3a51ulxaQHWkr 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(40140700001)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(30864003)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bBLSVkyxjNW0kUA/plXsjJ5YXHck8qfs96FYg187KIFMoY1zZo2+KFdaQ2QZ?= =?us-ascii?Q?Q8lIvwasYkt2LF2K4qv/MaGy0Mzi9NOBzDhWh+TcgqRi8tyymAoti0SFPUd6?= =?us-ascii?Q?qXVsCxk0t+HtwncdVrZYzXMeyJpGv4CPbrSUjo05Ao9z1ljvK/4gysRU669D?= =?us-ascii?Q?MHPeAyKHj1U4d8s9oXxLxtoTaJbt1krqMPn15m9t6W30UNxzOVSbOhKojEUw?= =?us-ascii?Q?Vv8kbS+H1fLzM7liTrgt/MMVsUJeuB1WRMUCP7iQ7DjCQrppOQ40msZvdA0y?= =?us-ascii?Q?S2K0OHKhBGdOlWSbaM49p7Z5rnh9tmYviEerOxko8axB28N7/iXR9K38b5Gn?= =?us-ascii?Q?burt/tVq7zkgQXSoMbmJacxdUI24AeNSe3/mCK3eNjwnZHSafyH2XAKgJ6M6?= =?us-ascii?Q?jX7pbHOKr0EcpHygVQhZ3dMVr/KoWPLpdXAOI6hHT4bF8dzoG9UKsRMUO3M/?= =?us-ascii?Q?hoLyk/Zy+pRbl4PcfmNZrIOW9bGHYxz80eGGD39fpjG00BDEuE90BwRu+8Vd?= =?us-ascii?Q?5w0G957KZ3R3fDEkF3ji+D80oO5bM41N3T0nq9GkG+6Us8T75t7BFHVGVOh4?= =?us-ascii?Q?k2HcCdOMAg5Jn9SSLxb0R9Nh7PpD+OrjAJ3SO/hUHdZWxqbdMJs0M4mcmWgZ?= =?us-ascii?Q?K8xN2Gfln6KE89Jm3g4JFb7zsZqhtrycQP/921j0Tpge3q1Q01dQc0H4gbRj?= =?us-ascii?Q?S/UOq2atwxFcKKGobO00Thirpb/9UQeFa5+rMHI8HVptLLcEG4//7+EY4uZ2?= =?us-ascii?Q?804hngn854bYcPGwf+40zROxvlvmkB1BALWus4tXO20F0gv3N+oiicNqX4oa?= =?us-ascii?Q?8yhAwN5+4ZMvnAdaZ1T38qgPcVwvGfEd+UL82aORSgFxMPOtVFO9bZdQ26P7?= =?us-ascii?Q?oZ+jSM926tw2zJaDSuJt+qxLVnkYfdzKUaoKVvkGlVJoCzqpDCD8d7/XQDCw?= =?us-ascii?Q?oZmsuCownvn23O3f4Wo2r0/tUvZmpZSwmfeDeqzjOjr+MVhCpSGEyT21JfjJ?= =?us-ascii?Q?YHGuEFrckYv5e/fWCI3MbQTIBnx7uhvIFqy1rrZBPuC3bj/EyGqQ+g2BPgvx?= =?us-ascii?Q?+V8e+Pfol2Z7AB02oIXUEzYGRWylvvalA2lyEqmbT6SqBw6ZnJDGT/t6a38V?= =?us-ascii?Q?ojD4YP3p6iWokp9HV40fIKQTcx1rJvQHyrYgtZ3ZCq5gfYvjvYCDEfEmnScI?= =?us-ascii?Q?7dQhyvpuroPTZiRq9gg3gAL9hMIzfpVEbH0fnnm2mPp9HPjpqZtRFhEttWbd?= =?us-ascii?Q?X9r+Vu1pzy938wISdZvCmPV4LSJr34tpRAAAagRqezkTneDjqwYVvr7qQbZe?= =?us-ascii?Q?nsoVRNUgd02aFe2w9vNbkojkcdDpoZyYWxryj7ZjWCZFyFjDB4tvb5lQey+j?= =?us-ascii?Q?Ka1r963Bo+ygjHR5gUJMXwU5JZP9PcGt023mCfiWjoGmIyNl5x4z9n+heWq6?= =?us-ascii?Q?j6Bh4r/ZZB1Nj3DArVFBl8Q9444emWsOwuTzZUmlasjsJbc92vwoYSO/6yiv?= =?us-ascii?Q?lzJjSn7VjK795KbgMgyZxE3MqwnfK05sb/CDdnFKrO/QNdbXCopz8y5MWPlw?= =?us-ascii?Q?hYmToF0EjJRPIxKqh4beBhSGrKS+uUpvKPRhxKKm5Byb3P/aJwZC4xYT0i+J?= =?us-ascii?Q?bg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +AaliqxYYNloXGZxQwB465o2GAJbSSGlWI8a106oqjpugW2XYsZFqhkmbOg18BzyacPyxQpRyHWjhVGf4L5cFxnj/6hkD76/HUEWI5TlLCvLtOI274R007uqdjEHNfKjFzsG3kIbtw0zh35FFhwGeUIZnF5T1TKgugls983dylRzagvzawQetYHooQBnCWpHNJ/umVAzvPfxLPM9u9hjNt7LWgCUvQMmfCqL1HciEgDSbqRfZ9VRvZZ9iytuAC1QKtlqdpmSOxECoPxYZrSaVqbL4scn1tFNNcyxC+ruOJ3MgyGDuyhGJYj5hTo5g40Xk1UEwrlwfNiw6nYnxJpY+gZilA9GGq2z6BGoZvvSPY2JIXCsubVo/4rX5fTuOcsvdwp5jNlCGrd3XlbP5smFVX3rgz24404qMGovOEDSkL6OI/r7zXWwKNWa4JNUDynHC3zXc1GhJkBLJS4J+ezjSFZ+ASalJMmNXE4s8GKz6pcIkl8MnEQksn4aKT0XMFRbN9pXfnNVh4+T7PVIGtB1Dif6m6tlxFskSRSHH7U9zkpH0nvNwAtTn8vqQnh4EiXQI5s0DkWaCmy5Tq9l1MOKWW2rYKu8KhlE/1N+btvZ/uAONvdp5GXCC5cz8AaDJm45KihAhzrvTUBnuXSDuyLojpW1LQK2rXvX+uiJMTefUQEC+69cRmFXEfSxaqmjeuQyqYmpXcpu+BeimMxcnLXMdwrrQ/Uyr63qvMMwyJnFakiwBcy5TvCGAjsjzh6sb2zCmnEBHWVBRYON+ScXasu/fThWCWdiX3I4zDL0t7gXONfVhh60W5Scha+9Ikvx9bafGIPVa/l3VZrc18N0EOHsLrfH7gdkPLadhjrLkm6CsSHC2s3x9TG3h2pE1UH8/wuvDWfbwKsnJAb9CE2jqUhfRA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 816aadc3-44ce-454b-c52c-08db57b0136b 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:35.7057 (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: uaXkNx0CSjrQiPNvJdxme5aX/wcMTznN8Q9UapUZFdgUw7FkGRVvVsg05L+m2CXLfPprZ4y6YIwmruPFBf4vnQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: B9hzyscuY2AO5Z-0yWiuezNa3TNO3d0C X-Proofpoint-ORIG-GUID: B9hzyscuY2AO5Z-0yWiuezNa3TNO3d0C Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The test functions are not needed after the module is removed, so mark them as such. Add __exit to the module removal function. Some other variables have been marked as const static as well. Suggested-by: Andrew Morton Signed-off-by: Liam R. Howlett --- lib/test_maple_tree.c | 158 +++++++++++++------------- tools/testing/radix-tree/linux/init.h | 1 + tools/testing/radix-tree/maple.c | 147 ++++++++++++------------ 3 files changed, 155 insertions(+), 151 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 93b40a78c4f5..19b130c9ddde 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -51,54 +51,54 @@ atomic_t maple_tree_tests_passed; #else #define cond_resched() do {} while (0) #endif -static -int mtree_insert_index(struct maple_tree *mt, unsigned long index, gfp_t g= fp) +static int __init mtree_insert_index(struct maple_tree *mt, + unsigned long index, gfp_t gfp) { return mtree_insert(mt, index, xa_mk_value(index & LONG_MAX), gfp); } =20 -static void mtree_erase_index(struct maple_tree *mt, unsigned long index) +static void __init mtree_erase_index(struct maple_tree *mt, unsigned long = index) { MT_BUG_ON(mt, mtree_erase(mt, index) !=3D xa_mk_value(index & LONG_MAX)); MT_BUG_ON(mt, mtree_load(mt, index) !=3D NULL); } =20 -static int mtree_test_insert(struct maple_tree *mt, unsigned long index, +static int __init mtree_test_insert(struct maple_tree *mt, unsigned long i= ndex, void *ptr) { return mtree_insert(mt, index, ptr, GFP_KERNEL); } =20 -static int mtree_test_store_range(struct maple_tree *mt, unsigned long sta= rt, - unsigned long end, void *ptr) +static int __init mtree_test_store_range(struct maple_tree *mt, + unsigned long start, unsigned long end, void *ptr) { return mtree_store_range(mt, start, end, ptr, GFP_KERNEL); } =20 -static int mtree_test_store(struct maple_tree *mt, unsigned long start, +static int __init mtree_test_store(struct maple_tree *mt, unsigned long st= art, void *ptr) { return mtree_test_store_range(mt, start, start, ptr); } =20 -static int mtree_test_insert_range(struct maple_tree *mt, unsigned long st= art, - unsigned long end, void *ptr) +static int __init mtree_test_insert_range(struct maple_tree *mt, + unsigned long start, unsigned long end, void *ptr) { return mtree_insert_range(mt, start, end, ptr, GFP_KERNEL); } =20 -static void *mtree_test_load(struct maple_tree *mt, unsigned long index) +static void __init *mtree_test_load(struct maple_tree *mt, unsigned long i= ndex) { return mtree_load(mt, index); } =20 -static void *mtree_test_erase(struct maple_tree *mt, unsigned long index) +static void __init *mtree_test_erase(struct maple_tree *mt, unsigned long = index) { return mtree_erase(mt, index); } =20 #if defined(CONFIG_64BIT) -static noinline void check_mtree_alloc_range(struct maple_tree *mt, +static noinline void __init check_mtree_alloc_range(struct maple_tree *mt, unsigned long start, unsigned long end, unsigned long size, unsigned long expected, int eret, void *ptr) { @@ -115,7 +115,7 @@ static noinline void check_mtree_alloc_range(struct map= le_tree *mt, MT_BUG_ON(mt, result !=3D expected); } =20 -static noinline void check_mtree_alloc_rrange(struct maple_tree *mt, +static noinline void __init check_mtree_alloc_rrange(struct maple_tree *mt, unsigned long start, unsigned long end, unsigned long size, unsigned long expected, int eret, void *ptr) { @@ -133,8 +133,8 @@ static noinline void check_mtree_alloc_rrange(struct ma= ple_tree *mt, } #endif =20 -static noinline void check_load(struct maple_tree *mt, unsigned long index, - void *ptr) +static noinline void __init check_load(struct maple_tree *mt, + unsigned long index, void *ptr) { void *ret =3D mtree_test_load(mt, index); =20 @@ -143,7 +143,7 @@ static noinline void check_load(struct maple_tree *mt, = unsigned long index, MT_BUG_ON(mt, ret !=3D ptr); } =20 -static noinline void check_store_range(struct maple_tree *mt, +static noinline void __init check_store_range(struct maple_tree *mt, unsigned long start, unsigned long end, void *ptr, int expected) { int ret =3D -EINVAL; @@ -159,7 +159,7 @@ static noinline void check_store_range(struct maple_tre= e *mt, check_load(mt, i, ptr); } =20 -static noinline void check_insert_range(struct maple_tree *mt, +static noinline void __init check_insert_range(struct maple_tree *mt, unsigned long start, unsigned long end, void *ptr, int expected) { int ret =3D -EINVAL; @@ -175,8 +175,8 @@ static noinline void check_insert_range(struct maple_tr= ee *mt, check_load(mt, i, ptr); } =20 -static noinline void check_insert(struct maple_tree *mt, unsigned long ind= ex, - void *ptr) +static noinline void __init check_insert(struct maple_tree *mt, + unsigned long index, void *ptr) { int ret =3D -EINVAL; =20 @@ -184,7 +184,7 @@ static noinline void check_insert(struct maple_tree *mt= , unsigned long index, MT_BUG_ON(mt, ret !=3D 0); } =20 -static noinline void check_dup_insert(struct maple_tree *mt, +static noinline void __init check_dup_insert(struct maple_tree *mt, unsigned long index, void *ptr) { int ret =3D -EINVAL; @@ -194,13 +194,13 @@ static noinline void check_dup_insert(struct maple_tr= ee *mt, } =20 =20 -static noinline -void check_index_load(struct maple_tree *mt, unsigned long index) +static noinline void __init check_index_load(struct maple_tree *mt, + unsigned long index) { return check_load(mt, index, xa_mk_value(index & LONG_MAX)); } =20 -static inline int not_empty(struct maple_node *node) +static inline __init int not_empty(struct maple_node *node) { int i; =20 @@ -215,8 +215,8 @@ static inline int not_empty(struct maple_node *node) } =20 =20 -static noinline void check_rev_seq(struct maple_tree *mt, unsigned long ma= x, - bool verbose) +static noinline void __init check_rev_seq(struct maple_tree *mt, + unsigned long max, bool verbose) { unsigned long i =3D max, j; =20 @@ -248,7 +248,7 @@ static noinline void check_rev_seq(struct maple_tree *m= t, unsigned long max, #endif } =20 -static noinline void check_seq(struct maple_tree *mt, unsigned long max, +static noinline void __init check_seq(struct maple_tree *mt, unsigned long= max, bool verbose) { unsigned long i, j; @@ -277,7 +277,7 @@ static noinline void check_seq(struct maple_tree *mt, u= nsigned long max, #endif } =20 -static noinline void check_lb_not_empty(struct maple_tree *mt) +static noinline void __init check_lb_not_empty(struct maple_tree *mt) { unsigned long i, j; unsigned long huge =3D 4000UL * 1000 * 1000; @@ -296,13 +296,13 @@ static noinline void check_lb_not_empty(struct maple_= tree *mt) mtree_destroy(mt); } =20 -static noinline void check_lower_bound_split(struct maple_tree *mt) +static noinline void __init check_lower_bound_split(struct maple_tree *mt) { MT_BUG_ON(mt, !mtree_empty(mt)); check_lb_not_empty(mt); } =20 -static noinline void check_upper_bound_split(struct maple_tree *mt) +static noinline void __init check_upper_bound_split(struct maple_tree *mt) { unsigned long i, j; unsigned long huge; @@ -327,7 +327,7 @@ static noinline void check_upper_bound_split(struct map= le_tree *mt) mtree_destroy(mt); } =20 -static noinline void check_mid_split(struct maple_tree *mt) +static noinline void __init check_mid_split(struct maple_tree *mt) { unsigned long huge =3D 8000UL * 1000 * 1000; =20 @@ -336,7 +336,7 @@ static noinline void check_mid_split(struct maple_tree = *mt) check_lb_not_empty(mt); } =20 -static noinline void check_rev_find(struct maple_tree *mt) +static noinline void __init check_rev_find(struct maple_tree *mt) { int i, nr_entries =3D 200; void *val; @@ -375,7 +375,7 @@ static noinline void check_rev_find(struct maple_tree *= mt) rcu_read_unlock(); } =20 -static noinline void check_find(struct maple_tree *mt) +static noinline void __init check_find(struct maple_tree *mt) { unsigned long val =3D 0; unsigned long count; @@ -592,7 +592,7 @@ static noinline void check_find(struct maple_tree *mt) mtree_destroy(mt); } =20 -static noinline void check_find_2(struct maple_tree *mt) +static noinline void __init check_find_2(struct maple_tree *mt) { unsigned long i, j; void *entry; @@ -637,7 +637,7 @@ static noinline void check_find_2(struct maple_tree *mt) =20 =20 #if defined(CONFIG_64BIT) -static noinline void check_alloc_rev_range(struct maple_tree *mt) +static noinline void __init check_alloc_rev_range(struct maple_tree *mt) { /* * Generated by: @@ -645,7 +645,7 @@ static noinline void check_alloc_rev_range(struct maple= _tree *mt) * awk -F "-" '{printf "0x%s, 0x%s, ", $1, $2}' */ =20 - unsigned long range[] =3D { + static const unsigned long range[] =3D { /* Inclusive , Exclusive. */ 0x565234af2000, 0x565234af4000, 0x565234af4000, 0x565234af9000, @@ -673,7 +673,7 @@ static noinline void check_alloc_rev_range(struct maple= _tree *mt) 0x7fff58791000, 0x7fff58793000, }; =20 - unsigned long holes[] =3D { + static const unsigned long holes[] =3D { /* * Note: start of hole is INCLUSIVE * end of hole is EXCLUSIVE @@ -693,7 +693,7 @@ static noinline void check_alloc_rev_range(struct maple= _tree *mt) * 4. number that should be returned. * 5. return value */ - unsigned long req_range[] =3D { + static const unsigned long req_range[] =3D { 0x565234af9000, /* Min */ 0x7fff58791000, /* Max */ 0x1000, /* Size */ @@ -804,7 +804,7 @@ static noinline void check_alloc_rev_range(struct maple= _tree *mt) mtree_destroy(mt); } =20 -static noinline void check_alloc_range(struct maple_tree *mt) +static noinline void __init check_alloc_range(struct maple_tree *mt) { /* * Generated by: @@ -812,7 +812,7 @@ static noinline void check_alloc_range(struct maple_tre= e *mt) * awk -F "-" '{printf "0x%s, 0x%s, ", $1, $2}' */ =20 - unsigned long range[] =3D { + static const unsigned long range[] =3D { /* Inclusive , Exclusive. */ 0x565234af2000, 0x565234af4000, 0x565234af4000, 0x565234af9000, @@ -839,7 +839,7 @@ static noinline void check_alloc_range(struct maple_tre= e *mt) 0x7fff5878e000, 0x7fff58791000, 0x7fff58791000, 0x7fff58793000, }; - unsigned long holes[] =3D { + static const unsigned long holes[] =3D { /* Start of hole, end of hole, size of hole (+1) */ 0x565234afb000, 0x565234afc000, 0x1000, 0x565234afe000, 0x565235def000, 0x12F1000, @@ -854,7 +854,7 @@ static noinline void check_alloc_range(struct maple_tre= e *mt) * 4. number that should be returned. * 5. return value */ - unsigned long req_range[] =3D { + static const unsigned long req_range[] =3D { 0x565234af9000, /* Min */ 0x7fff58791000, /* Max */ 0x1000, /* Size */ @@ -963,10 +963,10 @@ static noinline void check_alloc_range(struct maple_t= ree *mt) } #endif =20 -static noinline void check_ranges(struct maple_tree *mt) +static noinline void __init check_ranges(struct maple_tree *mt) { int i, val, val2; - unsigned long r[] =3D { + static const unsigned long r[] =3D { 10, 15, 20, 25, 17, 22, /* Overlaps previous range. */ @@ -1231,7 +1231,7 @@ static noinline void check_ranges(struct maple_tree *= mt) MT_BUG_ON(mt, mt_height(mt) !=3D 4); } =20 -static noinline void check_next_entry(struct maple_tree *mt) +static noinline void __init check_next_entry(struct maple_tree *mt) { void *entry =3D NULL; unsigned long limit =3D 30, i =3D 0; @@ -1255,7 +1255,7 @@ static noinline void check_next_entry(struct maple_tr= ee *mt) mtree_destroy(mt); } =20 -static noinline void check_prev_entry(struct maple_tree *mt) +static noinline void __init check_prev_entry(struct maple_tree *mt) { unsigned long index =3D 16; void *value; @@ -1299,7 +1299,7 @@ static noinline void check_prev_entry(struct maple_tr= ee *mt) mas_unlock(&mas); } =20 -static noinline void check_root_expand(struct maple_tree *mt) +static noinline void __init check_root_expand(struct maple_tree *mt) { MA_STATE(mas, mt, 0, 0); void *ptr; @@ -1388,13 +1388,13 @@ static noinline void check_root_expand(struct maple= _tree *mt) mas_unlock(&mas); } =20 -static noinline void check_gap_combining(struct maple_tree *mt) +static noinline void __init check_gap_combining(struct maple_tree *mt) { struct maple_enode *mn1, *mn2; void *entry; unsigned long singletons =3D 100; - unsigned long *seq100; - unsigned long seq100_64[] =3D { + static const unsigned long *seq100; + static const unsigned long seq100_64[] =3D { /* 0-5 */ 74, 75, 76, 50, 100, 2, @@ -1408,7 +1408,7 @@ static noinline void check_gap_combining(struct maple= _tree *mt) 76, 2, 79, 85, 4, }; =20 - unsigned long seq100_32[] =3D { + static const unsigned long seq100_32[] =3D { /* 0-5 */ 61, 62, 63, 50, 100, 2, @@ -1422,11 +1422,11 @@ static noinline void check_gap_combining(struct map= le_tree *mt) 76, 2, 79, 85, 4, }; =20 - unsigned long seq2000[] =3D { + static const unsigned long seq2000[] =3D { 1152, 1151, 1100, 1200, 2, }; - unsigned long seq400[] =3D { + static const unsigned long seq400[] =3D { 286, 318, 256, 260, 266, 270, 275, 280, 290, 398, 286, 310, @@ -1585,7 +1585,7 @@ static noinline void check_gap_combining(struct maple= _tree *mt) mt_set_non_kernel(0); mtree_destroy(mt); } -static noinline void check_node_overwrite(struct maple_tree *mt) +static noinline void __init check_node_overwrite(struct maple_tree *mt) { int i, max =3D 4000; =20 @@ -1598,7 +1598,7 @@ static noinline void check_node_overwrite(struct mapl= e_tree *mt) } =20 #if defined(BENCH_SLOT_STORE) -static noinline void bench_slot_store(struct maple_tree *mt) +static noinline void __init bench_slot_store(struct maple_tree *mt) { int i, brk =3D 105, max =3D 1040, brk_start =3D 100, count =3D 20000000; =20 @@ -1614,7 +1614,7 @@ static noinline void bench_slot_store(struct maple_tr= ee *mt) #endif =20 #if defined(BENCH_NODE_STORE) -static noinline void bench_node_store(struct maple_tree *mt) +static noinline void __init bench_node_store(struct maple_tree *mt) { int i, overwrite =3D 76, max =3D 240, count =3D 20000000; =20 @@ -1633,7 +1633,7 @@ static noinline void bench_node_store(struct maple_tr= ee *mt) #endif =20 #if defined(BENCH_AWALK) -static noinline void bench_awalk(struct maple_tree *mt) +static noinline void __init bench_awalk(struct maple_tree *mt) { int i, max =3D 2500, count =3D 50000000; MA_STATE(mas, mt, 1470, 1470); @@ -1650,7 +1650,7 @@ static noinline void bench_awalk(struct maple_tree *m= t) } #endif #if defined(BENCH_WALK) -static noinline void bench_walk(struct maple_tree *mt) +static noinline void __init bench_walk(struct maple_tree *mt) { int i, max =3D 2500, count =3D 550000000; MA_STATE(mas, mt, 1470, 1470); @@ -1667,7 +1667,7 @@ static noinline void bench_walk(struct maple_tree *mt) #endif =20 #if defined(BENCH_MT_FOR_EACH) -static noinline void bench_mt_for_each(struct maple_tree *mt) +static noinline void __init bench_mt_for_each(struct maple_tree *mt) { int i, count =3D 1000000; unsigned long max =3D 2500, index =3D 0; @@ -1691,7 +1691,7 @@ static noinline void bench_mt_for_each(struct maple_t= ree *mt) #endif =20 /* check_forking - simulate the kernel forking sequence with the tree. */ -static noinline void check_forking(struct maple_tree *mt) +static noinline void __init check_forking(struct maple_tree *mt) { =20 struct maple_tree newmt; @@ -1730,7 +1730,7 @@ static noinline void check_forking(struct maple_tree = *mt) mtree_destroy(&newmt); } =20 -static noinline void check_iteration(struct maple_tree *mt) +static noinline void __init check_iteration(struct maple_tree *mt) { int i, nr_entries =3D 125; void *val; @@ -1798,7 +1798,7 @@ static noinline void check_iteration(struct maple_tre= e *mt) mt_set_non_kernel(0); } =20 -static noinline void check_mas_store_gfp(struct maple_tree *mt) +static noinline void __init check_mas_store_gfp(struct maple_tree *mt) { =20 struct maple_tree newmt; @@ -1831,7 +1831,7 @@ static noinline void check_mas_store_gfp(struct maple= _tree *mt) } =20 #if defined(BENCH_FORK) -static noinline void bench_forking(struct maple_tree *mt) +static noinline void __init bench_forking(struct maple_tree *mt) { =20 struct maple_tree newmt; @@ -1873,15 +1873,17 @@ static noinline void bench_forking(struct maple_tre= e *mt) } #endif =20 -static noinline void next_prev_test(struct maple_tree *mt) +static noinline void __init next_prev_test(struct maple_tree *mt) { int i, nr_entries; void *val; MA_STATE(mas, mt, 0, 0); struct maple_enode *mn; - unsigned long *level2; - unsigned long level2_64[] =3D {707, 1000, 710, 715, 720, 725}; - unsigned long level2_32[] =3D {1747, 2000, 1750, 1755, 1760, 1765}; + static const unsigned long *level2; + static const unsigned long level2_64[] =3D { 707, 1000, 710, 715, 720, + 725}; + static const unsigned long level2_32[] =3D { 1747, 2000, 1750, 1755, + 1760, 1765}; =20 if (MAPLE_32BIT) { nr_entries =3D 500; @@ -2049,7 +2051,7 @@ static noinline void next_prev_test(struct maple_tree= *mt) =20 =20 /* Test spanning writes that require balancing right sibling or right cous= in */ -static noinline void check_spanning_relatives(struct maple_tree *mt) +static noinline void __init check_spanning_relatives(struct maple_tree *mt) { =20 unsigned long i, nr_entries =3D 1000; @@ -2062,7 +2064,7 @@ static noinline void check_spanning_relatives(struct = maple_tree *mt) mtree_store_range(mt, 9365, 9955, NULL, GFP_KERNEL); } =20 -static noinline void check_fuzzer(struct maple_tree *mt) +static noinline void __init check_fuzzer(struct maple_tree *mt) { /* * 1. Causes a spanning rebalance of a single root node. @@ -2459,7 +2461,7 @@ static noinline void check_fuzzer(struct maple_tree *= mt) } =20 /* duplicate the tree with a specific gap */ -static noinline void check_dup_gaps(struct maple_tree *mt, +static noinline void __init check_dup_gaps(struct maple_tree *mt, unsigned long nr_entries, bool zero_start, unsigned long gap) { @@ -2499,7 +2501,7 @@ static noinline void check_dup_gaps(struct maple_tree= *mt, } =20 /* Duplicate many sizes of trees. Mainly to test expected entry values */ -static noinline void check_dup(struct maple_tree *mt) +static noinline void __init check_dup(struct maple_tree *mt) { int i; int big_start =3D 100010; @@ -2587,7 +2589,7 @@ static noinline void check_dup(struct maple_tree *mt) } } =20 -static noinline void check_bnode_min_spanning(struct maple_tree *mt) +static noinline void __init check_bnode_min_spanning(struct maple_tree *mt) { int i =3D 50; MA_STATE(mas, mt, 0, 0); @@ -2606,7 +2608,7 @@ static noinline void check_bnode_min_spanning(struct = maple_tree *mt) mt_set_non_kernel(0); } =20 -static noinline void check_empty_area_window(struct maple_tree *mt) +static noinline void __init check_empty_area_window(struct maple_tree *mt) { unsigned long i, nr_entries =3D 20; MA_STATE(mas, mt, 0, 0); @@ -2691,7 +2693,7 @@ static noinline void check_empty_area_window(struct m= aple_tree *mt) rcu_read_unlock(); } =20 -static noinline void check_empty_area_fill(struct maple_tree *mt) +static noinline void __init check_empty_area_fill(struct maple_tree *mt) { const unsigned long max =3D 0x25D78000; unsigned long size; @@ -2735,11 +2737,11 @@ static noinline void check_empty_area_fill(struct m= aple_tree *mt) } =20 static DEFINE_MTREE(tree); -static int maple_tree_seed(void) +static int __init maple_tree_seed(void) { - unsigned long set[] =3D {5015, 5014, 5017, 25, 1000, - 1001, 1002, 1003, 1005, 0, - 5003, 5002}; + unsigned long set[] =3D { 5015, 5014, 5017, 25, 1000, + 1001, 1002, 1003, 1005, 0, + 5003, 5002}; void *ptr =3D &set; =20 pr_info("\nTEST STARTING\n\n"); @@ -3009,7 +3011,7 @@ static int maple_tree_seed(void) return -EINVAL; } =20 -static void maple_tree_harvest(void) +static void __exit maple_tree_harvest(void) { =20 } diff --git a/tools/testing/radix-tree/linux/init.h b/tools/testing/radix-tr= ee/linux/init.h index 1bb0afc21309..81563c3dfce7 100644 --- a/tools/testing/radix-tree/linux/init.h +++ b/tools/testing/radix-tree/linux/init.h @@ -1 +1,2 @@ #define __init +#define __exit diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index cf37ed9ab6c4..03539d86cdf0 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -14,6 +14,7 @@ #include "test.h" #include #include +#include "linux/init.h" =20 #define module_init(x) #define module_exit(x) @@ -80,7 +81,7 @@ static void check_mas_alloc_node_count(struct ma_state *m= as) * check_new_node() - Check the creation of new nodes and error path * verification. */ -static noinline void check_new_node(struct maple_tree *mt) +static noinline void __init check_new_node(struct maple_tree *mt) { =20 struct maple_node *mn, *mn2, *mn3; @@ -454,7 +455,7 @@ static noinline void check_new_node(struct maple_tree *= mt) /* * Check erasing including RCU. */ -static noinline void check_erase(struct maple_tree *mt, unsigned long inde= x, +static noinline void __init check_erase(struct maple_tree *mt, unsigned lo= ng index, void *ptr) { MT_BUG_ON(mt, mtree_test_erase(mt, index) !=3D ptr); @@ -464,24 +465,24 @@ static noinline void check_erase(struct maple_tree *m= t, unsigned long index, #define erase_check_insert(mt, i) check_insert(mt, set[i], entry[i%2]) #define erase_check_erase(mt, i) check_erase(mt, set[i], entry[i%2]) =20 -static noinline void check_erase_testset(struct maple_tree *mt) +static noinline void __init check_erase_testset(struct maple_tree *mt) { - unsigned long set[] =3D { 5015, 5014, 5017, 25, 1000, - 1001, 1002, 1003, 1005, 0, - 6003, 6002, 6008, 6012, 6015, - 7003, 7002, 7008, 7012, 7015, - 8003, 8002, 8008, 8012, 8015, - 9003, 9002, 9008, 9012, 9015, - 10003, 10002, 10008, 10012, 10015, - 11003, 11002, 11008, 11012, 11015, - 12003, 12002, 12008, 12012, 12015, - 13003, 13002, 13008, 13012, 13015, - 14003, 14002, 14008, 14012, 14015, - 15003, 15002, 15008, 15012, 15015, - }; - - - void *ptr =3D &set; + static const unsigned long set[] =3D { 5015, 5014, 5017, 25, 1000, + 1001, 1002, 1003, 1005, 0, + 6003, 6002, 6008, 6012, 6015, + 7003, 7002, 7008, 7012, 7015, + 8003, 8002, 8008, 8012, 8015, + 9003, 9002, 9008, 9012, 9015, + 10003, 10002, 10008, 10012, 10015, + 11003, 11002, 11008, 11012, 11015, + 12003, 12002, 12008, 12012, 12015, + 13003, 13002, 13008, 13012, 13015, + 14003, 14002, 14008, 14012, 14015, + 15003, 15002, 15008, 15012, 15015, + }; + + + void *ptr =3D &check_erase_testset; void *entry[2] =3D { ptr, mt }; void *root_node; =20 @@ -738,7 +739,7 @@ static noinline void check_erase_testset(struct maple_t= ree *mt) int mas_ce2_over_count(struct ma_state *mas_start, struct ma_state *mas_en= d, void *s_entry, unsigned long s_min, void *e_entry, unsigned long e_max, - unsigned long *set, int i, bool null_entry) + const unsigned long *set, int i, bool null_entry) { int count =3D 0, span =3D 0; unsigned long retry =3D 0; @@ -968,8 +969,8 @@ static inline void *mas_range_load(struct ma_state *mas, } =20 #if defined(CONFIG_64BIT) -static noinline void check_erase2_testset(struct maple_tree *mt, - unsigned long *set, unsigned long size) +static noinline void __init check_erase2_testset(struct maple_tree *mt, + const unsigned long *set, unsigned long size) { int entry_count =3D 0; int check =3D 0; @@ -1113,11 +1114,11 @@ static noinline void check_erase2_testset(struct ma= ple_tree *mt, =20 =20 /* These tests were pulled from KVM tree modifications which failed. */ -static noinline void check_erase2_sets(struct maple_tree *mt) +static noinline void __init check_erase2_sets(struct maple_tree *mt) { void *entry; unsigned long start =3D 0; - unsigned long set[] =3D { + static const unsigned long set[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140721266458624, 140737488351231, ERASE, 140721266458624, 140737488351231, @@ -1135,7 +1136,7 @@ ERASE, 140253902692352, 140253902864383, STORE, 140253902692352, 140253902696447, STORE, 140253902696448, 140253902864383, }; - unsigned long set2[] =3D { + static const unsigned long set2[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140735933583360, 140737488351231, ERASE, 140735933583360, 140737488351231, @@ -1159,7 +1160,7 @@ STORE, 140277094813696, 140277094821887, STORE, 140277094821888, 140277094825983, STORE, 140735933906944, 140735933911039, }; - unsigned long set3[] =3D { + static const unsigned long set3[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140735790264320, 140737488351231, ERASE, 140735790264320, 140737488351231, @@ -1202,7 +1203,7 @@ STORE, 47135835840512, 47135835885567, STORE, 47135835885568, 47135835893759, }; =20 - unsigned long set4[] =3D { + static const unsigned long set4[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140728251703296, 140737488351231, ERASE, 140728251703296, 140737488351231, @@ -1223,7 +1224,7 @@ ERASE, 47646523277312, 47646523445247, STORE, 47646523277312, 47646523400191, }; =20 - unsigned long set5[] =3D { + static const unsigned long set5[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140726874062848, 140737488351231, ERASE, 140726874062848, 140737488351231, @@ -1356,7 +1357,7 @@ STORE, 47884791619584, 47884791623679, STORE, 47884791623680, 47884791627775, }; =20 - unsigned long set6[] =3D { + static const unsigned long set6[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140722999021568, 140737488351231, ERASE, 140722999021568, 140737488351231, @@ -1488,7 +1489,7 @@ ERASE, 47430432014336, 47430432022527, STORE, 47430432014336, 47430432018431, STORE, 47430432018432, 47430432022527, }; - unsigned long set7[] =3D { + static const unsigned long set7[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140729808330752, 140737488351231, ERASE, 140729808330752, 140737488351231, @@ -1620,7 +1621,7 @@ ERASE, 47439987130368, 47439987138559, STORE, 47439987130368, 47439987134463, STORE, 47439987134464, 47439987138559, }; - unsigned long set8[] =3D { + static const unsigned long set8[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140722482974720, 140737488351231, ERASE, 140722482974720, 140737488351231, @@ -1753,7 +1754,7 @@ STORE, 47708488638464, 47708488642559, STORE, 47708488642560, 47708488646655, }; =20 - unsigned long set9[] =3D { + static const unsigned long set9[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140736427839488, 140737488351231, ERASE, 140736427839488, 140736427839488, @@ -5619,7 +5620,7 @@ ERASE, 47906195480576, 47906195480576, STORE, 94641242615808, 94641242750975, }; =20 - unsigned long set10[] =3D { + static const unsigned long set10[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140736427839488, 140737488351231, ERASE, 140736427839488, 140736427839488, @@ -9483,7 +9484,7 @@ STORE, 139726599680000, 139726599684095, ERASE, 47906195480576, 47906195480576, STORE, 94641242615808, 94641242750975, }; - unsigned long set11[] =3D { + static const unsigned long set11[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140732658499584, 140737488351231, ERASE, 140732658499584, 140732658499584, @@ -9509,7 +9510,7 @@ STORE, 140732658565120, 140732658569215, STORE, 140732658552832, 140732658565119, }; =20 - unsigned long set12[] =3D { /* contains 12 values. */ + static const unsigned long set12[] =3D { /* contains 12 values. */ STORE, 140737488347136, 140737488351231, STORE, 140732658499584, 140737488351231, ERASE, 140732658499584, 140732658499584, @@ -9536,7 +9537,7 @@ STORE, 140732658552832, 140732658565119, STORE, 140014592741375, 140014592741375, /* contrived */ STORE, 140014592733184, 140014592741376, /* creates first entry retry. */ }; - unsigned long set13[] =3D { + static const unsigned long set13[] =3D { STORE, 140373516247040, 140373516251135,/*: ffffa2e7b0e10d80 */ STORE, 140373516251136, 140373516255231,/*: ffffa2e7b1195d80 */ STORE, 140373516255232, 140373516443647,/*: ffffa2e7b0e109c0 */ @@ -9549,7 +9550,7 @@ STORE, 140373518684160, 140373518688254,/*: ffffa2e7b= 05fec00 */ STORE, 140373518688256, 140373518692351,/*: ffffa2e7bfbdcd80 */ STORE, 140373518692352, 140373518696447,/*: ffffa2e7b0749e40 */ }; - unsigned long set14[] =3D { + static const unsigned long set14[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140731667996672, 140737488351231, SNULL, 140731668000767, 140737488351231, @@ -9833,7 +9834,7 @@ SNULL, 139826136543232, 139826136809471, STORE, 139826136809472, 139826136842239, STORE, 139826136543232, 139826136809471, }; - unsigned long set15[] =3D { + static const unsigned long set15[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140722061451264, 140737488351231, SNULL, 140722061455359, 140737488351231, @@ -10118,7 +10119,7 @@ STORE, 139906808958976, 139906808991743, STORE, 139906808692736, 139906808958975, }; =20 - unsigned long set16[] =3D { + static const unsigned long set16[] =3D { STORE, 94174808662016, 94174809321471, STORE, 94174811414528, 94174811426815, STORE, 94174811426816, 94174811430911, @@ -10329,7 +10330,7 @@ STORE, 139921865613312, 139921865617407, STORE, 139921865547776, 139921865564159, }; =20 - unsigned long set17[] =3D { + static const unsigned long set17[] =3D { STORE, 94397057224704, 94397057646591, STORE, 94397057650688, 94397057691647, STORE, 94397057691648, 94397057695743, @@ -10391,7 +10392,7 @@ STORE, 140720477511680, 140720477646847, STORE, 140720478302208, 140720478314495, STORE, 140720478314496, 140720478318591, }; - unsigned long set18[] =3D { + static const unsigned long set18[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140724953673728, 140737488351231, SNULL, 140724953677823, 140737488351231, @@ -10424,7 +10425,7 @@ STORE, 140222970597376, 140222970605567, ERASE, 140222970597376, 140222970605567, STORE, 140222970597376, 140222970605567, }; - unsigned long set19[] =3D { + static const unsigned long set19[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140725182459904, 140737488351231, SNULL, 140725182463999, 140737488351231, @@ -10693,7 +10694,7 @@ STORE, 140656836775936, 140656836780031, STORE, 140656787476480, 140656791920639, ERASE, 140656774639616, 140656779083775, }; - unsigned long set20[] =3D { + static const unsigned long set20[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140735952392192, 140737488351231, SNULL, 140735952396287, 140737488351231, @@ -10849,7 +10850,7 @@ STORE, 140590386819072, 140590386823167, STORE, 140590386823168, 140590386827263, SNULL, 140590376591359, 140590376595455, }; - unsigned long set21[] =3D { + static const unsigned long set21[] =3D { STORE, 93874710941696, 93874711363583, STORE, 93874711367680, 93874711408639, STORE, 93874711408640, 93874711412735, @@ -10919,7 +10920,7 @@ ERASE, 140708393312256, 140708393316351, ERASE, 140708393308160, 140708393312255, ERASE, 140708393291776, 140708393308159, }; - unsigned long set22[] =3D { + static const unsigned long set22[] =3D { STORE, 93951397134336, 93951397183487, STORE, 93951397183488, 93951397728255, STORE, 93951397728256, 93951397826559, @@ -11046,7 +11047,7 @@ STORE, 140551361253376, 140551361519615, ERASE, 140551361253376, 140551361519615, }; =20 - unsigned long set23[] =3D { + static const unsigned long set23[] =3D { STORE, 94014447943680, 94014448156671, STORE, 94014450253824, 94014450257919, STORE, 94014450257920, 94014450266111, @@ -14370,7 +14371,7 @@ SNULL, 140175956627455, 140175985139711, STORE, 140175927242752, 140175956627455, STORE, 140175956627456, 140175985139711, }; - unsigned long set24[] =3D { + static const unsigned long set24[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140735281639424, 140737488351231, SNULL, 140735281643519, 140737488351231, @@ -15532,7 +15533,7 @@ ERASE, 139635393024000, 139635401412607, ERASE, 139635384627200, 139635384631295, ERASE, 139635384631296, 139635393019903, }; - unsigned long set25[] =3D { + static const unsigned long set25[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140737488343040, 140737488351231, STORE, 140722547441664, 140737488351231, @@ -22320,7 +22321,7 @@ STORE, 140249652703232, 140249682087935, STORE, 140249682087936, 140249710600191, }; =20 - unsigned long set26[] =3D { + static const unsigned long set26[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140729464770560, 140737488351231, SNULL, 140729464774655, 140737488351231, @@ -22344,7 +22345,7 @@ ERASE, 140109040951296, 140109040959487, STORE, 140109040955392, 140109040959487, ERASE, 140109040955392, 140109040959487, }; - unsigned long set27[] =3D { + static const unsigned long set27[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140726128070656, 140737488351231, SNULL, 140726128074751, 140737488351231, @@ -22740,7 +22741,7 @@ STORE, 140415509696512, 140415535910911, ERASE, 140415537422336, 140415562588159, STORE, 140415482433536, 140415509696511, }; - unsigned long set28[] =3D { + static const unsigned long set28[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140722475622400, 140737488351231, SNULL, 140722475626495, 140737488351231, @@ -22808,7 +22809,7 @@ STORE, 139918413348864, 139918413352959, ERASE, 139918413316096, 139918413344767, STORE, 93865848528896, 93865848664063, }; - unsigned long set29[] =3D { + static const unsigned long set29[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140734467944448, 140737488351231, SNULL, 140734467948543, 140737488351231, @@ -23683,7 +23684,7 @@ ERASE, 140143079972864, 140143088361471, ERASE, 140143205793792, 140143205797887, ERASE, 140143205797888, 140143214186495, }; - unsigned long set30[] =3D { + static const unsigned long set30[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140733436743680, 140737488351231, SNULL, 140733436747775, 140737488351231, @@ -24565,7 +24566,7 @@ ERASE, 140165225893888, 140165225897983, ERASE, 140165225897984, 140165234286591, ERASE, 140165058105344, 140165058109439, }; - unsigned long set31[] =3D { + static const unsigned long set31[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140730890784768, 140737488351231, SNULL, 140730890788863, 140737488351231, @@ -25378,7 +25379,7 @@ ERASE, 140623906590720, 140623914979327, ERASE, 140622950277120, 140622950281215, ERASE, 140622950281216, 140622958669823, }; - unsigned long set32[] =3D { + static const unsigned long set32[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140731244212224, 140737488351231, SNULL, 140731244216319, 140737488351231, @@ -26174,7 +26175,7 @@ ERASE, 140400417288192, 140400425676799, ERASE, 140400283066368, 140400283070463, ERASE, 140400283070464, 140400291459071, }; - unsigned long set33[] =3D { + static const unsigned long set33[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140734562918400, 140737488351231, SNULL, 140734562922495, 140737488351231, @@ -26316,7 +26317,7 @@ STORE, 140582961786880, 140583003750399, ERASE, 140582961786880, 140583003750399, }; =20 - unsigned long set34[] =3D { + static const unsigned long set34[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140731327180800, 140737488351231, SNULL, 140731327184895, 140737488351231, @@ -27197,7 +27198,7 @@ ERASE, 140012522094592, 140012530483199, ERASE, 140012033142784, 140012033146879, ERASE, 140012033146880, 140012041535487, }; - unsigned long set35[] =3D { + static const unsigned long set35[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140730536939520, 140737488351231, SNULL, 140730536943615, 140737488351231, @@ -27954,7 +27955,7 @@ ERASE, 140474471936000, 140474480324607, ERASE, 140474396430336, 140474396434431, ERASE, 140474396434432, 140474404823039, }; - unsigned long set36[] =3D { + static const unsigned long set36[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140723893125120, 140737488351231, SNULL, 140723893129215, 140737488351231, @@ -28815,7 +28816,7 @@ ERASE, 140121890357248, 140121898745855, ERASE, 140121269587968, 140121269592063, ERASE, 140121269592064, 140121277980671, }; - unsigned long set37[] =3D { + static const unsigned long set37[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140722404016128, 140737488351231, SNULL, 140722404020223, 140737488351231, @@ -28941,7 +28942,7 @@ STORE, 139759821246464, 139759888355327, ERASE, 139759821246464, 139759888355327, ERASE, 139759888355328, 139759955464191, }; - unsigned long set38[] =3D { + static const unsigned long set38[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140730666221568, 140737488351231, SNULL, 140730666225663, 140737488351231, @@ -29751,7 +29752,7 @@ ERASE, 140613504712704, 140613504716799, ERASE, 140613504716800, 140613513105407, }; =20 - unsigned long set39[] =3D { + static const unsigned long set39[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140736271417344, 140737488351231, SNULL, 140736271421439, 140737488351231, @@ -30123,7 +30124,7 @@ STORE, 140325364428800, 140325372821503, STORE, 140325356036096, 140325364428799, SNULL, 140325364432895, 140325372821503, }; - unsigned long set40[] =3D { + static const unsigned long set40[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140734309167104, 140737488351231, SNULL, 140734309171199, 140737488351231, @@ -30874,7 +30875,7 @@ ERASE, 140320289300480, 140320289304575, ERASE, 140320289304576, 140320297693183, ERASE, 140320163409920, 140320163414015, }; - unsigned long set41[] =3D { + static const unsigned long set41[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140728157171712, 140737488351231, SNULL, 140728157175807, 140737488351231, @@ -31184,7 +31185,7 @@ STORE, 94376135090176, 94376135094271, STORE, 94376135094272, 94376135098367, SNULL, 94376135094272, 94377208836095, }; - unsigned long set42[] =3D { + static const unsigned long set42[] =3D { STORE, 314572800, 1388314623, STORE, 1462157312, 1462169599, STORE, 1462169600, 1462185983, @@ -33861,7 +33862,7 @@ SNULL, 3798999040, 3799101439, */ }; =20 - unsigned long set43[] =3D { + static const unsigned long set43[] =3D { STORE, 140737488347136, 140737488351231, STORE, 140734187720704, 140737488351231, SNULL, 140734187724800, 140737488351231, @@ -34995,7 +34996,7 @@ void run_check_rcu_slowread(struct maple_tree *mt, = struct rcu_test_struct *vals) MT_BUG_ON(mt, !vals->seen_entry3); MT_BUG_ON(mt, !vals->seen_both); } -static noinline void check_rcu_simulated(struct maple_tree *mt) +static noinline void __init check_rcu_simulated(struct maple_tree *mt) { unsigned long i, nr_entries =3D 1000; unsigned long target =3D 4320; @@ -35156,7 +35157,7 @@ static noinline void check_rcu_simulated(struct map= le_tree *mt) rcu_unregister_thread(); } =20 -static noinline void check_rcu_threaded(struct maple_tree *mt) +static noinline void __init check_rcu_threaded(struct maple_tree *mt) { unsigned long i, nr_entries =3D 1000; struct rcu_test_struct vals; @@ -35369,7 +35370,7 @@ static void check_dfs_preorder(struct maple_tree *m= t) /* End of depth first search tests */ =20 /* Preallocation testing */ -static noinline void check_prealloc(struct maple_tree *mt) +static noinline void __init check_prealloc(struct maple_tree *mt) { unsigned long i, max =3D 100; unsigned long allocated; @@ -35497,7 +35498,7 @@ static noinline void check_prealloc(struct maple_tr= ee *mt) /* End of preallocation testing */ =20 /* Spanning writes, writes that span nodes and layers of the tree */ -static noinline void check_spanning_write(struct maple_tree *mt) +static noinline void __init check_spanning_write(struct maple_tree *mt) { unsigned long i, max =3D 5000; MA_STATE(mas, mt, 1200, 2380); @@ -35665,7 +35666,7 @@ static noinline void check_spanning_write(struct ma= ple_tree *mt) /* End of spanning write testing */ =20 /* Writes to a NULL area that are adjacent to other NULLs */ -static noinline void check_null_expand(struct maple_tree *mt) +static noinline void __init check_null_expand(struct maple_tree *mt) { unsigned long i, max =3D 100; unsigned char data_end; @@ -35726,7 +35727,7 @@ static noinline void check_null_expand(struct maple= _tree *mt) /* End of NULL area expansions */ =20 /* Checking for no memory is best done outside the kernel */ -static noinline void check_nomem(struct maple_tree *mt) +static noinline void __init check_nomem(struct maple_tree *mt) { MA_STATE(ms, mt, 1, 1); =20 @@ -35761,7 +35762,7 @@ static noinline void check_nomem(struct maple_tree = *mt) mtree_destroy(mt); } =20 -static noinline void check_locky(struct maple_tree *mt) +static noinline void __init check_locky(struct maple_tree *mt) { MA_STATE(ms, mt, 2, 2); MA_STATE(reader, mt, 2, 2); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84515C77B7D for ; Thu, 18 May 2023 14:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231892AbjERO7I (ORCPT ); Thu, 18 May 2023 10:59:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbjERO63 (ORCPT ); Thu, 18 May 2023 10:58:29 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65E9D1718 for ; Thu, 18 May 2023 07:58:05 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34ICFdMs011817; Thu, 18 May 2023 14:56:42 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=o0r44DGQi8lK2mAF2MeGErME5jJFvB3OhAPffrijvsw=; b=lYOeeb9tDTjBgHu760IoeDoitHpUdCuD7LLlDQQ3Ik596W9oIwml1Uo4+egtXCguqkDg MZeI7wjRwWiE1SeeZ29uFHVntjvR2vjcXAG9pYgztEgffRAqheI/zMSDJvjjW2XHWk2e uC0r1BbIJ9Yl1HMrrb41t4LYkzb2SdRNt9gUsl6nCzjtbzpstfWCAa25epKaEqHWb8QJ wmecwGeXsuGEWDHZl+qqiR+ohdZvTTS9gALf7ht/7WAEo2O7TJbMyGpoPGUat0zXKdod /gxna+ss1svib4Llf6w1vDDGQ9/rN9iCv0UjhB3n1/8KOqNG/sPetP0bMO9KZSex2lIS Cw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qnkux8am4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:41 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE58OA039952; Thu, 18 May 2023 14:56:40 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mq77-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DMFVcldKu0no20qaOBhHqogU9oKB1+MqoJq7sSeAKJdJYvWCVsFBACDJxczQgOKPVaC0MBMss1o2D0x9hb132f1x06LTwiwYCby7+Y2xn49XpY/40PQaglNff9UaSEfmE9xNkpThyKjA75V4kYT7Wu9CIRZagCkRME2m/JM9OadDq5HdN0Y8eyyi76EXXHGPUSCJHWAiO930Zv2Sd2RL4Iz+FtorSwtFt2spOA71+Umhv9ANcJIQXAkGoYe1EX4I2unK5QvMQm4FLhS/8jPk4YQLZzAAeLocpSEiS9QrC6LXv/h1OJcVT6ewLIVMTvf2bjerjLB9ZCMWz90Y6xrotA== 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=o0r44DGQi8lK2mAF2MeGErME5jJFvB3OhAPffrijvsw=; b=FLr3burNW0/jLUid9KA/IGZApPDOhT++qQytnjboiExsQF2ViZ1oNkKafsTRudO5+HwGcqlKDgMvIVMN6rXFtwFQL5oyZpYqG49QqzZgTc0NXkOuNB9h+iWwq9QB/X9rCQ6cj+GpXKWwIA5FwBV11lCKCBGY/omSAsJy7L6dzIIWcpe+RYTEDdMJqBctau3LyjhKHCsS3SqZwRvZH2OzJ27lCeBpT4thHuFVTHyAYoIb80RrTiODa8GyYtOImFAaRdjUMjaKdtdqTj+9f2rUnznIESK3Y2ItSFR7M/byTGhFJTmlnnTgRUXB1ji0Pk5YquY0wZ1z4BLd2egYWqU3wg== 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=o0r44DGQi8lK2mAF2MeGErME5jJFvB3OhAPffrijvsw=; b=s/ySPeV+sbo4/piqxoX5wWOjISchDKODU0DFNs9jD35gQZiVSgeX8L0LbaAiHacRUR5D2GkVg8KfWIukNifzB/KljCq3yw4cAQTo2t3lDeJkDkub468ZmS4a1nsi5A4XMGquRr4FpQjOUVRw+eEL1g6vB508lBKYtHwE4CPCed8= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:38 +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:38 +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" , Peng Zhang Subject: [PATCH v4 20/35] maple_tree: Remove unnecessary check from mas_destroy() Date: Thu, 18 May 2023 10:55:29 -0400 Message-Id: <20230518145544.1722059-21-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0048.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::32) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 875d706d-cf57-4bac-0bfe-08db57b01520 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CbY39T8TPABngFOk3XXWn5+iR6zWcCcBKY7CrBNpW+phjZ2r5zHgJ2XSPylEf9OKCXI17slEOnjCPCP+SPQaH1x/fT3E6cOw3G3LXiUbanRlrMAJJxxZm7AzkrApeYZXT4pQsKi5hes6vO4nTyCqiy3Hsiu+OIHbgSA8MKK64PVl8LPNN5GhgAR3NDbRrFsBQNUPcNJ3n/WO505cvIUTmp85W52Ipr5uXhkgT82j5fG8FYMXGLiyE8ja1xJpRGQPuyyqybAvOfR/Wn6gWR3uj+AdHc7uBYutpEIu9tJ2nBToHsgLz/XnEpdkU6qrMdTd7pWwwjIm6djLYonUhXeYOwbIaYiCoBBjf/wlFZY+WJws9QlWx0r9VbdzHaJZUJRglcFpP/3Fj7yMDjhYzt3UYGfz83OgD5w5CLhSmunGiszb3cqZc0HxDQqPCULaVj/OURTVZP9hYBJq63kMTna8rTAt8Aky8OHVOUdcETrfTuEm8zX8vBFvl4pPinWgUnLws3Ueqy9B0FpYsxZeCWbgxaTnvPjEwtURyYD15DvCTrhp+Nk2tey9jZuMbnALvXEo 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(54906003)(2906002)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hGU/L9P0z/sLWHGZmdfo8bPOejmYmFheOhcboWPZGdaLeeIIsfzRLwQdLyPl?= =?us-ascii?Q?uCE4vlR0Ao2yrcHQD08aV2TdlxcK6U92L7v58weZqRoRVn2QnVQXxjIoP8x5?= =?us-ascii?Q?Z2SV7MqnW8apjiq24Db5V/EIjkyr+3CpmuHEXMim0MPmsb7wuujig7HHMFq9?= =?us-ascii?Q?Bk8TeuuayCHoLoDA2NhsECiv2AKLdb9GX4UT4JMitF4UwVTFAYEM01SrZwVw?= =?us-ascii?Q?Vn6+81+LELWO1J+sJJngpB/MPM02LmH0RZ8drNv1cnjl0HK0Fr575d9S86o1?= =?us-ascii?Q?NLc8jH8arriNFHxoCjQTiul6riBqAnPH9y6C+lPo3hFl1SjTxMkdn88/4iNa?= =?us-ascii?Q?rfiEjzulrua1lm7bxJljoKrMkO0ASwtrIoY6EoV0MTUdGL+JIVXhhktqSNRt?= =?us-ascii?Q?RmHeeRSdkH2bIZ1r1bx3nk+md/xS25E7FzSjPPCcvLr8zYPXrVNJmp2ysAiL?= =?us-ascii?Q?/wfJaII5Gi0Q16CLpVWsisB7ARoIfJb/boblcEpGAB3a65L4kKoziVZ9rZ0e?= =?us-ascii?Q?91763O3dsYSTfvzkd5nHLrTiVt9l+h9OU3oucQclbhL2Zh0ceZOuopOQyB/0?= =?us-ascii?Q?FbFUyL0r3atgsBN3D0KRwMXCFqKiXWltaaVMvRD8KHhxt0KyucrkoIzGFNbm?= =?us-ascii?Q?sFrJIyMTvuwX+UKL4upCOYphzQ1aHauQnOMo5FA87eQHVPnl77JoZNjfpqil?= =?us-ascii?Q?j2XDvkk/umM0Zc8gUQJmIQXdfiP19s3XTi+FQAcXJ8tmC1KegW7etdI9pi2A?= =?us-ascii?Q?+gbgFaXvmYEIkmBJk0ZagSA7LFAI9kVAXCgqs/j/zqTeO8HsY479mTEsWQ8b?= =?us-ascii?Q?pNMqSkg8Zd8uHwhcQeb5xBWk0AqM3SNuaQr6H2vqkP4TDDXksujIW97tUZe5?= =?us-ascii?Q?54Z3UXIz/w0uFihNEH7DVglD03AS7sPfhAx36ONi7JEoqkFj0J/Lo/abx/n/?= =?us-ascii?Q?GvM9ojtYXDvqWixpda+chy4FgiL6jBiQq3uRZ4UVqjzWjuAA0TheykpI4895?= =?us-ascii?Q?qZAKBeNP1H0N2QjPCDZ0nW28Rlses21qpO+lfon9f3rbmd3BQFDd8jDrmmXt?= =?us-ascii?Q?2k+O3tcK0CxiKevlB9bcV81jktK6iaTdNbeXvCAuQ6JryrNu21YPUb77IXPK?= =?us-ascii?Q?wRZF/cCYkR1QJ5Vh83cJE+izmuC6ed2b+jeMna06Gi2WjJ7wb0UbXXr353vu?= =?us-ascii?Q?S09erRG8SXxaOlA00IIUGSfCzeQQpmyWY/EBgb/7egsbreVMcJlW/lna0qVa?= =?us-ascii?Q?YtAjS5kcfo6xQLIZcPcxvjPH1cwNJAdpSf9kOHswBZESC+tBgjt1cGJScwj6?= =?us-ascii?Q?dmhg7J3mikJ6XJj08Jg9eWhTX6AV5COK3MkoyVxbkpZcFj2K3q/ViW6PpPVn?= =?us-ascii?Q?hXufiDCQ1uH8fQc/FsSiJvDxPf/cjWLp8rNcFzu0sy5P/1WOSSXNHjrupWWz?= =?us-ascii?Q?ztPB0NRfd7x6bGVjFFIPNaSgrYC1VPRqSu2NZfsJVMVx4rsvfq3hGzywdZNI?= =?us-ascii?Q?Mj3Jhzr+tUeBA/4sZywLxf6vAtJQDMCgajgDH1/eOtKcPFtZ6l4q0yCNzvks?= =?us-ascii?Q?52KEiWUQSJ/4DluYzt4kivEzoRnbmspW7ahcf80q39Ukhi5ruNvQrbKjkoW5?= =?us-ascii?Q?Dg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?m+FBhrSDkU0sg0onRo7RwX0EAIC3kAa+EgOYyKZeA13eyoHEav/xwqkogp+M?= =?us-ascii?Q?24U/9gKtj1Q707/KwFju3P5vpLBqJ3Yg4JJUBTBCzzk72UxRhSiHiRIeWVg6?= =?us-ascii?Q?ayJCszqAwPfTXKi/itFOaDPu2CTlzZpwW1tGanSuS1R17kqwb0CQcL9ROHDY?= =?us-ascii?Q?w4VYO155CPymw7oK22cET2pdkGLhO71rjV7rL7/B7jkB/BOK7zeHNMyKyLBq?= =?us-ascii?Q?Dksu0dATH/0xFEzNxvKZHL/lR7ysKLfoJfbLCRQ2RrEqSySYSj4ETKIr54p2?= =?us-ascii?Q?GG2+rs3i9+iSO+NAje9KsCy04l1vJ010Qhbl28rBggpiYVhPVz3k+v3jMfKM?= =?us-ascii?Q?rE1yZONoXCY5grP9nSzzZzAYNImhHtFwrfzI+KVRUxgfnvO2W14gkHy0zXSB?= =?us-ascii?Q?mkeZe7IMdFd3bnPvE1Zo8HbCIXOuAUwUJ2RsF9FVUrEW//V8gPJrFZrk+vVN?= =?us-ascii?Q?pqnua3RaTHQ5q8l3qCjJB2FRZaXC/gPb0raa1FTkCDL1FrjLgDbfmeegn4/n?= =?us-ascii?Q?cM9lyPYu8xryUrKFYayLrNCAjPczoaWWxQen1iksyQFYy+2s5cssMCSHj4Od?= =?us-ascii?Q?gPVEjljw5tyPnKDQl1L5ggvjrRmocRYe/SS8wUb7h3mDrYbzY/n361CPHIEK?= =?us-ascii?Q?PJY9vPWx8U7L75/xmoIrsZDHuxVtU2KLs5yGki4G+arNCFv1mONB/1xIbWiT?= =?us-ascii?Q?vOAjsQ+Mf7gQ2VL8ItvCtkRVAGZ+/OrMuH1uTHKcDoIHPxSLffq1MFv/NPbT?= =?us-ascii?Q?zbzZMFLG6lKZqjo8FkgbRBXxmH7ubNSflG9eWMmQM0nhC1eZR1V3nNfui8jH?= =?us-ascii?Q?K+QvbRUwduqF0nOPdx2UGqHdTGLgbM48eADZw0z02EMYXOIAExSlSrmU3BDR?= =?us-ascii?Q?oY+akYNhwGw0eoso6CcZUNP372bENxyWBGZeRjq1c+rzsnLrm/fbf3obxuov?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 875d706d-cf57-4bac-0bfe-08db57b01520 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:38.4459 (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: VOM15J2Z9KlDho56a5mUaTrloTOrE2kD1LvwSpL+Gk2ENQOK1icfazHNqlVdtLMh/K1FdJ1OBmNIynFCNLOvHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: 7G9eij61nVLHRGAzBCMMGRbFfqqx6-Gi X-Proofpoint-GUID: 7G9eij61nVLHRGAzBCMMGRbFfqqx6-Gi Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" mas_destroy currently checks if mas->node is MAS_START prior to calling mas_start(), but this is unnecessary as mas_start() will do nothing if the node is anything but MAS_START. Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang --- lib/maple_tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 9f3784f4a5b7..b3e5ae43ff8f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5816,9 +5816,7 @@ void mas_destroy(struct ma_state *mas) if (mas->mas_flags & MA_STATE_REBALANCE) { unsigned char end; =20 - if (mas_is_start(mas)) - mas_start(mas); - + mas_start(mas); mtree_range_walk(mas); end =3D mas_data_end(mas) + 1; if (end < mt_min_slot_count(mas->node) - 1) --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED912C77B7D for ; Thu, 18 May 2023 14:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231929AbjERO7X (ORCPT ); Thu, 18 May 2023 10:59:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbjERO6j (ORCPT ); Thu, 18 May 2023 10:58:39 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ED3F173B for ; Thu, 18 May 2023 07:58:12 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34ICEqPV010486; Thu, 18 May 2023 14:56:43 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=kk1VuRS5kSNxVjC5gqUqAVN5sQ5M/Ew4SDikwGYXJCg=; b=HITpHuHOX1gPHewBmQthXtlbWE+BVFgaYakYpCF/j2lTTCgVF5S103/hvxDM5kDJlbVE HzI4WBy3Cy/p+F1JKM1ETDRN/DEud60pAhqMyQc6s/Mu5entdTuUvYxIqPNnx7mxhMbo ZKXXi4wHRTruc3mdfD7vEPtV0ipM2zygnbG5oswqPSpGJOGJfIkv3UpEbnPsAI2zwURJ LblouYnLoiNcoNIZQfw7PIufB+b67Sxf/gTqew1Lj/bykLd7HO0IBf20u0htgZN1+Eqg 659fpJWcSjBOuCe1g975Q85NtvYRr2dVN76VzUJGZj0lpic2XilUMhsHb/bLKgBzJ1fM eQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qnkux8ame-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:43 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDwvVZ004274; Thu, 18 May 2023 14:56:43 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d67yd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dFhMc4LohmRJi46ozfUuvePWITLAo877BtWwIFnHAyDIz/b09/h+6Z9D4kulrQs82ukhmkc0Ki8tok2exMqbIrGbX1AutzKBKxZko5cps5oOLpkIq2vvci31Kw2jAm0vCOc3HBccKrLybxOQM7qzYmCjVyu3auyOEVmR31rd/eOkcC0cDBxvTPdprPUApxofyur1xXvpupDDXZ3/eJgBxGfA28Yf7rFtuOL5ourB7jE9oLOtI0Ws02IrmULLDdtvtpah21uTHFSakPHnMitOG2IC69GXBEmnQIJ9yNRRIIA14f7A6TuVpWIr3GvIKnaMAEbhQ4h1klNBJOEgKNSENA== 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=kk1VuRS5kSNxVjC5gqUqAVN5sQ5M/Ew4SDikwGYXJCg=; b=gEITRlcxny4bRBwPd2LUGTnGcsIXmE/QepPPPEzG9XukZznIaVQ12Fcj07AfDY/IayUX/9BNRTtnoQZS+HxVVVQ/ZO8NxX2DlnqJBljpQK2lz4HDCNU+AhlPyHtt9ak3scO0r77qR5MBDLPltszGoUt7WgXp8vZ46KSF93wRNAOa6QwIZ0iF2qjFHuek7g6W+03Uit2pSVBgcSEeDovnta1RJUCOweRWGC4F8FHrQVg2vjmzcunG6UhLvwA+IF4B6gFDh+qpOtNvjFyFHfLMqQb9wLarndtP8ZVVMVlm0e/Ef7lHVUAqbviqi660hfKYpIVBUEY1vMJaGacsmuEp9Q== 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=kk1VuRS5kSNxVjC5gqUqAVN5sQ5M/Ew4SDikwGYXJCg=; b=LM0vOOVd/T08go+Up7CoYYCTbmywOjCHyHBHT3k4LqXOBxAMYMx/trFsCZ4Kq8tCh8C4mmChdO6f4UzqLuvo9J5u3A30ne9KGCPoDmpCkncQ8deyuQXej62baOhMB059c3Ww3DQWB65eMhPznApNXzjTztYxcqZWOQQ7FCK7LrI= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:40 +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:40 +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" , Peng Zhang Subject: [PATCH v4 21/35] maple_tree: mas_start() reset depth on dead node Date: Thu, 18 May 2023 10:55:30 -0400 Message-Id: <20230518145544.1722059-22-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0003.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::23) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: ecdcf175-ff33-4eae-cf4c-08db57b0166d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sh+maO+MJ+D2kakE8yMdjywlVS1OOYEBmMHJ6xzs47Dta+Ww91AQ6xvQ7yP2vpYcVV2IKHkpyRG/QysNcIcsaUnRlcemZg7Er/94g8iQkKkJ4BDB7tZ+Ecmq2Y9K/FbtV43d6Zmdxo2pIk+PPLvCAGJ2eP1szUjvbS2aTiFtqAZSQHRgOYYahe5taWUFwxI9UyHPmS5Kk7imC8XJN0hU0Vegys+iC/62tZ7JArn5AD2uCUKsZpUfMaGTgEQsSscEGNgzW7DxHr4r+rIYXfxzXl/ASavqluMn9zluvXtYnqdX5fBDwKmiUqXADv+d7ZExdGNEe2lV4Fid/4htPg9mKW7O0V9238NYXM6jugil4xJacg87XG1pG81vPAnjVt1UlD1E7DODk52vapenqjaU3XfakNLCcheNki4W90+Ry1iqD13zPS0mDh+TEfojHaU30J6Xf5i23Zsi9iC9DN5ccHEd8bG8Q0auo0xOWCNA/OlpOpWib1Z955xFItGzLhv/femqOF7qcCvu8NQkRI0WQrIjQke5s+PkIzxqV/TaTXur0BczWHnL67ZLsKgj+Yno 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(54906003)(2906002)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ie0Um6gvSo8/SARPKGN5YzBIWkExd5ajggppePzd92Jo3bErlhOnm+9b68LU?= =?us-ascii?Q?STa8lzZezBcaxwwXtN6O7m10yw8mf9PYr/91mCklb6h2QvvcoJmDqhpxun4H?= =?us-ascii?Q?ufC1l4s9RdAMfviIgCnqwD5l4ya9Ghyv2jTa1Zm2BBMWSjgLFewviWKA4jOl?= =?us-ascii?Q?uwHpvMU/Ipgw6/ZISg5O1+tOn1Kc2C1941dq2MoSEmWZCuNGnBSqhtUvLAa5?= =?us-ascii?Q?Moo48qzhmQtaaTI3+F0QJU3A5busDRQAMQDakvTBcCRiAc0bWK6XjnoHcpKv?= =?us-ascii?Q?rCRhYPbCC5xzqZBhewwiuGQACgVt4MM7ikyHI1g09G0re25TJCYo4yNjqk1i?= =?us-ascii?Q?J2Mm+/tFlvvzxzQ637aTgTqRSnQ0Sa/jUU8BOm3dSTVaKuTvLPE5gync4wti?= =?us-ascii?Q?N5DFmmPTJOPiSvSnTjDnIxW0qSRDMrEjJhQhB7Upbamk86+fkrarBArj0wHy?= =?us-ascii?Q?1Brgwgj5YQcJmky/X1OYdOqkQFSp1o1LfCtqoQiUbjcsxBN7DFtJM+Hrzthw?= =?us-ascii?Q?YrqLpEOGIVZWnlt9UCrzEFfQPPAkGO1LA0GwSkO+Bueao03L6wAKeSCfmLaB?= =?us-ascii?Q?/ZmOSh59kWR1AI5EWgihj3sROMwDknwT4JJRVHsiW/Assjo0Hvsof6e6hKZ9?= =?us-ascii?Q?cfUAdT+fu6VKEzGX1z7jhOplDU0haHBtqdx4Ee8l/Jrwpq5wNBE/qFz8FN2u?= =?us-ascii?Q?OA6RRsu3mdGdG7FVGz2Y/FYh2DkAzXPRRXYWKAdmevZU2YbQ9z1rqP4DaqfF?= =?us-ascii?Q?jVCf3Ts7Bo9Vi+ptEgAujDeHz0z1AwK6xzuP7NuQtdUfos1jZHATM7MZ8hRq?= =?us-ascii?Q?xnXVlCEN+vUwnEJ0F0BqCFewcovJzYmMMlxTf1ti7spA6nc0r5d5BviA60wg?= =?us-ascii?Q?gFBRq36Gs5ua6qAopoZ8EuctW+tFC3smJSFnrYVmdtwiR2GQBV3SjDw7p3DJ?= =?us-ascii?Q?716CdWxhYcZWZqGadbBikiO7ryQn8FmHRScD2HWqjFClf1wGtF1yZpLtrDik?= =?us-ascii?Q?Q1hxHaVht/IBlhOdRZU8XrAVY/jsttBllsWt5UG7BkKb6tsbvLUopQImbdeW?= =?us-ascii?Q?AaTQd+lDEFKb3skHUN0GOQKZR1dlXnjPphtF/d3hYCmYaAxpduIj/XeeEFCf?= =?us-ascii?Q?aBRiFzAWQQkZa8ilYKkA4+IPFZhIQnLeZbZtxbZ8ehzIQvTFpJQrQQ0iJiaZ?= =?us-ascii?Q?5L5x4napfXImM8ArOCT+B8i3z0S08jBo9nRizl+PXZRRj/GD7TH9KDJaAFpP?= =?us-ascii?Q?5Jy+NmQ1zHAkWtL+ey3XKr6J0CsSkEcUhIDA4ghM8EBe2Av418Wz7AkOolki?= =?us-ascii?Q?EnsdTy2pf3B4GnovbsdWWbk4W+5iOhgdlvUnAn2XzTlFk0GHBWem8z9PXD9H?= =?us-ascii?Q?uaNu2gUYEGqlrxlD4yyybEstys0sv3Kaw243H/WOdRLJvOSyuGRlVdVg3Sna?= =?us-ascii?Q?t2aqOjh8u+PQhjD7nI2dxIEUqzKiayvt1ObOX1YtBIqquaCtoJ//NhE1eKYJ?= =?us-ascii?Q?Kn9goUN00FLavkA6iIvKWyTsXyRXkarNe1n68V5546mw4PuPUklZrguZQAni?= =?us-ascii?Q?lfXQoEgJTKF8ZQTyOcDlNqGsN8opYT+vauV+8IGV2vFJeXzduOClyY/zgjnb?= =?us-ascii?Q?oA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?15b07NxpTF7KDRLvHGzKXeP8bcIIXNkWfQ5JcxJyKM7wJVLN+7iAp+BFjNGX?= =?us-ascii?Q?r0IkD5F84qfxguEROlpB5ScaSl0/RQ3I3OX9g2VvJqNUBbBz28L1cJhN5kgn?= =?us-ascii?Q?cdfQEzmsAL8gjAqMc1zE4oXDIy1s+aByYfdpcqc8AqNuxFFRj3olTZA6rcH0?= =?us-ascii?Q?R1T0xjwBj02jIrSFw3Mrq9+pNOrK+L45hoa8TKOSzISj20zEYqiBekJgy1GO?= =?us-ascii?Q?DBPhbmtFA9ALf6PqNq8A8K9eTYL02C7EVRwrNy8/10dcqkVEbKVLXuXQBZ+R?= =?us-ascii?Q?kiPby8tY+d4KylMB+XwVKzSpBC2RF0CfUjKO5I/XIierDOKMpmtPIRyzcTgP?= =?us-ascii?Q?iKx/6txRrGEURBLPfVmlZcDa9kj8gKh0tr5nAjiFCEwW0oblJGzfIAPGBoWp?= =?us-ascii?Q?tvVOI+tFoASdqtK8cez6VynUGleU+Fuy5oJPIM1ee970UGO3ENREit1vYy8b?= =?us-ascii?Q?ypwPcyUMq/JqEd1JegVzrKnMo0z1R1U+a39bFdtvJqg7XR5Mp4W/n+7s4ck0?= =?us-ascii?Q?HSFBUSRk66C9LuzUWTZ0Zpc4AimKNqo1SK1naWdxVXQTS23OmehLgBVk3TYB?= =?us-ascii?Q?SSf2g1Yc9lzCXAA+f+Stm+35BZdbAmQfUxLmirWury8fHjrmqMLwwDGDTVZI?= =?us-ascii?Q?fMbpkT4IJojuZnlzql+45qZplqnsi6mDlzKea9GpJze3VhwRhXrMiEad8F2k?= =?us-ascii?Q?kA01OuGk9GrI0JEn2DQZJYRX5+zGyo6rP0u12bVgNvSGDI3/7oHnQihz/nKK?= =?us-ascii?Q?Wzvv1jihTfWWwGqIzSKMtc2U5y9f1stAvfOsb+l0nTdx015CPRbFgvxqkF48?= =?us-ascii?Q?Fl3rpzHCXpqc7A2w/0r4GXa6VlcSkhe0IGw/+mowK1OdgoTQ5TBgo1/hehSN?= =?us-ascii?Q?RE1hWVYsTFYr8VlcvOet+JrlnPnu02hQmkANa7L8ustQcRyUayVGWklgnt7K?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecdcf175-ff33-4eae-cf4c-08db57b0166d 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:40.6450 (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: l1QRjIvdwV5wrrRu+eop6kYsZQeWmkQRpd8QsrUECTeUSxhT+l31Y1m79hoIL+x2QKY2Tt+05pnkUyS6F+7lzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: JAAlHjXfQgd_QeHHVr3E46svQe0rlBK7 X-Proofpoint-GUID: JAAlHjXfQgd_QeHHVr3E46svQe0rlBK7 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When a dead node is detected, the depth has already been set to 1 so reset it to 0. Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index b3e5ae43ff8f..e233f41ed4da 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1396,9 +1396,9 @@ static inline struct maple_enode *mas_start(struct ma= _state *mas) =20 mas->min =3D 0; mas->max =3D ULONG_MAX; - mas->depth =3D 0; =20 retry: + mas->depth =3D 0; root =3D mas_root(mas); /* Tree with nodes */ if (likely(xa_is_node(root))) { --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C79B5C77B7D for ; Thu, 18 May 2023 14:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231865AbjERO6y (ORCPT ); Thu, 18 May 2023 10:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231794AbjERO61 (ORCPT ); Thu, 18 May 2023 10:58:27 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 267A710FC for ; Thu, 18 May 2023 07:57:59 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IlYr012447; Thu, 18 May 2023 14:56:45 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=jgywN8jRiNRwTIyRRyz+BVe3XwlkNQkfDm5N7nxtCT0=; b=kH6HK6Gxj2S+IDz0cO9C8zLJo+Q59oBueWGwNXY950voWl4D95FH+WsSOTquWUj5xjfM 40Fc5KcJvkO7cekOyKjf1aIbIz3kxxKApIzGUVdhaVef5lAfZEmy7kJnVwZBa0Z6uOuD 8FdCFqrYPITEq4htsrdHD7CAN/zM/TNUPkPleczszljTRa7Lp0CLEwelwpHtZGbdj2bK drVH3Qjq2aySLBJ3iYUlxQ6mYuCCJEMFII2n0jU4BQhSKWx3gKd9ME1Tuv9VL/fSSt2u WqwA91vMbt31BxWZQK/3iZ4F34rX5yEzKIjq7n56euanSDgJwwpfQt+mwgmChQtt0GSN 5Q== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj2kdrh00-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:45 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEidhb036327; Thu, 18 May 2023 14:56:44 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w3tx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ej4njUs+c1MWR1ZoyVVAJuBWO4WbNagSIuBZjTlswtvtMy/k9AbZxCzzMSiG2w3DYdDANyodu7cedLhaTMSozniicePWDt85elnQGWpa94pOGS+UR8ZSjIsHFRDH0CZldUBGyWCzYi/GGBBzoWdUOBog7fkGBN99CDgoV9PkSagLc+ywpadxLv0kpzGR6bJuL46C9G9JKzZsmtP8NQUR5KNraGvEO96ZOpkL2lukZJGkEJUAJXWx/byBzJExxUpFatA3e0TkaqnkqnsQ6cWTXO+OnFY3l0+7G9zFR/UBPvoNlSfoj5NivKyCC31M1l9v2u/h2aGSbqnQEC2g15Ofeg== 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=jgywN8jRiNRwTIyRRyz+BVe3XwlkNQkfDm5N7nxtCT0=; b=iguE3oZgfVijyH9+8noAzyrdh+INRsYwTRTGc8AWYkk5mF4NZoqJgd8FJoHWlYZK6sfJJB1TpgNEkdfTAzc3mF2Zi8mqyu1vacCtvfMq+U8Sc0PyJtSNTh9yO4WkNgV2157wQ3mQ+LU7pWYfu65d8gobOFNQRxIJl7FX2YTUbXU2HnMT7D5fO4PbKXPe3LhJ3KUXjK8UM+rGbzu35TcgcqfqVEBxPihTnb0HYuGQzwDJZR8TH1u57ZE9RVTpTUg1SZrg1eYkzOcEvZcbzZTRux28vOlYU27kIyUH6E2JsNNi+zyCX19pLEHYj44TMWJ+qCxansqj1ZojNeEPcui4fQ== 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=jgywN8jRiNRwTIyRRyz+BVe3XwlkNQkfDm5N7nxtCT0=; b=HltFhs7hrzf12wOmonJrhpV7sxZDY/P7xxqKym5wu98kFAIW7oObiH/9PuKBYVgva4FSA/F9iQsIwChmWDsDD1Cf7Y/ZEK11uAm79XqDW3dIKVBktN7u+O482AoiJVe1wWFFLTfVnfalxawC27BvmupY6gl/Nvk7wp6UWz2JIrw= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:43 +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:43 +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" Subject: [PATCH v4 22/35] mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes Date: Thu, 18 May 2023 10:55:31 -0400 Message-Id: <20230518145544.1722059-23-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0367.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fd::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_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 562db84b-bd89-412d-40ec-08db57b017eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iFB9nSxqfLDl2YTBgVnoJPeuLowhNMzBF2Q2a97DTkcoFeRrN31h8yqZJBrkGw5z0Qcg9J3E4Pm6MFUq3ARsD9WiQjjnA8FnS4O9aRxqDuBCTFaZh6kuthVoAe5uZJ3FMiGbD3HZSEkFcnJFSMPUwBIWvlBJcBRav5pAf3LIWWTC/WhCk0Dthmclnev0uCMcopM7gkMlXOQl+nI5QKBsnMlnc9YYCh9Ku+AIAV96Ty5iqly6RO9oOQLKUtdRiNpZ2kuf5PDQoFt77HsWR1Z9MJQQ3ykgMg8bjMKU/pcXfY4/vakLq+U2M2VwG56+IxTrB2BfUQxmM1RZc9v5MnS1Un2SgD8Qyn48C7nVzBipTf+DpPmIgT/KOQWnRpxvWcIHWOg/8bymp6yoKYBS+sBblWrRGNAsTdYyG41DEGa6TljGitJY1IFRVHHzP6MHFHWxDAzREM3JIUwnoOZVmrB8tDcDVRF33BEJR81jpnqiSNj58ZwgsMx5zyZTJceZOwcNX++HSvgFoTVQZiDNW6/C/y5kbP4gCfEMFx2Q0qpL0YBT/sq67KLyNxF69H1Ewkrh 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3pOt/5z6n28u8a7wnFhWguJIPykQikGNU7jb0sJSqcxiCZhsGqnuFD0xXcWo?= =?us-ascii?Q?J4iKFaSiCg85AWiRS79Qa/anlZiE/zPmICwZ502b+3m2YoNBOO6xbd1dIU70?= =?us-ascii?Q?ozJFOvsLsyTJ4NaEcop6wGW1cqTeURw/Do9fqtM6nR6oCMOxjiAr1wqkStdy?= =?us-ascii?Q?bu19IY/uNw1rVrRPBrdJVxNW8d36W2BQ1Vv7pH8guIPigXIRhS4HAActwOcT?= =?us-ascii?Q?O8ijfyJbvrYanU3aFDjgE39B5ro+Vln7zCqNosj5rOrWYw13sO6qtTuMq3zT?= =?us-ascii?Q?fsw4Bz2iTSPUWFnnmF2MTzJ+jApXyYAbRsUAVYezJq2ZBT04xMlSSfEZQMqm?= =?us-ascii?Q?Icz8Jwx9cZJ4YCRvgPAlXOKonK75c3vFP4ELwMfefy7DN0h4oa/PzGdI8o70?= =?us-ascii?Q?AjvMGtgSAYgeaAYGDENbWZnULpUGu2SujXPyFu48xksaFTv6Nw0Cq/F/D+y9?= =?us-ascii?Q?p7Y2a4+CUtbxnCeEKLOS9kdq738/ktIfmw4DIMnHLIi81ce2Usqz0g0qF+ZO?= =?us-ascii?Q?IDvMRKacFV9g8zcVOjb8hKP+Vs0NW998JGh1K/4Jz/YuAzj7Vwc2edQW3feu?= =?us-ascii?Q?TKA0HFPc+BZJ71kSHTjepUC+uHZZAyUD7Du63gmbL3TkWMT9HdWZ3ha1L0rg?= =?us-ascii?Q?a1jFDPPi7FjAKkxNRV2GKuxHKfDoyfGXqmv0diWKOmvVYYEA84GO19/InqOF?= =?us-ascii?Q?ISOWpDEcB4iBxmd2YD+xzTGL6DwntBdaExrz+oKLNwuYKiMrCfZnFCrtib/d?= =?us-ascii?Q?Yfbywnm+J0rt9uleRwsP2cAFwLq24Nl+k64wFJAdHM0b/oX2P22+5B7jUu3F?= =?us-ascii?Q?kX1Hy05LY0cTQAZF/mVV/gCuFGH3s1snumCwMs9cMW7d0K+ZDLo9ALWdNisk?= =?us-ascii?Q?dRlxVBPBmag5qBcZPCGkK56S0AftJkkBNiABULnQGkxcpOgU4iXTxNb8JBnH?= =?us-ascii?Q?vweuSV8n9CSv6xjCSdStCknrsAZqbzIxg6ljS13L1NeBTw/UCQheb+hef/c3?= =?us-ascii?Q?j7jxgFZG6wyHEM0ZYMF1SMS6GOqy1j44RSNe6rrU9pex6n7GsqLdPhxTkfOK?= =?us-ascii?Q?2hJ715gVdKjbKBwOwTBxxomwZtRa0RUeZ+dIlP/YQad9PHx4cSXaNRe0aYRT?= =?us-ascii?Q?QWAEpySb1SfPFe+5A+q++iLthCmJH3/trtf5+BD8+Ku/EQ5b3Q9SGIAnIAu1?= =?us-ascii?Q?UZBYsTsz1MSOQMedjzTyuwkAS+8bKBxvZv30RDYxhkbvLjkG+FtegR9y+SfZ?= =?us-ascii?Q?5zRd3Q4PYYWwqGZFCtcJdVQnnP8/3gxX1pa+miAAvZcA3zvLOkurUXbmbt00?= =?us-ascii?Q?xKEpVvceScmdlI/+b7K1mF/rKdiSZ2JNdUNCpGhZyBHv4OV9wd2Y15LL8T/D?= =?us-ascii?Q?iWIDKuqQ6eGkDrtUFAZ1NdiYob3Q7oz+udOkt7DSI8pOJsfNPmP4Xb0nzHDV?= =?us-ascii?Q?cn+zglmAxIRmZx1Z4kQi2Qn9sNUegiMFiKjNPR/H40rLjEQ5Q5mh/kBFGMl6?= =?us-ascii?Q?/Pfq8ug2TO///UHtCf85PfCAcrW+t3wvY844WMzsrg0Bm29f/3u7j0QusUFt?= =?us-ascii?Q?LOHUvNZDqKjbMl9ZQGLnuyj0fgoEknW+Gu/8ZqpZZWMxjsAevK71GdGXGQ1/?= =?us-ascii?Q?1g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dGxfImqnr9pzZRSki7RrW5yVhsxmry72AKHWK+xpbd0R9TSDP00Ib+B4+FHfI+eCM5RXKFnC31WLf+qVq0gQWaRzkGW9iYLx0SYJOVG7oXFjAHn7Q1WRrLm79MtbiNII/Omip+No2Qo3i+oMTrpQMIAw2dXrBYa4fbXcNUxxZ3mrijVDF9aOY2dC0xdeCljka1LEWWZFFOVTiDo1e4TIQ9KCL3MXyz/q7O3pwo8RNf95qBp03NUOGwBY4kLqmMl/3OZ3tQLBDI4iLpCAsJ7YXJAiUK1nDauQt9SzYAviOZaBCQJPoxWALPTWefZp5Cvh5FocWXg3U27jTdCAhwb5HMVvsNwEhAnSBDru/Y7vvxfngI35W/o+Q5c3PWA4ccaa+AZc9uN8v7tGJkavzV71KfEp7cEOios9SsMfmTmJ5gkVPbhFxQY9aLssgLeRUd7OWDf+FzjO5jY/ITGCYjLhxmXZxcMkm3l8uBVfsGTwAd7ZxBJAjSwbDyao3BxDlxVBSUKpqpGq2WfS4Tw3rS1vifdpTvYl3ikwGHu644d1ytSLP9Tz1PhERAGCzQYS7iwbBtjlOPZ0HVYAsntR7iAzJ9BrPiiWKj48CQTpKrmmiGfaOYppjUmnBkkpv/X9AhSkTp0TI22N7KDP+LMJqXCvsLCGFmCF2G6V0iSIfwVBgNjHg/+cu0nPt4Oy2NtIZHimpALsFrHhlumqtRF2HH6JD/cxqe5/0Gij/QbE9bNHdR7K914BH10AeVmjwi9Od41U2McUSV2Z4GYE/legU7MACTm1++HWaU2TLbhT3L0jvRZ0H5r5WS9yU0Uj82IE+aFXlRWDB761EBICPlnwlWQ6+IPM0uYAXmP5wHZG75ACOt7eMEh8FEV48q1XeM35AGXqywGbXgCbOv5tq7CynXWA2Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 562db84b-bd89-412d-40ec-08db57b017eb 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:43.1198 (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: hezqRNr93dbp0EQ5zJEy7IL7BF9QQBrbKzicL70f1gOe4O4ZS/jJ8/i/AHc0gvlhoqUZ+GHrXpQf/YcxZtbWPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 2NTUNuCQ95Lzfw30g5KPpFc79bmv8ea5 X-Proofpoint-ORIG-GUID: 2NTUNuCQ95Lzfw30g5KPpFc79bmv8ea5 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The maple tree iterator clean up is incompatible with the way do_vmi_align_munmap() expects it to behave. Update the expected behaviour to map now since the change will work currently. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index bcebfd926632..1602c854133a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2418,7 +2418,12 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, #endif } =20 - next =3D vma_next(vmi); + if (vma_iter_end(vmi) > end) + next =3D vma_iter_load(vmi); + + if (!next) + next =3D vma_next(vmi); + if (unlikely(uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71CD8C7EE2C for ; Thu, 18 May 2023 17:35:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230037AbjERRe7 (ORCPT ); Thu, 18 May 2023 13:34:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbjERRe4 (ORCPT ); Thu, 18 May 2023 13:34:56 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5988E4A for ; Thu, 18 May 2023 10:34:55 -0700 (PDT) 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 34I6IrSF028535; Thu, 18 May 2023 14:56:48 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=kwlks45KaPTPCTeh1SIB2wxYF9YvjH82mk47CFRH1M8=; b=W+rvc7VcqZBBQQhDlN4VTySouhjp+IzjWHVJx3etAYJwd9d/BbWBJvlY5JV/jkFqY4KI n4tdIfL9O1DfCFHZRKQ2+jJb6ICAYSlmXQ3UYSjrWxeBimEGmzGDpGZuCwMRbqSv9Wxn RZSW3XnIPWygdFxFOZ+zi4EaFsJ1fN0h7hxy4V/5FqUf4/bnoABbDWmwzdFRjBTCsU/9 Jn7yjyDxlq+o//H+3mvWjT2OZrDH8bZwumr0tkDm/mM7ywKIk6UvQuCOVm7Eb90IJ9Uq XaWx3k/BRUjV9PkDSC3mtQNOpQ92sCrGC30qnn9RNadHNQpRy30QfG6baprfa0VllzE4 vA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj1fc8f9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:48 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEC28s040073; Thu, 18 May 2023 14:56:47 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mqd8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EnrxVp0/+Bs0lFCNtMRBMnGbOlDuTweZuQxUbKnxztQ6nbbJKk98GX7+AHWhbv9o+ILb4BarV378da5VQGx22qi67ZPzuGOzPDJImZ2X1vZAaUOAyU8rXbZYBx+/hbVyiVYrb2aKtR7eNjN6rLzUwziWmuQCByvr4trUfFebv0bhhQP4yzO8UNubYa+iQbk30925tMYeUzOS4edgz92yWZALhso4zGAOkEktWtSkmOTAlwJWEOxvztvaqSaA9d5TFLxxM4Iw2TDQi3l02HtA+7TQaG0NGy3oxsE3UbMWKflIzOi5cRPdGQh+IfofOkBMx8hjFzqlA8KTL9HNPJ6DdQ== 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=kwlks45KaPTPCTeh1SIB2wxYF9YvjH82mk47CFRH1M8=; b=BKOd0QUX9eiKLGKilaI6dMQ8w/enhuLxb/+ibeMnryXfPCtNUSQcDDlrj8NZVYA43dube+C1sgBXXsefPWwMybLFOWdLg0EZLxfCGf1a45X7yfdKjh9GLOqH/AD8+AX8hJib42IL9S4WhVu0BIWE4iHPCAC6DL9DadYwbR+7ug6WTzWzV+8GvNQfn4hlPgTtIhI/djZykj2g4pruSvNDOKD3TZwHsXKSfrTNW6jxd9/zw9hPfqL7m/qq/dXL2ct+0hngShjzv4dCUIKjRCTazmv2YoPwBI6IAcL0vPH9KFrzbzVICJMlOSCA9GDjalNMstcPZ5qox4jKveZZ46hRzw== 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=kwlks45KaPTPCTeh1SIB2wxYF9YvjH82mk47CFRH1M8=; b=MxCsY87K6JH2yvzXFP3qO2YzdxBQTVv6E+JIDj6Y+lsZJrvvxxlahU9Wt3PBe436slICsMRgdF1YChPyHulcmWQRF0/eAqQaeD2KKZgqgaAs5z/8v3gHx9u2JM1sW1whmP42YeVk5MlP2nk17wmB+mpAhdGzIydXx+Zd4hZjZCU= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:45 +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:45 +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" Subject: [PATCH v4 23/35] maple_tree: Try harder to keep active node after mas_next() Date: Thu, 18 May 2023 10:55:32 -0400 Message-Id: <20230518145544.1722059-24-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0077.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::25) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 43704bbf-2109-449c-db78-08db57b01950 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o8JEUyvakc/M4fuVlyw0Z3bc6KuZktHkfNLS0/JON+QyR5eodfsCyPtVPx0gdkttqE7wMzJ2Pc0kMjC/QsqlTMUtuOuG2BFSv71MitFoE1Vy3EMY7BX0LPm3hliVJAxJ9kJI+zPSaed6oK8vroEa0yXoNuoJWBKCJAc86zrDmnEaJs6Adzs1zXCGqwXTSYsBt/Pi9G87NugZsc7pX9ts9nwh0hIA9CejcSEli1mJq2w/Q7sldxTfouqoE81Db3AnpcVYqihpWnCNGRmK9BuPy1978fyduvh/9Rp91vvzxubn6nzSu2Gx0/WDgd9RZZuf3dk8lV4YhHrzNuCjt1HGjzsIayXXpdOF+fcOxejYrDCRxp0RefA8YR/kBG3FNLIhxkQFNFSpWfcbTsxH8CWhk22MtbC58UzFu927G1BraZF/0D0bYDnFQ8F0/E5EqbX+3sFs4JrgKQE8UUT68//uVJsyG+904tob6wr7yx6uKYvnWaI895QAdMLw8uGIGt4pyjRHB5P/eslSusZx+Cxl2Q9cji3NL4Mm4i6AQeOift2XkT/lHWjArKJgzoYx5XMlnl3OhcgRQbIP9GV37377ymWuQKOscSYjTQGvPcyb5j1YXFdRZ1joTgt8sFnjl3Nn7hJf2DrQUdAIbtRWcZFURA== 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(34023003)(148693002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AUllk+MnSeuwOCLaD4aw55TtOV/5uAcGoQYSZCagWz06Vjk5o1bWtaQ255EM?= =?us-ascii?Q?FK2ihophjHlZoXCKbZN6Um+y/MYl4UCozp6sFHmNPz1evEpEqs4HfatVjbQj?= =?us-ascii?Q?Jcep+fgfEv/O+V1l4WcuiZrcx44oX9HVGGHzKm34vM0hsy+TZ8JJY7m4lMya?= =?us-ascii?Q?grLiXkBBdNjrakAJoaZW2vaiMzw8TejczY/gPlM2AVftIflzHo673U5be/nb?= =?us-ascii?Q?Qph2I9c3WePYGxNM32Ovmv2kYI+bB8CcxH/0TO8XaBPmFDtihJKSWezRXsdd?= =?us-ascii?Q?KcopsDHmy6opovZxHU7JFjih/bHa6zkvPAGUu4UN37U2/62/WsF+kfA1Xe/7?= =?us-ascii?Q?rmnYvZ0qLlOxqRLLxTGp34zPXBG66j+/328AqvflL3CdOEUZeAax22GDYPNT?= =?us-ascii?Q?uz//PlnaUbVGSPTiPGXb8AxiBVuEleoDNqdMP1r9Swvx2pPytJwQBK/gWnPG?= =?us-ascii?Q?k33Nbw4l38rMYsnQAcQiIk9P2lWSoi1ehhVAtTbttb8Y6Ubg6k43B0fbJ480?= =?us-ascii?Q?PbA1hW0VcHKFO6Wfud/ZbOzNliwI0xzOuyXBgpjj420s69X2HR/Q4J/hClys?= =?us-ascii?Q?3sxCuLGOTDS9RgZtjAAbIsofJVeg8BtkID68kNuhOwDcWb1C4wjyJNtOEU0a?= =?us-ascii?Q?6vckQc7EkZ3f+GttG8Kzd1gB7RxP9xk0DhmjTzUhW7L9G7WHxJq8qcmaTECf?= =?us-ascii?Q?Cz6tS+uB4phXn/OR3zIctv4rCYauCgFApwL9iSM9qcwYyYdgLLxaZpG4MsKL?= =?us-ascii?Q?DoNpexYRvEnydvTa+QxGY5e4amUiww0g4G+abXKc6gQJIGk8JPlAIucYiZRl?= =?us-ascii?Q?Uzv0ZDADP+d4mjWNWuahAdPEFNNtbEwSDNHU2OAPmYAd6/nxLo0hNT9W+IB8?= =?us-ascii?Q?Qzsazr4Ls0ohjl6rM/jBUv+tWAo2k9ef/kusXUWXWGZGVLUcJF/Dc1m0d1jQ?= =?us-ascii?Q?/SHy1DPZZIHEE6zzzXHyQeu+uSvKPOSqHAKI7SonWqMo1g5iUUO8CzOFDqPO?= =?us-ascii?Q?lNd/xMY4zlc1y9PTiBswbRzkTq7oYCOVyrIrTsMdSM0egk4DK838v75Y7IXm?= =?us-ascii?Q?Kd6KnV4L73lE+QqwSyv2bCfq7I085eqfZDb04vjb0xJBqTHcIYUZck6+r2Rg?= =?us-ascii?Q?dwu0giNB3MFfkxCOw3rYc9bweIM4EpIo130klmpbjXAeQCsK200pJKfBF1gj?= =?us-ascii?Q?HsigCRu2P4gIR6+/7/owUim7XVoWxsWVr7zKLx/NnFcqGTk8RuYWXVOwxWUh?= =?us-ascii?Q?DO4bU2DzmiV9tS7ddNDFDZggLBhT8OZqbZIytEAexHzT22lTbiVW1LhYLYt+?= =?us-ascii?Q?3ZWqazhVfazcd7d8YN3j0N3tNvuWDkYy/pCeJOwnkCHzNh/m9YoqMkFBUQgU?= =?us-ascii?Q?kryw2kWe+WzqdaTbLr/vsBNWoJ96cfnokNm9m+f5v4JX+NwInWD8suLUDOOp?= =?us-ascii?Q?Xu458RT3yyfXfem9CAofFd3WQZ7SIFxNTL0SQZw7u8UG4qR0rbRleFCJFFNE?= =?us-ascii?Q?qlso1yDIQFxcKKug2ktV2/syviNOnzb+2oouRsv71laKpDMUL96kIZ/cr3Ww?= =?us-ascii?Q?Gt6WIcC2g/X4CdMqD/KVPcMO6hodaJj38dzTQVgEj3LecTwKzEVS7cEBTMTV?= =?us-ascii?Q?8Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cArVtuG8sgTpV5ggGkAz7saxom/0P5nxU0ELE6IvLQ6pbe8TUWQbahFAYsHsigapdJSoj1sTnv0qWJbHk0fb9IBNgbyci0saGwDUsH5rrIAr0neAepnT/8FaLXBUDIFCI5/msMCXjiZYgqErv+Ue+QncbfvyfnqrEMI8Jpdp9HiJ+arufe+Aux2EGmPlYlodqDdwrb0tvuqXcnRxNm3rNECYxl0NuQErkV0gJclVizqOsE3Cql7VhXnjwRBjzmQEsEjXDO+VbO7hXZbW2O8k7aYM2Qog0iC3/ZaCMNj3Y4yN6M8PO1OlA6nkOZrryHB+hbmCpxkGailXoYucbYN9udXBH2+ANCenwb0Pr8z+EPIzpQS/a8AuSXmqit5gR3uLjzay4DoQGJxiMV7YQEKkpBYosc9szULZp7hOGQuhnYtH6rMVT75ibO8wCIIYAjTDUHRXJ7+TXUBToH2Qvig7oEsdTITc1A2WF88CVSsNia8mblrUmc9IykZmAr5dc8moam78libP4dVhhprBbn8Nzo3l5nsmtCP5bVL/uK/tRv2q/nGSql2B2LjVuOumSAqXUPFaTM4S1O+LATkQhRa6CEK/61S5rwoqR7jlo/b5aOs7Pjx4Iyri8lYdvFMNvy8hoi8W0O68B2OdQvybr3r6OgwNYo0zylzdfaubpw05i0F5yiDXGpvJgL7xM+c7h8cw687aq4zRT3HuuEwxkCY3XogbgZvxSiikr6WOAwbClEhBNT1r2zr+YcLqRKzf7vgVUP8LxiLrzSyRQ/NqwD0V1jFQfW/VdSQHphdYNMcO7kZfzm81EKceECLlG8L/SLrigKCghYHmYvw8RuCCFBA6nA/rF+GzuzC/jLdDHBNrEedIwt/RiGlnK+rCW2y3aiGQP3FabWBkbaSpeLtg3RIpvQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43704bbf-2109-449c-db78-08db57b01950 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:45.4894 (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: s6Q2xjH1+S75XyxWwhAgVPs779yy30DkFKE9tcnB/xpNI4H/za/aTRi6upPC2sx6vCZOyWbSid6Tj1rZQenKNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: hHG3fmaLQ_gb4abwatAWfcCA3_Cs3aQG X-Proofpoint-GUID: hHG3fmaLQ_gb4abwatAWfcCA3_Cs3aQG Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Clean up the mas_next() call to try and keep a node reference when possible. This will avoid re-walking the tree in most cases. Also clean up the single entry tree handling to ensure index/last are consistent with what one would expect. (returning NULL with limit of 1-oo). Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 89 +++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index e233f41ed4da..09142af08214 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4726,33 +4726,25 @@ static inline void *mas_next_nentry(struct ma_state= *mas, if (ma_dead_node(node)) return NULL; =20 + mas->last =3D pivot; if (entry) - goto found; + return entry; =20 if (pivot >=3D max) return NULL; =20 + if (pivot >=3D mas->max) + return NULL; + mas->index =3D pivot + 1; mas->offset++; } =20 - if (mas->index > mas->max) { - mas->index =3D mas->last; - return NULL; - } - - pivot =3D mas_safe_pivot(mas, pivots, mas->offset, type); + pivot =3D mas_logical_pivot(mas, pivots, mas->offset, type); entry =3D mas_slot(mas, slots, mas->offset); if (ma_dead_node(node)) return NULL; =20 - if (!pivot) - return NULL; - - if (!entry) - return NULL; - -found: mas->last =3D pivot; return entry; } @@ -4781,21 +4773,15 @@ static inline void mas_rewalk(struct ma_state *mas,= unsigned long index) static inline void *mas_next_entry(struct ma_state *mas, unsigned long lim= it) { void *entry =3D NULL; - struct maple_enode *prev_node; struct maple_node *node; - unsigned char offset; unsigned long last; enum maple_type mt; =20 - if (mas->index > limit) { - mas->index =3D mas->last =3D limit; - mas_pause(mas); + if (mas->last >=3D limit) return NULL; - } + last =3D mas->last; retry: - offset =3D mas->offset; - prev_node =3D mas->node; node =3D mas_mn(mas); mt =3D mte_node_type(mas->node); mas->offset++; @@ -4814,12 +4800,10 @@ static inline void *mas_next_entry(struct ma_state = *mas, unsigned long limit) if (likely(entry)) return entry; =20 - if (unlikely((mas->index > limit))) - break; + if (unlikely((mas->last >=3D limit))) + return NULL; =20 next_node: - prev_node =3D mas->node; - offset =3D mas->offset; if (unlikely(mas_next_node(mas, node, limit))) { mas_rewalk(mas, last); goto retry; @@ -4829,9 +4813,6 @@ static inline void *mas_next_entry(struct ma_state *m= as, unsigned long limit) mt =3D mte_node_type(mas->node); } =20 - mas->index =3D mas->last =3D limit; - mas->offset =3D offset; - mas->node =3D prev_node; return NULL; } =20 @@ -5919,6 +5900,8 @@ EXPORT_SYMBOL_GPL(mas_expected_entries); */ void *mas_next(struct ma_state *mas, unsigned long max) { + bool was_none =3D mas_is_none(mas); + if (mas_is_none(mas) || mas_is_paused(mas)) mas->node =3D MAS_START; =20 @@ -5926,16 +5909,16 @@ void *mas_next(struct ma_state *mas, unsigned long = max) mas_walk(mas); /* Retries on dead nodes handled by mas_walk */ =20 if (mas_is_ptr(mas)) { - if (!mas->index) { - mas->index =3D 1; - mas->last =3D ULONG_MAX; + if (was_none && mas->index =3D=3D 0) { + mas->index =3D mas->last =3D 0; + return mas_root(mas); } + mas->index =3D 1; + mas->last =3D ULONG_MAX; + mas->node =3D MAS_NONE; return NULL; } =20 - if (mas->last =3D=3D ULONG_MAX) - return NULL; - /* Retries on dead nodes handled by mas_next_entry */ return mas_next_entry(mas, max); } @@ -6059,17 +6042,25 @@ EXPORT_SYMBOL_GPL(mas_pause); */ void *mas_find(struct ma_state *mas, unsigned long max) { + if (unlikely(mas_is_none(mas))) { + if (unlikely(mas->last >=3D max)) + return NULL; + + mas->index =3D mas->last; + mas->node =3D MAS_START; + } + if (unlikely(mas_is_paused(mas))) { - if (unlikely(mas->last =3D=3D ULONG_MAX)) { - mas->node =3D MAS_NONE; + if (unlikely(mas->last >=3D max)) return NULL; - } + mas->node =3D MAS_START; mas->index =3D ++mas->last; } =20 - if (unlikely(mas_is_none(mas))) - mas->node =3D MAS_START; + + if (unlikely(mas_is_ptr(mas))) + goto ptr_out_of_range; =20 if (unlikely(mas_is_start(mas))) { /* First run or continue */ @@ -6081,13 +6072,27 @@ void *mas_find(struct ma_state *mas, unsigned long = max) entry =3D mas_walk(mas); if (entry) return entry; + } =20 - if (unlikely(!mas_searchable(mas))) + if (unlikely(!mas_searchable(mas))) { + if (unlikely(mas_is_ptr(mas))) + goto ptr_out_of_range; + + return NULL; + } + + if (mas->index =3D=3D max) return NULL; =20 /* Retries on dead nodes handled by mas_next_entry */ return mas_next_entry(mas, max); + +ptr_out_of_range: + mas->node =3D MAS_NONE; + mas->index =3D 1; + mas->last =3D ULONG_MAX; + return NULL; } EXPORT_SYMBOL_GPL(mas_find); =20 @@ -6518,7 +6523,7 @@ void *mt_find(struct maple_tree *mt, unsigned long *i= ndex, unsigned long max) if (entry) goto unlock; =20 - while (mas_searchable(&mas) && (mas.index < max)) { + while (mas_searchable(&mas) && (mas.last < max)) { entry =3D mas_next_entry(&mas, max); if (likely(entry && !xa_is_zero(entry))) break; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BF59C7EE23 for ; Thu, 18 May 2023 14:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231944AbjERO7j (ORCPT ); Thu, 18 May 2023 10:59:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231487AbjERO6m (ORCPT ); Thu, 18 May 2023 10:58:42 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A6031A2 for ; Thu, 18 May 2023 07:58:17 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IoJ5006529; Thu, 18 May 2023 14:56:51 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=W28sfOc1Ebm9G6oXnJIkL5YbIyR2oRp0bN+zyezWu+4=; b=3YxNQOMSLm8Fl/AJk96bIxq/5lBKdJqNWDfuyK6x8L18iN6pwv190qLqdoUMgUe32O49 9zReLs4K153qsTLZi8Z8YlytXC7FaST5ipzLWIyw0Uu3ebf5fkAH5PEX5U0VsrQnRuPn 2FQLgO9/K20+odHAev/UNv35IbaEWm4QGHc/TMTUeSNLIV+NnM8MEhVlX9pf1evTF3OZ iPJkesoVZgx54ttopPMpbnuyBbAt84slHr4WfbCVhyzTK1ESSRkh5PaNq6qQ53V7GXhC HalaV6BCJJywhBSK9BvbJdvT4hiolzR2OsLnlFzm3yC+iG1urXI9MXnN8DismS3+lJj+ FQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj0ye82r0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:51 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDdCHd040028; Thu, 18 May 2023 14:56:50 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mqeu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B/LMqj4xnMPwm4eoRHHVTcNEraqYZ8eijPxIfo2WJSQiFZcig8lLHK5bfvTeOm92uY73Lf3aB9PD9pvMnLsVJ+yvMwgZcsHNTMRTNVZBlHMO5YpIvdnod1GWy5Ltp1U7lr7STPD9zg/mXwCc22WgWtP7B6ouCyJZd2OsBUk1CZg2IAesi87NagP/HivB37TkI1JBKbpe9QBAOyhJGxiXptdMr0NClEslmwiCs22IsZ2GvsLoM+J+hjHmz/HUDXAFJUYLNFcgluTploj4KpQV6O+RhZyr0vVHQdS6jOPJ68LgFCL0pVzulvitnslQ4R+QVP1f3sAs9UK5SGmRNXnLcg== 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=W28sfOc1Ebm9G6oXnJIkL5YbIyR2oRp0bN+zyezWu+4=; b=BwA7SQm1TlMtoR3ib19r/2ULCra0yguEL9YD3gK1GcCIEQxxtj3VQnL0O37I+xDWM7Q1MBbSAGNFNXMstxMNKqERwrCpZNNyyWn4Gvb/XmstbuzvUK/vS3IlO/yDF1obnqI1EQhr2Yu9FGNr8JjhdxIJzRB5GBxNCsOZZDjyoPr33uGGXswpJfAUHopOLj3lGM0sPK9RuGALOaRaYyv+CXrgK9n9EfSfluUMenyOKgTZx3UeKVJhV3ltEW4DZxWTOM0Fqe+IzO0BuAOtnk6ZzWQUWYDVeSkuvcNHT6m1IxN4aTOXLLpbcvIYP2+LPoOVjVz6LX+AD+6eLVAqGEizvA== 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=W28sfOc1Ebm9G6oXnJIkL5YbIyR2oRp0bN+zyezWu+4=; b=y12prn5ooAR91eKDzVZ+MSOP0wRklXkwtJ/FlHZ+2hD7+LkrpraeOqu7UIFbHkvpf3ghAVzW+SQVz5ILDHDt4/LO4ywqTkrMLrKDCFoysm1myp95ug5YHAp7V7NtMG2ogH+cFE4S174spe9zRO6Czw0JQAMgFOhTpL2KjWx4I8g= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:48 +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:48 +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" Subject: [PATCH v4 24/35] maple_tree: Try harder to keep active node with mas_prev() Date: Thu, 18 May 2023 10:55:33 -0400 Message-Id: <20230518145544.1722059-25-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:111::11) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 38c390d5-990c-4fd4-242b-08db57b01ae6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jxDpKdJaRu88zBjVUO/9+Z1+ZbM/uBLZ/SbYz1SonUn1Y0O4QEcw/AI4j8adcsBZ4FRLatqPvj3EHLte0FVokYxppYe2IMlv/e8wgZKTapXLTVYCKqFMF361xk5HC1oTxtMzlw81qLEwsvXvUs5euXxDc5vJrKfznd8XF+LLTY2LgpzLIdjP5GnleMLMaXJrG2fxndZF/++pI05FjRxPM1LcZwfYNu8WQeC5PicZnx09LBZIwhe/tPxWJQFig5m6Iro/CMQguSFZQ+e4butCV+iBJRv7HTTLdNWEfAPjEmGSEZcSIRoCFAtK+LRqyRYj32gXNGuA0shVovRyWVzHdni6XDjLaaJQhp+3PjeuLFJXNWJeGAPVv7Kh9HyqVLi9TUj2yfKg+s2MQWESYy2Vv9Qa2VTlvCk7EWpdvE8n3XaFEZXQu+O8VdZ2/psSHtK6ahuMtZHAPQo2BwD8m/X+9Mqae94h5/tvF4wTHq8D5YGVv4dgtICz9rt2n3hJVVshpX84Iuq2Dx7BEW0hY9YcnURwHS74VnwQnTztpZs9CurRv88GNvGmL0vBCEmm1Az8YMAKLiRSzphsFXXrzclsLu7SiMsDP99FgfWv9sf4nzLwPNtRcEom/QqPLdAiffRYSphrhvvY/R/A/snQlNVraA== 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(34023003)(148693002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hRiV/57gg/QRhfny02ygSTSGSwekIEVJnh0jU4Vvk5vZKbFakZePXWUOmScs?= =?us-ascii?Q?N0tKOlwgscwlyPJmq/GM12b7il+w0nkTLJ9BUypjZRziTqGJhCj0lvjtaTkY?= =?us-ascii?Q?dS6N+QzB96GrslrojnMwgnxyWxOFo72H72XbuQo5kXWlcX7heMXo4WbG8y7o?= =?us-ascii?Q?3tcdFRrPk/7nd/gkeTVyxYJcq1FutvoFKPuC6wb8g+2ShI1Ge6FjcX0B+KXZ?= =?us-ascii?Q?6VIkTzKYaK1BuIMelqN/bGbYtXl52M8lc8PAhDPKN6FyQNneAY03qhdtrUFW?= =?us-ascii?Q?ZrGtidTL8fmyrlPq4uwC4g4hKmkTUr2Uj2Fqf1h6Bbr0VqYOOlTO6Lk76a83?= =?us-ascii?Q?rxVYm/lt02uQEM7c9uq9lJrcnZfNH/UESXX4SKcT54C+df7OnBWKLhC/eAom?= =?us-ascii?Q?FIsm/mCe3ELpVmEqs/ya1C6vm/XYIQxjKI+KsPWOdpX4sPRxJ0HGBVlY3IWT?= =?us-ascii?Q?7QLCZqpfHv5StTwdoIIIJJstr/83STXr1XhtPOKJ+kiGdrJPRNmWs6f3fSko?= =?us-ascii?Q?nyqK+xgFB2sWyanxcBmvHNaqDKYplCNBWxEGoPXrKPaodMbtt29buUZytVPm?= =?us-ascii?Q?6QH5XXfxIqEm4kZkBQD8icjx1kJnID6oHdqHFtyFI1lCvYpIz4JpnIBs0qlh?= =?us-ascii?Q?MxySPflgAtobnMSKkIsONYqE6i38B7pYXI3kiasD4SS8LyrVhP9VXspbl89u?= =?us-ascii?Q?NtdSJJzTXvG0OdNKGN+cH5P7xrTQ1SkXHnjSoKnawv3f75uEa+THGxMlTmBp?= =?us-ascii?Q?QZ5V0TfqiWqKQGzRsmkAf6sb4vVJtr9RvI8XtW+0CFZqT3nL1bmYxiu5tzYl?= =?us-ascii?Q?9IQTYxlnbsfEzP3vWN+swutcoRUs+larnj7/jh4RAeDw/ft4777oCH36pKHH?= =?us-ascii?Q?O6CCay1ooiJhZoLxOnJHXrKLzDlY/EgmrW0JBtaXKEeuQU9gkFarxj+oBSD6?= =?us-ascii?Q?ac7nkTzRjMlhVM8vzl+Koed0PI0VKQu9F5v/OPMZ9cFVfxrne+eByYm0+N3D?= =?us-ascii?Q?oICNX33z9pEAx0Xhtzwf++5P3M4aQDUg0Z1PMVJwm+6nLqANfIEbeJCfb5GM?= =?us-ascii?Q?/9a8QeNaF/ErGr7zcQtgt+kdJM7z9A3rQZD7daD1Yfw3zYAYH1cT+dRysKjI?= =?us-ascii?Q?zOD+7Lu00+AEmDelw6qcOazzsGhRPaNELbXbGaYCgIeIGYxlsZlpck8QpibK?= =?us-ascii?Q?/H5gDGVLVyRy2kz/W2EHF8m2V3Eua0FJ3D6H94GxWe+2MGzeLjoL7sKWo12J?= =?us-ascii?Q?fj8evRRWz8p1ea2UePT2sdp06+2X2GOgqL7PLpPxOqDZDC6ME/VSd0Ac17RD?= =?us-ascii?Q?jf7xaXR5gVMhXom7Ev1p0937xKFF0b6qPEXhqier2QmLqvohqSR9pB+A+3Go?= =?us-ascii?Q?fTLPX9d+DdUIDgK1Nno5qf8GyQL/rdJouO0m0mEdYc5SNWBys9HrcDKjDCZp?= =?us-ascii?Q?HuofZHIYBbUt5kR+0biir2aM3ugwZ0+n/sk0+OrS8vdx7WbMTfM1kOS1YJ1H?= =?us-ascii?Q?qM5QORTaoWd6cXIvHKCHaHHNyzjI848UNljFEHb0430a9DYLEG1XuI3pvWwS?= =?us-ascii?Q?B3Wrnca1r6AVEfrm5AJVBMF4Ci0FXY52BH7xtgkFarjusjP/lh0X+HCKrgls?= =?us-ascii?Q?Iw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Xzf67/Wq3FcXQD4g4FUUTZrZJ0NM2/d7p2W/6RDggl1JSpuZIrm4EL9eMbjhMePJ13oyzcXFIyAq+7v72yPgg0LV4RJRDcVKg1/cpKXYndJNjP1wV74Me028YHVL/tmjk33gwQox1OHzt6J8XQode4BdQOxajrkCWn5seho0cscBsfMhGy3RbOi+uXgMB5uFwSPFIneq65scBZhikq+f2J4EpNtxpfzbjI+OBA2LxknQS3Eugpf0BMfoFtkaNQHonkRmv/RgZ7E6HX//xmVrwDbnr/rS9SQfOpOVsT8lNA2jl8xFrfJIaV0MJVscG8K7l/fKMqEwBBrsMjsu6SGv4DsK6U7iGaqksGkidRiuvZGRM2sry6atv1XctWqgK0lY4gW927yQHVu1S8OuJIn0JyiDH2JmE3qt+qE/FDUxWYpMo10JUdUlCrHXslOVCl2X+TzIE6fxEZikCff3E/TAtcU+QdawqqFcUn1zYKCFKPUJrAIA+FQXupBGb2RhyVN6nxNs2RohdNxB2jDADCjSQQGYxr2GWV74BO4ZUEmTx2SXskcHnKfkjqB66j91vuo+8GDbI66FRqkUfFjoYVHPz2y1bOALCF3cLA/FFBQz56cgbPAo9tIAJ3fMlHdW1UVGCGstNqZKYHunmabjezXij45l8QzR3t+S2b+OiYRZIGS86jcOv/i8ECgVzTOg0KbJxJx3sC12yEgNkq4mCNLMELXFQuRezSB/uMUjWCL5DITM6RYacL6z5Kvy8tIBVYJTnh10nPXJvfzA3arrHFeWDgkXBBf0nGaqA8OaCNT30MxOlRtKpK+Bp/0PeibgMV/teOw6Wtxr9QLANzCz69KZhMlGd+7Tkg3Bcn1xUgN0DuKDdm8ZwRekdVejZ4aF6EjkHm0gyLKFUz/znmB7Y0vrLw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38c390d5-990c-4fd4-242b-08db57b01ae6 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:48.1711 (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: tUh1pqpfYTUbKGUcZ+a9MtTGErXNPyI7r8B+9I66kFFFgzccF2nggozCFV05YNZEVDgdN5/I28MYKiYOAGM9eQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-ORIG-GUID: ILsHtbKFAdztoPaxyvw3AyTf6eZPg-jf X-Proofpoint-GUID: ILsHtbKFAdztoPaxyvw3AyTf6eZPg-jf Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Keep a reference to the node when possible with mas_prev(). This will avoid re-walking the tree. In keeping a reference to the node, keep the last/index accurate to the range being referenced. This means the limit may be within the range, but the range may extend outside of the limit. Also fix the single entry tree to respect the range (of 0), or set the node to MAS_NONE in the case of shifting beyond 0. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 125 +++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 42 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 09142af08214..425ad922bb2d 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4827,7 +4827,7 @@ static inline void *mas_prev_nentry(struct ma_state *= mas, unsigned long limit, unsigned long index) { unsigned long pivot, min; - unsigned char offset; + unsigned char offset, count; struct maple_node *mn; enum maple_type mt; unsigned long *pivots; @@ -4841,29 +4841,42 @@ static inline void *mas_prev_nentry(struct ma_state= *mas, unsigned long limit, mn =3D mas_mn(mas); mt =3D mte_node_type(mas->node); offset =3D mas->offset - 1; - if (offset >=3D mt_slots[mt]) - offset =3D mt_slots[mt] - 1; - slots =3D ma_slots(mn, mt); pivots =3D ma_pivots(mn, mt); + count =3D ma_data_end(mn, mt, pivots, mas->max); if (unlikely(ma_dead_node(mn))) { mas_rewalk(mas, index); goto retry; } =20 - if (offset =3D=3D mt_pivots[mt]) + offset =3D mas->offset - 1; + if (offset >=3D mt_slots[mt]) + offset =3D mt_slots[mt] - 1; + + if (offset >=3D count) { pivot =3D mas->max; - else + offset =3D count; + } else { pivot =3D pivots[offset]; + } =20 if (unlikely(ma_dead_node(mn))) { mas_rewalk(mas, index); goto retry; } =20 - while (offset && ((!mas_slot(mas, slots, offset) && pivot >=3D limit) || - !pivot)) + while (offset && !mas_slot(mas, slots, offset)) { pivot =3D pivots[--offset]; + if (pivot >=3D limit) + break; + } + + /* + * If the slot was null but we've shifted outside the limits, then set + * the range to the last NULL. + */ + if (unlikely((pivot < limit) && (offset < mas->offset))) + pivot =3D pivots[++offset]; =20 min =3D mas_safe_min(mas, pivots, offset); entry =3D mas_slot(mas, slots, offset); @@ -4872,32 +4885,33 @@ static inline void *mas_prev_nentry(struct ma_state= *mas, unsigned long limit, goto retry; } =20 - if (likely(entry)) { - mas->offset =3D offset; - mas->last =3D pivot; - mas->index =3D min; - } + mas->offset =3D offset; + mas->last =3D pivot; + mas->index =3D min; return entry; } =20 static inline void *mas_prev_entry(struct ma_state *mas, unsigned long min) { void *entry; + struct maple_enode *prev_enode; + unsigned char prev_offset; =20 - if (mas->index < min) { - mas->index =3D mas->last =3D min; - mas->node =3D MAS_NONE; + if (mas->index < min) return NULL; - } + retry: + prev_enode =3D mas->node; + prev_offset =3D mas->offset; while (likely(!mas_is_none(mas))) { entry =3D mas_prev_nentry(mas, min, mas->index); - if (unlikely(mas->last < min)) - goto not_found; =20 if (likely(entry)) return entry; =20 + if (unlikely(mas->index <=3D min)) + return NULL; + if (unlikely(mas_prev_node(mas, min))) { mas_rewalk(mas, mas->index); goto retry; @@ -4906,9 +4920,8 @@ static inline void *mas_prev_entry(struct ma_state *m= as, unsigned long min) mas->offset++; } =20 - mas->offset--; -not_found: - mas->index =3D mas->last =3D min; + mas->node =3D prev_enode; + mas->offset =3D prev_offset; return NULL; } =20 @@ -5957,15 +5970,8 @@ EXPORT_SYMBOL_GPL(mt_next); */ void *mas_prev(struct ma_state *mas, unsigned long min) { - if (!mas->index) { - /* Nothing comes before 0 */ - mas->last =3D 0; - mas->node =3D MAS_NONE; - return NULL; - } - - if (unlikely(mas_is_ptr(mas))) - return NULL; + if (mas->index <=3D min) + goto none; =20 if (mas_is_none(mas) || mas_is_paused(mas)) mas->node =3D MAS_START; @@ -5973,19 +5979,30 @@ void *mas_prev(struct ma_state *mas, unsigned long = min) if (mas_is_start(mas)) { mas_walk(mas); if (!mas->index) - return NULL; + goto none; } =20 - if (mas_is_ptr(mas)) { - if (!mas->index) { - mas->last =3D 0; - return NULL; - } - + if (unlikely(mas_is_ptr(mas))) { + if (!mas->index) + goto none; mas->index =3D mas->last =3D 0; - return mas_root_locked(mas); + return mas_root(mas); + } + + if (mas_is_none(mas)) { + if (mas->index) { + /* Walked to out-of-range pointer? */ + mas->index =3D mas->last =3D 0; + mas->node =3D MAS_ROOT; + return mas_root(mas); + } + return NULL; } return mas_prev_entry(mas, min); + +none: + mas->node =3D MAS_NONE; + return NULL; } EXPORT_SYMBOL_GPL(mas_prev); =20 @@ -6111,8 +6128,16 @@ EXPORT_SYMBOL_GPL(mas_find); */ void *mas_find_rev(struct ma_state *mas, unsigned long min) { + if (unlikely(mas_is_none(mas))) { + if (mas->index <=3D min) + goto none; + + mas->last =3D mas->index; + mas->node =3D MAS_START; + } + if (unlikely(mas_is_paused(mas))) { - if (unlikely(mas->last =3D=3D ULONG_MAX)) { + if (unlikely(mas->index <=3D min)) { mas->node =3D MAS_NONE; return NULL; } @@ -6132,14 +6157,30 @@ void *mas_find_rev(struct ma_state *mas, unsigned l= ong min) return entry; } =20 - if (unlikely(!mas_searchable(mas))) - return NULL; + if (unlikely(!mas_searchable(mas))) { + if (mas_is_ptr(mas)) + goto none; + + if (mas_is_none(mas)) { + /* + * Walked to the location, and there was nothing so the + * previous location is 0. + */ + mas->last =3D mas->index =3D 0; + mas->node =3D MAS_ROOT; + return mas_root(mas); + } + } =20 if (mas->index < min) return NULL; =20 /* Retries on dead nodes handled by mas_prev_entry */ return mas_prev_entry(mas, min); + +none: + mas->node =3D MAS_NONE; + return NULL; } EXPORT_SYMBOL_GPL(mas_find_rev); =20 --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE573C77B7D for ; Thu, 18 May 2023 19:50:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230251AbjERTuW (ORCPT ); Thu, 18 May 2023 15:50:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbjERTuU (ORCPT ); Thu, 18 May 2023 15:50:20 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25CC7E67 for ; Thu, 18 May 2023 12:50:19 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JDTi018335; Thu, 18 May 2023 14:56:54 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=s3ex6HS9UhbpN+9ia8BU0WmPJxpM6tKnuxn0TPH+HDw=; b=ZMFuZTSnU6tJKATAIHyu7csPrZbJUm4ahaunzio6NrMuPl2P1aOy9+JqMjsC8ZN9pROA D98c+C0Axy86si60/iVucpe9vv3T/4cnkLPOAIXOFK0H5O4XuIiM0sSqVXgMy8498/Wd gZqBn+zYxm/w8bF0fDnjAkwW9L+qhm5PStYQdm1P/0GlCUwtg0TKvQVkQID79/rsj8JD VnLqQE5GIVXOlKDGpcw/7WImuVbHM319LEYRuDwijycNBSHoWUotcQ3TxryySflInJBy zRnLFUvFEobV5OHqLrWsHiAhZ2i8ZWwAXO7mq6PuK5J/d6lovoBksZmLUkanJzrD0yOv jg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:54 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IERmLc036399; Thu, 18 May 2023 14:56:53 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w40g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RYQItWPl6O0zmatgHVYRaKtzF+uhmAVqn+uIaNkVR6joM2aR51oWOrcvEP+mJulI//bOBcQ3iEjUP6UmcDGFtLogT1tQXShnWqRAwQWTirNpqZBBYWHgJ4Qzwl3Ck9E3Wnt2D+Xpv3qac/n3BQpfsViTULbFm+g8BSjSas3xtcy6iyeLws25eV4FoFt1ivzbrPQGmGOpwqA9AwVvj5XDsICRsmnNjORpqh697v6x1R5TZX2B3ymjPtFfExex3FGKXqsM+SiAnG4ZxMV6oq/5qz4JYE2Yjf5KWy97j0LN3TQdKn2hzmUiV1LKy+d3ry4PK24CnIBZAeNGtMlLgkV1QQ== 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=s3ex6HS9UhbpN+9ia8BU0WmPJxpM6tKnuxn0TPH+HDw=; b=XiH3ntTychzLzLOo8ytOF/7RoIx7fw1AVwyaEmOmovOWgPe/NLdgh3k7/MgDb4g4QiQR88GvpOKdgUN0dmd1zMWPNQ6Tc8wKlAXzrcJQg+/DPTyvIoYP74lf3sogXPrDhhWYPJkJYw/uHTMyJqbSctvpXIgwUyBe0+oNzRWLxvP3+4po06w6pN9PVCI8F2VQkue5oYbPkt7uXIcrEIhb5kzFTM1oToSYhNlDJTZiIT7NprDAz2TAdpVwD23ze30IaR+2qLoYGabXclUSkBZaLrs4ceI2Y+rezU46hornCLHUtZqYfgf0OtVXMkxqHOLcTLM5wcXymYhaXk3Q+h/Deg== 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=s3ex6HS9UhbpN+9ia8BU0WmPJxpM6tKnuxn0TPH+HDw=; b=lGxiMc7rhwHfm87SvpaclvaoBrMJHSm9370t3mfpfVLteBBumoZ223UVMoMqPFZspRaOEeHp5Tc27+Dmz0Y2NXyNdDit2gTy0WeRipTA3kxWWehD0ithnlvubnWpcWPiOn19oRDqtHt8kZbAwpocnUrXzWup05ljBpx2sHgidaw= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:50 +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:50 +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" , Peng Zhang Subject: [PATCH v4 25/35] maple_tree: Revise limit checks in mas_empty_area{_rev}() Date: Thu, 18 May 2023 10:55:34 -0400 Message-Id: <20230518145544.1722059-26-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0072.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:111::26) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: e307035e-966e-4754-5a73-08db57b01c68 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SKnU9p+paBAiAAlbECTG07aiRe3QDE9wHddbg1Zp8cvVcgRf4TNNBKtSt541NpXnONzILjwX4HHkT0JJxD+fqz5zRXU+A+0ALNVPeSCmr3JTd5rHsnBxvxwvJ5E0J2YBRha9ksUzAA4WdHJdk9YOQBIxC/aaIKQdZCV1zBM4KG0dat1ZM9DxlEvBSQLOP/dTZZ95KJGPXwdp347gaFNryjCvUGR5jmy4xYr7GVeVLM31nTSXUYatIa7s3jf4J0pU9ibfwMZWq1VPNDEbwW8sZSpdNlBdD6WtH+wgl5+fRn00+zWkFHy90G4OzSTyKps/LvWox0UKlmgupI+/adQ824AdnwlDoYcdbufCkwekTIt1XRM2pOfE1Z5m/VNxyKYLrm8eWmfcM/0M8VEcpT+aUmFbiR10zfU2fbA+iqghIEFzrxV85YYTUP+Ah1ikgJ+Ot5SbMTh7LQZvjptY13/ax0afxb5nnJ/K24/Og5ur8T9xIDUkhbZ358k1QpqicCaBPqFPls6qczRUxcLmP9L7BfGyyV8OM/ZeZPeBJ31lRj49ow5ulvf2PzKjW7ajkTO1 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(54906003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JzbKU+kyj5wjSycZpdsepaWhksNbLpU+mn20Y00mBVAeOE73Yr2GfD2+F02z?= =?us-ascii?Q?XMfbbjRkH9P9Lgo7DMfDln/Wgq8n1CZILXLhps1POjAvLy312Dq41vpe9aJ8?= =?us-ascii?Q?xWRwSt5Sdn9tll2TWEqPmvRDidgWcjMTvgDFPB6tB/3kA/TIakMlnw3MBqTF?= =?us-ascii?Q?auD54WOfYfRZHhrvrRrOe3TI9B9pPsaw+UoTMVfPRn1JA6kRn1GDlDuEexRp?= =?us-ascii?Q?MTtjeppFrbH45sdJyAq0OK2lgTXVldfMq4qUH0CiRe+rvFSyH6D7KhZ3jkLg?= =?us-ascii?Q?pTUaXt7pZeJUE1YKIZn3xhI90JnWUXRMXJNpE7iGzCRpm0I1j7yNKhm1fI9f?= =?us-ascii?Q?ERo212iamJI1ZVJQ4s8bhjCkTfByZTMx+ADb6GlSy+Fm+tABEQxx4qXBX+Ap?= =?us-ascii?Q?C8WeANggXdw2lpsH9erO3+XCTr8vCV8UqVZfaQJrYy9byhPy/SwLsPU6y7VB?= =?us-ascii?Q?dt7t/pY9ndmEbIM9HfLVaK2nqHVb5tsuo06meR53kwv1MQcLsiEUMVkoshp4?= =?us-ascii?Q?sr1vYr9u4uXHx9ScRnbnmzOhR2+fwUt524eq6EaIgRttMkTuphfY6nNqgxWd?= =?us-ascii?Q?fJy/Sx2KRImE8sIhcnkmyw63Zo9jblrKRQr/MZTlOMUsYv0ZFPgEeWvwSAqr?= =?us-ascii?Q?zY7W2pxYCVzX4ztyjxWrWDTxa7zDIQYgWcyh3s6AnbY+jn4H1a8u6A6Hp9Og?= =?us-ascii?Q?YPPP0tU/9Pva1MWP2Q4BT8iOO1chwoIy5WQiazv7Xn0sWNDxr6mK3IqoWR9B?= =?us-ascii?Q?HershFKdv+6fqYMGxeYi3LOxW1e/LUQXQpWtEKKzg/ewXpKM7YN5alT253oh?= =?us-ascii?Q?r9avgshzFy9e66mfxwOCyFiNU6J/odJTTXkNEitjpIPp4NONOI2pQvJgUBsG?= =?us-ascii?Q?uoNGc5TXUdk0SyC4V0pVSdP/34IpRaWC756Lp//YmRFbeiET4WdnKY76sW7f?= =?us-ascii?Q?yvWer0WfjH3jNz2b06P4dkJddc9i7kjT5h8UcWkvbJUCAGG1+FcxFChhHXbK?= =?us-ascii?Q?USwlNeVKjAcRsyg2VfhCGzBfs6GArnJ+dm4s4s867MJoRlt1LUhKhqn7Jtvc?= =?us-ascii?Q?cWOjQgxaYBwoRLHf5ysszOBrQC9g1pgEFTdOxKqsyHpL1PiJu5+7t9yIld3E?= =?us-ascii?Q?qKIui8gcWhBP5/rm/lY3AG9+LPBIirY+Gt9ng31EEX+mPVJZ8FrwRnC71nM5?= =?us-ascii?Q?WVeyRVKWAzQJBGVi5h4MYVzCEbpI+uvQP868zVRdJ51O+c4n5HptAWqNAQ7Y?= =?us-ascii?Q?QE1kYES5XL3Ub00rcrxk1bCe9ad+e/b+Yf/1r87xS5AhtvXIoG0GAsEp07FL?= =?us-ascii?Q?VeEW5NP8en1XI9jikLnUlK6SUht0i1zNqzxE1gU0P4KV4xXnDJdNufg5sBH0?= =?us-ascii?Q?CFjgpIUPDcA3f2KdqiHcwLcqxOtGcpZ0UPHEauJJbRqNYdqL2bAbnCQPx95S?= =?us-ascii?Q?N3C8i/Anda2UnhdikFXSW39Y4vUntngwcp7lBHNnTs+zX1XMlbsdeMmdVKuy?= =?us-ascii?Q?DN041E2UttaKtU4LWk2SroiuGcmbWpZy1waQAS5lUdE0IMgvGMrXW8BNwvT7?= =?us-ascii?Q?QIhKGfmviCqCPLyImE24yFSBMzdOz479u81+twyMYYyMA6SLR0qvWuw8/Fon?= =?us-ascii?Q?7g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?EamoNGCCnpcTm5WnU0AglvvkhksoaZDXkZ9KO3BN3oV6Vka9s4u5L2BiZMTp?= =?us-ascii?Q?/mVqlystBoTvXfhEsK0nQa1peSFHptp6p4oTmLXUdYpZZOSJV5tAI+EjthYx?= =?us-ascii?Q?wzwr59fhA75+9zddtfbVgLXyhdyFf2DYIvM+1ygZEm43mMz+qVSsqM8ck4Q0?= =?us-ascii?Q?tzzA0EJ+PD2Z62BrNHkXfA6g2asmVr+j6FrxRitNGcnrM3zUiXGuY+dooPYR?= =?us-ascii?Q?ggEU9nwuBaVFETa9hYetAluc4tscu40I1eSd5CT2Kt/BsXjnA1zu7/tfm/fh?= =?us-ascii?Q?uEZJhlnOZC9CYy4WULnpeDz1CBmUg7v6GPewGzqkNNWQoBGyOSSgjLbzLZr/?= =?us-ascii?Q?V4uXYLtiqCc/O8xf5TE6+CI8eCCsbnvBZEjB2uQHVLwXvnhW6tK7oIgpWjEF?= =?us-ascii?Q?OtEnbUEOQ+YFCs8udukeOiN1/PxiL/FxqFRIuXdBUmRvjzaN7V3YzrhWyaxu?= =?us-ascii?Q?IC+pdFKBUnkQ/FqQEOzQw4xNMsvbfMnGaN7uBnnxUGygbfsp01/uQ/djf/EM?= =?us-ascii?Q?6lbiqp2JdA9PCkKillxOqJ4Nf9LPCwHq7Kf/sLYwIl1UfWyn9EbEF2UMGSH1?= =?us-ascii?Q?UKohqjzqrOdGsTydutkOPQJDkqJL4O8e7gyVGyX1VbhESssfOkytzuY55yRt?= =?us-ascii?Q?O9ttXykfskFv2bgWgnUmnIB9HplELF6ePsQtYQPYPVIki8dw3mLYMGgQWa6I?= =?us-ascii?Q?d+9kaqmQnep84N0aZLgAUzj3rjHE/6RiBoKANTSQBAe8/WWIqS596lRHlRNg?= =?us-ascii?Q?kx9tUdDN9yN5zWzf8lJmxPA59njYrF/FzPr7cgaX8kuLlNBb7o2xhemIpMm8?= =?us-ascii?Q?pvPASoBgKdUd5Gczv4b4C+2YFzQoh4JOsNvi0KfjtuMkUwfL24+c6uXpqfeU?= =?us-ascii?Q?YM4HzW9AoKoN/6SdNfsPJP1n4gyiYaEQdr2mdDVrFDX+9GeyG4T163dDwJ2k?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e307035e-966e-4754-5a73-08db57b01c68 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:50.6674 (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: AxPCoepSsoZO/Vt7JvHz2YX4gbYH0mtiHmS51Y1m24+2118+q8ZtENTxSDY7wwOMrbGA3sf2SYZ1RXkYtMQDQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: t-7l36pYpSjGvibqjHlgkJZlPc8D6Qap X-Proofpoint-ORIG-GUID: t-7l36pYpSjGvibqjHlgkJZlPc8D6Qap Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since the maple tree is inclusive in range, ensure that a range of 1 (min =3D max) works for searching for a gap in either direction, and make sure the size is at least 1 but not larger than the delta between min and max. This commit also updates the testing. Unfortunately there isn't a way to safely update the tests and code without a test failure. Suggested-by: Peng Zhang Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 20 +++++++++++++------- lib/test_maple_tree.c | 28 +++++++++++++++++++++------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 425ad922bb2d..580310741d89 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5282,7 +5282,10 @@ int mas_empty_area(struct ma_state *mas, unsigned lo= ng min, unsigned long *pivots; enum maple_type mt; =20 - if (min >=3D max) + if (min > max) + return -EINVAL; + + if (size =3D=3D 0 || max - min < size - 1) return -EINVAL; =20 if (mas_is_start(mas)) @@ -5337,7 +5340,10 @@ int mas_empty_area_rev(struct ma_state *mas, unsigne= d long min, { struct maple_enode *last =3D mas->node; =20 - if (min >=3D max) + if (min > max) + return -EINVAL; + + if (size =3D=3D 0 || max - min < size - 1) return -EINVAL; =20 if (mas_is_start(mas)) { @@ -5373,7 +5379,7 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned= long min, return -EBUSY; =20 /* Trim the upper limit to the max. */ - if (max <=3D mas->last) + if (max < mas->last) mas->last =3D max; =20 mas->index =3D mas->last - size + 1; @@ -6409,7 +6415,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned= long *startp, { int ret =3D 0; =20 - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, min, min); if (!mt_is_alloc(mt)) return -EINVAL; =20 @@ -6429,7 +6435,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned= long *startp, retry: mas.offset =3D 0; mas.index =3D min; - mas.last =3D max - size; + mas.last =3D max - size + 1; ret =3D mas_alloc(&mas, entry, size, startp); if (mas_nomem(&mas, gfp)) goto retry; @@ -6445,14 +6451,14 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsig= ned long *startp, { int ret =3D 0; =20 - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, min, max - size + 1); if (!mt_is_alloc(mt)) return -EINVAL; =20 if (WARN_ON_ONCE(mt_is_reserved(entry))) return -EINVAL; =20 - if (min >=3D max) + if (min > max) return -EINVAL; =20 if (max < size - 1) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 19b130c9ddde..f167d6ef8159 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -123,7 +123,7 @@ static noinline void __init check_mtree_alloc_rrange(st= ruct maple_tree *mt, unsigned long result =3D expected + 1; int ret; =20 - ret =3D mtree_alloc_rrange(mt, &result, ptr, size, start, end - 1, + ret =3D mtree_alloc_rrange(mt, &result, ptr, size, start, end, GFP_KERNEL); MT_BUG_ON(mt, ret !=3D eret); if (ret) @@ -701,7 +701,7 @@ static noinline void __init check_alloc_rev_range(struc= t maple_tree *mt) 0, /* Return value success. */ =20 0x0, /* Min */ - 0x565234AF1 << 12, /* Max */ + 0x565234AF0 << 12, /* Max */ 0x3000, /* Size */ 0x565234AEE << 12, /* max - 3. */ 0, /* Return value success. */ @@ -713,14 +713,14 @@ static noinline void __init check_alloc_rev_range(str= uct maple_tree *mt) 0, /* Return value success. */ =20 0x0, /* Min */ - 0x7F36D510A << 12, /* Max */ + 0x7F36D5109 << 12, /* Max */ 0x4000, /* Size */ 0x7F36D5106 << 12, /* First rev hole of size 0x4000 */ 0, /* Return value success. */ =20 /* Ascend test. */ 0x0, - 34148798629 << 12, + 34148798628 << 12, 19 << 12, 34148797418 << 12, 0x0, @@ -732,6 +732,12 @@ static noinline void __init check_alloc_rev_range(stru= ct maple_tree *mt) 0x0, -EBUSY, =20 + /* Single space test. */ + 34148798725 << 12, + 34148798725 << 12, + 1 << 12, + 34148798725 << 12, + 0, }; =20 int i, range_count =3D ARRAY_SIZE(range); @@ -780,9 +786,9 @@ static noinline void __init check_alloc_rev_range(struc= t maple_tree *mt) mas_unlock(&mas); for (i =3D 0; i < req_range_count; i +=3D 5) { #if DEBUG_REV_RANGE - pr_debug("\tReverse request between %lu-%lu size %lu, should get %lu\n", - req_range[i] >> 12, - (req_range[i + 1] >> 12) - 1, + pr_debug("\tReverse request %d between %lu-%lu size %lu, should get %lu\= n", + i, req_range[i] >> 12, + (req_range[i + 1] >> 12), req_range[i+2] >> 12, req_range[i+3] >> 12); #endif @@ -798,6 +804,7 @@ static noinline void __init check_alloc_rev_range(struc= t maple_tree *mt) =20 mt_set_non_kernel(1); mtree_erase(mt, 34148798727); /* create a deleted range. */ + mtree_erase(mt, 34148798725); check_mtree_alloc_rrange(mt, 0, 34359052173, 210253414, 34148798725, 0, mt); =20 @@ -901,6 +908,13 @@ static noinline void __init check_alloc_range(struct m= aple_tree *mt) 4503599618982063UL << 12, /* Size */ 34359052178 << 12, /* Expected location */ -EBUSY, /* Return failure. */ + + /* Test a single entry */ + 34148798648 << 12, /* Min */ + 34148798648 << 12, /* Max */ + 4096, /* Size of 1 */ + 34148798648 << 12, /* Location is the same as min/max */ + 0, /* Success */ }; int i, range_count =3D ARRAY_SIZE(range); int req_range_count =3D ARRAY_SIZE(req_range); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72C4AC7EE23 for ; Thu, 18 May 2023 14:59:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231391AbjERO7m (ORCPT ); Thu, 18 May 2023 10:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231854AbjERO6t (ORCPT ); Thu, 18 May 2023 10:58:49 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9173319B for ; Thu, 18 May 2023 07:58:23 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JD6q018341; Thu, 18 May 2023 14:56:57 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=tcZOdnB2lE1EqsRzUn79ee6riysqDWNmIuJsfyFVFnc=; b=g8PaJDZTh2msetZxgBtOVN7qQ8OOqr0xvyHlUzZLz3iQgAevuMqVMlr79xwP7/FJ2unh BV/Q08k3phN9PHJ6zXmGlXI6d1sA0pEmOibM03GSSeIc9WvncyGOLJ59fLC57dm1z8CM 9/hFhzcfyNQYYRUIiBcIOIXY1RLEKcTsChYDhkLU6WkBW76lhO3OD1BonUmhKRA9a9so V4MPMSqTmd66lVYLJuCIzd37Zx+xulAsZrJ4CdGw16CFqoVDEJrDsVc7KtMJP7V/pey5 d3QWQn4kvB0VBPN4Lf71uTUTKTOHHbZ0kmhtolKZj35yf1Zt3yGZ5CIdQ5YV6B7YWwfl aQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vpn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:57 +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 34IDtR7H033865; Thu, 18 May 2023 14:56:56 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c96y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ij3Ob0yjsdWkJPULN89P6c28ybI95mZZBJgzWfEkohNer62cF03QB8f854tRVlSEpk5hu8S5Ur55WAV994ZOk5W5pJy40R/PgyKGI04NF2pk36E/Rcw+bm8OKFeJmVbIFO07g3qeSGaFc+5dq/fGEdc5VQATv7BTkSxUAC8N1IUXN1+gt/U2g9UeTTlvdfrA/uZjVZde1zrwptc5SI3tVnQ0v5Rlomcez7HsYxJ4DPp0JSt8XneNaJesF6QNXtdZGDA9SliVKPfqmOmAg/6t4cG5hdWz/cgXyGANdaXWsHpNQiH52OH3bDax4JHHsPPZEqq6EuTGFOBIZ51vVOF4jw== 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=tcZOdnB2lE1EqsRzUn79ee6riysqDWNmIuJsfyFVFnc=; b=YUeKJPy940TkdWP1z3EKWh8nXSvEiUAhS6ckJmH16FdIZ3oGdY0A/FmKZmA+fRGMnTQZpZqdjTLNywHNIdyUf7HiEKFD51n+Pi/fA4sepwvZT+dhN5298gEXRvDIQjHySxzrFLh+iOebUn8klLmDQv8voPdYy7hcqBIj6TZ4nNqbZtSYNtcLa6yqdLX91gDZCj6keTVo0TbLRliw8Nf/P1+siWo0NZSTRNegVEpbFJps8w56mPFMS29kponB3bGlLySoxPebL9bcSgQUmuq3hSqAgdDnmYS/RBXOLLaYLDYyo4gesKUyD7jkm9pfw4ZPznWuLEItbxR3OjyNVS5s3A== 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=tcZOdnB2lE1EqsRzUn79ee6riysqDWNmIuJsfyFVFnc=; b=Wd3q0SI39EhBb96EjDEE+1AtXqzpZYPv70BnKfbZJ7RTxFd5wK1zZStJCYpH1XoXYXsa6UxE8yxqjGcULaBqzNLJP8gSH8m+0SrugF/FUH3nWkLlsHaJPEfGUHlLwmOxpk6d1EqXzmO4o6HAlQnChAqL0A7de7aw+AU5SJMdi5c= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:53 +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:53 +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" Subject: [PATCH v4 26/35] maple_tree: Fix testing mas_empty_area() Date: Thu, 18 May 2023 10:55:35 -0400 Message-Id: <20230518145544.1722059-27-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0020.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::15) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 89fc54e4-875e-49ca-3ee0-08db57b01e1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C+DpcvW8OGYoO2m4IPUSSw9n93qPPRRUYse+8KAPpGI9EiteVIQgk/oXGppANH757YkScq4HCvEimikMCbRAzcR53UpQ9Qkg6ER533JsaeADF25QXi9rECzyRW7Bfeg8IIbxjeKEDOkB+uMSWr1wvxSdqQx3ZLcIeYsrsb6eWg2WfPejQJz6LWZaLkssDeSgBWLniq4LbBEk3utik0Nz5iqQOmyxVFVzvizoRymHnj0niP6WOVgJG+1e1aDmH+bwfYxMv+SXDDSX/bJhUE7Lb+p24q4S1Qtctwb2ACMm7z5blmrJsCDYsUf8ojbsp9c70hSeX53oi5w1weyXMMF97bchHNTc0dXKkAaFuV2mqMQmnA3T8g+XQ/jLA+GXacpb7DrsgZRjDevUwu10fdN6f4pF8Z0Rh+4XaXc3PnWW90jEZYMT+q73Eu9g0BCnifJq8xuuc/WbE43/bLAcChHfwjvSryXgM18JT6h0RxmZKNxELzZogZ/XsRGEtOzpQOPBMEf8zenuP28b4HC3RfePLoziEBy27rOTiE7T5RYCyIbBGYWXKhULz6dcdlpxq3gN 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4w9H+HKVC+FD9Ies0a0ak+WG2VpskwiAQgbRz/KZDJOor942bL8eurZNBQie?= =?us-ascii?Q?Wzb4hOgObQsBKJzr9ufDZZGsZgpirjIenn+xcIAMIix2mbt01HTEJAQjspFw?= =?us-ascii?Q?B4iVMPF81SeKYrte7tsxqtofjcwMUmAJv12w4XIgRmDTjzkuoAct639UMM4S?= =?us-ascii?Q?Wm/c1nK6jl4oSpBy1uwicnwh67fNg3YmPaPOJ+Tunwya+Wu0DE89jAQ8+SjJ?= =?us-ascii?Q?b8EZ8IptPoZQlJmxdWubv2GZH+YUHrmrqtlNNvbRW1NmFNr2BC4l+LgMqWIM?= =?us-ascii?Q?aMVz3SJvWBgD6HpgTRqowTc7InU/qXWPvYqG2emw3CTlZQnjVxE8xRG8w8aS?= =?us-ascii?Q?slfq2THHWtwwi78Y6vvXMuxWlufnpJ0mfTlxATGy/YtHZ+1CFyQfnAI6BR6m?= =?us-ascii?Q?Ti1EZjCpdFSO4ytAsHpdU8jJn4udJKl18qzGPvhXBrA1guGUa6n/weQuTbsy?= =?us-ascii?Q?aONH3jkqUew+uI5F8ZnIIQ5ukEcKRyDEmWTWna+RKVubEOgaVN78dx5KjeyG?= =?us-ascii?Q?x5/+lOZrVEGOGq2Z74KPJ2pK5GeDg3hYQToaJB50l6x58oCS0sZiSiVrlSWf?= =?us-ascii?Q?/HWfU949IWhxJeRLpqD08RfRv+5+qXxPdcNDH8QWQTJmE4NDgt1HU6XqF7sP?= =?us-ascii?Q?ZjCN3BC8hcRB86IFSUVKVdk9QLVGfYrT0uCnvKEivp4jwWYpJXoKxe/BYlGI?= =?us-ascii?Q?RPX1UY+9dc3EDYMVx4G8hiGwaxpONiL0OkfzqZTInImQlSjSabt/cyEDgewJ?= =?us-ascii?Q?kyabuUfkMBEeZnsSR5uPj3tDg6oCUYA2hNXaWA91LwhxhZnGrBOHPx78zcW1?= =?us-ascii?Q?oxfeINxXIU1sAt6jUY04KZ6yp2a2ovuezU+3U20qI1/S6YBZHwE2t7xwxEi4?= =?us-ascii?Q?Mqnq4WSYkiBCRD+2EXoahwzreGufdZeKWUF+YxHoUFQl33emJr4xJGtt1CqR?= =?us-ascii?Q?bxW76kGiJKl96DcIo1CXUWodFyu+7l+QlfL0UBNAwgwUPEfLqv2rUHz0WePi?= =?us-ascii?Q?jkdXxWjVl+BlFdJSeGTHTCH0+hpFKWwCPiN+mmgHj3xw/FbXWi6zjltnZQ7U?= =?us-ascii?Q?s/NrqmPLkhbE3sYD1uUKBEXZOoZv4yDdJohrvTdJRlWVAlBM6+YVpW0KFnvT?= =?us-ascii?Q?agZTlN2wt/AhnOsxOBAj9xcv860LFeOZQu/D9Ba65aD7F5CEM6O6//y8tqj5?= =?us-ascii?Q?HqyZPCa6pJ9hjQE7C+OeWo0Plvh4A/VvQhKbq96sqF2ESJvv6XqsCfSPQSn4?= =?us-ascii?Q?fBc3gE9fZt5kUi/+zp3crl/sIk0mKEddiMx617CmUtAnbCXAsttUkF8/4Uxy?= =?us-ascii?Q?QwRYSHNyK2V8pyFT7+BpFptSOj8HcO6rtOhm67xvuvvEiIj+0RHasyMxz4Vd?= =?us-ascii?Q?LxJOxdLsu5g53Hm/2sEJnMbcZa4Pk9ZoMMhleyOh+bXF9zIJ9vF7grpsYlyz?= =?us-ascii?Q?luqot3BKYE13SJ7dStr6PQ4HdpJSns+eBpHgsIoeCh5Il29+wvKF7qBpkX8f?= =?us-ascii?Q?HDunj+rzqgCVuDewvVDCtJ2ludLgtKlp0+jIf8qBB7P9ykUYb10dwR/gWb9T?= =?us-ascii?Q?E1uiJ9WZi9IHozpC+WBO80jbBgoj5zgVBK14JDZ5HooAyBsPoBx7YXq/f2df?= =?us-ascii?Q?1Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9A/uY4q1OaHecaCNaxmpCaIIdW9PIhHTUgjN6R0XZf0fSADKzXCRbdlYXQJWn3XLrH9KK0BAbULimWRtGmnrlOvAi/ybIQRt6ZbWhkfSwN5KrUZRDcUfcbK8bkaPymbCjRf74Ru+u4w9LJH9h4Ah9N66CXmkWQ+YhITa02Iotg97ynRa+/wye/QbNSlgqr7Lhp4htA1CI3YIGsrFS5lrTFI5isdKsAqVhx1tGURC1P2gBs+n1hxq1CnoQ1+hY+uXS0obLVFhIbF/4nPKD37CuzAF4I8qfRXCEWucA0GyXgbdqvcxZc3uQ2hyyR8XUKeJchOrYHDw4WKAhkYxkusMac/5XQv8GLkK1hq7xXIhsF5d25kVA+4VOhZqnvf+2OTyrkRtgOnI4krym5EGpL2cMefKjHT2bzf/yiMcpzf/HOBm332YGHaglCFmE1Igaj+t9yVD1p+sRlTuolkmwl841dFPCLyw1RSMK4lCK9wlYymQuxWaA1ONwivhxW/HD1QSwFpgjLROm3lVCAoj2j3zacLWoDln5AoHZEMQa7InCHzP2aUORpIkiKV7ymtQ1F2N8UdzGKuCNjil/nBxAd+/PoL89A8/FuzB5Oa4E/0cN8ibeeYmfnk8RwqDoq+NoNRl2Z2SlzvD9nI+taDo/X685fDnki/e9TxpZ2Ff5przy6yUdH7+e33AuGqzvlwj2mt0+ULNemrWEg4F4Pft8x/Rk0Vm00f6g/P74exYk5wGzjtfmKUlAGmcUOjhsfKmVDhDznNBdmrkn7uC+w+ZUfUU+JpJPTHYO2ux/4PXdd6LLAhw9oRS11MORpnzQi7ourLl/L2gQWSZhI1ax8ZqtfaOs6oZOo0cVHVvxMNMwHlKLLhqLvWLg3k78vfe31FQGLhWsH97s0/12eCzFSqDA1tcnA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89fc54e4-875e-49ca-3ee0-08db57b01e1a 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:53.5160 (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: J20/t9t8Sg6P6x3/LwS7VALg2EuqUycTYLKBz4jdGtrbxr6/XUtw5W5ktPIfXjFrfbyclXVgkhN0rrLRVOut3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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-GUID: gHueLeqjCrf9jMseF_IlNqjl1HsMKXtP X-Proofpoint-ORIG-GUID: gHueLeqjCrf9jMseF_IlNqjl1HsMKXtP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Empty area will return -EINVAL if the search window is smaller than the requested size. Fix the test case to check for this error code. Signed-off-by: Liam R. Howlett --- lib/test_maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index f167d6ef8159..d295fdee2fae 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -2697,7 +2697,7 @@ static noinline void __init check_empty_area_window(s= truct maple_tree *mt) MT_BUG_ON(mt, mas_empty_area(&mas, 5, 100, 6) !=3D -EBUSY); =20 mas_reset(&mas); - MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) !=3D -EBUSY); + MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) !=3D -EINVAL); =20 mas_reset(&mas); mas_empty_area(&mas, 100, 165, 3); --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5E5FC77B7D for ; Thu, 18 May 2023 14:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231898AbjERO7L (ORCPT ); Thu, 18 May 2023 10:59:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231834AbjERO6b (ORCPT ); Thu, 18 May 2023 10:58:31 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2A1F1726 for ; Thu, 18 May 2023 07:58:08 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IlYv012447; Thu, 18 May 2023 14:56:59 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=BNJ/xs+tArZ3RHkKqzIfUzuJIlhPq7rBrHJ1DH2BcV4=; b=Y1Gn+jcuobXm3ljccfkRmC8VfoHx5KCw/ZgQtU3Dx038ZQ5LMQtQwR5aWYE3rB461Wn+ QP++YkGYNVzV9pH++Cj9B5MCUGWW2eVaXSs9N1sTKSfMDBj0kxLegaL1FBpq1yilI5lI oJx5HfZmcqSvpz4BCuTQHcTXGXK/A2Elo2Qke3/dmUgP+UKE21LvoSYtK+l7bZPxaQsi YAePA4PL80gQ49IwnERx3BmaFm7GfAtZEIeIPeheFUBXvdzaq65GWct66tVWVZk8o129 Yb3kFWtZTIEHnq2aHhZ0DxGSM9gZvcc4JulgKcGLD5m/W8Ee9JpfIk6ZtxTOJ2Cp8FTx jA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj2kdrh0s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:58 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEIORY036313; Thu, 18 May 2023 14:56:58 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w453-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:56:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oFyV4ukGYF1HHc1vXl8ekSQCVAAmvC2TRhYY7qnloLtiD1WgoMHR/btC15T5RSEBQlxt9HTV68p2/RbZ8fMwP9KW9FeSZfozTeD7MOiHLwN7W1O5JCAkSPI54Kct7XEC8ymIdSAvaKAPBDkTwF8igor6KDkBl6L4FzAiKTjFjdtJ8T1v23Gn7U/aFx0pIZZyD0WUmqHul3CaSCKyqIK9eqOiWbR5t3pfT+Xq4nCMNtsmAjqisYoWRLNggUmUWPRpeh2TE3MlSr08wqPvyonPtKVhRWOaCQKXUgTDtyCHuOYKVuxY4FcVs+DAdIYRWscBoMp8dfnZpikghGqHzdWy1Q== 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=BNJ/xs+tArZ3RHkKqzIfUzuJIlhPq7rBrHJ1DH2BcV4=; b=AiPDj+14LxMd4rVhNqhddFY5AnoYPBEYfGgPGTJaqoE74aQAQGRJPIA6gc9qX3VH+apsEGWoqeDaccTcNznFu0XLXWIVdIOJe8Eg04tKFM6OU+Mibcr61x4mPfLYLZREurJ3oV2fo37NoiwQTbh2Li4QwlPXVlldnXmzZN/6phEoEPXd9p26ensCV6/uW3uaQrFRSM4mmh0jl0reDnwzjIqE+7xyDiE8NpjxljHiej/JAzxiZHYlAaI/L4WLfPP+kVRi9awTDk83gNk64lkG6VcYYZLS3auKQ0oxILXZCmcJjcYDRVYZ/T+lRdUleEn5VGaV8pguyeqVc4zX56Otyw== 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=BNJ/xs+tArZ3RHkKqzIfUzuJIlhPq7rBrHJ1DH2BcV4=; b=PixVlpEYS1ujFM2PdkRpzBer+oo4zzfpkQZ4uBonm5BEF2I4z0rbbGKyZRdZNrO7zzjB7CxB1jR0lP9oUXrVhSoi7ojOKNO2SbwZm6FeajB19uHTtbRsGT0pAXNMZWQ82ndzsd/Z757rBZ1JgkjU7CXoNMt1RcobceFHrra4AOA= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:56 +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:55 +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" Subject: [PATCH v4 27/35] maple_tree: Introduce mas_next_slot() interface Date: Thu, 18 May 2023 10:55:36 -0400 Message-Id: <20230518145544.1722059-28-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0123.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::32) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: c15f59ee-ba55-4bae-3ba6-08db57b01f82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /8gp09koOMpXSxE8LYfvMMD9CeWo/NBVe+TA97LzyQjnnRpLNhHssIQnPlxsUw0/qtKNSKszm+n8inNENj9gq53jR1Hslb4pNvomPLex0/OwK50bNBZTY5dyHcaE9pnv+FNfomNFZZaq5O9eiS+xfSbkBXSUJsWdYxjQXjp848MjEZ3cZrDABD3y3Tjjqf6rSwwPXaEMllv4wFr/Oh9gksZUYZ1IQAx8SPJ22xlD72nyRLLCWtxb6yIroc6vfcdTOxZxAvVqQ8Wvb0hbBRLycC7M+L6VQ7xb7kQQUNiRivHT+qk/LnTm1aOiDxyDIL5WBYBRcHYBjAXwqgNQ5z0XTSsDa+K4cljHS+BC7DtfTFl2WL3dtl3ohlaJfI8OjijgpX9d2laTD9TzeGMlN2rUu8m0g4Lj3D82M/SvGqsKJDnt0itOG5lk8VMXASTZVqoLT60mehUXn4iVX3gm/Xt7TDPNp4RwXGzGg1NeB/NJ/5kKSdlsVWZZkVaQNdDm+yGiHfR0c5H1j7b/piAxTKgWzdNa/8S+2NeYX3LNjZGF0aYLJOLgC3Vt9YZB6ZYh9khp 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wp9ye8sPn+iQjgPPIZNXsVTV3z0jYE1MGeaIOtEyGmDlF14M+jXbS5FOMJJb?= =?us-ascii?Q?YYdWbBg2DUf26r5QSIohqrs63X0/Uste7mBCVDmjbX+GSeys/yWMuDiw9RNT?= =?us-ascii?Q?pQKSB3aIZa4hWoJMeVS2iPiIBKCF4ZaLIrocJ7vkSHB+gg5lt+2DYOQor8lS?= =?us-ascii?Q?bhHZV+79vWqy+ZO27byK/ebgD+jP2SbvriFO5G40wEWaTczcSb32uhQT/XeQ?= =?us-ascii?Q?P0RaJu8FFOU5dGopMaNS9J3qJqPhYGf+SCpLiwn6P0F10+dk5rNf54tla6Mh?= =?us-ascii?Q?bsbk0FNFJGtA4BBi0tK3smuEouBaZb4+z5BxKzRsSQ3YmrE1PBG4b1MVRB0E?= =?us-ascii?Q?2VwbU5FTJ+EQjaBn8AE6PDsf3jZu1vxtP/G2UAf9hbF7lMlbq/qKzXzDZ3Ix?= =?us-ascii?Q?/S1QIoDTcLns9fnedqnWshoB237c6QW86rkGxQcH5x+urh74RBfh4E8ATcA1?= =?us-ascii?Q?qUz5Xd8Vw8Q6mze/KXhzBbtG2Hz9BVR+CK1X9l9GfxJUCBRHsSAN4fC1hGEX?= =?us-ascii?Q?kpb/xaQ0gCHqmvTNEzD2Tz+cffxRGl54YbfO2meSOcXJE9LKJLIy0Ml5MG7D?= =?us-ascii?Q?8Do6UO3FEJ4ObGDf4fx22CJ6tGrPz9K8pnjNlSE5vvmPNEpFE5f4qttLcUsU?= =?us-ascii?Q?jSc9LZVbi8oTESZb47A8QrlRG7Bcg0wh0Gb+Fe7e/FVHmGTlE1FNhN3pRn42?= =?us-ascii?Q?T6FBpZqoq83lQGVaeu4Fd2yfQROoX7aPXdAVlMo/l/mZaO0IucBK/pGvAMX0?= =?us-ascii?Q?chndN2cxCZ9Roi+tV70GcOFFE7K1YtsmoKOa1LbxJxR2s4IMmvQBTykPFzpg?= =?us-ascii?Q?SEjiGtaKwLsTOZ5sFgQmEi1aOFfyzknPFxgqCLd/4jX1gLHtg9scrC2XgtR1?= =?us-ascii?Q?mVMoQH2sL0tBWgMbul1kedR9coiUH1ZZHOGSUjGi8qxm6Cy4kLiAivqphrTN?= =?us-ascii?Q?5ShM87mtPcBA1HokX0bmYJnrPrKOffVWZeCbl4xj3FzAdQwr655xFYyC0DOa?= =?us-ascii?Q?G722TWVVsTJKbUPQbhF0bzBG05If2XW/bXEyc5RIw8ldo+LuP7FSEf+jy3m9?= =?us-ascii?Q?fZWOCJuOWda4Kg2iUwC71h2rqXfWVX1XhMTJCbox2c6E6v/2IbZWVGevVijO?= =?us-ascii?Q?pgXokCfyeMcUR4ESocBvWwwBd+US4C56MEyuN3iHTw32jLbi3fYi6oEEtzUe?= =?us-ascii?Q?ylnOGtmr0ioDN8Fhfte09tvFVlRmUaLpQdEEvf438nXS+/qbG+vahW3NLWCu?= =?us-ascii?Q?06cs70rK0UCaaKxk6fYGZUJAokgSJbq8aaHohB0ZmIsWV3A/aGm32d+LfO17?= =?us-ascii?Q?ANWIVaCa1KM2XLzQ5h+oGB4LK6ML/C5Z08BhF97MyIH3HDFh5B5qQoCoX593?= =?us-ascii?Q?nZg/XUgbD/Fm3zDz2JyG+9xs+jM7mgKXLKkgpb8e8Zuujvo+x/vc3xt6q20v?= =?us-ascii?Q?dkJrErH1cQp2stOXKmKCL1VQBQI+50GyFEPfcGt5ui4Ty6CV0GPiX76gDjXK?= =?us-ascii?Q?QRj7S6QSUi2Vu8TIKclleigiv1pHhWifJ8qHmFy2BTG88mZdtNjyiD65cGda?= =?us-ascii?Q?3WBbnuDgmDw4daKAs4wV7gYF6wvaoqAPveRHPF3qFo8R5efZ5K5kfadzReJ8?= =?us-ascii?Q?Ag=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AbpMM1McfCq/X0Sz0NFoFAXDfM2L5nzwYB5phOkRm9JFLyiqaWTKbLkkFoUEQWxR8IpE7FR0K/ZCV73qL6dZkkcs/3RBITlzHpC2vZqHty7pn+RPkyn0gAvj5QFHNwHLQAJRm9J+zDb+QYDkI0gogxuBIjZw9PSte2qEYZov5kJUmvX1GrEC61rfVUyC5WRqCr7JxRYvRIH6z+YHw7/gbCSwnjwaRrdUEnj/baxQZYrqb4M12f4hLXWQIQf8jDbquZnLv28wQNAxZOU4M+2Q5sD/ELUCQXQ8TfMZZKdi/JZmu4wMD0MhstIUQWvya8F8FJ75V0CRzJd9/HXNg3TMAKesD+N6GnSMoT5DZS+efEY2bwpyivDYayeHgAb0jwgtIuyjsX9YU8nn/3FC4FvXrxHbVLGWqDvpsrKUEjpo8w7SiKn1BR1/G8rkKuHl4RuM/096ESm2aMw4FwhVta34eR7xMrfOQsZhIeVKltq/yd1qZvvgYRgoxrbxb3rmy+T7ff/7G0P6rE4J3m0LXmxjp6xt2Wk7jUsA5/oOFiyFQppcw7ElqRF+6BSZqtFQoQUdwEv3iLt2H+gRnK8SQ77a+2HOsMA5YEu/ntJi+tijNcOEZLmgCJAgAkexRJqwKAEz2Y4SZEPBG3/Fc6bhBkK6sSt0K7EMf4viN+gMx0yd74ou/AClpZ6UDDBwiWUbpRx2yR5sgGC+eB6DFDgNy+1LXEHl9jY8kDRvrXi90nvIyKzEoq5W9C2ykIc8igJjIN6itmP32k5KiQY/chnN79lghUsbWfm6NXY+QQ8hCgpuDUdsprZb8OivWie+NeR/5skZOlemYWDkDY6iFX0qMMTlVjHHSKQBNgDlGlARfh+ZSOrg1+eWt3G2srmQN88om4l4IO+xFpbmIH0I3XFQ8UmlMA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c15f59ee-ba55-4bae-3ba6-08db57b01f82 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:55.8744 (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: IiXRSixjRrXbVirfuEsgnoM7xS8LA6DaNJUdfMqmdZj9sEHKenSl09rDIuFgTIViGoLfcI4jyfD0Z0JNOhoGMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: K3Yhsaq6t0yxrW9A1ib2ngAPTLH4j8BY X-Proofpoint-ORIG-GUID: K3Yhsaq6t0yxrW9A1ib2ngAPTLH4j8BY Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Sometimes, during a tree walk, the user needs the next slot regardless of if it is empty or not. Add an interface to get the next slot. Since there are no consecutive NULLs allowed in the tree, the mas_next() function can only advance two slots at most. So use the new mas_next_slot() interface to align both implementations. Use this method for mas_find() as well. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 229 +++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 125 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 580310741d89..860f82e16166 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4606,11 +4606,10 @@ static inline int mas_prev_node(struct ma_state *ma= s, unsigned long min) static inline int mas_next_node(struct ma_state *mas, struct maple_node *n= ode, unsigned long max) { - unsigned long min, pivot; + unsigned long min; unsigned long *pivots; struct maple_enode *enode; int level =3D 0; - unsigned char offset; unsigned char node_end; enum maple_type mt; void __rcu **slots; @@ -4618,19 +4617,16 @@ static inline int mas_next_node(struct ma_state *ma= s, struct maple_node *node, if (mas->max >=3D max) goto no_entry; =20 + min =3D mas->max + 1; level =3D 0; do { if (ma_is_root(node)) goto no_entry; =20 - min =3D mas->max + 1; - if (min > max) - goto no_entry; - + /* Walk up. */ if (unlikely(mas_ascend(mas))) return 1; =20 - offset =3D mas->offset; level++; node =3D mas_mn(mas); mt =3D mte_node_type(mas->node); @@ -4639,36 +4635,37 @@ static inline int mas_next_node(struct ma_state *ma= s, struct maple_node *node, if (unlikely(ma_dead_node(node))) return 1; =20 - } while (unlikely(offset =3D=3D node_end)); + } while (unlikely(mas->offset =3D=3D node_end)); =20 slots =3D ma_slots(node, mt); - pivot =3D mas_safe_pivot(mas, pivots, ++offset, mt); - while (unlikely(level > 1)) { - /* Descend, if necessary */ - enode =3D mas_slot(mas, slots, offset); - if (unlikely(ma_dead_node(node))) - return 1; + mas->offset++; + enode =3D mas_slot(mas, slots, mas->offset); + if (unlikely(ma_dead_node(node))) + return 1; =20 - mas->node =3D enode; + if (level > 1) + mas->offset =3D 0; + + while (unlikely(level > 1)) { level--; + mas->node =3D enode; node =3D mas_mn(mas); mt =3D mte_node_type(mas->node); slots =3D ma_slots(node, mt); - pivots =3D ma_pivots(node, mt); + enode =3D mas_slot(mas, slots, 0); if (unlikely(ma_dead_node(node))) return 1; - - offset =3D 0; - pivot =3D pivots[0]; } =20 - enode =3D mas_slot(mas, slots, offset); + if (!mas->offset) + pivots =3D ma_pivots(node, mt); + + mas->max =3D mas_safe_pivot(mas, pivots, mas->offset, mt); if (unlikely(ma_dead_node(node))) return 1; =20 mas->node =3D enode; mas->min =3D min; - mas->max =3D pivot; return 0; =20 no_entry: @@ -4679,83 +4676,106 @@ static inline int mas_next_node(struct ma_state *m= as, struct maple_node *node, return 0; } =20 +static inline void mas_rewalk(struct ma_state *mas, unsigned long index) +{ +retry: + mas_set(mas, index); + mas_state_walk(mas); + if (mas_is_start(mas)) + goto retry; +} + +static inline bool mas_rewalk_if_dead(struct ma_state *mas, + struct maple_node *node, const unsigned long index) +{ + if (unlikely(ma_dead_node(node))) { + mas_rewalk(mas, index); + return true; + } + return false; +} + /* - * mas_next_nentry() - Get the next node entry - * @mas: The maple state - * @max: The maximum value to check - * @*range_start: Pointer to store the start of the range. + * mas_next_slot() - Get the entry in the next slot * - * Sets @mas->offset to the offset of the next node entry, @mas->last to t= he - * pivot of the entry. + * @mas: The maple state + * @max: The maximum starting range + * @empty: Can be empty * - * Return: The next entry, %NULL otherwise + * Return: The entry in the next slot which is possibly NULL */ -static inline void *mas_next_nentry(struct ma_state *mas, - struct maple_node *node, unsigned long max, enum maple_type type) +static void *mas_next_slot(struct ma_state *mas, unsigned long max, bool e= mpty) { - unsigned char count; - unsigned long pivot; - unsigned long *pivots; void __rcu **slots; + unsigned long *pivots; + unsigned long pivot; + enum maple_type type; + struct maple_node *node; + unsigned char data_end; + unsigned long save_point =3D mas->last; void *entry; =20 - if (mas->last =3D=3D mas->max) { - mas->index =3D mas->max; - return NULL; - } - - slots =3D ma_slots(node, type); +retry: + node =3D mas_mn(mas); + type =3D mte_node_type(mas->node); pivots =3D ma_pivots(node, type); - count =3D ma_data_end(node, type, pivots, mas->max); - if (unlikely(ma_dead_node(node))) - return NULL; - - mas->index =3D mas_safe_min(mas, pivots, mas->offset); - if (unlikely(ma_dead_node(node))) - return NULL; - - if (mas->index > max) - return NULL; - - if (mas->offset > count) - return NULL; + data_end =3D ma_data_end(node, type, pivots, mas->max); + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; =20 - while (mas->offset < count) { - pivot =3D pivots[mas->offset]; - entry =3D mas_slot(mas, slots, mas->offset); - if (ma_dead_node(node)) - return NULL; +again: + if (mas->max >=3D max) { + if (likely(mas->offset < data_end)) + pivot =3D pivots[mas->offset]; + else + return NULL; /* must be mas->max */ =20 - mas->last =3D pivot; - if (entry) - return entry; + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; =20 if (pivot >=3D max) return NULL; + } =20 - if (pivot >=3D mas->max) + if (likely(mas->offset < data_end)) { + mas->index =3D pivots[mas->offset] + 1; + mas->offset++; + if (likely(mas->offset < data_end)) + mas->last =3D pivots[mas->offset]; + else + mas->last =3D mas->max; + } else { + if (mas_next_node(mas, node, max)) { + mas_rewalk(mas, save_point); + goto retry; + } + + if (mas_is_none(mas)) return NULL; =20 - mas->index =3D pivot + 1; - mas->offset++; + mas->offset =3D 0; + mas->index =3D mas->min; + node =3D mas_mn(mas); + type =3D mte_node_type(mas->node); + pivots =3D ma_pivots(node, type); + mas->last =3D pivots[0]; } =20 - pivot =3D mas_logical_pivot(mas, pivots, mas->offset, type); - entry =3D mas_slot(mas, slots, mas->offset); - if (ma_dead_node(node)) - return NULL; + slots =3D ma_slots(node, type); + entry =3D mt_slot(mas->tree, slots, mas->offset); + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; =20 - mas->last =3D pivot; - return entry; -} + if (entry) + return entry; =20 -static inline void mas_rewalk(struct ma_state *mas, unsigned long index) -{ -retry: - mas_set(mas, index); - mas_state_walk(mas); - if (mas_is_start(mas)) - goto retry; + if (!empty) { + if (!mas->offset) + data_end =3D 2; + goto again; + } + + return entry; } =20 /* @@ -4773,47 +4793,12 @@ static inline void mas_rewalk(struct ma_state *mas,= unsigned long index) static inline void *mas_next_entry(struct ma_state *mas, unsigned long lim= it) { void *entry =3D NULL; - struct maple_node *node; - unsigned long last; - enum maple_type mt; =20 if (mas->last >=3D limit) return NULL; =20 - last =3D mas->last; -retry: - node =3D mas_mn(mas); - mt =3D mte_node_type(mas->node); - mas->offset++; - if (unlikely(mas->offset >=3D mt_slots[mt])) { - mas->offset =3D mt_slots[mt] - 1; - goto next_node; - } - - while (!mas_is_none(mas)) { - entry =3D mas_next_nentry(mas, node, limit, mt); - if (unlikely(ma_dead_node(node))) { - mas_rewalk(mas, last); - goto retry; - } - - if (likely(entry)) - return entry; - - if (unlikely((mas->last >=3D limit))) - return NULL; - -next_node: - if (unlikely(mas_next_node(mas, node, limit))) { - mas_rewalk(mas, last); - goto retry; - } - mas->offset =3D 0; - node =3D mas_mn(mas); - mt =3D mte_node_type(mas->node); - } - - return NULL; + entry =3D mas_next_slot(mas, limit, false); + return entry; } =20 /* @@ -4844,10 +4829,8 @@ static inline void *mas_prev_nentry(struct ma_state = *mas, unsigned long limit, slots =3D ma_slots(mn, mt); pivots =3D ma_pivots(mn, mt); count =3D ma_data_end(mn, mt, pivots, mas->max); - if (unlikely(ma_dead_node(mn))) { - mas_rewalk(mas, index); + if (unlikely(mas_rewalk_if_dead(mas, mn, index))) goto retry; - } =20 offset =3D mas->offset - 1; if (offset >=3D mt_slots[mt]) @@ -4860,10 +4843,8 @@ static inline void *mas_prev_nentry(struct ma_state = *mas, unsigned long limit, pivot =3D pivots[offset]; } =20 - if (unlikely(ma_dead_node(mn))) { - mas_rewalk(mas, index); + if (unlikely(mas_rewalk_if_dead(mas, mn, index))) goto retry; - } =20 while (offset && !mas_slot(mas, slots, offset)) { pivot =3D pivots[--offset]; @@ -4880,10 +4861,8 @@ static inline void *mas_prev_nentry(struct ma_state = *mas, unsigned long limit, =20 min =3D mas_safe_min(mas, pivots, offset); entry =3D mas_slot(mas, slots, offset); - if (unlikely(ma_dead_node(mn))) { - mas_rewalk(mas, index); + if (unlikely(mas_rewalk_if_dead(mas, mn, index))) goto retry; - } =20 mas->offset =3D offset; mas->last =3D pivot; @@ -6108,8 +6087,8 @@ void *mas_find(struct ma_state *mas, unsigned long ma= x) if (mas->index =3D=3D max) return NULL; =20 - /* Retries on dead nodes handled by mas_next_entry */ - return mas_next_entry(mas, max); + /* Retries on dead nodes handled by mas_next_slot */ + return mas_next_slot(mas, max, false); =20 ptr_out_of_range: mas->node =3D MAS_NONE; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EFE3C77B7D for ; Thu, 18 May 2023 19:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230282AbjERTwY (ORCPT ); Thu, 18 May 2023 15:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbjERTwV (ORCPT ); Thu, 18 May 2023 15:52:21 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C734E44 for ; Thu, 18 May 2023 12:52:20 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JDTm018335; Thu, 18 May 2023 14:57:03 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=0gyCDIKC93BPQ76stKJ0o4Op1QUgFXcRfpAud8qjgE4=; b=lnva68kSo21o0aH1JC4h9OJcPhe4YEmXRna2qQc17X2kH+uZJ2I+9MBFASoysp4nmZmr sXd/qcH4NJMp9WglDrDdmEz8lAxZ+PY71XW5f8X29s9MZjbVchc8qWECT82HDkGzfuXa orUXMJp7V6sMykGM2eY7sg/iikJoPzfl3Wr0IZH9g3YFNvB+k/Kp9YoWjGKFeQdfTOmi jlOINMd67+OYwPD/OQuh7ilm7KPjqVs37EQ9kpLBSyIIQZUWAyBkjAftbalXGMtmYKWO 9VvNu/USi5zSyt8Iky3hHlyyhtNgkceDLRdvx+1Gp5cix+uT/iB0hyt5lP2qOxI/TBmq jA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:02 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEXVLW036331; Thu, 18 May 2023 14:57:01 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2106.outbound.protection.outlook.com [104.47.55.106]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w47f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eG/qlrq12kr7tuLTEsnLYA5lDsQdb/2xIWtjc7PV5BvtHapUAUuULiE/zgsSfpK6uqKwZ5UWq6p8W08LIlBrNzmBeezNq1e9EdDPHxzya5zYl3lXwqJe4NvawaOpGs4y16MpYJ/CZx4vlxtxANraTqvCHFrn401xx7ej6gV+1gjGl0MPTLfkUda3hbP4Kd11Sj9zbZp4hQwfzsspjXm9IrqEUfIkiKwjhdky5RHbjieqCV7qDhjaq8lvPBSAseF3rfptHjy+o968rf7pURiYqsMhKPI/jfzNLczz0hAQUs+C2vkhGB4+LJAslr8592cQApQ0qTZdE0viQcr6n0CcCQ== 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=0gyCDIKC93BPQ76stKJ0o4Op1QUgFXcRfpAud8qjgE4=; b=SDU71bLJpLY9Ai8VL0KbUu3FpnZ3qBpNEjmm4j9YdaZO3iJ/QzMIHGiovEkPYARDZQUv+GsAD6O+lM1InQRLy4NpBoqs8sq/JPX6CJezmCvX4OQnEiIOkzVVfk4hMAKcejAdhAxUVZAInjn5Hg0HRDStLT46K/vO9rb97Rs5LVa1Jz/rYPWeXp+fG5/Vkwjq3MQogBbXbiGJqxuKAiLsoKm6JYwm4CEi9OXQIDGDcYZfyW6XK8j4M7iKhafvU+WonZkGuLl0GmzNPeL8yruyJBhXSQrQYdzXNhP5gPdSkQlPtU/MCHUV9WKp8mlwB3eHQqvli8hs/Tm9sgkV/1S9OQ== 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=0gyCDIKC93BPQ76stKJ0o4Op1QUgFXcRfpAud8qjgE4=; b=Hc38volSE3m+xSa2G8uxF+5yONa9GjHd/qOXYS8WMssbR9gnPVnlEPRdBCJuheRrQBGD4xHOCz/x8liv/AilIQx58deNK8pXCNLTCNDCEP7RskYg7xgePTAJvOtRPyB1E9/q5u9wP4TXhRgEVBD8dGpBM9BFaA0kzv/8mSTiQtg= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:56:58 +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:58 +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" Subject: [PATCH v4 28/35] maple_tree: Add mas_next_range() and mas_find_range() interfaces Date: Thu, 18 May 2023 10:55:37 -0400 Message-Id: <20230518145544.1722059-29-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0122.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::31) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: af7d2979-f9dd-41ef-0f9e-08db57b02102 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XzCI15xzlLLUNsHzoZ0bXkP7Ip4oe42g9nbJ+4i49BTxzA/O1mWAJ/P9UUHckOigBGAtSYbNT2ID22FX3oPyNAZ1Oa3k535JYQLgQoP36JG+dPRiQ67UOLbHZD3yz1cf4zfsyAGrVwAOatPgY3FhpnXbNM47na8boT3DKNP2weowJUpqOtsUs8QM0Cy4RjyzOMowMFELumJOG8+d/4ajVXSp+tPuUZp1D/4iW5/eUrqLGoNBmdCYEPp+ow7Ha2DDip3G7bGWiyXaM0lp1V0vuY1tor9N/V/v4kwvnYYJRL/ndF/YuFk10YfmxS9C1/Fl3woXzDDY0p121hGwj+Bb70JC06kbzekuPa8s9mxIHK1sXxtV0D5vdE1OpRgqoVEbfORZkVts1cqbXFXPHhaZX4RW1wUIZC+I02kj9X+CgisFj4miNxhM9b/kKVLvwoJjon44a5f3KfJsxmcwc2NX5oB+0whb8zOFuPMC+zXs5urXXCh693RZ7tzPzl/XhcKk3xZmv0Tq71mTYtT3JOMNdXKCW84DTmRwuI8b6mLs23ZpC1x5qZlBTVdCABxZou/Y 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Q8iw9Ka/PnVEh31if7PG0pmilDgQb97az3is4ylGhJ40dENa43CCER1GPobE?= =?us-ascii?Q?CiW9T+4K65GNyNYlXwISDKjdSC2M/D/Ei9299DFS/rS9uPrfZwZKFD+7Crxk?= =?us-ascii?Q?yEFFVCPx91gWRf38Zdd5BkuY26BieSWonVAKTxDm3CN4Mhgr704gS/kPMOR2?= =?us-ascii?Q?ehxVazv2HmgrxvX2rb6hzGxZ1A0j6h8pGKxOV2PDISzhTTcbOvr6wme+uf5C?= =?us-ascii?Q?athXfgHyPjaLzJd8FTL028apOHVLCfT44t7ehwpzlZ9gdOiISu9igef0FrVw?= =?us-ascii?Q?JmM4Vi0f0DWXkoC7ZUtZD/ypSTRvJ3tBCrf+o359uCkZpLnJnt3l6z/HGwzk?= =?us-ascii?Q?TjnBON1LMgRRcGO2dbsVW8HszYoiQlGgT1CpnMbDNU0Tva5ID7hq+bWUVWRR?= =?us-ascii?Q?geSMWJa64XU7mmfvhgVc6ErpFSKNzMw81M7FOvIt3S7euEx0grO4QB32sKDZ?= =?us-ascii?Q?LSdqT49yySINPOduWRDeDqyLzZokWkglyl2CoBfuHOSZXUJiir8vglliY8UF?= =?us-ascii?Q?IUTmfGcdALaVIOgXzSYeY7CpwFwlbf3LwQsAmVKhXBVZht0Yvr7WFnlEmuvH?= =?us-ascii?Q?oq9QQwfLNVE5VMtuV+y+cL6/sylEtDZFFakLo/+icyn8LjNf8tL0YvKivYm7?= =?us-ascii?Q?kHYGrXIbACEDTByEBwwJznOiMoyi57v1svYWaaBXattVm1V7tPX7qN1I/c6B?= =?us-ascii?Q?nZWAp2C99XdphOBoVerR6LGS02IaCwHwBRk5oe1+84xEf9u24ukIRJMoBDbH?= =?us-ascii?Q?GAN0Gq/1tahsk/62TV5q73JFybWQTEkFM0zLunMS3ORt+26A0mAAL/lOQsi8?= =?us-ascii?Q?UnV4f/lZWXGbtcsG4g4Rr78NFdNkwqDmMVLpxniz9YYCLr+o9Hv3+TzI/7U/?= =?us-ascii?Q?2aH5F9zNLaOC4nWJcmv0GYxGvQn4nIbiudlQyP/yozfN6ls9YD77swVE35tz?= =?us-ascii?Q?YCjR+o9ZRP6fM4vgvEq8JD3TOLNfZ2ycuCiRP7fHW86mVrxbRdMNk/Id8Hlx?= =?us-ascii?Q?EqJtVPRkQvFHE5BmLuNOECVjMGAkXZNtnY3pQK70lKw+fxHw45hJ2Oavtqks?= =?us-ascii?Q?TB0k998RL4IKpYh422do5IUppLucfB01LuZ8F9YZ7b+o7b0BkbMo58oDrRFd?= =?us-ascii?Q?yFlhX4tWJQX4yB2JtDn30K0esqowLxi3FLzNFtsACzM7z9pTkfSiGtaj1lUt?= =?us-ascii?Q?/LvzbamCAVUde00woJ+7bmfzq/IixV29P/Cf6EiKlQhz49LtWw0Zsbx9kkXf?= =?us-ascii?Q?8+ySjfTQQVKMcWLJVKwJ3Ect/GSvAFsign48RPKyWS/rxHyA0yd1hKZYUsTJ?= =?us-ascii?Q?K20eOxXv0tLEQQcE2PVjtBxjhFm3jZQOIXIZstjdH497Wxj0FEP9nQRMAggf?= =?us-ascii?Q?N6D4SKr5NYqMvQMW16EqyX8DFzwLPae9AmFk45fR5aa9YZF+Z9ue6d1+irEg?= =?us-ascii?Q?uxf2z9EkNCiB9aWyLQV/nL1OKZ8WM14h353yt2dU7dYc70zh2hABMNDCIbck?= =?us-ascii?Q?MwIpRjPKZhL5spilMbZrvdB2C4olt4L95clDDUijQ9sxNUmVGwhlk0qT13RN?= =?us-ascii?Q?01NjhmNktofANN/P7BAK3Ut625tooOG1BqHJ4PTq6EWhra8Xdq+pC4vI9Mpa?= =?us-ascii?Q?dw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: fQL3GSMfXf+ULnGzcaUIBOU72maZ+L4eetJiHDNOx3V8DjbLvd+YC6XUCSB8XHJQRbEPPcob6qU1E6XuRYPfvJCNFZAdIKls58jH1ZSLw0DOLJy+42SB9j72mftVSErb6aagGqzuLYeupIHv2E7wSMgCK/hOh72T+Ffm7NN5cLGXeFRcQK2H0jIWNrv5xDZwH/MUsM99yku+xz+Cb0c3nznhip9bjL026c0ajxxFzmYo5xBTdx5v2tdjCtrHp7EY323gc+EiWmA/APELA+N89gp+7TLtadu1dQXXiJEWBwMTyUZyEIMN0swBM4sOR7cIa0B9XEL5Rjh2A1XfuljHdo8NaygPzeNQ4QLXjVbKZFA1P5+1UqjW/R7UfOA6+9V0MgifTP4rS+MH9jaAX6Tj34wWxOPlvaahob4WLjSBg6c9IdxdQP8kemiCijn+jLHp6AXueyAAcDDgkbPPOjCmlNQ/hLIRsiltjCFT5hwmU0MwK3vA4gMC0SD5vdNcZqhmzEWYJf/pPa1d3HeiAVxAFelTJjwI8rqVqvKEFUiyUpwcfO1qywNnKhEoSN0SSHiBp/l8fQYsMwLIOJGZrGtVvW6RpwAQwRh0shbcSlte0udOdYdARbbwVqjnb04sg8Bj1Fj7T2TLn3ZhExh7t6LlkgP15oFa0fVaMbVkl4XcYOPBeR9j4C4cnrhK1LqVAEJxDi35bkLXIramew8yjIPznU/ULx+AspxVOCWELQJRSr9NIjmgUZ9chCbJ47B8jybJTo03tnQlxNBXrgJSp1Nc49QhW/riIkGtFdG/xhCyH/bH02kZxQSQH/xsYtLOrvoBZJRDER8SnqZQCdSz7yusl+vzjUWYrPjStS87+NuwHFCXyi06HJU5ADSKIC2/ZVVBmRvKmZ2Oue9o2QsLYR9B2w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: af7d2979-f9dd-41ef-0f9e-08db57b02102 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:58.4505 (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: u59zC5DxlY6DI7lDhruYJlarOksT2kBpmwcrpMrJ5kTX93E77hLBH4bmfAeMGE8yRbO8HCojeAhP2F9VSKnuDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: zRrZvx-ozfeRgEKek_FlX8EficT-XQxg X-Proofpoint-ORIG-GUID: zRrZvx-ozfeRgEKek_FlX8EficT-XQxg Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some users of the maple tree may want to move to the next range in the tree, even if it stores a NULL. This family of function provides that functionality by advancing one slot at a time and returning the result, while mas_contiguous() will iterate over the range and stop on encountering the first NULL. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 3 +- lib/maple_tree.c | 172 ++++++++++++++++++++++++++----------- 2 files changed, 124 insertions(+), 51 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index ed92abf4c1fb..9d040043858a 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -455,6 +455,7 @@ void *mas_erase(struct ma_state *mas); int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp); void mas_store_prealloc(struct ma_state *mas, void *entry); void *mas_find(struct ma_state *mas, unsigned long max); +void *mas_find_range(struct ma_state *mas, unsigned long max); void *mas_find_rev(struct ma_state *mas, unsigned long min); int mas_preallocate(struct ma_state *mas, gfp_t gfp); bool mas_is_err(struct ma_state *mas); @@ -467,6 +468,7 @@ int mas_expected_entries(struct ma_state *mas, unsigned= long nr_entries); =20 void *mas_prev(struct ma_state *mas, unsigned long min); void *mas_next(struct ma_state *mas, unsigned long max); +void *mas_next_range(struct ma_state *mas, unsigned long max); =20 int mas_empty_area(struct ma_state *mas, unsigned long min, unsigned long = max, unsigned long size); @@ -528,7 +530,6 @@ static inline void mas_reset(struct ma_state *mas) #define mas_for_each(__mas, __entry, __max) \ while (((__entry) =3D mas_find((__mas), (__max))) !=3D NULL) =20 - /** * mas_set_range() - Set up Maple Tree operation state for a different ind= ex. * @mas: Maple Tree operation state. diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 860f82e16166..b5df37be7a15 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4792,13 +4792,10 @@ static void *mas_next_slot(struct ma_state *mas, un= signed long max, bool empty) */ static inline void *mas_next_entry(struct ma_state *mas, unsigned long lim= it) { - void *entry =3D NULL; - if (mas->last >=3D limit) return NULL; =20 - entry =3D mas_next_slot(mas, limit, false); - return entry; + return mas_next_slot(mas, limit, false); } =20 /* @@ -5885,18 +5882,8 @@ int mas_expected_entries(struct ma_state *mas, unsig= ned long nr_entries) } EXPORT_SYMBOL_GPL(mas_expected_entries); =20 -/** - * mas_next() - Get the next entry. - * @mas: The maple state - * @max: The maximum index to check. - * - * Returns the next entry after @mas->index. - * Must hold rcu_read_lock or the write lock. - * Can return the zero entry. - * - * Return: The next entry or %NULL - */ -void *mas_next(struct ma_state *mas, unsigned long max) +static inline bool mas_next_setup(struct ma_state *mas, unsigned long max, + void **entry) { bool was_none =3D mas_is_none(mas); =20 @@ -5904,24 +5891,71 @@ void *mas_next(struct ma_state *mas, unsigned long = max) mas->node =3D MAS_START; =20 if (mas_is_start(mas)) - mas_walk(mas); /* Retries on dead nodes handled by mas_walk */ + *entry =3D mas_walk(mas); /* Retries on dead nodes handled by mas_walk */ =20 if (mas_is_ptr(mas)) { + *entry =3D NULL; if (was_none && mas->index =3D=3D 0) { mas->index =3D mas->last =3D 0; - return mas_root(mas); + return true; } mas->index =3D 1; mas->last =3D ULONG_MAX; mas->node =3D MAS_NONE; - return NULL; + return true; } =20 - /* Retries on dead nodes handled by mas_next_entry */ - return mas_next_entry(mas, max); + if (mas_is_none(mas)) + return true; + return false; +} + +/** + * mas_next() - Get the next entry. + * @mas: The maple state + * @max: The maximum index to check. + * + * Returns the next entry after @mas->index. + * Must hold rcu_read_lock or the write lock. + * Can return the zero entry. + * + * Return: The next entry or %NULL + */ +void *mas_next(struct ma_state *mas, unsigned long max) +{ + void *entry =3D NULL; + + if (mas_next_setup(mas, max, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_next_slot */ + return mas_next_slot(mas, max, false); } EXPORT_SYMBOL_GPL(mas_next); =20 +/** + * mas_next_range() - Advance the maple state to the next range + * @mas: The maple state + * @max: The maximum index to check. + * + * Sets @mas->index and @mas->last to the range. + * Must hold rcu_read_lock or the write lock. + * Can return the zero entry. + * + * Return: The next entry or %NULL + */ +void *mas_next_range(struct ma_state *mas, unsigned long max) +{ + void *entry =3D NULL; + + if (mas_next_setup(mas, max, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_next_slot */ + return mas_next_slot(mas, max, true); +} +EXPORT_SYMBOL_GPL(mas_next_range); + /** * mt_next() - get the next value in the maple tree * @mt: The maple tree @@ -6031,49 +6065,41 @@ void mas_pause(struct ma_state *mas) EXPORT_SYMBOL_GPL(mas_pause); =20 /** - * mas_find() - On the first call, find the entry at or after mas->index u= p to - * %max. Otherwise, find the entry after mas->index. + * mas_find_setup() - Internal function to set up mas_find*(). * @mas: The maple state - * @max: The maximum value to check. - * - * Must hold rcu_read_lock or the write lock. - * If an entry exists, last and index are updated accordingly. - * May set @mas->node to MAS_NONE. + * @max: The maximum index + * @entry: Pointer to the entry * - * Return: The entry or %NULL. + * Returns: True if entry is the answer, false otherwise. */ -void *mas_find(struct ma_state *mas, unsigned long max) +static inline bool mas_find_setup(struct ma_state *mas, unsigned long max, + void **entry) { + *entry =3D NULL; + if (unlikely(mas_is_none(mas))) { if (unlikely(mas->last >=3D max)) - return NULL; + return true; =20 mas->index =3D mas->last; mas->node =3D MAS_START; - } - - if (unlikely(mas_is_paused(mas))) { + } else if (unlikely(mas_is_paused(mas))) { if (unlikely(mas->last >=3D max)) - return NULL; + return true; =20 mas->node =3D MAS_START; mas->index =3D ++mas->last; - } - - - if (unlikely(mas_is_ptr(mas))) + } else if (unlikely(mas_is_ptr(mas))) goto ptr_out_of_range; =20 if (unlikely(mas_is_start(mas))) { /* First run or continue */ - void *entry; - if (mas->index > max) - return NULL; + return true; =20 - entry =3D mas_walk(mas); - if (entry) - return entry; + *entry =3D mas_walk(mas); + if (*entry) + return true; =20 } =20 @@ -6081,23 +6107,69 @@ void *mas_find(struct ma_state *mas, unsigned long = max) if (unlikely(mas_is_ptr(mas))) goto ptr_out_of_range; =20 - return NULL; + return true; } =20 if (mas->index =3D=3D max) - return NULL; + return true; =20 - /* Retries on dead nodes handled by mas_next_slot */ - return mas_next_slot(mas, max, false); + return false; =20 ptr_out_of_range: mas->node =3D MAS_NONE; mas->index =3D 1; mas->last =3D ULONG_MAX; - return NULL; + return true; +} + +/** + * mas_find() - On the first call, find the entry at or after mas->index u= p to + * %max. Otherwise, find the entry after mas->index. + * @mas: The maple state + * @max: The maximum value to check. + * + * Must hold rcu_read_lock or the write lock. + * If an entry exists, last and index are updated accordingly. + * May set @mas->node to MAS_NONE. + * + * Return: The entry or %NULL. + */ +void *mas_find(struct ma_state *mas, unsigned long max) +{ + void *entry =3D NULL; + + if (mas_find_setup(mas, max, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_next_slot */ + return mas_next_slot(mas, max, false); } EXPORT_SYMBOL_GPL(mas_find); =20 +/** + * mas_find_range() - On the first call, find the entry at or after + * mas->index up to %max. Otherwise, advance to the next slot mas->index. + * @mas: The maple state + * @max: The maximum value to check. + * + * Must hold rcu_read_lock or the write lock. + * If an entry exists, last and index are updated accordingly. + * May set @mas->node to MAS_NONE. + * + * Return: The entry or %NULL. + */ +void *mas_find_range(struct ma_state *mas, unsigned long max) +{ + void *entry; + + if (mas_find_setup(mas, max, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_next_slot */ + return mas_next_slot(mas, max, true); +} +EXPORT_SYMBOL_GPL(mas_find_range); + /** * mas_find_rev: On the first call, find the first non-null entry at or be= low * mas->index down to %min. Otherwise find the first non-null entry below --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51C0EC7EE23 for ; Thu, 18 May 2023 18:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229912AbjERSuZ (ORCPT ); Thu, 18 May 2023 14:50:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjERSuW (ORCPT ); Thu, 18 May 2023 14:50:22 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8129EE4A for ; Thu, 18 May 2023 11:50:21 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IsjN012432; Thu, 18 May 2023 14:57:04 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=1TdNAGujIkL2WjS4gl/cKBZ4VuW37YWu43lI8MFgl5A=; b=N02zp6fb9JGl3bXqiGkEXAQc0P/B0DjFegf/APscMbwKfPIe0IJBuBHEPjrSVhK14GGQ wRQxWqvMerQkMWYotsl1dEU+LSPG+vFLScW/BEk/M5kl2TOZKvKz9TU5WzdPOGwljh2t 5wA8ilLYihx5q8qNE0As99Tm1vGpjYECV9+oxkpeXDNYG39Eb+q2EtrX1JPEDDDxxgI4 fKAVGltzmkhkCQ5Di3E+q6lHo9wWhdBY4SxgRlYvJLzI2sVEkLqfLKBViCLHGoUyWfE8 mpe09RbDWiE9hDzRNQvGNbRybK3ox/o+d6su2TEBCujVmTq/KgU5NgLg+VWSZ0HRXkZ1 NQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjrc1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:04 +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 34IEc20P033902; Thu, 18 May 2023 14:57:03 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c9df-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OcAHddjApTVvAMitlty2XWRPeyzPDENcJxM2Ii3HsDpG1BbkA3edlswsTGiTO11PeDdeA/ov9th1ZdqErEV876FB01nJD+DUibNPk+uZxRH0eOo5qKsim+cCVSKbWV7cPW7GNXT1gCTqRmgH6RMZ4Y5jJCK3CNRD/S/Hal0yJc8FTgkd9+s0lcTrjg1a+HkXBAKY3RNdbO/MVO86U7kjgzxqmHmmaliS/Lmalwf30nhNDIL8dN62xq/dKRHdIuTnNGxDz2z8phIynlLilU35wzr7x+2sc99dC8PTN2GasTbmx065u8MmGBr1B8cDmzUKzi76dkjWMB0NUEbNXd84yg== 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=1TdNAGujIkL2WjS4gl/cKBZ4VuW37YWu43lI8MFgl5A=; b=Btw3d+CWLOSE2mkHj7OHDBZ9kCuY3So8Xv+Gj5TqV7FigcdXYBOLC1LaL3dwmpJbvOsVzd9QHqZplDxqHJe/bNyoPCYHZdGq/PFyaQ9OeafR+n5BOdtmMISRc2sJeN6qPMv+4g8uBv+j75v2jPQZIoTd4AEA7CeP10KbOAsnn64KjbmnPbor5Mb72Q9oF2+/1PPU1qUDPBMnD8HqSXFuwrI8bqVxpNuM/vQ/qShipA+brdarCi0jId/+MENIyLOONeE9SRa7C44uHfDVS90l/PM/5j6b0cMG5CWlAi6e+4TCa1dCBAO2bZt6AUGafb1iy3e7p+wAvVrxAggnO6ESPw== 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=1TdNAGujIkL2WjS4gl/cKBZ4VuW37YWu43lI8MFgl5A=; b=eV56iaNUCrAnbkKRfr7s+xHTDSa+U7VX2pARgVDbdX24MdyJSkwlaDmYMQ+UC11HFOEH0zEeNpz2cx8fm2I2x1a/1yPBohDfEjxJ1deKO1hV6cS8ukQBUVDrIHZEEeoyLN77all8GThjAfRoho/GP7ZhQwjWV73QIwSDuNSYlAY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:01 +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:57:01 +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" Subject: [PATCH v4 29/35] maple_tree: Relocate mas_rewalk() and mas_rewalk_if_dead() Date: Thu, 18 May 2023 10:55:38 -0400 Message-Id: <20230518145544.1722059-30-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0002.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::15) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: dd711551-0b31-4383-f603-08db57b02294 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lVTT/Qc0ChiVrnwiYIG7Nz592w57fbzIRx4cEHEfYIXd4aQnFtW8xGw9yN3i7Yb3AHYxnO3vGenD6byUiMYLR0hyG/V9PijKGcjqOawU2Fcfx8vP69/7OIn7lG2UqB/N9RUCzCKV/Kqc2yhb3Y6C0JXkLT7RFnorovGCxgYlESf9QW/duP6LLAI1Q650GPEN69uwCVBmrLT4EmYUGd2uxH/Hf7xYDr2P+28jjc6Zy21DTU7urssKFP/sJ/OyZIk8uRTap0zxRN5wF8T1oXK/0fynZC9Q/zBvO5WhapoK8gQj7TQo9dY964t6UAvXs2zVmE9LaChiKMhoYu37Xs5qlkMgu6XflI209//XcVpgJVjDt44ApHcB94TDWetodU+Xp+cqJBT58Wi7JEBLqPJpx6S+tkgUXbc/mGPWXEnte5qmf3UJysuCvTD/7iyZSVj0F2VuJ3votp68XUxOAMt7//P1Mxjfjyt/CsB/MaBrBjNnBXprNlXZC0OhlcAjfhx/xeNaNixdN7QSuJKaAg4d0WmOMTlw46PJTyhPXPePNs69z2FHD6q1ybsp0AAXzBLS 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MsKkEMMUPAnC7kqhfbzLuid2joXAkuK/2l+KWKmeVZtEd/pZDddD5yRdpLBI?= =?us-ascii?Q?Mb81e/6sex3ne1sUwC9uUiDbfCXcmr4XEfCn0wgB4pZ/NgpqAETK5h0492k2?= =?us-ascii?Q?gsNRe3ErDMgtzKj9lP0mNACrSf+6YEOE9WGTb0qVblStVSGWoSak9+Yh2ndT?= =?us-ascii?Q?SybNyXqCeLekrgzOXi/1LUyba1UEPQuyVvGjKuRarxcyEIKOFcgs4z5UtzaU?= =?us-ascii?Q?SWcJsNHqwsGCEFQLstSL8SjtjXiW/6G6I5RFo0xvbX1HIeenhWjweNeuly3X?= =?us-ascii?Q?oLd5Sn3/RcvZka2/Q5a2Q47rUrzFbFLQd+Th/41NU+zO9m/Qzdg3t35FjP7B?= =?us-ascii?Q?am0eMnfRH8TkJszfltZ6S/4fm2IowGB2sLlM4xv3tBlpO02CtPG5kCZzLj16?= =?us-ascii?Q?Pw7izlmCO8MVxCNQtymwy7t377LTKyPmicw4teRipyeDO6n31zmsAr3x3zD7?= =?us-ascii?Q?PGyMTE8OBnWI+OGAw49E7tQABKLs2Knhtda/9IRMHKt/WYv7b2blGOBs373a?= =?us-ascii?Q?KNsBv2dG16W817J5Gw+ydyX1LvNWoRLRKS8hjQYCphDyaHVj1nTvPSZo0agr?= =?us-ascii?Q?H+iGPN1Q/FvhlQgZSvVEN+MmsZu76lDKMPaFECywLvkizGSfLIEd9MtZYmxh?= =?us-ascii?Q?ZHzo8h9nRqznmDA4uvCrYaz/wrElynFW3RlRq3Vf3IjrcAqDU6ZcRPEZ3La5?= =?us-ascii?Q?/Wyyj1GqCYG/Fb/pm3HQmsg00o92EUECk10TtBOMYYswXxSdpHwDA4iKJPzW?= =?us-ascii?Q?CJNoRiwvuqEduV1d/YhlOL6rYz2wLzjjBohNMRzfLmFQkvZgA0KcEHJ/adw3?= =?us-ascii?Q?2QUAqlwV9DI1ixQw1lE4u3lunv96jpfBJOU78mpopCsep2pP7eGiit5fhFdG?= =?us-ascii?Q?dvST5N7o1wnfDGn8K4zRLcXnDOHt8w8F77TcL5uvcgpqcwyt+3cOJD72zfK5?= =?us-ascii?Q?6H5yySnJZ3jQxs/lhcQEj0if3JlZelgzl849iGbxSckt9JNhIc2SKlBwIulE?= =?us-ascii?Q?TGf5Ra4ytvI6io1cTRUTg/kwzV1/h6369s4HxLhwZBOzOc8dCbvn87iEvdPP?= =?us-ascii?Q?c4ygk1asduO81rhCBIBxR01EoVonakPFn8BG8G07hZzx9Zg1BTw7j79EwNBq?= =?us-ascii?Q?2Y/A/7hXwMwOuKDHli8tXDwQHYQEP8iKZ3seWfPIXKElqLcO6I4kIhFBKZDF?= =?us-ascii?Q?xfbuqA/0QBOM6m8PCwejNk/KkH7ENcEopccx4Oa7eSOrFZ6E0ifdxUTxskIs?= =?us-ascii?Q?5EX11eNzvYlseROxdhhi1Em3qIIEsYIhmNnkcIayqp6iHwttA8fO3f4farKD?= =?us-ascii?Q?/TM1g8un3cWrhel49XNIY/ZNHtN4k25eiLm2iZiaWupqtVmjOz4fDQo6MJnl?= =?us-ascii?Q?CGfF0bFTHidda/gAI8Zz6i6qVVEDXX0MuItHT0kiS+gbcJTn73jNBkICtzUG?= =?us-ascii?Q?T5ChnIRKc2zAmJbvYWvOrSsNQL2eAZE9eBnxj4nGmWOFt66zae25drLaaO5d?= =?us-ascii?Q?7GcI4zhSmJcZuWHyg6g7DNQ5Ut5Fl5W+JodyVhE8rkjLrUrW1j1eJ7HRR1I5?= =?us-ascii?Q?a3Jpjq5sM+UDSPgHwj3GTqJqxb1QmjP/fhsqxOTG2GlmZ96mjr/bZmq5NOUa?= =?us-ascii?Q?nA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YqM7WHgn1DQ5swKStdlEp2d5VlzZ6pN7lWoyjdkxZQHYjHc0oII7B5lNRqyLTC/OKw0rxSgrojtuel9vzahhkzBj749dtdab19wgtGCqGMM2FeFUtYGpIP71EGEm1vex3GuaAa0p+aXSdQgq11gcmVDYAiOHX10FT0FopM3fWcfOPiDjBP+D0KuVZm7w7HCMK0EjExuwyTrGc/FR+SUN9KXhCFhTUwYWta7bNFEYW8OJpAEBj+R7PXj6pUWlcq1JR67R28hkrjvdoLOlUDYkeJBJPQOaiQpQ/sKOkeyUnziIYFOYdRr2PX/qlR4onX+5DWFq43j06+JQiHfYvtgkYtIX4rMFKP/g4QBAr4EFgvCNr6tpb41KWogYSWakwdiSLULoN1aoyaRSkMd5zpqknXp5q7mFCw/7Bl/nLxMb24HdWAx0TL5iAGxouhJ1Wa/tLPPVxUjrLDzy7njv6muIIegoUIkUAXNnYLv2KeljXkiGWjWl8ndwMWgrMsXg6r1PxOXbb1LYr3wcIN2E/7suErepYA5SgvqXPIaI/b5XhAtr9TKRb80sIQw3hCUIo3wd29raOpxJybbuQdgqsV7tuV0fKqWP2ECgCpzeqW741DTUjKb3LfQRmG27UybdLSvsnzwNnTTFADHhutfaS72Fp/idOBCEHH/tcw92P8umS7rhsIrWVo76EKZfEfpxV1XHk9pWs5a3xT//op5irqIjsROeTjFWWRtpOR8GbwcKgnsfKhcCEGE6OdPTypNUgFFg/dvwQVtjDP34utbR8h5FqlLxZmr+2BwvXuyd6oFv6AfbnXwVt5YJohMUrl/XgVLELFXIrdPOF2XobIHhigkn3WncrsoCjc8ZhWJ6asDiLX33gAeUUA42ZNhq9PSpbhtFZjm2TLxrTA/CFtxLvFemwQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd711551-0b31-4383-f603-08db57b02294 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:57:01.0235 (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: cMz5lKPJnnUtDJGjwhj4Eo6SzNRkN6UdiOiPBkUCs7gtLept1isA7gQSoBmC7TORe9lY/Csm9IJo9ez+67UJRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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-GUID: 0lz_w9n5r3UYf7QH4OwgEWtPkTAYBtYP X-Proofpoint-ORIG-GUID: 0lz_w9n5r3UYf7QH4OwgEWtPkTAYBtYP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These functions need to move for future use. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index b5df37be7a15..25748014fe34 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4497,6 +4497,25 @@ static inline void *mas_insert(struct ma_state *mas,= void *entry) =20 } =20 +static inline void mas_rewalk(struct ma_state *mas, unsigned long index) +{ +retry: + mas_set(mas, index); + mas_state_walk(mas); + if (mas_is_start(mas)) + goto retry; +} + +static inline bool mas_rewalk_if_dead(struct ma_state *mas, + struct maple_node *node, const unsigned long index) +{ + if (unlikely(ma_dead_node(node))) { + mas_rewalk(mas, index); + return true; + } + return false; +} + /* * mas_prev_node() - Find the prev non-null entry at the same level in the * tree. The prev value will be mas->node[mas->offset] or MAS_NONE. @@ -4676,25 +4695,6 @@ static inline int mas_next_node(struct ma_state *mas= , struct maple_node *node, return 0; } =20 -static inline void mas_rewalk(struct ma_state *mas, unsigned long index) -{ -retry: - mas_set(mas, index); - mas_state_walk(mas); - if (mas_is_start(mas)) - goto retry; -} - -static inline bool mas_rewalk_if_dead(struct ma_state *mas, - struct maple_node *node, const unsigned long index) -{ - if (unlikely(ma_dead_node(node))) { - mas_rewalk(mas, index); - return true; - } - return false; -} - /* * mas_next_slot() - Get the entry in the next slot * --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A38C7EE23 for ; Thu, 18 May 2023 18:44:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230005AbjERSoq (ORCPT ); Thu, 18 May 2023 14:44:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229840AbjERSop (ORCPT ); Thu, 18 May 2023 14:44:45 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE4FDE46 for ; Thu, 18 May 2023 11:44:43 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6IrcY012408; Thu, 18 May 2023 14:57:06 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=or0gvhiuj20PZDjQz2A9EQ37j0qVAfTsjFswHLJTGPw=; b=CSWqg4nUL6VOOAxgLKYWBJUqPrEMgnAi30X2s/XfZgwf69fT2F7vGduGLbollPkTQc04 B37U2yN/d9Wd4oAEANtNiOvXyoXs4V7NsNhXBjqMwtpj4MvVUdDMUZtnI1pCYEorRbT6 uiNGrzv1zPGKghZBf7o42tJXzbTPogPGuUs7wVcBvHt011e9Sn5ZiCRgQ9xofAjbH1+h BBRnPRjsUdO9ApLRrIU32JdyqzF4VUGVGtSGpU4HCcay/Rbmpia3I0ob7jPGNlPwrtfW OSG/Gx9cpfN0Hbd1+vnU/ASNqlRa/7AyJt5mKnksw8+mXsIyXUXgx3bjOZGggOZwANu2 Tg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxwpjrc6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:06 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDRG4I040136; Thu, 18 May 2023 14:57:05 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2108.outbound.protection.outlook.com [104.47.55.108]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mqvb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kivZMgiCADNvPP/bnLWhfr3RKRkyLFoapxV2Ia0qdKx54mLmZ92WIISyr6zNVK6uoJ1m2MRG7JJZ6KsGrGeskg1f/CbWwWG5yVwic1Z9ZQHexDkGBlGd5hTGCiALpRH6ePF/IddfFPIv1hOPgPqHUNpcKZXdNt4TzHa2hHpp6VuA4yHGzTrkCTvppOuMzqfJqlCz5dJd2dfzi6KnF8hZfQYYBnHW7Vli8QCjutqi7shIEHUwQqLXxfn2iNC89krov9LSn10nUWRwmm3Pr0K7wCev1tuA+946hDndRGBbAwzxZxCOPwxRsFpZ8ngf/DJNrZ+G9Myhm6nsR7P4CmuDng== 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=or0gvhiuj20PZDjQz2A9EQ37j0qVAfTsjFswHLJTGPw=; b=NFkpgovCiU5LN0OIWHjH50j+Jd8suDj0ot/Tm3b4qAUwEaJhtjJtKX5pzUkrwiG+tPlH73t4IxmLyUUg67VJQt2B/Zx+jZrXKTJ3fA4a//2cE12jvhNtOoNTVNfrt5VJIXlfvuutzjbvIjR9UlFg9YzrolxHL4+IlYzYzJXefxilehcY9TF5pjxwahX+Hy9uSWIeV+EtPSkIE/VZVqwiTCkpbNmklIt+aIPWT3SbigvMxDYd765YewT1z2Tq278kewyEkZ2Sns3gSuZxbhoS/0IrXsgdJYdZ8QV/4Q/EwbknlFLlit9tbULtkcQwkTdc6yjNC4az2XLXjboQVAPSwA== 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=or0gvhiuj20PZDjQz2A9EQ37j0qVAfTsjFswHLJTGPw=; b=GBFkYnvAIxBjUYAhRkSwprKBJZl+rmv07s4BnU34WE8lqSFPG1OvycKvzGksrsAE3UzCIsF/NM7mNqY5/N9GwFfePYIQQO6+zeEDwg232V2oiG/FEF3eaj2UwtIRD1pCNr1o0BT79LVKRbssqFZGOZoFRKpwgO0zwr46mNb+1No= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:03 +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:57:03 +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" Subject: [PATCH v4 30/35] maple_tree: Introduce mas_prev_slot() interface Date: Thu, 18 May 2023 10:55:39 -0400 Message-Id: <20230518145544.1722059-31-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0302.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10e::7) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: c9479452-a750-486f-a4f6-08db57b023ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G1yDEz2POcDLDu7IMjvaVrCiVWrmpyY/N0zDxhKerde7AFqJwsERgEZ8LaMDmN/ViJA0PkbOCPgV56L0ro2ddqoooBwVQ1Rv7kcypCiONX+dbSk4tg8QT95d5FnTtMeNbs9DUhF0otygo326vqySKXC7ngp9tReKos1EI3jEnJqRbp+anS2itGzp/dq/V2u5Ttp5ySwSmeosF6oZBFNUBq6XX4jUrG1vq5zUri4//bGVYpka9+kWlOZEONXxC97Hp4evM3ASXmDXd5X/t6syiYF3kabjsLJ3ZQimXNYGKzRoRfOgwsRG8qKyB+24+m6lVFiaIypS50FHebLP+pMFd3Cvs0b1mbvGQ6WROz5crWQQmlcMNmR+a8ntad+KVj3ICRzeWM2n6+sxreu4Q8lwO8T2TdkjChrgjpgU8PfV/axZqRvXr5FOz4JThWUK2JIgwaZdPTpMuCq2v068r82/kwb/xYZfaXyZIypbQ90Fan+4v8F8n2uCLkFA/9wty/x3A3V1/FehMliG7ZgadJREDBmw+Yh0qaAvSeDszm8p8uKmC62jupp6rXBMyIVegUk2 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(107886003)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0MCPEWLhyEsDB2Or1zso+damDL0TbbPnAZxqgVEbX8nUL0cMMstfE0Pku30n?= =?us-ascii?Q?uLQx6QfoFURk2C9VRdnY8nQEwu47ufXCTmdCVV92TxNai8g/Ypz6AE4gQbq5?= =?us-ascii?Q?KZ36vPTxgOC2dALj9NAFefNc4Prr8TjcCm+lXj+zdui+Yt/53dTkMQXqfUA6?= =?us-ascii?Q?itkW4cKkzjCbAnR6mO9ojWAQ8/wabtraWaQW9YpE+1Agvfqw5NGpg/OgZca9?= =?us-ascii?Q?RKkZDY/FJunBw1uGIx6lnGqv8sBBIzsGVLKdBTFXLpJmWIvt8tuxo9k9JVRq?= =?us-ascii?Q?BNoqWY42wJ7dz9+8wThNQrZ9936MlvYDL0BQENIiBuBvIP2uTmTv9/aKJLJJ?= =?us-ascii?Q?BGnvmu9VLKFRcWGWyF3jpDLy6IrbFcE/kzFD+PPthieVTh9yQJ8FXDS7Lj75?= =?us-ascii?Q?Z4m/au8p6H9C/WMhmJ9s7EcR/BgCOvPSEAh8CdbW4A1Ttvl/wkKW17ib9J4w?= =?us-ascii?Q?05VGeRfVgYF5abe1gYr6JY86E/pkxcbnjucxUj4BG7/l8QGEo60AYZtg1wBA?= =?us-ascii?Q?VTE5ObgTajLerHVDeSmeMJMM464EcmBnJxIemNWuW6GpDIfgYKvmd1GMjd6+?= =?us-ascii?Q?cMR6WhFdOjeSfjIizHUK4II9q3eAYCWmFMEYgvXy3eJRSXJeErkZ4sZO8bw4?= =?us-ascii?Q?h6BTO9TnFr6dCapLA3Iuxz4KFgePawDjQp3oRqwmJi7NxvN6oHx6941ekPSg?= =?us-ascii?Q?XGsYCFDYssFmkZY1V9T9jcC/5Td7oDA3Hkx1bYeeG5YSsD13Y24YLOXKyimP?= =?us-ascii?Q?UAnhNVBURxX4fLPUdKyhKvj1IzORquiiQcLCGfCgpdGUaHc4Jznzv69LYJFS?= =?us-ascii?Q?IR+U9Bvn6tYyIu7fh4Az0lIjJW114WvzWDQnqWD0lx9LVDpHPLllNoWFQ2z6?= =?us-ascii?Q?JNH6ls9panZZ6c+D+4E7erwlwJAaQjGzTcD6Mtfu6zHL1bk7B7E3Ca/mtCL/?= =?us-ascii?Q?VQUBZPE3mplWrdJG0dGo3Dbb9ARzwlo4ftrwyXlkpbYgl1fbWQ8b2ljpU1Zi?= =?us-ascii?Q?m72L5MnjKoRx9PLUAXrf0bEGSJN6KC58VI0qKoJ5zr1BOT408fijbKK7igOm?= =?us-ascii?Q?LEalfTYEVKpr2UrcN5YLaqigE5XlWkOrVndVHfTBDiCfoam4nHW62nb4RcCC?= =?us-ascii?Q?FSnb/lMN1CN9KgVPxgSKcr1zltlsURfZXJaDrEnoHL0rbWAjAY/Nu+HSvLHE?= =?us-ascii?Q?aqOsFxE0vKkLJy3Fjuow9S4N4iXSzZ3YLM5yNdSvh1t69GCDhVP4dsSCXLP5?= =?us-ascii?Q?IBV+UNr5hbfbC86bp4Yp+6KgO/ibq4YItryaNKcDRnU1RBCFHxPoIYtPN6si?= =?us-ascii?Q?ONn27AyUxlPIoSobEcR+BAjMSDmFxFcZjiLIjQkcbZRj2k5tKUDKZTs1JMM7?= =?us-ascii?Q?uaUpqBnXGsdXEJYgnyAK5gxdlD/Lg3bMqZcSQzkT0Rak3UJZgJCNWL7m59f4?= =?us-ascii?Q?Zv7q5EOLgLUad7zDIFQRoftCN8n4P5hROeVOWRzC54TliI/KOOLWHZSE0t7/?= =?us-ascii?Q?V46p4iZT6gUbPTGKJZae5riipEYDrEH6uXFhpx6KcbedhnSNq2W6rgP4LDwv?= =?us-ascii?Q?j41Y3JwKjGzfpghWjWa7813GJS8itIsUj0btG94bCFxedtMhIFH2nuVfd5Tn?= =?us-ascii?Q?lQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Izqmc6ywIC5brFHk8D3kaMnX6QFaWhghxhcHTOLYGlYv6xxIX7zlrg0Qo1Ln8Ro8SR5LOnpQf75p3MRCt2Vo3Fg0lV8FtE2Bbc64+WCHp6DA5Tj4w6OoTYVCh3DwJZVJy18VM+3Pz0gD/IqqeRG51d0PmLp1FpLPU30hERgxNh4g+p6OF3PDLVgmiHTnIbXLGGe6EC8lv0yxk+Rg1hTzw4qU00oWrhFpSsJH0mawl93ZvfYuBXVT3ep/NX00xTjimCzzqcO2b+RlL4fiJx/GBCWkS+eh16kkfiTiHZDzSKci21ytsXN4GtMKmLggQJyD1GRiOic1fMqPYwCfuG4PgQnDyG4aYe1KZ30IUm5+w33Necu+mp4XajJoRUT5ekYS5BZ/tc5vNBIwm5v41af3lafnavmGO9cBwiWXKgoXJBFR5vkaK1Sp1ZEon7Ef4UvJuZgxsOB49ZW9dAMfZbJlcNQsAjSR5UV70YQjJU16TWbXZUuu53atLj7jyu8qm7xXYco6fz1JXYu57pCBD7NfhdvkOsxVE4asCdSHgf5sUqz294nEVJOi1h5XTMWEUPjf3xmBuGzUDxFPwkKM9mklGBMkonFeGQl0i/JeLsiPjVjFSMz3Cv7+iVcIhndU0fXA1ozWnDqOm7INUk186kK8cnmrxaszi9/f/1fVFFc3YGDDTlNUthGYZkqW5o/0CgCeU7ZvqSksG1ZNptVwHr2cASOGyppM+9AG1iEe70zsT4riLKY0mBEqXQhaN/wJh8FT1EDiTlKe0GorkGKN++g/z3+aUlFEQrx21HbvrRDLxTA+JDTpXPpabqajlvclvklU9cTLEmoTNX/DkouPfIMAezrjNYyf4wYcG36pG4KLHSyn0atGJMZGmRl75IH1mRpKIauzLQG13qP31nnOMxp4Vw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9479452-a750-486f-a4f6-08db57b023ee 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:57:03.3059 (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: 0sb/Jw1i9iI02wjT5fKPEVvblSp5Lb0K3oiEzPRWzvDQXE6TZb8PINUk/mRrxhzPooWRRTKMA1M9x9YYiYYJ1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 2FMAuV0vgW1Ao2acIbNdOwHuF27khLAr X-Proofpoint-ORIG-GUID: 2FMAuV0vgW1Ao2acIbNdOwHuF27khLAr Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Sometimes the user needs to revert to the previous slot, regardless of if it is empty or not. Add an interface to go to the previous slot. Since there can't be two consecutive NULLs in the tree, the mas_prev() function can be implemented by calling mas_prev_slot() a maximum of 2 times. Change the underlying interface to use mas_prev_slot() to align the code. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 232 ++++++++++++++++++----------------------------- 1 file changed, 90 insertions(+), 142 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 25748014fe34..f0e9ce5b0515 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4531,15 +4531,19 @@ static inline int mas_prev_node(struct ma_state *ma= s, unsigned long min) int offset, level; void __rcu **slots; struct maple_node *node; - struct maple_enode *enode; unsigned long *pivots; + unsigned long max; =20 - if (mas_is_none(mas)) - return 0; + node =3D mas_mn(mas); + if (!mas->min) + goto no_entry; + + max =3D mas->min - 1; + if (max < min) + goto no_entry; =20 level =3D 0; do { - node =3D mas_mn(mas); if (ma_is_root(node)) goto no_entry; =20 @@ -4548,64 +4552,41 @@ static inline int mas_prev_node(struct ma_state *ma= s, unsigned long min) return 1; offset =3D mas->offset; level++; + node =3D mas_mn(mas); } while (!offset); =20 offset--; mt =3D mte_node_type(mas->node); - node =3D mas_mn(mas); - slots =3D ma_slots(node, mt); - pivots =3D ma_pivots(node, mt); - if (unlikely(ma_dead_node(node))) - return 1; - - mas->max =3D pivots[offset]; - if (offset) - mas->min =3D pivots[offset - 1] + 1; - if (unlikely(ma_dead_node(node))) - return 1; - - if (mas->max < min) - goto no_entry_min; - while (level > 1) { level--; - enode =3D mas_slot(mas, slots, offset); + slots =3D ma_slots(node, mt); + mas->node =3D mas_slot(mas, slots, offset); if (unlikely(ma_dead_node(node))) return 1; =20 - mas->node =3D enode; mt =3D mte_node_type(mas->node); node =3D mas_mn(mas); - slots =3D ma_slots(node, mt); pivots =3D ma_pivots(node, mt); - offset =3D ma_data_end(node, mt, pivots, mas->max); + offset =3D ma_data_end(node, mt, pivots, max); if (unlikely(ma_dead_node(node))) return 1; - - if (offset) - mas->min =3D pivots[offset - 1] + 1; - - if (offset < mt_pivots[mt]) - mas->max =3D pivots[offset]; - - if (mas->max < min) - goto no_entry; } =20 + slots =3D ma_slots(node, mt); mas->node =3D mas_slot(mas, slots, offset); + pivots =3D ma_pivots(node, mt); if (unlikely(ma_dead_node(node))) return 1; =20 + if (likely(offset)) + mas->min =3D pivots[offset - 1] + 1; + mas->max =3D max; mas->offset =3D mas_data_end(mas); if (unlikely(mte_dead_node(mas->node))) return 1; =20 return 0; =20 -no_entry_min: - mas->offset =3D offset; - if (offset) - mas->min =3D pivots[offset - 1] + 1; no_entry: if (unlikely(ma_dead_node(node))) return 1; @@ -4614,6 +4595,76 @@ static inline int mas_prev_node(struct ma_state *mas= , unsigned long min) return 0; } =20 +/* + * mas_prev_slot() - Get the entry in the previous slot + * + * @mas: The maple state + * @max: The minimum starting range + * + * Return: The entry in the previous slot which is possibly NULL + */ +static void *mas_prev_slot(struct ma_state *mas, unsigned long min, bool e= mpty) +{ + void *entry; + void __rcu **slots; + unsigned long pivot; + enum maple_type type; + unsigned long *pivots; + struct maple_node *node; + unsigned long save_point =3D mas->index; + +retry: + node =3D mas_mn(mas); + type =3D mte_node_type(mas->node); + pivots =3D ma_pivots(node, type); + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; + +again: + if (mas->min <=3D min) { + pivot =3D mas_safe_min(mas, pivots, mas->offset); + + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; + + if (pivot <=3D min) + return NULL; + } + + if (likely(mas->offset)) { + mas->offset--; + mas->last =3D mas->index - 1; + mas->index =3D mas_safe_min(mas, pivots, mas->offset); + } else { + if (mas_prev_node(mas, min)) { + mas_rewalk(mas, save_point); + goto retry; + } + + if (mas_is_none(mas)) + return NULL; + + mas->last =3D mas->max; + node =3D mas_mn(mas); + type =3D mte_node_type(mas->node); + pivots =3D ma_pivots(node, type); + mas->index =3D pivots[mas->offset - 1] + 1; + } + + slots =3D ma_slots(node, type); + entry =3D mas_slot(mas, slots, mas->offset); + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; + + if (likely(entry)) + return entry; + + if (!empty) + goto again; + + return entry; +} + /* * mas_next_node() - Get the next node at the same level in the tree. * @mas: The maple state @@ -4798,109 +4849,6 @@ static inline void *mas_next_entry(struct ma_state = *mas, unsigned long limit) return mas_next_slot(mas, limit, false); } =20 -/* - * mas_prev_nentry() - Get the previous node entry. - * @mas: The maple state. - * @limit: The lower limit to check for a value. - * - * Return: the entry, %NULL otherwise. - */ -static inline void *mas_prev_nentry(struct ma_state *mas, unsigned long li= mit, - unsigned long index) -{ - unsigned long pivot, min; - unsigned char offset, count; - struct maple_node *mn; - enum maple_type mt; - unsigned long *pivots; - void __rcu **slots; - void *entry; - -retry: - if (!mas->offset) - return NULL; - - mn =3D mas_mn(mas); - mt =3D mte_node_type(mas->node); - offset =3D mas->offset - 1; - slots =3D ma_slots(mn, mt); - pivots =3D ma_pivots(mn, mt); - count =3D ma_data_end(mn, mt, pivots, mas->max); - if (unlikely(mas_rewalk_if_dead(mas, mn, index))) - goto retry; - - offset =3D mas->offset - 1; - if (offset >=3D mt_slots[mt]) - offset =3D mt_slots[mt] - 1; - - if (offset >=3D count) { - pivot =3D mas->max; - offset =3D count; - } else { - pivot =3D pivots[offset]; - } - - if (unlikely(mas_rewalk_if_dead(mas, mn, index))) - goto retry; - - while (offset && !mas_slot(mas, slots, offset)) { - pivot =3D pivots[--offset]; - if (pivot >=3D limit) - break; - } - - /* - * If the slot was null but we've shifted outside the limits, then set - * the range to the last NULL. - */ - if (unlikely((pivot < limit) && (offset < mas->offset))) - pivot =3D pivots[++offset]; - - min =3D mas_safe_min(mas, pivots, offset); - entry =3D mas_slot(mas, slots, offset); - if (unlikely(mas_rewalk_if_dead(mas, mn, index))) - goto retry; - - mas->offset =3D offset; - mas->last =3D pivot; - mas->index =3D min; - return entry; -} - -static inline void *mas_prev_entry(struct ma_state *mas, unsigned long min) -{ - void *entry; - struct maple_enode *prev_enode; - unsigned char prev_offset; - - if (mas->index < min) - return NULL; - -retry: - prev_enode =3D mas->node; - prev_offset =3D mas->offset; - while (likely(!mas_is_none(mas))) { - entry =3D mas_prev_nentry(mas, min, mas->index); - - if (likely(entry)) - return entry; - - if (unlikely(mas->index <=3D min)) - return NULL; - - if (unlikely(mas_prev_node(mas, min))) { - mas_rewalk(mas, mas->index); - goto retry; - } - - mas->offset++; - } - - mas->node =3D prev_enode; - mas->offset =3D prev_offset; - return NULL; -} - /* * mas_rev_awalk() - Internal function. Reverse allocation walk. Find the * highest gap address of a given size in a given node and descend. @@ -6017,7 +5965,7 @@ void *mas_prev(struct ma_state *mas, unsigned long mi= n) } return NULL; } - return mas_prev_entry(mas, min); + return mas_prev_slot(mas, min, false); =20 none: mas->node =3D MAS_NONE; @@ -6232,8 +6180,8 @@ void *mas_find_rev(struct ma_state *mas, unsigned lon= g min) if (mas->index < min) return NULL; =20 - /* Retries on dead nodes handled by mas_prev_entry */ - return mas_prev_entry(mas, min); + /* Retries on dead nodes handled by mas_prev_slot */ + return mas_prev_slot(mas, min, false); =20 none: mas->node =3D MAS_NONE; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CD8CC77B7D for ; Thu, 18 May 2023 14:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231935AbjERO7g (ORCPT ); Thu, 18 May 2023 10:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231450AbjERO6l (ORCPT ); Thu, 18 May 2023 10:58:41 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C724818C for ; Thu, 18 May 2023 07:58:16 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6Il19012457; Thu, 18 May 2023 14:57:09 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=+Mxye0KY7tWYyadVwkLe4uGBperlmwR2B6BWsR6giWY=; b=iXBVlSKh9H7S4lCnaEMQGylVd3Ai1LbYcccQ9POcDtt8Sl9cYtR2ZJojZVFexyfsLuJy D4nfQZQK8ykPvXd+hl1+anC3AC2saZOKhubsnApoWdolG7H360y7hxrohhcpjFBMI/RQ WMKjXdElNVkwkXuRIXSt2Htm8N1/GV616WmMGovOThnUBQZ1xBu/aANnyQ/OB+7q6OYW OXBWy+8xkziBHfObbUSqZVhHYbKMsVexMNuFGzAyX03r0DP8JuhqtbMsyOUquctYVr6P oXjhcKAElh+HJj+wodSzG1stPjzYbHK9hsmdFSBTCdBCSf8La3XtJRFgHERr6qa5C4YR pQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qj2kdrh1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:09 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEGfoF032234; Thu, 18 May 2023 14:57:08 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10cwt6j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DNIZiQXlliBMTjk0ldo6Xkct0QN7w7wEiQ+yK5M8INGYYO9UJFrwETd6xlrQYHWdkIDodCi6paZDLPXnZiA4czW052k3b7K2FA8MOC4kX1iQNpvZKNZp9Rbm+duvnnE/yMZWrfvih8q0xAQnHvIQYdLvOrimoqgz+Zxbms/m03Ool12dcDcWk711xtlQ5mZ00hdDzkCseyUn9e7F0ZpMs0/fF4inkkVMBk9+TcRX2qO+z6VmbZnsY83FMOjLOyBTIpSGMWuOf5UMsPd4sZWBgpPGJPEQ1mu+Rlf0EyauhFoXtHBGumrDRaDXa30CRFauduKnyuof6J+wbLZcgCIT0w== 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=+Mxye0KY7tWYyadVwkLe4uGBperlmwR2B6BWsR6giWY=; b=KKyTHl4YTHAIKlKewEfLi3B8/9e/CIDfNTcRswcNrzClyRu5IYqtVIhgbuhTrCa6qMX9mD0Skogu/6EqBdg5zvm58yV2/I9IGqtW4n/1hLjILkZhHJ6hHqjWvusKhN6mTps4hZxbvmS0ed03lnaWJs4/ce06d220guUegNzFOa2Gqj+qbeKdCNkKKW7QM1zTkOqcXQVgX8qlQibrfuL+uT/5zBSzqayFMtmnkzsDBFJrSlsPkK7RiKhOb//1rlqOeDsMmQVMNSxX5ySdLWiacnI2+son3VsYVmjEJBANl9JbgfVjc6eL7PF5aDePyUEYRddCrPRGER+WyPtbHy+A1g== 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=+Mxye0KY7tWYyadVwkLe4uGBperlmwR2B6BWsR6giWY=; b=DhvHMG4aMS+E1SxrEonO8a1ezGo+FWrSBlfjQliP7cOI06kZGgK0lfNZ8SqjVpIHz2PV2IzsMf7Gjrtz+KMH263gVaoxSPsjLhDITgm3PEl6KLmqUpM2bZxXjuzJC7VEQ0b5fs7kU31lM6bw37OI0NUlJOeGQfkCWJ4Solv3a6g= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM4PR10MB7427.namprd10.prod.outlook.com (2603:10b6:8:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:06 +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:57:06 +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" , Vernon Yang Subject: [PATCH v4 31/35] maple_tree: Add mas_prev_range() and mas_find_range_rev interface Date: Thu, 18 May 2023 10:55:40 -0400 Message-Id: <20230518145544.1722059-32-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0015.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::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_|DM4PR10MB7427:EE_ X-MS-Office365-Filtering-Correlation-Id: 1194ff93-a61d-4110-c2de-08db57b025ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P4/Uq0rU3e+p6aNviz0xfoWAvLrmndxGqhfgFnpyXr8gAG3VUxDst5QxuLwKOyYn59MW1su/hbH26HHrAJCnhSFyBEPdKH9g5ZjZcVflOALQnpgx3wBh9yRy26rVL6Zke9vif7lYF4+w09n/85tX9QXXOYETixv2ZzWy5jc0GpLg0KgPJxz/bIK0fe3QBPDNqxcDqZbtE+qGB9NjRyRaIczpjw7Izc9jhySoHu+8m09Y2g3MYFc/lm7WFbWhznEvqQKiRQt0NtjNhDk81h3tvhosEZoKrZlPWCkHSr73BKpIVuoox1TM2LR4C7aA8lbpefsslt5HRjZ7HHZPYtS/uOITgY5yoAm9oEO83oQpXNUjlBfYIpI+T5wNVMrDiMIE+N9EKXk1H/DPuJ3IYveH0HDezuOeYl5vevcrVIpPyiJ6eupH/h52xMIzBgc7SNhLhA8ccQ9HwkkAlOitygBiwhS8r2MDfisSe7FQYf8L0BwbEGoXPXY0ERTmNbvPJGvkfOvvNif4fpk1YLF1XhcD4cffje2iEiuzvRvyN9HSaZ7/U6RyEgMIrUqGZAb7eNiV 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)(396003)(346002)(136003)(376002)(366004)(451199021)(8676002)(5660300002)(8936002)(4326008)(316002)(6512007)(1076003)(83380400001)(6506007)(26005)(86362001)(186003)(38100700002)(2616005)(41300700001)(478600001)(66476007)(6666004)(66946007)(66556008)(6916009)(6486002)(36756003)(54906003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mzMiPLPXa5rF3pyEZ/Ehh1qHPPv4ibaOjBXggGe8pO4Ox3tWxeJFbN3/fynZ?= =?us-ascii?Q?ubhk57TTjsx3ZnhehLekp2ifowP6kRdaPSKwRIor0xmm6RjScoziutOFx7dC?= =?us-ascii?Q?FdubjDBpF7tZ9o8uyFu+l2udVlmEyliGE2yVbIdxaje568JhTFoCaH3TuICX?= =?us-ascii?Q?bNi/RrNDnrXMpj9OgAmGZSHquGy6uvBHVp+jZP6Nsn1APq/xlxsv2qdzSh8w?= =?us-ascii?Q?bK2W5m7fqxqQyZjCoW+sxcitP7uaIOqf7bT+b787PNjQ6QjTdmgiRKBHDLLx?= =?us-ascii?Q?dMMSQjDmUREnWop7EVYfXOFx3HV+vurzPB3n8hteC7Sp1o9xXo4C/Thur92O?= =?us-ascii?Q?JxS6RFsgChP+muo7MfHjBRxgboLI9BQULeKS4NyCDVzFld67o3n9Qfusgc0v?= =?us-ascii?Q?ocwjhN6DesEH/f7dt5+/c4ymcHVyOpayM5S3pJCgce8BnA5b1PG7b5GvOuo8?= =?us-ascii?Q?VdaSqXX5Q0i8k8U3a98/LPclneQbU2UWswCyI56euFeQMBXU7il9vabKxE/T?= =?us-ascii?Q?8qkvCoa31FMgt49DmGCa9VE8xR6q6wghdeduk7ou/Jk6BuOoStxScLJeu4ua?= =?us-ascii?Q?uyzrcxkCxp/C6vQr7T1HdszXZu1n/xE1EkdUIDbETcnj2oE/wcFZCsUemxOW?= =?us-ascii?Q?W2GDU7lqUp12OIXcTfGUjBrHFb/2HprnLGYG0KIz2lrMjg0t3kT9TGKChXZC?= =?us-ascii?Q?+XQ2wQF+X/4zvXg2BOdtKudymTvzp5K0MA0vB/NR9ZC1CMyirHf6U/OtfhwU?= =?us-ascii?Q?MA6mjlaCxfnRRNGyLI3BpK4C9A33/QXLi7WpZ2mnCJUI66uiQTiMR8QgAj7i?= =?us-ascii?Q?1MzLeYDFhSWOvZW/3KoFU5EKKTzbIpgGtQlwLD+RNDWXt51jHs2Nsc+4Aw/x?= =?us-ascii?Q?A4WM11Li0rBuXtsFJNT/65AUx9zi59IwLs4zcjo8835c3vlC8GrQP8nav+fF?= =?us-ascii?Q?NO/QVsqeqm5/9dA0DDTK4XNsQFqw/wUWFM2qlVLKGUNklIPTRMnNIrf3Dgmv?= =?us-ascii?Q?VXOSU1+WqSFJ/IK/aWamlrtjoqBw1up9eAetbw8u1q4HcgOfT2eeoqDBa1e7?= =?us-ascii?Q?UNFZjPvgAgvDDB+JQ2zmwdmMD7AFyEhb+qX/7cUDLBVC4CSgtD2MLVr4UfY7?= =?us-ascii?Q?BCwTx6yV4GI1Cp3EbIGZbKR9YLFu31c4ojgZ6HGdCuzjkWZ4QkRppGlQ2rT7?= =?us-ascii?Q?bed7WVW7T4U9LA18GQ/+IWJZlgVwz3QruTHDUmaAi938gDq5BIUjYZFKOmgq?= =?us-ascii?Q?mlHJMQ8ob6sRrWeVDlSk87jsOktU57lUJ+3dTlVIDDuqg81xb5tYs9IQ//SN?= =?us-ascii?Q?qi6jVr5xgy63NMmTK6gG7MJYLaX07lVLzRgZnlulzjXUCvvMUDCgzCZ+yjRd?= =?us-ascii?Q?JDgiQj06jLwA1q+7Qq+yyO8kkVkJmF6ar4/+DEISMmgaeynShaTv1ISfEaHZ?= =?us-ascii?Q?UxVt3bgeyWhA6Rasg+7xsy4k543xuunP9CAHKjtkvuRwDJcQmrnLuGLN3eic?= =?us-ascii?Q?WtGmx7ZOt0nck/F0zfniz6Y82u8Be5JXos3Y49GFKkXKAsFbNFhrWIaHmeEm?= =?us-ascii?Q?Z5BPqD4qv+N0YhgaceiUKc/wIplruu7aUuGRf4F5BihpBOsJY3c9Kr5Nr2OC?= =?us-ascii?Q?uw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: sG9R34682f9zaLCYZ8ZgD8Usr5lyJadvI4E+sklZGNppcl9uPN8DNJ/l1LKJ6YISU9S4X1rBsPn5p1QYTUGZr63YfZTpiuQhNddPOO6Wx0ZSYYOalPPgBp90OOv/cJgQ9VkjaXxgjyxkgSEoy/KWv30rOfXg/ciZ7r8LTCcTHt5t+1rOl06A3BfneDdQAry0V3bC/15WRol9OKPxrgzY/4gcigfI9rGgxqb+r72k8tUf6vs+3DY1MWLmJ0b8TykEcfJ6tBxKpSzR78DXonr9ZgHEOkb/yo5KaAlIVASH5OKzVbUF6uRUNpHv3Ntv2NRAm/9S3IELmY2tz197W32Bn5pTNeEYm7tmLqYBnfP0oeJV6t21yhUF3HLB6xsLi7TS6zgMfzQ3qAZHcJcOxYrjVNkiAYkkwTx2G8yilcu9kuDDDsme754f0UWS2EezLE06+NuyuQZikleT2lteKTVBOJyI4T4Wb4/qaU4rgEy48gmAoH27P44MNMt7rV6Iyc+i7VWy3ZpVEqm0T8Fq9nOsDJ0hRfvmEayQyPfbWdnDzj1JmUBKAdeYJL8JNdy/ZWsIUPmN9qW1e+UtFTDPWISKGxz5kzhhET2lQSkmIwqwFGaAMk4PZSaw270fKoWnrvvrb3FsB2VgvYbHEdA2Z62K/3KOle81bLdaZoSYDtaPO9jZRkxqe6g3guWzMVeDmDm55pGk+mSedwwJDLT2omrEqGdskgoDucYyrurq8o8C2F4lFqaWwLS+KB9f4e8FhPjwbfN/M0l3v8ECX+lZD9xXllfVhgWP9Eolv4fgyfxA7Em5EKohbH8Z09afdbt2UIq6UC9gfPUq18/lD0hqg6W7LW2yPELPhvFojFPNCxrhCGgxz7KHknlvIYWP4LMQFDqgkdSAIjA2cYPLnRDV7q53HkhZY9zUiaG56SIncHQA4EA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1194ff93-a61d-4110-c2de-08db57b025ba 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:57:06.2924 (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: ek8qF3rooOtXOUxdVmLAgV1SaJ4uEhPgb/3qGtThYmA88X9R/PfxgHdHWeQKQXd8D488ksjzeLZe+vDOyjjgSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427 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 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: M2n6dt1vGknjeqWWHdDHZJEkCgmqfMpb X-Proofpoint-ORIG-GUID: M2n6dt1vGknjeqWWHdDHZJEkCgmqfMpb Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some users of the maple tree may want to move to the previous range regardless of the value stored there. Add this interface as well as the 'find' variant to support walking to the first value, then iterating over the previous ranges. Cc: Vernon Yang Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 2 + lib/maple_tree.c | 161 ++++++++++++++++++++++++++++--------- 2 files changed, 124 insertions(+), 39 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 9d040043858a..541675229568 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -457,6 +457,7 @@ void mas_store_prealloc(struct ma_state *mas, void *ent= ry); void *mas_find(struct ma_state *mas, unsigned long max); void *mas_find_range(struct ma_state *mas, unsigned long max); void *mas_find_rev(struct ma_state *mas, unsigned long min); +void *mas_find_range_rev(struct ma_state *mas, unsigned long max); int mas_preallocate(struct ma_state *mas, gfp_t gfp); bool mas_is_err(struct ma_state *mas); =20 @@ -467,6 +468,7 @@ void mas_destroy(struct ma_state *mas); int mas_expected_entries(struct ma_state *mas, unsigned long nr_entries); =20 void *mas_prev(struct ma_state *mas, unsigned long min); +void *mas_prev_range(struct ma_state *mas, unsigned long max); void *mas_next(struct ma_state *mas, unsigned long max); void *mas_next_range(struct ma_state *mas, unsigned long max); =20 diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f0e9ce5b0515..fe481d4e5e6a 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5924,18 +5924,8 @@ void *mt_next(struct maple_tree *mt, unsigned long i= ndex, unsigned long max) } EXPORT_SYMBOL_GPL(mt_next); =20 -/** - * mas_prev() - Get the previous entry - * @mas: The maple state - * @min: The minimum value to check. - * - * Must hold rcu_read_lock or the write lock. - * Will reset mas to MAS_START if the node is MAS_NONE. Will stop on not - * searchable nodes. - * - * Return: the previous value or %NULL. - */ -void *mas_prev(struct ma_state *mas, unsigned long min) +static inline bool mas_prev_setup(struct ma_state *mas, unsigned long min, + void **entry) { if (mas->index <=3D min) goto none; @@ -5953,7 +5943,8 @@ void *mas_prev(struct ma_state *mas, unsigned long mi= n) if (!mas->index) goto none; mas->index =3D mas->last =3D 0; - return mas_root(mas); + *entry =3D mas_root(mas); + return true; } =20 if (mas_is_none(mas)) { @@ -5961,18 +5952,64 @@ void *mas_prev(struct ma_state *mas, unsigned long = min) /* Walked to out-of-range pointer? */ mas->index =3D mas->last =3D 0; mas->node =3D MAS_ROOT; - return mas_root(mas); + *entry =3D mas_root(mas); + return true; } - return NULL; + return true; } - return mas_prev_slot(mas, min, false); + + return false; =20 none: mas->node =3D MAS_NONE; - return NULL; + return true; +} + +/** + * mas_prev() - Get the previous entry + * @mas: The maple state + * @min: The minimum value to check. + * + * Must hold rcu_read_lock or the write lock. + * Will reset mas to MAS_START if the node is MAS_NONE. Will stop on not + * searchable nodes. + * + * Return: the previous value or %NULL. + */ +void *mas_prev(struct ma_state *mas, unsigned long min) +{ + void *entry =3D NULL; + + if (mas_prev_setup(mas, min, &entry)) + return entry; + + return mas_prev_slot(mas, min, false); } EXPORT_SYMBOL_GPL(mas_prev); =20 +/** + * mas_prev_range() - Advance to the previous range + * @mas: The maple state + * @min: The minimum value to check. + * + * Sets @mas->index and @mas->last to the range. + * Must hold rcu_read_lock or the write lock. + * Will reset mas to MAS_START if the node is MAS_NONE. Will stop on not + * searchable nodes. + * + * Return: the previous value or %NULL. + */ +void *mas_prev_range(struct ma_state *mas, unsigned long min) +{ + void *entry =3D NULL; + + if (mas_prev_setup(mas, min, &entry)) + return entry; + + return mas_prev_slot(mas, min, true); +} +EXPORT_SYMBOL_GPL(mas_prev_range); + /** * mt_prev() - get the previous value in the maple tree * @mt: The maple tree @@ -6119,20 +6156,18 @@ void *mas_find_range(struct ma_state *mas, unsigned= long max) EXPORT_SYMBOL_GPL(mas_find_range); =20 /** - * mas_find_rev: On the first call, find the first non-null entry at or be= low - * mas->index down to %min. Otherwise find the first non-null entry below - * mas->index down to %min. + * mas_find_rev_setup() - Internal function to set up mas_find_*_rev() * @mas: The maple state - * @min: The minimum value to check. - * - * Must hold rcu_read_lock or the write lock. - * If an entry exists, last and index are updated accordingly. - * May set @mas->node to MAS_NONE. + * @min: The minimum index + * @entry: Pointer to the entry * - * Return: The entry or %NULL. + * Returns: True if entry is the answer, false otherwise. */ -void *mas_find_rev(struct ma_state *mas, unsigned long min) +static inline bool mas_find_rev_setup(struct ma_state *mas, unsigned long = min, + void **entry) { + *entry =3D NULL; + if (unlikely(mas_is_none(mas))) { if (mas->index <=3D min) goto none; @@ -6144,7 +6179,7 @@ void *mas_find_rev(struct ma_state *mas, unsigned lon= g min) if (unlikely(mas_is_paused(mas))) { if (unlikely(mas->index <=3D min)) { mas->node =3D MAS_NONE; - return NULL; + return true; } mas->node =3D MAS_START; mas->last =3D --mas->index; @@ -6152,14 +6187,12 @@ void *mas_find_rev(struct ma_state *mas, unsigned l= ong min) =20 if (unlikely(mas_is_start(mas))) { /* First run or continue */ - void *entry; - if (mas->index < min) - return NULL; + return true; =20 - entry =3D mas_walk(mas); - if (entry) - return entry; + *entry =3D mas_walk(mas); + if (*entry) + return true; } =20 if (unlikely(!mas_searchable(mas))) { @@ -6173,22 +6206,72 @@ void *mas_find_rev(struct ma_state *mas, unsigned l= ong min) */ mas->last =3D mas->index =3D 0; mas->node =3D MAS_ROOT; - return mas_root(mas); + *entry =3D mas_root(mas); + return true; } } =20 if (mas->index < min) - return NULL; + return true; =20 - /* Retries on dead nodes handled by mas_prev_slot */ - return mas_prev_slot(mas, min, false); + return false; =20 none: mas->node =3D MAS_NONE; - return NULL; + return true; +} + +/** + * mas_find_rev: On the first call, find the first non-null entry at or be= low + * mas->index down to %min. Otherwise find the first non-null entry below + * mas->index down to %min. + * @mas: The maple state + * @min: The minimum value to check. + * + * Must hold rcu_read_lock or the write lock. + * If an entry exists, last and index are updated accordingly. + * May set @mas->node to MAS_NONE. + * + * Return: The entry or %NULL. + */ +void *mas_find_rev(struct ma_state *mas, unsigned long min) +{ + void *entry; + + if (mas_find_rev_setup(mas, min, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_prev_slot */ + return mas_prev_slot(mas, min, false); + } EXPORT_SYMBOL_GPL(mas_find_rev); =20 +/** + * mas_find_range_rev: On the first call, find the first non-null entry at= or + * below mas->index down to %min. Otherwise advance to the previous slot = after + * mas->index down to %min. + * @mas: The maple state + * @min: The minimum value to check. + * + * Must hold rcu_read_lock or the write lock. + * If an entry exists, last and index are updated accordingly. + * May set @mas->node to MAS_NONE. + * + * Return: The entry or %NULL. + */ +void *mas_find_range_rev(struct ma_state *mas, unsigned long min) +{ + void *entry; + + if (mas_find_rev_setup(mas, min, &entry)) + return entry; + + /* Retries on dead nodes handled by mas_prev_slot */ + return mas_prev_slot(mas, min, true); +} +EXPORT_SYMBOL_GPL(mas_find_range_rev); + /** * mas_erase() - Find the range in which index resides and erase the entire * range. --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DE69C77B7D for ; Thu, 18 May 2023 17:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbjERRcW (ORCPT ); Thu, 18 May 2023 13:32:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229801AbjERRcT (ORCPT ); Thu, 18 May 2023 13:32:19 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88E651721 for ; Thu, 18 May 2023 10:31:53 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JQvD026628; Thu, 18 May 2023 14:57:13 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=2YVRakESH/s1ICwCjt2PceIsUR1vzhFGi+kMxu5HLEc=; b=G5Ar9Xc4wZRZ+JDgd9WLGWNeOaRPt8sBmEp8/J/T4KHHswRArG3PiOtcro35uu/Mdw3p L+W97fqR3kg40yd/oMsxLyQIyooMpHe56AFtfX8rlEcUfycYTFBTE3y9PFKFTxyDH7Cl CjLMTk6GEo2RVRbxVfbQ2MWVIrM1qpFNwy/m0lmNMNRWENcW5W7uiX+NqoZ5Y3V8KG08 0EQQqy79Sb25pgVrE9z9muoZPXc+RlCUPnJeT8uYfeS9Haa4wX2dGEBXt3UCHz3oBchW GBLf1FnDmk7W/4O4Q+OxYwuRHeOkUJBQufz3TiUf2RKpL4Obx8ZLz9ZTloBSNxypHNJy kA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxfc2uff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:13 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IEJepY036702; Thu, 18 May 2023 14:57:11 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qmm03w4f7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eRzApWUsXmPv6VbTzVgd+0sdldQnn0LBKiXPdrtbaRcBE521GlS4JPl7LQYxrnRxzn71tE80rd2658JGPjnUXfTKATwGBc4t7kwMZhWyGnpHhuSwKw3y6lEea5gN4zYVhSEHc8x4an8K2NYnkU4EinI4qTABs8UpbiWarPBYFHhVpLit/tD25Q8LdKRJhO+hvwrVv0mvL/EsQZkVEjXArD+d32l5fqDV73vP6PJWiXioTSVxtQ9Emtk8VPO4VdYucSUHJ+XXp6XxuuXc7cnLk0wzS4NVFvBFBHrb5Hb5QDFoW6eD5kNn9PS1bP1n7tvE6aTav/Q/h4+HWoRJpaVmsw== 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=2YVRakESH/s1ICwCjt2PceIsUR1vzhFGi+kMxu5HLEc=; b=ib1nMNbmmL0yfPTXaj1Z9DtQD/3cjuDPSVT9jNYK1lJZ9B9PqucNRZ1Lrj8t3c5gNiE/qZk5AfPNUzxW2scJEgJEZXne6fLLRXa6hi6bK9eHvibTmQe9OKjcib2eGi7svvxkEqQs/7M2CS+A3SwVc0ChA3LgPO0k+xtMhDniI1vjXOVnRxq0Ed6UQwL09gkNwwr6V24p0BgQf1KWirg7tXf5wt+iBkk0NeNb61XFJKTWAT/zFJVk3IIX6DSCOZrmWXyAAdCqGgrLPJF6P6jEeq2n1yU6EGUBq0t6UWol1plknKB2aiX94NfBpHASlyqhOJ45pBfLTWx1HyycvNWQMA== 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=2YVRakESH/s1ICwCjt2PceIsUR1vzhFGi+kMxu5HLEc=; b=teoqPESHr89IHaOWwEAKn9MUNOy8cBPHm4jwYztUyup4INjMYIMlfNxpQ2ZJ2hj4/8HBv1DjBCP80biENEHPgt+LSMnBytgTU7xc37TguJAsMMmFFYAhzz+c0TzsWp6BtPRY1moo5N6eFIeeJaDIWY30nuvaS/oJGJVqCAoEaiQ= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB7261.namprd10.prod.outlook.com (2603:10b6:208:3f6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:09 +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:57:08 +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" , Peng Zhang Subject: [PATCH v4 32/35] maple_tree: Clear up index and last setting in single entry tree Date: Thu, 18 May 2023 10:55:41 -0400 Message-Id: <20230518145544.1722059-33-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0131.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::28) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|IA1PR10MB7261:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ab5f90d-1f66-4183-a940-08db57b0274d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RRtO07/Nhzy++WCs/z/sWpJbwp67XBt6QC8xkfzh3LXdExubo2lrsQmVsE2UNktvvuPm22wliZNLwYX+7x4STrRHSvbHlOkzRkV18EzhvIU4xLhzBFk5s3pa22EPPDyA1K6CAUvqtboHeD+PcKx0n8tol/ZWDDRcyHK6atHgQEzxgmEgbiJ5PNrvXFxT9BGKjBKl2A4biPWU8P+cEIpmXRcl19XlCI27wLQQsSOYjCGAmdKF9OAGUE7CPbZRg2vSh/+chKf1Gwx3k7YKw+tgy3TherpElk5o9XuXzAgHzXfWC84QAh32lZ+EmNDu59alZouKOjB5hDZMG2TmBhdj8mWEgkmh2sS8/GSjkbY4jyVS93QsB1J+oygYxq93rJ4DCuTRglAF/E9icp7tiXcPW0+i7R+r/GRJDWdSnKMq46CurFw3MOKbFjCO71qRCZKuDTjooBS4Whyf8p29rW9cr90LsXZ7yTaJHSeNf4IH2TOrpTjiAtEhD6+YT+cuCGTSs24a4K4oJfzz92IPlIO/6VA5+VDhj1AE3XUm6/MshnVSiWiMSjzGEmhj71n1cD3E 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)(136003)(366004)(346002)(39860400002)(376002)(396003)(451199021)(54906003)(41300700001)(6666004)(316002)(66556008)(66476007)(66946007)(6916009)(4326008)(6486002)(8676002)(8936002)(478600001)(5660300002)(86362001)(26005)(6506007)(6512007)(1076003)(186003)(2906002)(38100700002)(83380400001)(36756003)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/VVapN5yMF50l9fFsQevuqQedAsm3rR70BvILbkl9XkHot4uCk9B+6AUXNcG?= =?us-ascii?Q?61KST5hPGONTxy87acc+mbX6al/eE7IGVhGDVmnQ0VLG6+NFqKP6K5U+/Hl9?= =?us-ascii?Q?1Vn8G0ukZ9YL5J7pMkkhmd6G+Z6V1TaVXM1mMx3JSS1vkjNbW7CJ5qF2uLBF?= =?us-ascii?Q?8VQFhT7DAqJiVaF+TuKZrXhs0X+zJk7dNQKJT2qjDHklMzwbVxLlbiYkVAov?= =?us-ascii?Q?b8AKtQet/ia1NYW8RtA81pz8ZomiQezWE8yQgZ3LcQI17mCv9MZgcHfYm5IT?= =?us-ascii?Q?wS4ae8uZSbLLiWTaC42qzUZXs+UJxeETFIJDyrw4WgRDpvBblTvWoIsF0s/t?= =?us-ascii?Q?1+GGPxnNskcKl5IwwypYIFMyXo2WjNYqpzQzWYaXQyeIyAmQhXea8ieLtvRK?= =?us-ascii?Q?zNieBrMPWK/nO2jhjWjmaHIKbXSKt2V5YqwwNjNuReY5p0deX61HuzhMYOeV?= =?us-ascii?Q?nsHLhEBCf5SyXsp3bXkiIUGYphSM469L21cTCjVjOFPXNIUr1HoMz3/w7ZmB?= =?us-ascii?Q?IxX26aYqOFRHrV2lje16wVPXMSfNjReUEVrUR1oz5g3ZrJrMmIDDREV0yeWw?= =?us-ascii?Q?9iScDhWJ881KkDdWdI6DSC5ijh7sj7c8feKvynrnOVcJaIdGMOV68MtfdwyU?= =?us-ascii?Q?lwTyaSYjH8AK3MU3mc8ssXM97Q0SB9Ax1exxrV4LHmdFatST6xGkCaNOgzkw?= =?us-ascii?Q?qZu+uJTq5tcS4gCmsObqPkVIn5qfrbd8rKKLP+6aqB2SpdJNDGy8UZxOXRal?= =?us-ascii?Q?V4hcrpH6lowC3kk8xUfC1yLb04nUUdkRgY4SRebFggUMIWVKfBGyr9qYZu8s?= =?us-ascii?Q?F6eZeEXqC8PgJnJ3F9qRiuINg+xhHjY1ipincuHjrPjuC15TZln5Bvpf1riF?= =?us-ascii?Q?iFE1JnZUyJ5M0HaHYGnffW9+8mrgc+sh3G1J41wnyUAQAipVDmZhWcVtnNPv?= =?us-ascii?Q?A3UMCniMd/ssPwUiuiReODopJqNn0gysVAcDnSY7XCI5473B7vsB0Tg+gNLb?= =?us-ascii?Q?qeRlzzcwEhc6Zua15MzD6iRicPyvGNLJ/j/iAfrYdUya2S6OaLXX4recfrbP?= =?us-ascii?Q?jPA+VCn4A1KNcyg6J+4eBnFgGNKBdtxKT4tITmrPEqhrMP6qREGKBi9D+L6C?= =?us-ascii?Q?FIYrVN1Qc7g5NcAKW3Q/UWwyR4scSzvvZ41x/DOT8KhB5B8RdHeNxbz6i9je?= =?us-ascii?Q?f5PLxfNSKb3l/r9TwX6CQvCrWmrTwJ5JcZRrYJD+x4VGs5PQwXusYVmWANhI?= =?us-ascii?Q?Nwpqozc5eIoRKjat1aCRX3PzuIdYeewWw9Zas+LJPR00vRsjIgFZz8vdJMW9?= =?us-ascii?Q?80kkhpwwnCgxidZF97F9wFWuLA/PogW1ZMxhwqJP8nwb/ihAa6VyAu0dRjIl?= =?us-ascii?Q?owF254slBJJYNIVtkOlXfy8nQ5ykHSudWQRs0g7AOF0MX6xcRahgo2X1dy6O?= =?us-ascii?Q?1zKTxZj1GvZu0Yvzl0eQVkDBzJmqY1LbH8HTOGuZuVVJRURCsPmfmcEDlQUE?= =?us-ascii?Q?m3yIfWFTaDmTyUu0egu01BMpE7AFbASYwKunWmQKqHmNW7nziY9QryDfJdZ0?= =?us-ascii?Q?rR0NHNgUyRj/dHtVIaMwp0fLHOjfC1QRNrNTrG4Y2vOATzeXW771n1tt4emB?= =?us-ascii?Q?HA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?q+0rTE4w9d79GNjwee0KL/KLLUhoxkJhiiGlqY+VwvR4Sd/GfbVAObm3wAfI?= =?us-ascii?Q?yETDxx8nAzvlRgZiiZesZgAoxcXt/UOFVadV6hTGmiDF+xEI3CymuxSb6d3K?= =?us-ascii?Q?K8reLfCte5+3StiES5/A6hn02Z/Kj8zt8BUkZTd2C910xjuRkOyWF+5N9910?= =?us-ascii?Q?KmVMoQd0nfN3y7TlU+dnQn2k8cER/qwI8mYhabtAhSNBlTJ8REnLIDIRdgu5?= =?us-ascii?Q?4Q1Y+YaIRUHJPNJRn1vEh7jfTVDtPlukMrN/+39eUcQCXDl78U7N7DSiKAwz?= =?us-ascii?Q?lB8zvDptX0IwB8aZBrQXmYOJeAYE4I6jIl6gGDakbR0EHNjHhF6eCOy9bSUr?= =?us-ascii?Q?3cb8ABY+OsYsPhGt+qL3uOyAvBqHe0xVu3gUnw8StCiMeJ0/TcB562YGE0Ls?= =?us-ascii?Q?TfsT8eU+z4+XQZuO/zknci7DbxoLLmmuLM5CQc1Zm4CW08wjblDdJGMWwQcN?= =?us-ascii?Q?qjinKSlCQFkboxA6TdxJapVUM91ljF3/zh5rJFuvdiSo0RFFpSiT8AzwW6qo?= =?us-ascii?Q?10h1ccEFUrjkRoR8MvwG0+WCDgE5v111NumOdaEVWdthJYBq5ywnOpM+uk0X?= =?us-ascii?Q?CDFLkfMEZCsvL4F9L0DPT639cBDZi6WB/N6ajSVMohQiiQYgjTiwG6VkdqYG?= =?us-ascii?Q?kFFy8gcd2oWLhXX+xxLFYAenLlWGTLSTao6ActSYYVqin2o755/sG7mHdhTx?= =?us-ascii?Q?Yk8fifLzoJSzNM/eT2AB5spNPwjj+sajUPrV09aqQuAec4piEllbyZYveDmd?= =?us-ascii?Q?l7LyXrrXGkc28M8w3NflbqXmncri0yjTQOF7K49qNPuPFKT4dOjHGRQF7fBJ?= =?us-ascii?Q?U67sYb2LlUBaG8c4u6NtuHnk9/e0SamT44C8PXilfJO+AGgikhZhIS3aJe4+?= =?us-ascii?Q?JoN0DkxfauXGef0KxWJoa85su/Rpbd+aSpDVB82tgnVbRdDq/tDTsk8SVCf0?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ab5f90d-1f66-4183-a940-08db57b0274d 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:57:08.9360 (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: XSSGbwBLvcdE/glxqAZoH8DR+FTceS1v65A4Blie/sgsNLpyDDLkEMait4NP+KHng5y1K6SZdaWLFphqbejlmA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7261 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 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: -je11Ztu6r8Uiz_XU92f1zpGVMhmsl5F X-Proofpoint-ORIG-GUID: -je11Ztu6r8Uiz_XU92f1zpGVMhmsl5F Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When there is a single entry tree (range of 0-0 pointing to an entry), then ensure the limit is either 0-0 or 1-oo, depending on where the user walks. Ensure the correct node setting as well; either MAS_ROOT or MAS_NONE. Cc: Peng Zhang Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index fe481d4e5e6a..1e70a1b0c6f0 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5022,24 +5022,25 @@ void *mas_walk(struct ma_state *mas) { void *entry; =20 + if (mas_is_none(mas) || mas_is_paused(mas) || mas_is_ptr(mas)) + mas->node =3D MAS_START; retry: entry =3D mas_state_walk(mas); - if (mas_is_start(mas)) + if (mas_is_start(mas)) { goto retry; - - if (mas_is_ptr(mas)) { + } else if (mas_is_none(mas)) { + mas->index =3D 0; + mas->last =3D ULONG_MAX; + } else if (mas_is_ptr(mas)) { if (!mas->index) { mas->last =3D 0; - } else { - mas->index =3D 1; - mas->last =3D ULONG_MAX; + return entry; } - return entry; - } =20 - if (mas_is_none(mas)) { - mas->index =3D 0; + mas->index =3D 1; mas->last =3D ULONG_MAX; + mas->node =3D MAS_NONE; + return NULL; } =20 return entry; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4BCDC77B7A for ; Thu, 18 May 2023 19:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229756AbjERTeJ (ORCPT ); Thu, 18 May 2023 15:34:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjERTeH (ORCPT ); Thu, 18 May 2023 15:34:07 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48056E51 for ; Thu, 18 May 2023 12:34:04 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JD6v018341; Thu, 18 May 2023 14:57:16 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-type : content-transfer-encoding : mime-version; s=corp-2023-03-30; bh=t3fMBW05C58TmvbN+ox7McplGzPRCNLchTHdzirfeJQ=; b=2TxcilNNxO5FOb/4anGBBLZmGIhqjyHWC4D/quif128BapvMb+RRQRr2LCYrmkR4z6rZ Gej2xVeLL8byEAZPqjDJshpVkdDU/9Oj9WZjFF7NmocJ4ji4qy+xrl8icVLnkLXe5HZz 9Ve9w62VEUTfDBhTSPQX5ilyBh+afkHN0XG/HZfR7vKTu/bVKHtEV7VWHnD+pnk0nStG FCcKoUVu0pqhlSXa6fbqNbM0DB+/bXUbPHMeb64fwjyXs/JINslUn7gCyGNxWJ+ZAyZY aTHbZ5tR/ZyVDWGnxwzXdPytX1PZq2mOQA1VaxozPDENKM4kucNKA942v3UKbhMU8Rs+ 8Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:15 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IE0xBg004186; Thu, 18 May 2023 14:57:14 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2042.outbound.protection.outlook.com [104.47.57.42]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3qj10d68rx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BvzBLhA/H9LUphLuIBOIHt0HHB4/Y+aaqD3Xcgy1HPznEhT9ohuTdY7xpzEL4J8Chp/MH8gXK06+Ny3k9C5FHYfy++DVZvywni1wrXN+G6k4UtIPE0/fI+V+K0z5QyvmoAVyHTEM637KGIpzDS7oPPA5MwoWhFYnYmJYvBC2vcJ7o/FuLMqwIOXP0AiP0coNvixuAXB5nuP0by0kZC3vjwPyvGz+1YFDKIoMaYiHQdWpEfainncudkcozn/HQSL1hQtFHE+1e/CP3Gflpue0/8vpHtBcTVdZn0SZQv5LQ4HcYDXpbxIYrGxpZYpNL3WfMwzvqWoKotI4bVGWWn4L2w== 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=t3fMBW05C58TmvbN+ox7McplGzPRCNLchTHdzirfeJQ=; b=czZTgSzlG8XsTkqfOAvcjYoeOuQJUdYqHkeaIsOAcgC/TueA57C3NJOyZnOQ8Qgv/cXiXpkpLTRXK7CSYtcvSB63sOm2QgP6Nqm6s1dA1fbhyAuSmNUH5VkSxGIRVI5Cv8RtMp9Dg+uNRbteVvNAh9UBqcLOUhHmGVqkjQnLEdrIOCBihgMKowEJNVTavjCNzuUT+d9cHEx0vnJE13367A+1FqaEoh4boXt1axyil45VyF0F1GPAZdCpVyJFLmjX4irgTA+m/jM+RFVTa2Hl2TnMpSufgRU1grdHcvC73NVj4rjrlFSM1cj73hW81ukcWMwecSJM26Is/A36ikUbgw== 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=t3fMBW05C58TmvbN+ox7McplGzPRCNLchTHdzirfeJQ=; b=XP2UxOoGOhlachBBxmc5YZI8r1NJgcKugs+RUOChbNXRDw2iyUi80GemrhHlSwr3RBCpojqXLiVtt5ZjeKvlsJ8AM1ldTFp5BaosR99Cf3rzyhXo1td5MfQQDbNvnEDTZ+DwEpglVPmeJc/BuyNcD42lbOUtBYbiVVZpGnzCL2A= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB7261.namprd10.prod.outlook.com (2603:10b6:208:3f6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:11 +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:57:11 +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" Subject: [PATCH v4 33/35] maple_tree: Update testing code for mas_{next,prev,walk} Date: Thu, 18 May 2023 10:55:42 -0400 Message-Id: <20230518145544.1722059-34-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> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0144.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::10) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|IA1PR10MB7261:EE_ X-MS-Office365-Filtering-Correlation-Id: a66dcb6f-8f0b-4464-68b2-08db57b028d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O6ZRT2Vn6Ncz4xwnQD7eyoDNBdveVnnDPP1MnVP/DYGpRvLhRvyPM1DqOxiEIE78qQWaKRI8nmu0+Tje53fT4cLj+2InJlNqzm+YhZPGA8DAFe29JuGrCsy+JkEq+lUqh8cp7ZV8b+eNuQ4JQ83kj5WMF/XupVyCoFiuRhgeFZvOQ+GzInFdy3pMEf7G9MQc8Nl9XXcOqQOhK1DLEcmYjvfpKZKGzy843q9MAwUfwtA3hGr5IC8PRigFljni4RXhwhXm7C/fsy3nY/w8icKdBtsqWeFPSdmLuNfqAp4NcJ5G2CGVIzPr0c19yLVP/EJbzt4GxtSVyoMo4hm3h6BMeDKy92gNKOhDWpqMLuAh+DO9AsAabtf9ioJE3hjSq62REfK5klqIn0mgE7hjH7MfzPGux5yn5MwatrMVGOl9BGrdqRYx9ZAfC5gqguS0acOFhwzFrQ6l1sIRY7XwtCJlpiavJ46Glb71lLP1U+379F/Tlu7OIwo2K/Gsw04rbwe3RgPPJrP4SxKfUc0bjsY4VZ1bXTUt1ry1gJlQzabBfdPWAgpF8X4PmPiVR/aoBzGS 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)(136003)(366004)(346002)(39860400002)(376002)(396003)(451199021)(41300700001)(6666004)(316002)(66556008)(66476007)(66946007)(6916009)(4326008)(6486002)(8676002)(8936002)(478600001)(5660300002)(107886003)(86362001)(26005)(6506007)(15650500001)(6512007)(1076003)(30864003)(186003)(2906002)(38100700002)(83380400001)(36756003)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VHJFN2ZZV0dsMzN3Znpkdmx1THkwdkI0VklrQm95dXY0Mi8xY2ZONytpQUhC?= =?utf-8?B?TFFQeGp3NjgzNDV6YkJSSTFpUUNmT256bktLdHlhOTBlalVPNHJmbHlYd1gz?= =?utf-8?B?c2VYK2FvZ3dFRTIxb3RCNWtEa1VSQlpPaVdWbWgvOHdmNzlzR1pONG4wZ1dD?= =?utf-8?B?UlFnSVovV0lJbWI1R2FFYmFOckVtc3lyTTRka0l0VW8yUmFYR0pCOXpSL003?= =?utf-8?B?TzRMTEk4S3RGZkdUeEJoVEJLcmk2U1RtOC9YRjZVZ0xMcnFQZHFnVTFCQ1J6?= =?utf-8?B?SWZwY2hvQk5DSHBSYi8xSi9Qd0J3MDZFSEd4ejNnN1J0STh3UElOWUNwNFFM?= =?utf-8?B?ZHZiZFR4V0xYdFFYNjRtU3JjbXBpQVJud0dWaldWd0lXaFVyTEJTRXhkUjcw?= =?utf-8?B?OVhFYkNldkc2cUhTcGQ4dEIvZ0o3VThTaU5FUytMeStXNmRNTFM4bFZxVyt3?= =?utf-8?B?M25hM0p6U2ZNcFUxUUVCcVZqMkltNTg0M0pmMlo1d2wxLzdDZVhwZ3Nkd3pN?= =?utf-8?B?YlF5dmgvSkIzN2tHN0dwbDhPelJvcERkZU5ncXpzSzd0dGEyME5BdWdxZ3FD?= =?utf-8?B?Y1plK1hGQmVlVFlKUFJQZ2p0L0lrM2dCd0tKRW5GSGJzUlhoSnJMVFQ0RFhB?= =?utf-8?B?eGhQMTdYWis4alpxUEkvZm9aNjR5QTA1Zk4zM08wSGFHc1gxOHZ0RUlWVS94?= =?utf-8?B?UTFsSEQwanNVZWdWVWFld2hOV2Z0RXdTWUdlOGkxc0NLREdVY3NxSjBoUDJM?= =?utf-8?B?WlloWUs1OWQxUGNRMm91Sk1pZWJoaS96eVphQ1k2bzVFQU1xUGxZRHlCd0J0?= =?utf-8?B?OXUwaXUraGNUMGF6OFFwYnEwZHF4RnhJVW1DQmxkdnlHTEh0bVVLZ01qMHlN?= =?utf-8?B?YlJjRmFhWGpCYUJJS3lvN1A0Nlo3MlA4T3M3ZjUxVDBNZ01RU0g5dXphdDMy?= =?utf-8?B?TU14dCtFSnI4RDJES1NjNnRnMEtWcmV2UTRYVXFadVhKWVAxYThuYmI4OFA4?= =?utf-8?B?d0FiVUVrZGQ3Y3poSnQrSno4Q3lJdWI2ZW1pMDFscHZhQnlMZnFZT1lSUGFa?= =?utf-8?B?Q0EyU2k0ei9lWUV0dkFGS2dsQUlHZThmd2xhbTlSUjY1aTRHdGozVndCNzlO?= =?utf-8?B?MXNhNm0wZlZSQ0FiTnkwdjlCY08waitEbWFsSnptY3BuSk5RWllqWEJFejhC?= =?utf-8?B?ZUFFNDBlNXFicjZydWducWEvVUVCSFFjeEZwaHB6cC9GWjgrd3lFOWFWQU5X?= =?utf-8?B?SHlBODZ0UmV2Z0sxVkltMCtWYXZOOGlJdGF0eEJhdmltU3VpZDRrZWt1bVpk?= =?utf-8?B?eVBVK0JSOWF5akQyWDRuSFJ3QnBlK0ZsNmhxY2liU3hJRmxmbFVKSFVSRDdX?= =?utf-8?B?eW11M2M4RkgybStycmxxMS9rUFhNVDJiVmQwVE90VlVyZEkrS2FZQkhKY0k5?= =?utf-8?B?dlAyWjlhQVhhYndTY1B6Ky9qdDlnQTV2bGNOLzJrUGRaUlZhNzRhd014UjZW?= =?utf-8?B?cHpoMzg1andiLzFDMUJ5UUNnRk1SZ2JLR0RSVlFlVjNRbDRGSGF0bmJ4ZmRF?= =?utf-8?B?a2VvaTRKQmt4YkhRcEFPRzh2bGZidWt1cElqcEthdnR1b3NGdTBoQ3BhRml1?= =?utf-8?B?UEd1V2JWUzQ2ZlRteThKdVkza3o1cXRQdlZxRTRLd1JMK2JCUkp4aDY5SUZH?= =?utf-8?B?cVdobERsVWJnWWJ2S3EyRm8zQWFEdGh4dWtUNEZ6SlBIWVg2b3dUUU04K3Bq?= =?utf-8?B?WHdzTlFRL1E4UTFmd3ExelFoelVYTldTTFdCb0Nhc3craGdzaytUT2wvY3dj?= =?utf-8?B?c25ybkZaaDhnR1g1alFMK1lpSlVQaWdYUWtsekU4c200S3JaaE5tYjBTVml4?= =?utf-8?B?ZDRWYkZjQkl3TmFHcUVWMTJUZk84SkxCWENpbDczQ1doOVUxc0NQbzBQRmxj?= =?utf-8?B?VG9FQ0xiWFdyS0Q2MThlWExOUXQvSUFLZFN2SkJPcUlvc2lheVN4MkpicGJS?= =?utf-8?B?SW9lMXYvVk01LzdTT1hQQjFNREMrNlZpQlVkTmp0QW9rMG5aZzd5TkZreUVR?= =?utf-8?B?NndrcDQ3RHh1Yk1JcXV2VWJkcVZzdHh4cGJ3RzMwcUlpZVpFM0ppc2QzTU5k?= =?utf-8?B?cTNiMnhRM29nMHM1UytZREZLMDFwSWpBNnhQRUZQUFZlZ25RdEFBa0lkNW5p?= =?utf-8?B?SWc9PQ==?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 0L2TgwAHgybs/Y/UFHbw1j0VIjPpr1/n4WJ5cUXH93go5Z7BOdMS+/G2kcKMQaAzj5nnTtMXs0Qq4XjZKP+2ek83l+/feuHicUFIwhoT8ngGVQfbUk/K9E7nsf3DPyhOFG8LB9d6BKfkQ9quzr5TRjJLrvLAnGe7IjIVPbgh6sAmfBD/TNWipjrXz55JHxYtdxq42qbqdghh/yDF1W4k/qwF4yD1zgXJBnXswrAnHmKeHmVz8fXbQs2QOaSGopas+cnbOvPGOssiivl5ngM4IzHn+rdS1oAw5GkXJBNmFkwlZtmFX7/b/AUgZh6dDFGBme1F9JBzCMVZNqT4kdgHS/bPYA5PFjm4EqicdM1pxeeJreVK5vEWbdc7FvA32hH+zLf1/e52IXSOTJazcJhlxW0gcC+eyFLL/9aZKgxvntcAgBLwIZ8PYBFygX3tu0gY7E0OnlsCaXX3m/Hu9BKanUEBJ65fo2zI+jvNfLDThzxfnqa1dv0Vy8NB+ayRyolcEollmrsh7Mauoxe9ShzUxBM9T/VTauT12LDBzT4utwBfDgpA4lWgJKaciP49EQZNoYyzWD49v5Zvvn6F3gmyv9riT7ZKnPnuuF8yCv8r8S1e1xSTkRgY02PEIKw3GaOiOpmGny5vP4ykVCFMacPzUfjuhmVcD/v0eTSKpRwGOVswqSCwOsMwzI6ZIy+DZbrEH8KcYwES2avm8sG+esbLGTUycsq65ieM2XhUVupuDwf1i/pYaWHqec1xQkSnot6MYtrh7LQ9r9StIZF5ndY2JbLdS1PbeRi/hDC501nD2Dwb4BXwNn7m0jGWDsUpDM7vqTS3uhZbCwYwYm/6WeO9kKeYTEK8OXUqEni9cJDML75nACDlTdIowydfvnmFvbNVfYNnNkAQXRN4xJ0uV8mrPA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a66dcb6f-8f0b-4464-68b2-08db57b028d9 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:57:11.5731 (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: Dzqf9NEvvBGi5iI4hfz991/BDahs+DoOgyNnlu8ZeSlIRhAlRWMvl6iVkU+ihnftA8ubIZy4uHn3V+E1vQMBDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7261 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 suspectscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: Rtr1LnFISVkvoALC5cIXo2bb-HdjRorr X-Proofpoint-ORIG-GUID: Rtr1LnFISVkvoALC5cIXo2bb-HdjRorr Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the functions have changed the limits, update the testing of the maple tree to test these new settings. Signed-off-by: Liam R. Howlett --- lib/test_maple_tree.c | 638 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 633 insertions(+), 5 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index d295fdee2fae..9939be34e516 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -1322,6 +1322,7 @@ static noinline void __init check_root_expand(struct = maple_tree *mt) mas_lock(&mas); mas_set(&mas, 3); ptr =3D mas_walk(&mas); + MT_BUG_ON(mt, mas.index !=3D 0); MT_BUG_ON(mt, ptr !=3D NULL); MT_BUG_ON(mt, mas.index !=3D 0); MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); @@ -1391,7 +1392,7 @@ static noinline void __init check_root_expand(struct = maple_tree *mt) mas_store_gfp(&mas, ptr, GFP_KERNEL); ptr =3D mas_next(&mas, ULONG_MAX); MT_BUG_ON(mt, ptr !=3D NULL); - MT_BUG_ON(mt, (mas.index !=3D 1) && (mas.last !=3D ULONG_MAX)); + MT_BUG_ON(mt, (mas.index !=3D ULONG_MAX) && (mas.last !=3D ULONG_MAX)); =20 mas_set(&mas, 1); ptr =3D mas_prev(&mas, 0); @@ -1800,7 +1801,6 @@ static noinline void __init check_iteration(struct ma= ple_tree *mt) mas.index =3D 760; mas.last =3D 765; mas_store(&mas, val); - mas_next(&mas, ULONG_MAX); } i++; } @@ -2011,7 +2011,7 @@ static noinline void __init next_prev_test(struct map= le_tree *mt) =20 val =3D mas_next(&mas, ULONG_MAX); MT_BUG_ON(mt, val !=3D NULL); - MT_BUG_ON(mt, mas.index !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.index !=3D 0x7d6); MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); =20 val =3D mas_prev(&mas, 0); @@ -2035,7 +2035,8 @@ static noinline void __init next_prev_test(struct map= le_tree *mt) val =3D mas_prev(&mas, 0); MT_BUG_ON(mt, val !=3D NULL); MT_BUG_ON(mt, mas.index !=3D 0); - MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 5); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); =20 mas.index =3D 0; mas.last =3D 5; @@ -2047,7 +2048,7 @@ static noinline void __init next_prev_test(struct map= le_tree *mt) val =3D mas_prev(&mas, 0); MT_BUG_ON(mt, val !=3D NULL); MT_BUG_ON(mt, mas.index !=3D 0); - MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 9); mas_unlock(&mas); =20 mtree_destroy(mt); @@ -2750,6 +2751,629 @@ static noinline void __init check_empty_area_fill(s= truct maple_tree *mt) mt_set_non_kernel(0); } =20 +/* + * Check MAS_START, MAS_PAUSE, active (implied), and MAS_NONE transitions. + * + * The table below shows the single entry tree (0-0 pointer) and normal tr= ee + * with nodes. + * + * Function ENTRY Start Result index & last + * =E2=94=AC =E2=94=AC =E2=94=AC =E2=94= =AC =E2=94=AC + * =E2=94=82 =E2=94=82 =E2=94=82 =E2=94= =82 =E2=94=94=E2=94=80 the final range + * =E2=94=82 =E2=94=82 =E2=94=82 =E2=94= =94=E2=94=80 The node value after execution + * =E2=94=82 =E2=94=82 =E2=94=94=E2=94=80 The node valu= e before execution + * =E2=94=82 =E2=94=94=E2=94=80 If the entry exists or does n= ot exists (DNE) + * =E2=94=94=E2=94=80 The function name + * + * Function ENTRY Start Result index & last + * mas_next() + * - after last + * Single entry tree at 0-0 + * ------------------------ + * DNE MAS_START MAS_NONE 1 - oo + * DNE MAS_PAUSE MAS_NONE 1 - oo + * DNE MAS_ROOT MAS_NONE 1 - oo + * when index =3D 0 + * DNE MAS_NONE MAS_ROOT 0 + * when index > 0 + * DNE MAS_NONE MAS_NONE 1 - oo + * + * Normal tree + * ----------- + * exists MAS_START active range + * DNE MAS_START active set to last range + * exists MAS_PAUSE active range + * DNE MAS_PAUSE active set to last range + * exists MAS_NONE active range + * exists active active range + * DNE active active set to last range + * + * Function ENTRY Start Result index & last + * mas_prev() + * - before index + * Single entry tree at 0-0 + * ------------------------ + * if index > 0 + * exists MAS_START MAS_ROOT 0 + * exists MAS_PAUSE MAS_ROOT 0 + * exists MAS_NONE MAS_ROOT 0 + * + * if index =3D=3D 0 + * DNE MAS_START MAS_NONE 0 + * DNE MAS_PAUSE MAS_NONE 0 + * DNE MAS_NONE MAS_NONE 0 + * DNE MAS_ROOT MAS_NONE 0 + * + * Normal tree + * ----------- + * exists MAS_START active range + * DNE MAS_START active set to min + * exists MAS_PAUSE active range + * DNE MAS_PAUSE active set to min + * exists MAS_NONE active range + * DNE MAS_NONE MAS_NONE set to min + * any MAS_ROOT MAS_NONE 0 + * exists active active range + * DNE active active last range + * + * Function ENTRY Start Result index & last + * mas_find() + * - at index or next + * Single entry tree at 0-0 + * ------------------------ + * if index > 0 + * DNE MAS_START MAS_NONE 0 + * DNE MAS_PAUSE MAS_NONE 0 + * DNE MAS_ROOT MAS_NONE 0 + * DNE MAS_NONE MAS_NONE 0 + * if index =3D=3D 0 + * exists MAS_START MAS_ROOT 0 + * exists MAS_PAUSE MAS_ROOT 0 + * exists MAS_NONE MAS_ROOT 0 + * + * Normal tree + * ----------- + * exists MAS_START active range + * DNE MAS_START active set to max + * exists MAS_PAUSE active range + * DNE MAS_PAUSE active set to max + * exists MAS_NONE active range + * exists active active range + * DNE active active last range (max < last) + * + * Function ENTRY Start Result index & last + * mas_find_rev() + * - at index or before + * Single entry tree at 0-0 + * ------------------------ + * if index > 0 + * exists MAS_START MAS_ROOT 0 + * exists MAS_PAUSE MAS_ROOT 0 + * exists MAS_NONE MAS_ROOT 0 + * if index =3D=3D 0 + * DNE MAS_START MAS_NONE 0 + * DNE MAS_PAUSE MAS_NONE 0 + * DNE MAS_NONE MAS_NONE 0 + * DNE MAS_ROOT MAS_NONE 0 + * + * Normal tree + * ----------- + * exists MAS_START active range + * DNE MAS_START active set to min + * exists MAS_PAUSE active range + * DNE MAS_PAUSE active set to min + * exists MAS_NONE active range + * exists active active range + * DNE active active last range (min > index) + * + * Function ENTRY Start Result index & last + * mas_walk() + * - Look up index + * Single entry tree at 0-0 + * ------------------------ + * if index > 0 + * DNE MAS_START MAS_ROOT 1 - oo + * DNE MAS_PAUSE MAS_ROOT 1 - oo + * DNE MAS_NONE MAS_ROOT 1 - oo + * DNE MAS_ROOT MAS_ROOT 1 - oo + * if index =3D=3D 0 + * exists MAS_START MAS_ROOT 0 + * exists MAS_PAUSE MAS_ROOT 0 + * exists MAS_NONE MAS_ROOT 0 + * exists MAS_ROOT MAS_ROOT 0 + * + * Normal tree + * ----------- + * exists MAS_START active range + * DNE MAS_START active range of NULL + * exists MAS_PAUSE active range + * DNE MAS_PAUSE active range of NULL + * exists MAS_NONE active range + * DNE MAS_NONE active range of NULL + * exists active active range + * DNE active active range of NULL + */ + +#define mas_active(x) (((x).node !=3D MAS_ROOT) && \ + ((x).node !=3D MAS_START) && \ + ((x).node !=3D MAS_PAUSE) && \ + ((x).node !=3D MAS_NONE)) +static noinline void __init check_state_handling(struct maple_tree *mt) +{ + MA_STATE(mas, mt, 0, 0); + void *entry, *ptr =3D (void *) 0x1234500; + void *ptr2 =3D &ptr; + void *ptr3 =3D &ptr2; + + /* Check MAS_ROOT First */ + mtree_store_range(mt, 0, 0, ptr, GFP_KERNEL); + + mas_lock(&mas); + /* prev: Start -> none */ + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* prev: Start -> root */ + mas_set(&mas, 10); + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* prev: pause -> root */ + mas_set(&mas, 10); + mas_pause(&mas); + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* next: start -> none */ + mas_set(&mas, 0); + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* next: start -> none */ + mas_set(&mas, 10); + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find: start -> root */ + mas_set(&mas, 0); + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* find: root -> none */ + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find: none -> none */ + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find: start -> none */ + mas_set(&mas, 10); + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find_rev: none -> root */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* find_rev: start -> root */ + mas_set(&mas, 0); + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* find_rev: root -> none */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find_rev: none -> none */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* find_rev: start -> root */ + mas_set(&mas, 10); + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* walk: start -> none */ + mas_set(&mas, 10); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* walk: pause -> none*/ + mas_set(&mas, 10); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* walk: none -> none */ + mas.index =3D mas.last =3D 10; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* walk: none -> none */ + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* walk: start -> root */ + mas_set(&mas, 0); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* walk: pause -> root */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* walk: none -> root */ + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* walk: root -> root */ + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + /* walk: root -> none */ + mas_set(&mas, 10); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 1); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, mas.node !=3D MAS_NONE); + + /* walk: none -> root */ + mas.index =3D mas.last =3D 0; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0); + MT_BUG_ON(mt, mas.node !=3D MAS_ROOT); + + mas_unlock(&mas); + + /* Check when there is an actual node */ + mtree_store_range(mt, 0, 0, NULL, GFP_KERNEL); + mtree_store_range(mt, 0x1000, 0x1500, ptr, GFP_KERNEL); + mtree_store_range(mt, 0x2000, 0x2500, ptr2, GFP_KERNEL); + mtree_store_range(mt, 0x3000, 0x3500, ptr3, GFP_KERNEL); + + mas_lock(&mas); + + /* next: start ->active */ + mas_set(&mas, 0); + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next: pause ->active */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next: none ->active */ + mas.index =3D mas.last =3D 0; + mas.offset =3D 0; + mas.node =3D MAS_NONE; + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next:active ->active */ + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr2); + MT_BUG_ON(mt, mas.index !=3D 0x2000); + MT_BUG_ON(mt, mas.last !=3D 0x2500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next:active -> active out of range*/ + entry =3D mas_next(&mas, 0x2999); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x2501); + MT_BUG_ON(mt, mas.last !=3D 0x2fff); + MT_BUG_ON(mt, !mas_active(mas)); + + /* Continue after out of range*/ + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr3); + MT_BUG_ON(mt, mas.index !=3D 0x3000); + MT_BUG_ON(mt, mas.last !=3D 0x3500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next:active -> active out of range*/ + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x3501); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, !mas_active(mas)); + + /* next: none -> active, skip value at location */ + mas_set(&mas, 0); + entry =3D mas_next(&mas, ULONG_MAX); + mas.node =3D MAS_NONE; + mas.offset =3D 0; + entry =3D mas_next(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr2); + MT_BUG_ON(mt, mas.index !=3D 0x2000); + MT_BUG_ON(mt, mas.last !=3D 0x2500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* prev:active ->active */ + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* prev:active -> active out of range*/ + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0x0FFF); + MT_BUG_ON(mt, !mas_active(mas)); + + /* prev: pause ->active */ + mas_set(&mas, 0x3600); + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr3); + mas_pause(&mas); + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr2); + MT_BUG_ON(mt, mas.index !=3D 0x2000); + MT_BUG_ON(mt, mas.last !=3D 0x2500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* prev:active -> active out of range*/ + entry =3D mas_prev(&mas, 0x1600); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x1501); + MT_BUG_ON(mt, mas.last !=3D 0x1FFF); + MT_BUG_ON(mt, !mas_active(mas)); + + /* prev: active ->active, continue*/ + entry =3D mas_prev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find: start ->active */ + mas_set(&mas, 0); + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find: pause ->active */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find: start ->active on value */; + mas_set(&mas, 1200); + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find:active ->active */ + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D ptr2); + MT_BUG_ON(mt, mas.index !=3D 0x2000); + MT_BUG_ON(mt, mas.last !=3D 0x2500); + MT_BUG_ON(mt, !mas_active(mas)); + + + /* find:active -> active (NULL)*/ + entry =3D mas_find(&mas, 0x2700); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x2501); + MT_BUG_ON(mt, mas.last !=3D 0x2FFF); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find: none ->active */ + entry =3D mas_find(&mas, 0x5000); + MT_BUG_ON(mt, entry !=3D ptr3); + MT_BUG_ON(mt, mas.index !=3D 0x3000); + MT_BUG_ON(mt, mas.last !=3D 0x3500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find:active -> active (NULL) end*/ + entry =3D mas_find(&mas, ULONG_MAX); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x3501); + MT_BUG_ON(mt, mas.last !=3D ULONG_MAX); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find_rev: active (END) ->active */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr3); + MT_BUG_ON(mt, mas.index !=3D 0x3000); + MT_BUG_ON(mt, mas.last !=3D 0x3500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find_rev:active ->active */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr2); + MT_BUG_ON(mt, mas.index !=3D 0x2000); + MT_BUG_ON(mt, mas.last !=3D 0x2500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find_rev: pause ->active */ + mas_pause(&mas); + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find_rev:active -> active */ + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0); + MT_BUG_ON(mt, mas.last !=3D 0x0FFF); + MT_BUG_ON(mt, !mas_active(mas)); + + /* find_rev: start ->active */ + mas_set(&mas, 0x1200); + entry =3D mas_find_rev(&mas, 0); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk start ->active */ + mas_set(&mas, 0x1200); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk start ->active */ + mas_set(&mas, 0x1600); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x1501); + MT_BUG_ON(mt, mas.last !=3D 0x1fff); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk pause ->active */ + mas_set(&mas, 0x1200); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk pause -> active */ + mas_set(&mas, 0x1600); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x1501); + MT_BUG_ON(mt, mas.last !=3D 0x1fff); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk none -> active */ + mas_set(&mas, 0x1200); + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk none -> active */ + mas_set(&mas, 0x1600); + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x1501); + MT_BUG_ON(mt, mas.last !=3D 0x1fff); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk active -> active */ + mas.index =3D 0x1200; + mas.last =3D 0x1200; + mas.offset =3D 0; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D ptr); + MT_BUG_ON(mt, mas.index !=3D 0x1000); + MT_BUG_ON(mt, mas.last !=3D 0x1500); + MT_BUG_ON(mt, !mas_active(mas)); + + /* mas_walk active -> active */ + mas.index =3D 0x1600; + mas.last =3D 0x1600; + entry =3D mas_walk(&mas); + MT_BUG_ON(mt, entry !=3D NULL); + MT_BUG_ON(mt, mas.index !=3D 0x1501); + MT_BUG_ON(mt, mas.last !=3D 0x1fff); + MT_BUG_ON(mt, !mas_active(mas)); + + mas_unlock(&mas); +} + static DEFINE_MTREE(tree); static int __init maple_tree_seed(void) { @@ -3011,6 +3635,10 @@ static int __init maple_tree_seed(void) mtree_destroy(&tree); =20 =20 + mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); + check_state_handling(&tree); + mtree_destroy(&tree); + #if defined(BENCH) skip: #endif --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37D99C7EE23 for ; Thu, 18 May 2023 16:47:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbjERQrl (ORCPT ); Thu, 18 May 2023 12:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbjERQri (ORCPT ); Thu, 18 May 2023 12:47:38 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAB5C19A for ; Thu, 18 May 2023 09:47:34 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JJW8026300; Thu, 18 May 2023 14:57:17 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=H6a0kxqv5ze3H6E5XtAeQKjpADPWF+IvHJic3aVsz5Q=; b=J3HDBfzob2tK9yqH3mws7MMU3prpSynvoXx4DJen3IvjFn7kVgO/461unJYAOELES3WP aY4mJOe5OYQn8stj7IAffLqzi/ZGsHA15Ynw6WrUAif9q/ev4S5OqUk1Pjfooj3Ajx3M SCmJ9drjBEAiPheL1tNOZiQtWA/3HbrDlZXTYa8X+Wt1HF3vwKnChEQQdbdBob89jaPT axtRDJY3xAEzmXNADnqNEnOykGbBjm6cG5jYpGVQlgaSWBdVmJPq8aUH0Lq88XJXhjJR T1OGtiUjVyWnDrs0A7GwCNurC5XQ2GL6BZHUzXT35Y59G5FHCsQI05U7IbonupTmRJVo OA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmxfc2ufu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:16 +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 34IEEv2N034079; Thu, 18 May 2023 14:57:16 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj107c9p0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QMtr+9YqJtKd+8MoJ7JIoBsF+hjcFTUYqtTc+Nv57NhWamhOBYcfviG/Ump9v4V4N8dT7pfUKqvZIPIFUdOrCK535dDuVV4kqdv0Dla9DwULhejGADiLV7crz03yzxeC9IJden5NawDUynZ6pCMI9kbT9GyCX7tunjC7NGlCN7NQO5V61dgeqB2SVx8hIqyjgOQV3gRSeWTSdMHOYyCUu491IIaNL1mO/sqCEKvNbOTpnmMcPnLY8qG/HehI/6tMw5CNrAOfwug+E8zGvHiDuRV+mbt2mi5a1anQfMf4O87znAaSupO4ktzKyU31taRjS7Kz+6U10rV+dnpQwMuSQw== 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=H6a0kxqv5ze3H6E5XtAeQKjpADPWF+IvHJic3aVsz5Q=; b=U0+HZEa+UG5ykpZeBbcV8VzlewYJjNo6n22U7wbQmBDYKeQwIKcsqzJL/khCUVwB/R63fwkgmQt2p4hfOz4m0PBSk/tTTjXQ3PdEWMir2wimHpbwaRkBm5px+L5EgRgU94T0mGsAz3QZ1nNR+YgBkadRNcGLaaiAk4DyWlldMHUXScP9YyTJwJogvT520M6KcQ9J4CRLd7JJfsDOF5lFxiVdLshbp6FqHQqTraz6VP+loJLX3yNhA4iXtp5DsTTvTWGBt8ikj3SikwlYnc2s1udJLz8lENFAHThphI0D5NNWRqbU6G/LrIfVnGcCWg1iV0cHkkc6/dg+i4uMgmSsrw== 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=H6a0kxqv5ze3H6E5XtAeQKjpADPWF+IvHJic3aVsz5Q=; b=LyCFD16lus7PXuT+Bk1FuLyhB0gYUWjhiyLXmVCf+3CkSstl83gHp4S7+9sLS6CeIOjxDaoNs2DZ1rvXKG6/Qa5Wsr6dXpYb9FrUqWKWg2Fe4KbMLJUsDxEF86T9+myqSAHA/pye39VXHHWlx2m5gnWFhG8kv01SryIqRAso10o= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB7261.namprd10.prod.outlook.com (2603:10b6:208:3f6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:14 +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:57:14 +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" Subject: [PATCH v4 34/35] mm: Add vma_iter_{next,prev}_range() to vma iterator Date: Thu, 18 May 2023 10:55:43 -0400 Message-Id: <20230518145544.1722059-35-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0409.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10b::14) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|IA1PR10MB7261:EE_ X-MS-Office365-Filtering-Correlation-Id: bfe4fdd6-4a93-4f83-9ef2-08db57b02a5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qnwz1px650VVmUFvKr6kvKKBxeziT05w1+GzwQK9Hv1Iml/gLxqsJClfZjWSnGW+M1WmncoNgkAO+ddVHG259hh8Smf3zIlJDpkgsR3cm5rwg6q7kaX09s8GQjR4v1KnmGV1KgxAyl0zqN1XtBGRqNGp50jHMeWEtufw3NIpq6N1Dceni8X6pLpXOwXiQ6MjarFHVBOOPE5YIsh+/U7ldxdQHkeDth1G3rwo4nQoHOPs6Ga4CRMq7dqqCcZVphCY/g4978llGbaTYquBs7rF66ociJgIkkk5xXK1tAPLRUOSFEhbkCgGTc/K95kwycsJawHF2B6qkqKXPKhGmtkwt29LeGV/pT69NEvvJLaO9E88pUzl2GARuxNdrvlsAWBTFa249toeYeHK9tg9JjEtNyK2M6Qj0r9CdbtpowWnTggi52kFYI3/UQJd6WPS0NfKotyMHruVXAms4K8jhv3xDeeBoIaXiUPiJyzy0mDyWlZLKLPTMg7fW1ZbX6QUQaLof6C4bwegwbRzoYUEMAnV3Y7cxBrZKEj3F0OWyyOxqBd3C9PXzY2FJPx3mzZK5iBU 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)(136003)(366004)(346002)(39860400002)(376002)(396003)(451199021)(41300700001)(6666004)(316002)(66556008)(66476007)(66946007)(6916009)(4326008)(6486002)(8676002)(8936002)(478600001)(5660300002)(107886003)(86362001)(26005)(6506007)(6512007)(1076003)(186003)(2906002)(38100700002)(36756003)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p70Kk2AQHvE37DAeXDjCCXTqvIPGfvmcVv9IjqnwuPIEjzJO/tgBvHE1jk2b?= =?us-ascii?Q?Y1zhmqLOBDuxXirqi3JeVBe1/yow0IfFhCpxfTzNAfuItr0gA+rNOLh3p+0X?= =?us-ascii?Q?GnOAfqzcBz7nLKw3uQMZw3BNiHRyhwCYftOk0v64sNNKRkt7oajB3t1QE8hh?= =?us-ascii?Q?ZifpJYP5Xt7etlaBzpd9eshaZsBxzaUmePkP46i9Pm7a7w2GZYVZNCEohnP9?= =?us-ascii?Q?xqQ/+mMh+mWMSnDWAIraiyV6RahnjvmYJdDCMasrbLDVNcQLCNW7TwbxX90S?= =?us-ascii?Q?oglQwKCATDC02kwnj486wBR/RR0fqS3CJILbjqNwMhiBrydShen3s66wYi08?= =?us-ascii?Q?aR0OEmKlWhVP9JjBYDSQx5JcD0sTOmOJ/wJTWTgo2YzRmDHIX0VEbzoNhBJR?= =?us-ascii?Q?V/sPsep8NLpQq6TojuJFwt1kTjfnUWosOcvybMJ6bS10HqKm6z4Vh3/hVhSc?= =?us-ascii?Q?yBtFidQx4Aa5g/ieGA2sGQQE22b+EPHKdgzfXShk66Tfjx9khL6UrlV938/m?= =?us-ascii?Q?4hZFgrVjPABZEnwQ4146pLWVYhmeeFjI3JufkkI31JrBXbuvQbtyJ7UutPdF?= =?us-ascii?Q?qUFSGvg5JvPRPMDJxros81X9Qot+6lybdoJwE1vlnzqhLlVGM6pOEDSTFvtw?= =?us-ascii?Q?9320r4ncFflCKFX/gMujI0dCojW9AKku82cPdSxVHkEuZ5ExC/EdDVk69HYX?= =?us-ascii?Q?z4+w2oMdX6688jzR2f3XeOB5QjNQGgkchDLGWquOQonLhAQdWznXuqn1W6CQ?= =?us-ascii?Q?fCSJBn5CJNHhHT0hnpGIa6hbiMKuKBuDz4BP7jP+jlogz1kqduhmeqflYOv7?= =?us-ascii?Q?lmGrMkjhxE8U/fQBLZ5uhhp/0Asz6vESUih4jGDGsKoMqSw3KfUniJ1HFnnH?= =?us-ascii?Q?QnQmafG6QP44f20ei2tNgmzsmFooBZOL8hIu4BbP9qEUP4Ld4cZ7ENSw8yBd?= =?us-ascii?Q?kQUHgyLbrHNNLdUlGACM5VQgGcK85NKZ/YGXdAdmF2OGkdxrj3X0meozqzmO?= =?us-ascii?Q?KpLOHbUaDGLJ9jLGgrYHBZUP24Ir6foABtrhsKCn00iVdQizp+yz0sk5SZjc?= =?us-ascii?Q?W1L95fUD0Xd7TfgZ5EXpfl38f0g06duBcsWhmxQhxWFcR+ny6UBtWS1D0LB0?= =?us-ascii?Q?QRw4L9YbeT+mdKensGMTBezokw6mMAT31NSYz8pOPrSJzSjN/FSOR0vwNtTV?= =?us-ascii?Q?uewYniKt6AElBfhZHTW9SPBWQjq4fh+Vz4Y7fK9i+ToFlyXMLhwNTMrEZPkb?= =?us-ascii?Q?WYTGU0Gjf6h6wL7Fy9MAiqaDU5HA6mQPl/gjVcwEqMuNgcZAf596mi/YiOHA?= =?us-ascii?Q?utiYiGBXD+A6RWmN3WHSPsdc6dFJeIT9GXGQozfccytYcqd0PJ8bQl+UKXJc?= =?us-ascii?Q?UJNr9SdnNUYs1bDE5ofc1jqPp4JkYbwbvcXOJLGYJZVXaGDGKU9tyvvYMySH?= =?us-ascii?Q?glanekwvW801EOuDDpM4fjPDY0E9sxuYFCSt3OgHEKzurDcj2WxiBhTbTUNH?= =?us-ascii?Q?PBaOPlNEnjCsS06zAeEh5YGWAPwyCYwJ1dz7wmstJiq2eYAezP6iHk7qep+F?= =?us-ascii?Q?mqYpjzn4/s1WCmP7IzjyBgbKLpdfXgbIQOZcA14eSrmnZm0hdBIRGJWSmtKM?= =?us-ascii?Q?fQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: d2Kv/YMUu9qXkQ1WCLDn37cJnm3R45v4LaTIWBYmOF0fW4U5RcOAzrFc14UOAzDqURWyh7RQC0mweKX8Hnmw7nOWtd3rckBAjhQMkCnezhGzIoCnZ0PsE6xULP3x43ud7hmXsrT31Y5GhpmaEy1nhNfkJ1zdjBY+PUgghLYQ4+j1Xekb3+8g3sPcz32ld7ZCR3259oxdMWWxXIwNinKya1ixsyfF37z+gjU2A+pj0WASn18+HQ2tUgVUASns+8k8IDmBok1OmuMmtMhrU/z5SDDdJeyicVMCvNWT/7tKz535JgNLQ2MDLFX61XCqNQO2pQLAFRxJF5YTWjTpEHZbB1bmAaeVAf5U529DHh3fPJGF1JtEp5FiDiHOyZBvnAfm3aPqYq8njywi/843RLBGPDqWQya7Va61JWG2Tq3nGoRqAWkaDgrCmxjNU/vgwgiv+gVoEZci8CCMJjNIRBVaQsEXL9ET11GnDS8OkZB8W52WQVEQoVfGgeLPqdt+AwUqDBG0nJ8bds/dUpRqwM/pL+M+52hvbxnmPUky4+1Qw5NpETjknNr8xmofZIHIkZpriTUo1nQEX80gVbGW1FUd2+l0gRgbgSW6tWGlcnMUvJO2WpwoH+hJ8Hq9Ke+ISFbzczVkYfbCjQRNryptALeeQ/YB9jFx+ifCuXbA4GL+rzXrDWbeO10RuaTUrzqCCGPVPhD9wxzkHW2SVTQ3vXyRIYmgDHD1nWJ8TGXMbb3U1wr3xD2OuzXF3Q3I7uyTXIBQYCh9GBACCWXXSazRbqLfeigp5QZQaSp8rvMivnfdOV8lsnnbl+gQGB+JqcGQJe6E4vqWmarl2iOZGnbnoGZ5q48cAWI+uRZpcEe+dQSvE9kJc3cYE+/2zdEMOVKE+gH5dMPVU1caYypWax4tSgCT+w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfe4fdd6-4a93-4f83-9ef2-08db57b02a5b 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:57:14.0653 (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: 0hvnfBSdcjKHXweiF1zZ4CGx+p0akXt/QFuw1vSVRO1vwvZu9srsx0qj21BmSGmCPj6C5EI7AQ/haAHv9ojx5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7261 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-GUID: U9OW2C5RdSbPKMUYnNfEMCI8XI-lXY-W X-Proofpoint-ORIG-GUID: U9OW2C5RdSbPKMUYnNfEMCI8XI-lXY-W Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add functionality to the VMA iterator to advance and retreat one offset within the maple tree, regardless of the value contained. This can lead to less re-walking to find an area of interest, especially when there is nothing in that offset. Signed-off-by: Liam R. Howlett --- include/linux/mm.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1d4e7393ef..1bd731a2972b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -866,11 +866,24 @@ static inline struct vm_area_struct *vma_next(struct = vma_iterator *vmi) return mas_find(&vmi->mas, ULONG_MAX); } =20 +static inline +struct vm_area_struct *vma_iter_next_range(struct vma_iterator *vmi) +{ + return mas_next_range(&vmi->mas, ULONG_MAX); +} + + static inline struct vm_area_struct *vma_prev(struct vma_iterator *vmi) { return mas_prev(&vmi->mas, 0); } =20 +static inline +struct vm_area_struct *vma_iter_prev_range(struct vma_iterator *vmi) +{ + return mas_prev_range(&vmi->mas, 0); +} + static inline unsigned long vma_iter_addr(struct vma_iterator *vmi) { return vmi->mas.index; --=20 2.39.2 From nobody Sun Feb 8 11:06:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD90C77B7A for ; Thu, 18 May 2023 18:59:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229454AbjERS7H (ORCPT ); Thu, 18 May 2023 14:59:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbjERS7E (ORCPT ); Thu, 18 May 2023 14:59:04 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E78361726 for ; Thu, 18 May 2023 11:58:37 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34I6JDwr018330; Thu, 18 May 2023 14:57:19 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=9UABu5yS7r9cjV080JpQK2DakF6E8hWKSmADOcCJ2pM=; b=M+Z0CJUhN4t0RML6X8PUATVfzQiu8n0JzMeIns3LvAvA+xwz7LSP509VzAfxtA13tsh8 LFR+M0rZEB2B8EZ21HcJ24u7ne2eKJ7luq9c6meSzoMvOogZ9MHrEMJ+h0NuAHXsasq3 hV9tiJk5aeFHiS8BdY4/884oGi/zvM7qSpG6I9QnZbX+GkiIoJr+8b3lXjmQ5liyknCC SYDjh/DC0cebeQzE+H7A52RH8M10BaoyAkjMOFLH1U4bVruTU8knFNWImrdt6xDhLBB2 wNsW35AtKnGlfHO/1CtlzRck5WkbLBVoDwgln3XASBtrV/rsaUxlguh9mV50bGA+M9p4 Bw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qmx8j2vr4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:19 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34IDUidF040023; Thu, 18 May 2023 14:57:18 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qj106mr5e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 May 2023 14:57:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZauWPGiJfal7jN5lGYNJCdguZn50BteXifs2orPmA7SU+VVOql0ROkFivnQb9S5d6MHgC3LCniOIVHL+FKlEuw1pahYiJe7upHSFaEtuizTHrpjRtw+A5amVq6Y9rrq1zganomUhM1cKCgNHYWkM/CPAZHRv+wGdqx8pxVIMrz4krLgvNeBoVfhxpkv2uDCckJxYLkyoB2rhiCjMb49NABiTer2a5azySGyhJFs0PeAnZhDJO1VgVpogR0IsYXmjEe6Bu+AF2k5+ll0lWO9yhC/EyBa0WA7msb3iPPp7leEI4MasCtDAqHUgfP/PoL9iZhJUpK7rvNnE6ixGvOMpIQ== 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=9UABu5yS7r9cjV080JpQK2DakF6E8hWKSmADOcCJ2pM=; b=bsDwOreTZppXYnG1nFDOmpO6jNTzsul7FILXlC6X9qYdWDImcZl2aeiXs8qyF/EBcIzmRdAzv2wtvxEfstTeJqaFCYFd7ljBpOFwGOhSRo3g1nrQkxRtrS0m+MffCaBY7wqSFpX2qZdrHPF11xxj+Fu1qS0c2SuPdLapIL2TT7kuPUAXD/MqxCmhmfmM2GY0DVU75IVGXlQJ/LqLKzMROELkJV9RQawXAW/AfHZODYxr3hzbHVViFbw5qEiu0CdvmM/RTzCTKnRmU+HkTBeSIjbQNmjtoPmBnVcJwGIRJSdcq6w6rn7LebVMvHCPzoNedC45jfMUKxnjpUH2N5m4Hw== 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=9UABu5yS7r9cjV080JpQK2DakF6E8hWKSmADOcCJ2pM=; b=UBVKT9Yuko3L/IoUjTbnJ4v7nYtvRIVx0Jg8aKU2N3Gd4ufGVcGp/WbVwncLjeToYtq8PtldYIRVJkWFpbN1QLskEVfQVTs5on/PDApTwzGhafqe600OlsV7X3HuftT9kEmQ9Et4/BOMWH6131SX7hUwPQd2c8oE0u4GNvoEiuQ= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB7261.namprd10.prod.outlook.com (2603:10b6:208:3f6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Thu, 18 May 2023 14:57:16 +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:57:16 +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" Subject: [PATCH v4 35/35] mm: Avoid rewalk in mmap_region Date: Thu, 18 May 2023 10:55:44 -0400 Message-Id: <20230518145544.1722059-36-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> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0105.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::14) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|IA1PR10MB7261:EE_ X-MS-Office365-Filtering-Correlation-Id: cfce9cb7-3697-47a8-2504-08db57b02bcd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sYSbvrK3Z3yK8R0dRCBEBK+zu3wYrU0rnLqQDPZtACHV883myCCKp9TawSfArSiu2s3WGR9farps58k+UlHaPbSdvi6g/RmXCK1skY10OGW759o7J5qVby7vDWu+bKLrndccwlC1KfytOqcEpf/C4oS84QJb6qpUn4OxlNQxQ8bklQS013y6H4RU55ZfEp7bkk2Xoy/FqTCy2qliUqJ1RHzMz84y9JNLRR/tAjJDjmlqGEvvLX0n6bZutPXBCuYJaUPweKchdS4LYpY8TyOIUnJnvWEMCyBMAqSpimzLg8wjwC0VN6KxDVFnwD/18vdu/3ZIjVRH+EuPRqeZBba8bTs2ks+ZupP8nbCWXhoKjSPCmgT9nt9O895XyraDn3DvyyAK2Nr5Gc36FnsMrWxyxe6BODE43dxGXsnlIrhbgbM1YM63ea7mJnRTqYArSLLzTgOrCYDcYQVVw8QAAzjhgYQc5ACpZ9CCpCu0egILBYpxD0yqmcAybaiMjufZwMdO7yTh7Qa4HysmxH9iJr4iy2/PUV1K+nsKlRb7RnzhvJfD3sL8clgpwO80qcE310hj 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)(136003)(366004)(346002)(39860400002)(376002)(396003)(451199021)(41300700001)(6666004)(316002)(66556008)(66476007)(66946007)(6916009)(4326008)(6486002)(8676002)(8936002)(478600001)(5660300002)(107886003)(86362001)(26005)(6506007)(6512007)(1076003)(4744005)(186003)(2906002)(38100700002)(83380400001)(36756003)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iTFJeA5nVfF8YWLAR3rzwmwyei50FAZOoDROR+n/IK5D6TGOl6/ZZBzRRJSH?= =?us-ascii?Q?jHzGfCPbo/zhoZuVRhoKUDuDEToMy4BHUa3PsAdGVt6ah08/hSe56M/VflnO?= =?us-ascii?Q?TZdWabVVWeYdmxOWkoCOztG1r0h2YW1iAM5IJxjdfD+KLxEmMI3GeGHC5Hgo?= =?us-ascii?Q?vU1nTg1qOOfWTiymkrioidmemnQJkqxZQF9JSghkThXJCYajzYD3IaC7pkcA?= =?us-ascii?Q?Xn43ZTGqZmvXL+rfvPFBy04SoZZ8mOw9nSWA0b6QGgRKieuvQHm+M12PU1Q7?= =?us-ascii?Q?X1kNCizpJM2NJ6elzuw3Y8QV05ijZ8uVFv7EjybD1mXp5Uc69dOEEsOzjRGP?= =?us-ascii?Q?sSUCZc6icxom5dH1ydLninUkOc7pLjYcu35WyjfhoGEjDs45VLRN07JMeNS0?= =?us-ascii?Q?R7tM/ILnbzL64DLVjiHwck2Kkp+N8LERKL3eViWLV8iT/vlhkOntzNgRl8Gr?= =?us-ascii?Q?8flzB2CG3basD6aZwUrLoUuYhWXc/u0dC7bwLqNqD9FYpa1Glqx/wzTnwgPc?= =?us-ascii?Q?jHQxsTQyhaQ0tAnTywQsNkDJmjbjqvQWeRDIevr/FxvVSJoxEEjvoWwsAg19?= =?us-ascii?Q?vbI8Ij4euFDhNGq/rk2BoRKVM1qtFm8AQfUTLqNPTBTEieXkjqCkfeeZ4OmV?= =?us-ascii?Q?cFBPP8xmhEJHmbLfmj3fBknVnhDdhaC9tygXcgonO7/3hn5eOHUCMN2Qp/NS?= =?us-ascii?Q?UTUXlF2FAXmPUkEg/0oujCNQaqkj6i/9xECa8j8kg5S8Nu8MSoKiTUEaE9cm?= =?us-ascii?Q?BgUfixvv3hy5nvSxXzSrvxHmpSrQTl4gFv5qSi3m80XhEXEAQ+LcldZtDmnM?= =?us-ascii?Q?umN6oQut2tb2yYeldEh7JvqTDdD4Vp7xZ53KJNzmfY5Ih5vDDgmE2BlTYV6T?= =?us-ascii?Q?FqaEBty0n4lDCgWFa3LBIF/benrsbHIuvkS8WV2bOWZ9V9N1g2PLN3EKqRrf?= =?us-ascii?Q?XHFfWGOJGme93RksRrh14m/hymOhcURuAHePkmfPBmC7xmFQcgtcF8nW1KGB?= =?us-ascii?Q?G9T+rUGjdqreMOKA2F6klrSd4GF47rPLRovoOcqlfhpLWoouAhOhB6qqyLhP?= =?us-ascii?Q?qkQuFlMIxHcKzjlAJP0CWqQno0cMFF8xKnLyLuHVIrFme3cWVN2gHtIrbd1k?= =?us-ascii?Q?lJ4pMup/9iSVvl03qJScIWjSvLulDpk0gE40MMzRJzA1dvE4E6ETpMbPyXCs?= =?us-ascii?Q?eHbRu8Kqlm1XQK8/ewFvkzYFsm4K8h2bsBBov0ylSEK4xv/3jlbBHI4HqO0s?= =?us-ascii?Q?NbtSdyLN88+mCiPpS9g4s9+hy3KwNEEjYj09IB6EaLvCrRkJjbvMVW4iaBzp?= =?us-ascii?Q?NdiWgSIMnSqspJHjhJGtqtjGT6bY5coCC+kNWQ+sre4t2EH2UvSQXxLd+pAO?= =?us-ascii?Q?xOJlqAnRc/1yRFTu7qPRGRrs5L9D4QzjOYFRsU6moOTjQpMZDLmVsoCW8pob?= =?us-ascii?Q?kZjT+xlHwQlf+LqMTyqfaQXUuEF2+/NZKqO0h+FIjZTq6joCcpz/rW2JeTDY?= =?us-ascii?Q?V0j08b0OgTiY0f2SLFBYYJyAESuCtK5pio1aV032a/KYZr5YFV0sajM6izuO?= =?us-ascii?Q?aPj35HqGrRl24qQ1GmF6Ieorpb3TEoWEAih8kCBq44guDSeKI5wOVuGX7M1s?= =?us-ascii?Q?rQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +/TDtYFCQTM2sLp7wYZVi1Js7hKRdFAmdPWf6pLQmcigrpvjSLuVe3Z98xECv1TywhLo+GHNg6hMHJOqxiGaWMM3O8KAwF/KLtGqUSAY5n3UpZj2gZdxkweiVz2CU9hgbvnwvg4LmrdgT3zB3GpohSfNevnFxMv80SR9TfUNjCsapaNKTRC6/bN7n1hT637eLSrlSTZbHjD3oncixki+9HNi2jcbPupvU7iMt11uYSDCk9bRet1/93rWfsSRZURO8G/26HnP6c4MDTV9O4Sjk9WXrK9eRqHiUSoIDGl2fjjY3D9z3iYXIhbkHzxmgBQGCgtxFk7UqVz7A0nanOATyc83qVzFqDLl+0mkA+H3U+I9mnjCovWRwrUH8hl1ZgfWrIgaLC3VJ0hMJU0D3C1M2MkXyygzXx2kZk2SYFkGbyf/mnnk+g6hdx1fu7Yo6IE6uHWThDgmdykMhQ7ifp2rpwYZ/BXf0CLs4+lH8Fm9pevKvlBOM+aKmLHY9Zg94MmEJ4GgZ6u0xm7wiq5hR9X8izHvJ0mMHl8C0RGne6x0xpPlKGCwEZ6WXB97EX57qMrtZVHOPpY8pV7sDaC3bH0La7ulNw3FYXbrDD2uipRqEycF/hpwXD2InxOsAvomMYbXB4aQX8g0j2AjpcOGlhYFUNWvFXAm4n9hJOmAyc5U47nN+/bNCvY74Jwbq6NOtFNstgirW8FhH1LJYZENU0XXpMfbx2ojjIFWtfS6wFMDHBOH1NcV2G/p7kNimdp0K+71owyesb2jLYxW8SGcDpTMoplskipLVixX9t5pulXk3VZ0pOUzSylWk8AmdfS4tIpwjMJpOboxa/TOmRUqQY6gbQv6BppXeFXJiNiQp3KjppFwXDLRIPDyyjvvyx2qvh4mWSv35XlLmaZFzfEgnPLrjA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfce9cb7-3697-47a8-2504-08db57b02bcd 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:57:16.4847 (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: 2LumWk34zhWU21TRFStYO3bdXdfi+nz5xcItQcnxPedXT2tZPA8rodAStO5IvjB9Z4bIj69IIJxlj7FJEjUtkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7261 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 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180120 X-Proofpoint-GUID: 0Eh3hg7uWpi64GPgX6TGKt5oOf-HzJS0 X-Proofpoint-ORIG-GUID: 0Eh3hg7uWpi64GPgX6TGKt5oOf-HzJS0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If the iterator has moved to the previous entry, then step forward one range, back to the gap. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/mmap.c b/mm/mmap.c index 1602c854133a..71733953ff83 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2636,6 +2636,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, } =20 cannot_expand: + if (prev) + vma_iter_next_range(&vmi); + /* * Determine the object being mapped and call the appropriate * specific mapper. the address has already been validated, but --=20 2.39.2