From nobody Thu Feb 12 07:40:30 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 2494AC6FD18 for ; Tue, 25 Apr 2023 14:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234342AbjDYOKl (ORCPT ); Tue, 25 Apr 2023 10:10:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234330AbjDYOKg (ORCPT ); Tue, 25 Apr 2023 10:10:36 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D408FB1 for ; Tue, 25 Apr 2023 07:10:35 -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 33PDhpYZ001836; Tue, 25 Apr 2023 14:10:25 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=aIr0SwrMirH0Qok/1cx1PN+5MY4i1PWV/gGH7bHH8uo=; b=w6ehkow8R1SR8F+ygXYJZkPySYjYPG+/1afnxxRSX377Tf9PZ8D38iFIP3r17ldQFH9K 8tFG+BOt+iZw36bUkLG2X2F0MmofyaAkN/ChBxnH7LYpypfLmivVFjcXStaHL3qNrAVE xmIOQN5S6HhDjeiTkkuhU96oFdpajl+1moAsP67hQeaRYZgMjgsa5jrPW2rqRcXAQc6F MmAJP755Lt+ETDs80F1i0gttB3SiFEfI6W5dV8fjGZV/WJB7zgycEwm3DdPuJ5urUWNC JW3jF0y++hplB03W2inIUHVxfbIOPBYtWicY1hDKibb8VknMnmuQrCP2oVh3x74McSlP Dg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:24 +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 33PCeSeI013280; Tue, 25 Apr 2023 14:10:24 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2176.outbound.protection.outlook.com [104.47.57.176]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q46168ct8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D3ShGc3rqVcmlKgu+w+idzBzSVJ9B1wCS+0iSuVEXpEzvS1lut+Hay7Fh1GlqjXX/hefMzHLwbblqQxtkggTYIapf8H3HBduc6XLlTe10UI+l0MCQx9pjmdqV2vcJrk5oLNMaagS8wvkfCSlGZNJw/lhfQ2Qcc7Zg2rAnNpt/tNTc/r01uB2kR937BMqayZe11Xmm883Qy62mFBTC8pilC8WTuxaxNHhutQXgV6r7nZgETsX++/eN4o1JGukAtkpieiLRO5HAUidRFCSnkcu6PNyFmjdSqxhWk2Krhlvd4yp9nhIrnJ0nTburntQm+fb6i4x8Zg02UtiRoYk2kHcvg== 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=aIr0SwrMirH0Qok/1cx1PN+5MY4i1PWV/gGH7bHH8uo=; b=NcvMssJbbbw+X3nFVtJAhCJtA8pB236wAbhWE/Qf+nmHpR5OsLDkpOkVTVdwrE6xccApLK6NZNFcubn5C7Mszwj8MZcaCCNUfOJMo8VJWQNp43bzRiWELvguRuS1C4v6E5tS4RcKKDe1sWCwppVkIM3VLmf7uaioduz2QAyG7NIh7RwtXG41o2mABfvVZtHZhInqCCKFISBhiKLrn/ki2OerlwHwAW0P8gfg8X3uMp/Lr8zCTI6cesqF13GMheFympSNasTREgU/c5sTOg32YimnLmbwPMD9oUMMhIZg3sfRqzooS5flfoPkmEMpJbFUtdYpzEq1aMKyl4zTmjI0pg== 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=aIr0SwrMirH0Qok/1cx1PN+5MY4i1PWV/gGH7bHH8uo=; b=W2AZeCa8JD9sH4oSMSbNLQ5BoeILw80XAeMSwVqry446PWGZ+xxTWWV9kGYaUV+HK9NgzxQJptD1dbw2FDa+HWoO5A0K4tAXQx991usTWBzC/BRPSuyPm697qxNsrxPAxBtcMuAWLdtjNcEtRhvPEG75TCq07RZsUGZH8yProqM= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:22 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:22 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , David Binderman Subject: [PATCH 01/34] maple_tree: Fix static analyser cppcheck issue Date: Tue, 25 Apr 2023 10:09:22 -0400 Message-Id: <20230425140955.3834476-2-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0025.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d3::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_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a7fb81c-d2c9-4fe8-cbfe-08db4596cebd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n9HaFYKdMsxxAXORa4oXLQxpHH36Qid3LWo5sRaEPtKrA8zoT02/XoFrwqdXNsgakHe3uS5NZZ1MieriXYxVXIhoV+cz72oKCrHz3st0jNks71VSrfz8d1SbGZNCFbW2ZqeyiPUruUbWrmxIHjNfT53tXXomHYsTd+4qskKUQ/5jU4NUAtbxwFI7UreWkifwHZie78VQKUhrTDjo5yvviqLcMxk51BJ/BwiXCN9TtokHzVy/1scTp1tHuaLe7ABzLwpaSNqF/ETdvIPiWN3Pl+MjU+UtJdW03aRk+ahPHpJgD+0sRe5579wsjn/ixT4rng5UGcR1oC90dVjCP3zVIp22AHuFRkDLd0AuJ51Qv22qzIpP6A3pwu30TZaEPktD545evMSUr6KjST670C1jJpgBsWIrpd/dsaYXMU0+mMDvCmJF3Nej5D/SjpBrqiWgeODqG9gYHhGNx3So9zwvhJTDkHeW8K+MDva7N3Nydeov3n8TJw3+m2hISlRA80Jbq6mF98+T/yfZoY7RJ4U/MRqgMx3322mV+rJLwgHfm96t8nSpYaToJy8itpO4vFBB 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(4744005)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(38100700002)(45080400002)(478600001)(6486002)(83380400001)(2616005)(6506007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mEUttXhEAE9/CTXzLck1Hai9ipA6kvtRVRBKqRpZxvA0iQl4jWA1l/m2ctY1?= =?us-ascii?Q?krzqBdaojpImpqn++g0XMlWLQ9RWufIFfi7E7zlGJnB1aOkPvZL4yiFdCfU6?= =?us-ascii?Q?TNX/cOVxjS5JmkMIgMAmoaUwla8Bkb294VGzv1iKPRqtAov/0cMe2tkWKbc4?= =?us-ascii?Q?jrNJuGWOU2lclyuOhs5sOLJJgrt8rUchufDxDvOn3APZKE1f1j7obsTEwmdS?= =?us-ascii?Q?C7UvC8JmA7ldfacU4Gdo7P6eIdaEe4hyyUpyf685GUryBuuukvW7EUNEvGfu?= =?us-ascii?Q?ZmkxKr/pUWlaAXYN7iCyicQv7EOlgxyMFZzIWYMQe2hYfzTm8Dg4IlVfYtHf?= =?us-ascii?Q?fzuUMh8teGiXuZMLriSJeKfX6leQf6vod3mBmAu4/uDMiifyd1T6bWv8Sl3I?= =?us-ascii?Q?6y53CMSR7cSEsjMPWv3J/p43CzaeHggUyNcESQpmmAeLmoBdkrqKtJc7AMUA?= =?us-ascii?Q?1B0LQlSivLbwpBHu5mqvpLB325FtqqKK6AKwUtHpVnhbV3qlkB/U0HtThJK4?= =?us-ascii?Q?aGt72DHqUMlzbAXZwXPd2WcDjBKkFeZyicRJoiK/JtaGErheFvtNteZ6ImUB?= =?us-ascii?Q?P4kcnEkRp0oxEPJ+yRX8R+NLnckAEUhroP3op4G8dKfNuGtvKEOsyONwMvrJ?= =?us-ascii?Q?iFXnijDAKqk5bjvmC1zz9gS5Yjl4/dgMGy6HgKs3HfhH3TWmegGE2Mao9AmT?= =?us-ascii?Q?57ZEfeRAlNwXSB72Mbtite+yKnLlEKLev2wnSfUvlfxURx1bqOdVQdKY7NN1?= =?us-ascii?Q?weQN4dFH2l+mBBkn/Jv38GfgS78Jr/EqQk07Uvr63/PKtDUHKCZio21+cX1A?= =?us-ascii?Q?b+SrNJK3rnuWQpPlF5i1M9Vsg+ZLM8/vn/ceFpoq5FqSFnVy5SyChHHnN7Oo?= =?us-ascii?Q?SShkcjcD/cI6o39OHkqncYcfzIcvqCiozKkQLGaATMorXCMVCPQm6nuI9Wqo?= =?us-ascii?Q?tqupg6KU5wGwCCVbIPUOo3ppHtvtjSKpbwdngMjCyFG/q7cQOv+4/yjjx7cj?= =?us-ascii?Q?pEKxIA+Ux09s0iO4HGOFRnnnzr1jS3HcFuhlwZy/vAkPy5aa/xY3oB5GAVS1?= =?us-ascii?Q?NGwzgOwBpsjYXqYNYRwD4iUa77Wlwzb38MEsyiePBcV1NCfktrDxXgJgMK+p?= =?us-ascii?Q?tIhehlE/1Re/ImvR4eeUXg4j423DLO4N7acmsO3hovaa0s8WH70MhUamhXYm?= =?us-ascii?Q?7U6x2SwYwHUb9y4to7CCOiAp8X66/nXOepoXxUy1r2ZNmC7onGk3gVYDjp1Y?= =?us-ascii?Q?6DBjafLtP7IdqY4P+sgQVx1XskGGd9GvzwBTrPOhvezd3111md707dkMuWsT?= =?us-ascii?Q?K2xg/GyuLLbnRaEIcy6PQr6PDWYnKl0uRaCDOxXd0WvW3GU2JlWRzutCs+xi?= =?us-ascii?Q?Au4ZIy/e/cSPGTpwXm5q6DAkG2+KT/Ps3FJcJ4yOeGrxlrXFsrHwfrwYlLIR?= =?us-ascii?Q?0vAOW6iwlmq1OdRqsvFddYO0W3Bl87dnVQGUVPsM30RI01AWEq7FWevoVML7?= =?us-ascii?Q?7gQ7HZoEm6wTwdoYGKdhPMqtUX6YbBMt3dqWyRzGfFaophblplEzc4rbsxXI?= =?us-ascii?Q?L6/BgU16tC42tFRehkhbXnAfEGNA+B0oZF5v/dLzZINSbm+DXh8UOT5xWuog?= =?us-ascii?Q?Yw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 4JS24oJGBF+Anc4KdmCu8RbDRiRLEXmb5cwH7Ti/SXxwZWglvXK6QowzrLGCKTunqWm/zmHoASkjjZXABa/VlBQfyCnVdauVsAH9EYWXu6hvBbec3iqhbjB7xuDqz655w4mqjW3ZrNRtGb7LvONNiFPNaaB3p8PtpVyAgqu+dktO0PCZ+KrAvZmrXg1TK7PYdL0xZ9mQWrA08to81fPO3sN6GTehS8ShuhnanhdxZ27P9qs8Ki6AuqbXBSJcyH5L0m3Yk/ZU008akQjnTTzXDke2RQZPD5HAzGjiJ51GuU4nKQI1hC4ivZidJs35UBmCPQmE/AljUtB55TkFwh7x8cSKscAzhXH9QbNUK7nR/kxqiwbrzEDXORGrTGU5gjGAT8Y4CiROU8NlIEHplgq06jxo6lWN9Cm1NVwxuJHXFanDJk7Omols2GoTI95zB22jtGkuxDDMke9sFYGkRM1iVD7oZBR/RmCiQzNcj9DE2EcK7ppDc7Fnva27fneg2eB6AfKD+a7rnFyJliBzgP47AJ63qAXKHkWYqFsPRt9q3mncfXaxRsN3F6iYr8NKHgaCkXvVSyedH1ces7xMl7fUC+QLJB3XGgFawmtdbLHi6tu5XS6KGQ/nw6GRZzLpNURhSOycw+9r2s9RS9rbezEGpwsHDK5ZQSKau8kcpQM8w2ShysI6rDZ38L1MqID47Ziglb47mylOwG97KwBtdEVzDyrVMl9ORJFdsvJINSj7ZxDgm0MM8URRQX2i6MKixrWBI0GIAo2wQYc/xxahjwLRVu8BpMxebhcJ51xHKewxFB90eQ8f89kasfDZPa6e3oJGrEuPkeFxFfavD2yQ6xaxPuOXtAYk4le013Hk+fDg9Uu6nK1Xi3izfumuKKFsHQnuwg1yg8WCy+pxaAILNrOOt8kBVhDBN49+EjWotL/J9Dc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a7fb81c-d2c9-4fe8-cbfe-08db4596cebd X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:22.0358 (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: Qfv5BDzKLVYS7/ePBMx1Jb9JRrGHFfqtlH20XDHP8Nxq99PeKmKZvf6JgOqX29SToDmeJ347HaUrcemy5U82Jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 phishscore=0 adultscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: VrUNUeLR3wUhKtWgBg6yepI8Dbjke9q8 X-Proofpoint-ORIG-GUID: VrUNUeLR3wUhKtWgBg6yepI8Dbjke9q8 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 110a36479dced..9cf4fca42310c 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 Thu Feb 12 07:40:30 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 3EDE0C77B73 for ; Tue, 25 Apr 2023 14:10:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234351AbjDYOKv (ORCPT ); Tue, 25 Apr 2023 10:10:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234335AbjDYOKj (ORCPT ); Tue, 25 Apr 2023 10:10:39 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DE526A57 for ; Tue, 25 Apr 2023 07:10:38 -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 33PDiYpM022658; Tue, 25 Apr 2023 14:10:27 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=p8bYlVicQX60f75L1bnEUO3IOESeVNSC3YS+Zx2A1Tk=; b=a0+PAvCLqVGO12lOtnY6YW3evh7AjfNdXSQ7u0q5uAOIfsDhEgFpubv7UU9IjkTmIRyg kOOLHptlyObOO2cdV3wLNglmqov4t4B40YpD69xJ+ivQbaeNFa4VW9DG89ux1tsA6bgN aJZdGvT9qGPanvuoO7IIDszI4Y/FKvmaXhTWUZFeae7ojH2I2WBIXsGduv7+QPkFmLhF 7kBBmSyKcTKAEGXnGftTZkQD0OeM+ro6OjbvEBZa2FMqc3MMTCe6otDJobh9iOnyuquw 3bjbxc1t8ZRbHLCsdCCrx9x5OpkBzAUDf3GAsCnX6ftZKqVD4r+XcoGzGxrngZwXVb78 rw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q484undrh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:27 +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 33PDSKCP007654; Tue, 25 Apr 2023 14:10:26 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gcp7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=huN2vwlftAx7dUnrkHJxW8vADu/kqzmgrXdeYubBGPpDbB0AfeLxFC788CMs0u2Tyzz7wopY/kSBEo2Shr2WeHL5rM7SizoaWSuIuefGLbp0JbcIDi7IUBNzuhmcsrEhkQ9UQwRprfoTC3zNo8xNQAs7Ppl68IfLjCR9NpLfRtd7jpzAUBwCBGPo5zAp6keLhwQbOfNRgqXyMH+8bHxpzWiNGIf6XzdElMXedyRyVvzU4RHqCg45pLsDN43QHi+VBFmax/9vAsQnF7bn9FLK2q+19T1Du4ausG6Np9nzRThb/GVDwzF+GEJsj0oNHC/hzKZmLbEL6jNg6tuKDoerVQ== 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=p8bYlVicQX60f75L1bnEUO3IOESeVNSC3YS+Zx2A1Tk=; b=LzlbIagqO8CNwzO9e7cYDHi3e+Usey20RFwlHWehuWfniYnHDxbZWAqP1nQSgrq3bELFc9vBl+EcAFOKDVQfMTkB9FZ53AsCljhyEW275Z1BJE0u+u18nAT875L4A/AriRqLwDOY05ktamgn6XXjltEHE2VY1fpqdpTT8yzm21mlf8/UUK6oEADXiThw4btEw2UQmHmREtXDPs86N40Xm3pP3pzQh116CWy7W5HNrA1Xu2xGMb6iuJH4lzCuxwQLKrzUmglSx9F963V9X9fPkvoRnOchPTj27/2GDEjCblohFrb8z3r9N1sWSCalHyQXHoYIa5QLMic4Tz+P+qfvAQ== 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=p8bYlVicQX60f75L1bnEUO3IOESeVNSC3YS+Zx2A1Tk=; b=mVmyAEmIdO3bhQ+uziC8cS+XIeanSbjiVDZzMSeZQTWqJgu56qV5xfTYaGKxutz1VCkkbEhacFDxS+MNqF0JJhFAZX9HEz1gEGJNSJ2X5ZI9saSXsma/ZIbXSRRsQj4N5A7o5l6nCJRN/mwE+Sp2GH9W50ld15eMl78PU8tiyx4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:24 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:24 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , Wei Yang , "Liam R . Howlett" Subject: [PATCH 02/34] maple_tree: Clean up mas_parent_enum() Date: Tue, 25 Apr 2023 10:09:23 -0400 Message-Id: <20230425140955.3834476-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0108.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::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_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: c9f6cae1-1b02-44ad-540d-08db4596d010 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NvmkUF+okBTuFvhmt1zxExWSbMZVI3hSg5z6PlRwAlYMXp8bR9M6C54PQ3l8YJeYt4gdvIkuRWSeChLS0bgrx4kbRzTmvYWG5vk5NZPa36xzjo6v5Sw74eSvhetvYOpF8ayEk9fBtD1fRWo7YuXXqhPqw3Q9PCKH0eZLRxxmEa+eTZUyTVeYEBHDeUn0cqynjtELmGANfMcFCTrrjiieTWot989M2BNmQFcVwcbXwVJwG6V9nAnihMAZmhjblC8+vA5toWNIQn9rzhR6PjhhhoKLtEUUkvUQIk58wPqzDMTFjTvEvT/H3YK0OxfWpfQWfje6f9qzZcdcAmam3qZyBZojzp4kIcvbOmsNvfYgrbkSKKvU5ihlwNY2QSruIo0/sykj/RpJoOG6Yi7w8np8Y3AFn0q5TnUQ32vGStxNrp2rH8V3anoCqjSKYhcYDc1aEmavKq+HyUH6H0ERD+Qi729BE6/tBcG2qLSI9a8qi7wfDfA+/oiXmmQv0cyARDdrlQyxACE9oiw36Xw5JidvoZ6jze+VV7TaTdmYNL2Dxl86XwOrgOnBoFjmHS3MgSZY 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6486002)(83380400001)(2616005)(6506007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7zwgsBbXTWSrlWtkl+jeiZ/gHTyoOpLFRDRL/Kg9t5qdZ3W4wM7UuChET+Ea?= =?us-ascii?Q?apbzxZKXXTAIrouHbgdXimW/QhCkhDUA9JdetqNiKNdiwq1/C2s09KzsAfpK?= =?us-ascii?Q?fOT2WLlIG7MFAw0LjuK2hLG05z/p76Dh+J9sPRFWdEiq5SWZfyp7zYCPLdfz?= =?us-ascii?Q?9YW5eOI3pLQWqN5rMhmjsdigM5Wd4IJR6/Cj4vMLya2kaBLs7Vw9mt8TX0RR?= =?us-ascii?Q?e2qEGeAldzJBX1z1YEdn8qwfciMJzqwFCcO+/TygJWfnGCzXASk90UzGspte?= =?us-ascii?Q?Gzp0B+eyLkqf0ZsXDiEhXHCb46tMRtgApp7+PHZIq4ePqHVaWssGbTk61Sef?= =?us-ascii?Q?zVwIKkQxoQC+HHvcHM5OyNCsjXqNQXy0NZJDmHh81f9/4AmBGaWFnZYtXOjb?= =?us-ascii?Q?RlhHwavaJ8t0bOkRqt/byUwcCQmoVy6Hbja32GM0zZffJ6RnvavSsPyhXiWS?= =?us-ascii?Q?2LpTGQjhoa+GKk962GKDfEapuWq8bJFiqzZndadNahLrUl9VMlIGmR2HXtLx?= =?us-ascii?Q?XJKYkn5GTeHk3XWqF4lNJlYUnKY7KjqZ6lgye5CDA9bNFJccVPJTdBZ2fK6L?= =?us-ascii?Q?Pj53PggjQ13JkIIeNrbZ2lIZsTiR7RoijkG8roEbMOEhRlshpvwlheuuE7mV?= =?us-ascii?Q?mxaFnGZc3OsHqdXzQyXniaP/C3tlaWW0flIoiAcfElxXph5sd8pdhT/F8+85?= =?us-ascii?Q?77ZLVaJVboT8byJYodP5P1ABwWQ/ODpidpvXp76/xAVyuzpcIQ9C1e9cFoT0?= =?us-ascii?Q?14qvn1lSuNDAcC7gCAzAf1z3pZvVRLa8524a2tOnXr0QamkG0fpblRocsWap?= =?us-ascii?Q?0U9qAvAzjAo2qAiWO+ngATv7m7Qmt1/HPJLkAfqVL6+9AA4Rt8QHg3KDxLEt?= =?us-ascii?Q?BJHx/tFcfci3SouGe2AOne/VgGFfOF+H2WhCRDA/Bq2x57FNI6dy7Dyj9AsU?= =?us-ascii?Q?RS56aO/1HAw9MEcB8XKL0QN8e7XcZduUN6HAPa447LsAivfd3oFhsrhbUhvZ?= =?us-ascii?Q?hXxmNDS6EVWIXh78vUQKsSAIK6EnuCxc0Db3VRxUse78nNbtTYssXggZreGl?= =?us-ascii?Q?IN0MU2/S6xcmrXxmmO+1JrrbvJpOnxPIa53y87Ns6uODxxIvA6rNLi+FzPig?= =?us-ascii?Q?wvfBOtZehGHEf/1AbhbqAk5cAD7qQO1vg6cB3q2ToG/2TvDw1rfC3FMmLIn2?= =?us-ascii?Q?waR2MP0T/uLf6dcZOLf+UZUSfeECY2XMvErxnMVxm0YucVLvl+INC+L3rs7w?= =?us-ascii?Q?Axz0QzzM/R1s+WRvwf97Xhv9ey1Q2djxo+jKF8TKZ1p8dlDAGTXDMZPcx71Z?= =?us-ascii?Q?F0WK0HEnKd27zV+L9/hY15adctRa/J+4qLMZcOUVpxnj42v1njf9kt7GsMdN?= =?us-ascii?Q?pXg4SWXTH5tKU1etrDG0AMHNkHBAzy06iOkgQOayw8fLifzkT0kOSIA5QULy?= =?us-ascii?Q?NeHyrCKDMw0djMmqTv4CmiUZnzLyesYXtBRSATe9pgdgDjWoPs8G30axHNig?= =?us-ascii?Q?trAIUJbGOcBiB4y3gVcR/8Ia0Y2xRtEYMtyl8y8vGzjVqwyptGnWALgwfiMs?= =?us-ascii?Q?obd8vcbnVSrfzYgiBxPIY/alvbJiYlH6Fugn7xk2U9vY9j4kdMQo7AHtJvd0?= =?us-ascii?Q?hg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: eRKCnrNQe0d6xf0g+j8A0/eHcmOe6KDPuFZBwIrvw7EEXZKsWm+FXJ3pWSvUrb76Ik2/yPwhV7qCDKLcebH7vRqEQ+Z+gI5e2eOceBhf9OzZWukpzSzWA9fyqTJwUrKDnW+inXD9o5fHdKVNABLSlkpihqGeojBXYDLlpEBjjVYltUMDoxKdSDPoTkG53QjSix0cMDGY94CLtNf1WIPhihX57To8nC/VuuxpmGgT4qZmER5imeHe7Fgw15OoENA6+mriBfXT+vYwYhlZhU1x+HTrrDIkUjYdIVrSMb0kVtLjAl83nhIj3JNd5Mi4xAq1xWhiA61FG7NBMMuU26g1GXIKf/mB0lDNrsAGbPq7ydqfSREDb7HeXkdvPRuLFf03pOK3aRquaAjmThswcyrsRnNcgAnf/BNN5PUY4QD2pm/5DZb/JelbtlFmkcf3PnW6bNrI1PGPUwNoaRzd6vDTtXFkSLB0lbIXIipncPCuOl5UNmXjumcTjjNdafojDaS4K657YRu8SId8dHolZgGxiJ0n0iWWtyfHoiE503Ypzaew87kcl37C1uWooItxJP5Xq6jZseovkllZDdmaUxPlR8ZAQDNmYawJqJrisaTNGzj44Bcz8iqmz5ped53WZaM3vbw+4ubM5ZqOcjw5NegjYs+tP2s/+dvFDFH3c4la0sATd3a5bbfVQEE4uHOBSiSMZRm081L6v3LXLUUj2t9h5N1Hro1vnF3cYDe/0nCfHfg0F7NpY7BT1K+XwGkCL2Fcd2nXD2tHlhWYtrUMc3DDxq7NdTfWTCe7DLh6lS0vrzvvahZyxkof4bgkQlquMJntChF0jtJ3sjZlwy5pmwpwNCJZFoy0CxK8lPBwizGr20pHacvZnrDxLYGeanvE/Mkpig+TnHfSO0QnS4s7kUNcvQsViW77dUhCHALkwsiexhI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9f6cae1-1b02-44ad-540d-08db4596d010 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:24.1920 (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: ALcmypgBA/367MnkhrdBJA1PxQuU12uRnhlt5kzYAbjVCwyjaThEaNtcavaZgFY7eyRMcMc8Mf1YfkEbv/YvBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: bptD89mFRTTn4pZQYcbisEMX_Wg-6fqM X-Proofpoint-ORIG-GUID: bptD89mFRTTn4pZQYcbisEMX_Wg-6fqM 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. Reported-by: Wei Yang Signed-off-by: Liam R. Howlett Reviewed-by: Wei Yang --- lib/maple_tree.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 9cf4fca42310c..ac0245dd88dad 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -428,25 +428,23 @@ static inline unsigned long mte_parent_slot_mask(unsi= gned long parent) * mas_parent_enum() - 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_enum(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. @@ -7008,14 +7000,16 @@ static void mas_validate_parent_slot(struct ma_stat= e *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_enum(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 Thu Feb 12 07:40:30 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 7B1E7C6FD18 for ; Tue, 25 Apr 2023 14:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234348AbjDYOKq (ORCPT ); Tue, 25 Apr 2023 10:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234333AbjDYOKi (ORCPT ); Tue, 25 Apr 2023 10:10:38 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8369F61A4 for ; Tue, 25 Apr 2023 07:10:37 -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 33PDi75d024299; Tue, 25 Apr 2023 14:10:29 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=S1JH+3ln71WmML3vmtjGYSigdHsRHRx6Zm7HZXEzXVE=; b=ANGz8p4DnPINu7jJetT1Bt/GrvETIyOpIGZrZVHQTDsoPDuE9hoA7ICn3MpC8PhdHIxK TZJ1wtnKzwUU5PaPz01bqTkOhecNQlho7D/unhpiIQSIwAb/YTMvEFzJva4rMGvOzbXt pYskYa1US/vjiVEKHgNecV6HkElfS8MDyAQF27qmU/CoVwi54oR+6KfMER2XfkO1N9B9 e3VX3uvTQLedIEfZdEklpHzhWa6ufT/MF+9H18K01SYOxDfrYda69thCjaOX8O1cNNqC E/zy08vA4+ZEQTpgm8tt5tvDX8G65gh/6taUHqKDCzAL82y/pmZ1Orredowt3fOGytga vw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46c45ftn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:29 +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 33PE6WY3024885; Tue, 25 Apr 2023 14:10:28 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crb72-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CXPH+xtRDKSQAcA7yVmH/2IlsHcFFtyhPievjCukigTKvBEG49aXHHsrCTTnPwjr4wbNwIAyBT1Y6YpQL+RfEw5O7hGrOFExCW8HB0ri6fkZ4D4qQE/65t9Rw25FV97S3S0nopq3TF4xo/EOlBEw3Gyiy7YKytEoFXOnmbt7TE6CfyP/1GY4f58y/MCcJtt115+PSKaOEu0hURbgtOTIiPZ5ffBt3cEoYY9lUZrXBHzknUTAP0HaYWxfUEB1umLiyXlj+4NfLsjtM3xcXTTJRb4w8fs51dy5eZ8J+CaBGeXXK7F3UVkImBoIcrnGOWM0aEeMRnrLLJmZSGUF+CeswQ== 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=S1JH+3ln71WmML3vmtjGYSigdHsRHRx6Zm7HZXEzXVE=; b=herTiNqlPbDyiXELaTU0NUQujSgN6+mrv5DsH23+JrQUaHN0vB+i2QUXxteZdaMhedcmw8gqhmL/vlPKRO+lVeTXS2PORZEUoxhs4Q69ToBlQdut6S4vqOEduE4h7cru9cjGhtq/vtfknEBjtX99qL14z2Fg7qFxZiunR8LC+sKMFEXw7Pa3NMleCKsPOxZQVP6Gqwft7PhDwB6e1Rs+FzTXr2J27gw5kufK+C458ONgGZ2Lgy0tb7GfV+ed7+yYQhguREhu+uQ4/fXRQH4z/AYStnc8atFc1OOL8C00KDIDIfo3oktvUhpI7mlXbd21ER0WyqJZcapg2gznigTZrg== 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=S1JH+3ln71WmML3vmtjGYSigdHsRHRx6Zm7HZXEzXVE=; b=Ya+RUGa31znEW6TsQACf4GDXT7YyooXMTM7DCY4/J3poSyKxaJ4P39/5JUmb1tWJmGzt78UH4sY4TQcNMHbo/3Wi033i34Yros47SAoRVKwFzb5gE1OQvB7oznyNZWQgiGH0ermvW6ni6cn20cnf0H0kUS+5oznSvNtYeaWvu60= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:27 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:26 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 03/34] maple_tree: Avoid unnecessary ascending Date: Tue, 25 Apr 2023 10:09:24 -0400 Message-Id: <20230425140955.3834476-4-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0107.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::20) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: a81f3f01-5c29-4e68-75df-08db4596d19e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GG4wsptvSoMON9GaSjPnDm+U+ikYoZ3QdAYd/oG9W7GH+rT1gxVoBS2kI6P75i6ZJDGOC6Q9Cy6znpwGiSf5MG6vLlrPaq8dgUBB/pqsqGqidlsyYXEJCOVezwvP7cNX42i0N8cq7t146iwZqbA+kFvwW3wjcztu+FynijfQUNvNkNUUWJKCJoDZvNBrAYDg0G8+0MruRmrU3m/uQGapkWB7KkwnVbRkmhXOJWFg1PX+8TbawENFvz/DWfo4vnPzmI35rxcPT6XJDa37GBSvYM7kmWqf415MPt5v9sGrPUI0/omNOYs/2/A7dhQAbG4Xmx7R8pQo9mZxijulcMbQEMUINh+hLGQBgdH9pLmxJ51zmTELdiyBtdSpkzYp+Wx6w9H28EOakNbqvD3CSrpzgppwpLQDeJeBfLC0VK2RE5P79P/frgMYw3DgCUb4fjVUllrM6G25w/tqjs4LnSraXKU92N92dZK5q0Ranyhp30LOONRdA+sAc5DuoTKU1cUiHPKybTf/hkhrONiQZD4RTENK1ucC7OuloDbWe2LEClrtIXg2hGpJPxPVkkoXPTP9 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6486002)(83380400001)(2616005)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b91YwAQ5UuSY5cCNYnNGJ25TspR5uZP2C70DZrJXyw12r/10Zw5TVplMg8sF?= =?us-ascii?Q?B/o+ctZwDAmme9rqBF8pOZaMCdrM2TfaDmcoXFa9YOGubQib/Kuk61l/rciE?= =?us-ascii?Q?JvLQV+zybIjqk1Fkpp9LP3pssEkcldL0CPDuFjJpADf/YeWgO4vGkswk/BWk?= =?us-ascii?Q?tSYzxfG2KibT5Kn3uLIJzvVgbUi1wXd11MrnwrczAXQgxuS7ci8jMhYzeEsG?= =?us-ascii?Q?JI2rmQTPntxl0NegDR16/IMNdwivPMxW1q3A4V+YAkGlgktPV8weLG844ruE?= =?us-ascii?Q?dDhmap2/DucfnonorgMFtD42U7m4sX7Le74n7TSbwU51j7NtJXlrqaops5/P?= =?us-ascii?Q?7gC+TCwf+FIr09dwICoukn/+k1q6dygccPKT3cPSedOMZPTAaMMu0Sv9aihZ?= =?us-ascii?Q?40xeG+HPloh+mozKECT2CYKUdH36hrkhUzVzn2WIbECRebWAmfn8VV53YM9z?= =?us-ascii?Q?YXX8N9btCThVKw3PgI+8BzX4kl78J5C9iXKgvZraj5Lg4/22aLyZ/PkJEtTP?= =?us-ascii?Q?cw2POmn4otwyq2ko7mCJlXliKWhIv97TdArhSyF0vzQEScrfqDBY9x3cwnv8?= =?us-ascii?Q?ucKe9M9D1JUVTak5yubJCzecTIznS7oJCp9Jkpg04Kloy9qCcslTUzPTIn1p?= =?us-ascii?Q?U2UPibeGeiolIQa9LAAbns+KYiY4/zkJbVQd9q/41psjSSL6KHKyG/wYIOH6?= =?us-ascii?Q?LhKoaGFz4vW9tSaGVK8LRjpu9qGxEZsrFSakl+P84DiRKEkP9DqKOE3SK9Z6?= =?us-ascii?Q?dOa1CUHh40NykY1dHtOAGV5qqPUGxBcdtnav24BFIMocmfFwX+qGJ868K5Ju?= =?us-ascii?Q?Geqw+bouW3LxaqTnRsWsv9KGgoICGGUSf3fjidqpJiCypdMemO8222yIz1F4?= =?us-ascii?Q?ztuK1rC3bKwS3XkK0h5h83GR0cC2h4oNcwcrALdMhU9o/qsqlGjCpTiVPcnz?= =?us-ascii?Q?drAe+nH4NRdF59NxQZiYjK3AmtYm2QsdF4NqTvRCMCQeKBaa6hpeU/ZrF8Yc?= =?us-ascii?Q?41l/14ucSl+tRIpIjS3r8erzgbd6LHXpvoG+La9IsBJPhjz07npXhJs7VwSS?= =?us-ascii?Q?0fXrWqoK38dHE3fdTCQsEA3KWAfh9WuelAFrst7yCEI27wiIRaiJ3xemLJ9T?= =?us-ascii?Q?lcDryefKqmebMAfiu7yKVxj4/Ty7oO0wsQvNJf6FekQRg9o27xe921SI+Vjz?= =?us-ascii?Q?7UStleXITk+ygKP6ugdS3Qclx9wo9Ua7KC2xH68ha3xMxMEBQ9kdt5LIRDnl?= =?us-ascii?Q?52j8dpiKNh4UDVofAUgx0BxOYOd80pXi77BJmNJmsPmuWI3ANt0Fkqow3zwM?= =?us-ascii?Q?J3/ggcfxq0JiMuf9fTaKGZowHvQzX4n1aJvxKOy5gXha/uIowCnE9la4j9GK?= =?us-ascii?Q?tIpn4xPqQUAzV5QrDjAwWz2hLflxD4njgNaGzljwPyPKBRvuFtvRNqxeVVif?= =?us-ascii?Q?PJQMW/NNN02pMrUKr/o7zvY8ByVAWX5KKoeVftB7svCHlHrE7j4MLGJRuFyH?= =?us-ascii?Q?LdoPoCOBaOM4om/isHT9g04lLgUi3eFflE722t56wweRCytbEK4GkJH3M31a?= =?us-ascii?Q?eMJ1HOQi6IOkx/mDlpcHP8bZHj/sMjlpnfg1JFFdO2smPMn+TPZBxvAGQ7u9?= =?us-ascii?Q?2Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gIHCGXUnHjmKk/Jb2mlDnzO+CheBkKU57YISaWftZv5UaZS84pjgZVydw/WnRtXP6RR9WgQs8IFNme4YodVKCFYDmkc5GoYAmWskuHqjjccdLrBTtrjtRNn/K7Rcpg9DubJRZlM/PfVZhSJ2UorSQY8B3hRliSGGYun6DwWsZba7nIVuM0KN/lFQKzLwcyQrVPWCt1GSLK30W/LRPl9vDeaKNHGrK/pyfffu6A0Yo9JEJUKsxlRNgC2/JO97t2FaZrmAR+T+Z+TQvv6bEua3xY/L8iNRSaflrx3kkpvHcLgs+pod1MDgYOUJP2ct2+dO8QSXXGjv9IqlytzKeSD8nNRgYFOBzxIIX+Go7kPIECq8K9Gc95QnV8+s2joEwW8cCwKpvUVp9aKZTNrBjM/r+8P76YcAxh6T8GnebDO9vKGjL8zASVepCXCxsu4krMkpQ6vDV7gAi4m+fx0sMTVpHuAMYwbdmpn4q0sSQ5HetKVrJnGXa2bWS6hk+l66A84EUrVA/qeKZqzoVy5GytiwzYp0Nt8FPmQmEQ/hmWz/4ziiyRa/z69Tfxe1KgCjwoCRMCXLrEJpGyUxo3mwOOUJfdjZ12ka7l60FcCDzGNjZWGNirdVqkm+Vx+3rRZ2N7GQpf+p+VuFMT5E1jEdPo2nJtHDVPe21SUTrqtN7tylYZgCXtfe0w4mSMmNnCyS9DtXJA3Aos9aOsvvDphBUIoQPpYOUYSB0iPyJwIORDhPx/PVCmFDs36FDTgfn8VLh43HQIr0cmU5KaLxQbtjdqexv2Tty3YMfr76xysc+n1fDMbBYPGLbGZ8PMF3hJImQuSH1CdzwqNCo5JsGszZB7gX0hHboGJVkQY2ZpKltslBLG/fKr3/DUIE2Po8WVIGtE6hgBv83LvIGwCDNKn63n+pNg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a81f3f01-5c29-4e68-75df-08db4596d19e X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:26.8503 (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: bJRBxFBekFYI57r1Perx/IMNDMbRE4Hwi2hAAN+fufLhyzINPTp4KpDzU1i26itHvQXPN5TGB8+7yZjx0F+bQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: V4HQp_Vg_rE5oW5qzKzDHo32QKjSFKXn X-Proofpoint-ORIG-GUID: V4HQp_Vg_rE5oW5qzKzDHo32QKjSFKXn 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 | 6 ++++++ tools/testing/radix-tree/maple.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index ac0245dd88dad..60bae5be008a6 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1132,6 +1132,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 9286d3baa12d6..75df543e019c9 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 Thu Feb 12 07:40:30 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 8C8F0C77B61 for ; Tue, 25 Apr 2023 14:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234370AbjDYOKz (ORCPT ); Tue, 25 Apr 2023 10:10:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234340AbjDYOKk (ORCPT ); Tue, 25 Apr 2023 10:10:40 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FD7A14442 for ; Tue, 25 Apr 2023 07:10:40 -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 33PDi1SK008675; Tue, 25 Apr 2023 14:10:32 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=hnIf8rM9FwgxfifBfgv8ptwUanorf+NhjcYAJVOIWxg=; b=e8KX9c0/gOqqHLZHmn926OWJ4lRQQjDQDiLmL883PG3T59LQJtqBF++mFfLQ/GqpkhGy euSZiqIph9Z763XLyN4wXN+Z714veYNsA77RXTw0xBL+9M2SjZMCJBHMIA6mGF+qBBA3 +lQI0GeU3H3WzBLkM+iyxUMnRpAVNWy9lVFrFrT5qm9zldiTS6NNLz/AgE5SuAcpd6nY RB4V/N9YqIwpoYP82mXZtVWsfgCQV5Gpjm1Og3SsQKX8ELrmodpd16xigShXE2bcVGQ+ 8VADI/46h8mcUOKOpPzCe4o187AgnJOQmuOEYIYJpsUD9EC4q0NmoxsoZtSVc90Z+3M7 aw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q460d5e3g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:31 +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 33PDmQnF024975; Tue, 25 Apr 2023 14:10:31 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2174.outbound.protection.outlook.com [104.47.57.174]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crb9q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CL/Ex5UXRL0RitVuIHkSmY9Q/YPhbyyBaW8J8lfLvniu4m7E0AGIXZiuCAo86dBGBQi5KFneJy0eT+z90vwH3tgO+diK4BjpcT1QqClphqZWx59R0+RzIvUYZ2EHnCskvuKSdQHZfH1I7UpH8pYPN8KgEIeGdyZf3vaF0qY0hmeRIjrIvlAQpdFieu5S1WF7EM6DZEoipQEkDsh2R+drnf+G5l/HrLuwc0lDLns3zRh0gBporIPgh90caaO9UJ9Ggc3YHQc78ZhDzz2nV/TAk96YGTp/FZoEMKvN88YtIQS5HheYNvBl2DQwmAjaI1/Mwbbduwbn19FBYi1gEAtiCA== 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=hnIf8rM9FwgxfifBfgv8ptwUanorf+NhjcYAJVOIWxg=; b=col8EehAXIZEUyzzPH4M9BG4GLm4C/xarTZzoXSEj24Mffa93BQPTeg5IVlEocgNN1ONuyD9Yf3R4FZ1QKdBxTrnXDyEVUaetET6PXWVhswwmLm6EsUm8sN5upccZ8eYsf6TtRoPvRNdLp6iNKLRza7YoG37wA1O3oHu9q0hWFIz1LK9aMeiMCuTEzzXR+C/ZwO3XMnmB4EkTOiD79qAXULEMrMF6QLjHyITYjiyDP7oU9gT16nZURLQSacTgzHaqJZA3KcdTHWfYY8bl/EirLT+RO67sEIeOqbX185QlJvwPEDDN0mqzbYbFPoEK7Vz88VXKHWRkBSY+JQl7+o+QQ== 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=hnIf8rM9FwgxfifBfgv8ptwUanorf+NhjcYAJVOIWxg=; b=UBfHVgDgb5s59gRxvDLBdEUYoCPrlj8dzfx/RzKxIGr6H2314vAJSofuvytQ9Jyk6+gDaIxQ5r0dySiMufJnLR0O8iK+TKovsiFKb1mwwBI3MdfWO3CzJSmt1qUZ7MVMO/5l2HEb1HfgwZXY6qxL65fNGoANZj8/pbVtAQIt9sw= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:29 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:29 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 04/34] maple_tree: Clean up mas_dfs_postorder() Date: Tue, 25 Apr 2023 10:09:25 -0400 Message-Id: <20230425140955.3834476-5-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0010.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::17) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: bedcb2c7-8e45-4c4c-e780-08db4596d31b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HGz5brbAfEGjFh80UAcD51aj3SSgTAVCCPnv7m6n0spcwjtzSup1SwDGYlN1rwUhwL0DrwWbcUhPZu0XsdA1MJm30FnqUvKTWQM4/zA6t45JL6lDXgsuOo8ogy8zZMvy3NK5YX9RqBdIG+Dbzjzan+U+BvjTbdhvKW/iG+W99q8U0vRWD6zCvd03ugDjuvYxCO3htukCyaGp7Qzcmg0B38dGsqme6nrKiIDse1LxieGksJC5Ni7GzjJ+NFG/7W1f6d0srn8aY2onwuz+RRHCw1O7KoCseHTT8uuzc57YDKaZM6wQYYTd7NokOzuHjixEewBAdO6qEo+ivFYiOZLvefxGnVEjZjIQgaON5S8Lqq64dhq877SQNWqukf1Zw3QKCP3nE2uZcDotla4AM7OnFsx2FsdIKbMYOIH6RGK7k3r8CJWuzzOuGKLGUKF1tpD8wekBZbOocKpZ1P2UVzyZS6zlIUiHkJI9lKr5PHWbAvRMBglDtRL/k27P6+62vzLA3MMSr4nTJhX2d/ZmRtKZP/43sQyilio9wCDataEMPyWCBhEa6X9IhhK/+AmGFNPD 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(4744005)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6666004)(6486002)(83380400001)(2616005)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kxyCAtx+u8Db1QzuDyL7Br5xmwLX4sHD4G3d2HZSQLaYaDDyOrGg6V2cRKhk?= =?us-ascii?Q?lnZlOPV3391M9G7AaCiA/6Tu4EYAqXVAj7vt+JncbrBKfXqS4dpqkEFzfyEQ?= =?us-ascii?Q?XqB8JvSFryYlliBQVDaaP9bllRC1Rn+pvNbN4cJSOC8UnCISSrDHWDs+9ZyA?= =?us-ascii?Q?WrFgDHjZc25DhSbsIqjbg1JWX9VpoYeAQ+vSITxb38cyEwzACPyPKGM0MEnV?= =?us-ascii?Q?s6sPU9iTSxHY8Z5bJwB0P6kjDWXYMFNFlGfg/ENyXj73VGWZGMdGsDu81XwU?= =?us-ascii?Q?Zbzt+T2+JJzMPe8kAkywxsld9VfLO8y2nuvcyLXgBStPk3A69n7kUUeMYOcF?= =?us-ascii?Q?QoopFxhInyBdNwzLjx6pnMSMTiHvfwE4X7e6CmdyvdUbkgtsS99U1w402Qqn?= =?us-ascii?Q?2CV2q5NhViFwZj8JmQprfI3C5RVM9gJe86jKupzSAcMFaXkvE2E1WmU6S7IZ?= =?us-ascii?Q?83xfgrgBEtcTiC6t4xxpfQmJH1YVU9IOK5v5Fg66J+p5Jg99JfZaFZYujtqJ?= =?us-ascii?Q?CLJd74w+emkMEgZmFMtFd+uwqNmgmvCsqAyIp7XL0Vpr9fny43L/d1GA07lP?= =?us-ascii?Q?9Ipt5twFiqDG4IVpeFJvOA1IF3Bd93x+5UOWnYREsn7NmPtYHe+uZ0FIzokX?= =?us-ascii?Q?v2miBh2cAWpMekgG7GybWHLZgnC3XM7BKrM5VM9n8t8JRtKGalibzAB/kIQQ?= =?us-ascii?Q?+NJLVtzynHbRSHa8/zzZ7IOAa1eciYsziK8WTp+ZFUDW51gzsSQbW6H4oNwY?= =?us-ascii?Q?E8YtSXjCY8cAyw4jEpnbEYnNoFQfwv6z8Dx2v9HmEzUKJc0DaTIYXRbcziAz?= =?us-ascii?Q?Xc3r70YOqcCnUOnC67LJ6gyG/eGyq5npMCnMy2ZNYmzZ0Z9yq9V18raXHkyi?= =?us-ascii?Q?UerIeGOvaxfhGibRmK8FiUjzRtxrd3zxwQuy9oxkFcMHRjgKFy9X9OslEdoc?= =?us-ascii?Q?9Tlixl6/wHafaqb5Mis2pj9CoWHhaUgUaL7j8Fz33zx1MIZ8cOalHiCxsaYq?= =?us-ascii?Q?pqcKz8kCrCfmhTilEmDBRjZl3gBc0fJ8OKcX1W9nD8U5DrxBx4LjLui+WseO?= =?us-ascii?Q?shui2SAD9WHzKwE/5WFYhyhGq84hyCWEIF/7fc1fSZBFXbVJTRUV6grWokOK?= =?us-ascii?Q?4t5TFi268qQPIwtB05xnWaULWkgy8mvOZBJks6tYjTuGkLMewsjgqDwnl8WO?= =?us-ascii?Q?U3MovvGIqIkCHtA4zIB8RLjrkZ5u/sfUZZATfDHIhBIlf1DYN+M7fg+X2l4o?= =?us-ascii?Q?cBSfFtdEgv3d1/uTCxz/BVwYdR4HrwQwu709ietIN0HTRw+ddXWWeTxBFRoM?= =?us-ascii?Q?S66MnFQQEx0uNdqMugVL9+OguAaiWuDXtmrZSJ7vte3PWwC08yZdrMBKMmmI?= =?us-ascii?Q?IFhZN4IZPao12SFzcBY3+5zkVsBW7OsglHQkSq9Q8c4gKF4u4MF8m769+p4p?= =?us-ascii?Q?dgJdz/APhl1Bfpaq3VD2s6gWnaQInLIq7KILNBFSlmo3YKF4y7HORgpEOhwz?= =?us-ascii?Q?l2idN/Ihfhi/JYdiepbPWF5GU14Ce0uwoR7QVRFRHHwbx5dPtuePMcmsSYax?= =?us-ascii?Q?RsJ13uvjPTduzaB1T2JxT6pvhy8YJXiuGOuIZXXat+oMmeuZvy5TdkrwSFvu?= =?us-ascii?Q?wQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6APGUy/6I7vqNcdJHpQ0KwOiRFr6x1pbm29J/v5+fdLHKAmhEEFzUdXOYQX1I2Nd0iplD01Ula7ZIM5kkYQPWePqwOb6QnYc0/21cE3qanNFx0CINBRoLUkpKqS1EYpgsEZ1SHHTtaxMN6h1VxmK+s2OzD3JKfRO0/0cRpndHhRhZ0AniXvPdPH8243b5D4MBtKtJLh1ZXXe4ZBOwK62VqCN6SX4IEgd/u9abjlTcUvvFuFZelB124sCEhY9aPR1QEcH68p3SPBWFCvTdTCMqqeKCYhdrGh1tpdVi4VSbIsm1qY3GPgZG1AgQz7mcFd/ZOqvs3sTNFLYhxvatgKSjEy8x+1i0c6Db3SF62zER2yMdHOoqmhwAepnYHT3v7GWCZIMd9KmrXaEo3WP+73i5zpgjxxTDmXlaWaLxNozrTNRdCxJdBv0ikbmoNyO2flijVqB07djnb9FAp3enUvT+LA9RozpsxHajWRtdzkZZKkYxr8iZ1wo1dpqhE5NqQ3v4TtlctgMV1ag8yV8bGoJFFgMjajlNSf14o2yJT6HnM6gmihifHMmSb+ht/Z54yWrBUI6EqyNvozIEg9HRgumx+p4W+DCx8VHDcLjdFYy3mLPqSdhF5cCr8K/6LBZT0kc03q7BE7044IJ9aOzE1TnfMVHwyhYsREbLgdRQkf87D2uQtSQXerUgI1ofBiAFsjsKyia1d0+EKdSOZrC9+MCkZI/oYL98Jy5SfT3+HptWIs1P/cF7p+uMTIVT9IUi2E+hTO3T027yskvxzmiZKAbUJ8MecuujyP5v8T6w5/lOWq4bRIfr9DynqEAmFp0fpT783fIkV1qfzmi7QXLYOyVfRn3Mrst2lDdvIDOGSqYDycmZCvTtWwP0Zm+wucqI2jXBrLuycQdH9d/WGIyTWcUkw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bedcb2c7-8e45-4c4c-e780-08db4596d31b X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:29.3438 (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: 1x/9hgqpXCuPycVrWTFYungAKfTGUMHhm+bHlta51dPidddZwVsTIVK1pF4Y0EB0+GGo629QhVF6dUEjCtRWYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: SL-jpWtxVeWocq1cX4LrM9CCghPJsP9L X-Proofpoint-ORIG-GUID: SL-jpWtxVeWocq1cX4LrM9CCghPJsP9L 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 60bae5be008a6..dcab027b73440 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6740,15 +6740,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 Thu Feb 12 07:40:30 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 E4719C6FD18 for ; Tue, 25 Apr 2023 14:11:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234380AbjDYOLC (ORCPT ); Tue, 25 Apr 2023 10:11:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234341AbjDYOKl (ORCPT ); Tue, 25 Apr 2023 10:10:41 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85A3513FAD for ; Tue, 25 Apr 2023 07:10:39 -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 33PDhpLG001868; Tue, 25 Apr 2023 14:10: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=M8UMuQxpQmvbH1W8NeGhIKkIYQ2+Q7fgiPOkD745LkA=; b=zDDUX8I0dvdmqR2Z8cfLgDPykjIpEq7q/Y0X7FDW6Sboi7CFv6cu0lL1N4yvNRGFNc2w RMlENCVU6HfXKHOc7TwUVrdmVknwdj2u5C+qefDmV1Jl3jBZtM0ltTibeQVO/EaKkmWJ tgAYUFVpHhnK+qhcyiS5jD7ZdfrfdUYMYrxpjJtcDgwf4AchjNNlHYwahBWpHHtREXB0 OjieQUWgsrjAP1/+UdQjaExF43EcZ3hyPQCfTMM+yK68pI7o7lYA/H4fbmNBhGEINsVU Vgk8Gkaq799jR3+UIxyPcE897XnOlBE0ZzhyE8HfK3d2dqyqtNGkGK0dHVrB4v5g90zi ZQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfbm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:34 +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 33PDUgY4006656; Tue, 25 Apr 2023 14:10:34 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gqrn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZbbehFnbvk6eBAIVyatUDVfOjDMQbGy3PQKMo+qMe5Bgsx/+3R+yM8AWXDk+p0ckLC9Q8BUo8iapW5r/Nb4abrUiwf9P1Q7Wbk6p5Ho4ay+ve2/5y6ab5dqa3TAJLuyZh1sPgIJIHzGZxxnWOpMh3MSrqSndDuEqYDVZqtEw33DB5baBGcBItBUVKundJSSsMQ5rxSrJxPOjX/iePu5EjZMvUy3aBGJZSHkgOJfQfyNhMO7SMKOEdKjmvimnMtbtbp+7nsCHHmV/vfFcKYjrBG/THMEwfgy6m4oL5z8yC6r1KdwXmCN9FI7UWPQeMZf+l7tum88LPBIoBYh2JpNYlg== 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=M8UMuQxpQmvbH1W8NeGhIKkIYQ2+Q7fgiPOkD745LkA=; b=Uatv503g37r57w+NHiafBOUCgTq6w94i0vrtb6gH7/EQqQ3ZPgGHl9IIE/hCDV+NBEALE1o8rE/oh2bgerwez3bhU58demjrvO9RHj45/yIBsEN5V8L40g01UAXKF8jzkq69MwELkaSRznuzRlLTvaDd/00bXMdx0K8ydkRuz+mdhRKNHg0EqxFb2EHVvMZUB3m6maFh0Yg/6qT2ouRw+4SwpJuxQjc7G9+PM+BV2c2mBJo2KFptbM4a26Fb6wOAsFb27uUwFflBxYUhT8D/w7ov3yzjdokubajOOv552Fh1hvKk4y43q7VEqJ/4bFL4VOhm51d7TYyoTHLyuROOJg== 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=M8UMuQxpQmvbH1W8NeGhIKkIYQ2+Q7fgiPOkD745LkA=; b=OySg8OPTfCYs6HbSKhfdQ1UvwBHVD0Gwf9aW+/r3OCy7N0DDgQyKSi8UpoLXqjDGGKm90LdO5Aclk1QE5Dek6iEIgHQ5xlJrbqcOCCdFeTMBJCliFOOp2fKrOHcuTvJFxs+LON7wdxz0FD7PYG16Gls+FDN8BLCbGLZlp+sQxYw= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:31 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:31 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH 05/34] maple_tree: Add format option to mt_dump() Date: Tue, 25 Apr 2023 10:09:26 -0400 Message-Id: <20230425140955.3834476-6-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0408.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:108::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_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: 7549c03c-4a94-4ebe-1fc6-08db4596d47f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +zD6YHC4n6X4FW1zgHBd2GGxxXlWByTT3+bUMJsFGCBKq4dJmbRotU1Pe0d1lLO3U6iLI98EE6RNgZuY7r+NaGGgcwoDaoLMEu2glxXOcynKfuZt/KTHnwKw/6Ude+gf0hzV9KgW4hFQ2/6L+Zvp9/yzVMIrg4KjF6aSL7GCudpcEHWsCiamHrZBVyzdvfonyYp2Za2rm78PKDLboYvTmBKTuHubqL+mPl+sUGnRScUZw5FHS+uHV6gY/4pOs4esC2o6kVRQQL59UkXjxpveNHS0rzqd8NHzzo9f/U1uaFaZxpzkJmgm0gwYCD4UEv3MLt6e1hTsgZL9goh53D+Luzh37+GxFaO4sTgu4bEE/G8cDFtq22fdpKzsUhyjVnJ+foobjiGNWlN1abzpD2pQYet3N1zc9VLIq6kaAqsRtE6OOYr6MYQxe+CgiBrunjkXfxmjcPTucIHUBQe9hKvgz8sHzz13IOQ6gKPunO6MUX5WihjRgkAtjxmL0m+tvfXvcBiojcldAxKVs3fYNUpTlAW1uQzjsLtBfGPOM5WrVEJblMBJzdQL/mSRRuhsRZCQ 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(30864003)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6666004)(6486002)(83380400001)(2616005)(6506007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2ddw+8nDZOfLu/eO6Q8oS72I3ut+JpJrLyLT3kYvh9fxVfMTTnLCzPpbUnLl?= =?us-ascii?Q?KmkjIKQ4BiSW710G/jaouvtqeR5+2aLMSBxSsp20GemHAcn/MR//Mv3Ek0cm?= =?us-ascii?Q?SY+G3EIXP/FG+wxRK9ZbQTz8Q6V1LiU0gqixrK6Io8nSii4VkVmtBoL7RPsX?= =?us-ascii?Q?3wG4FPz6zcdMXNBg4jSlr/MCGXHiA7rvil7zLSlAw0Dgc0sZOlOvN2l7qAW7?= =?us-ascii?Q?TxinAE1oMBB39oyg4m390Qw10Ss5XDco1/5IZ9RFe/X8v220IGQKmuW3i2g+?= =?us-ascii?Q?FbgmFnUnBLTGuWXwzQrCbLJ7omufA1FF3UzE04Gml5m0Lg3ITQWSxSrZUibk?= =?us-ascii?Q?YyckHwn8432NVGiIyfrrAGY9MdU4gJgN50Z1OxM9o7Q8YKGoGgUQxHeOqPFW?= =?us-ascii?Q?KqyN2WK2FlVkkHrKCI360s34ebw/dGj+ddm7kbuvOWChYul0hhLsmPa1pix1?= =?us-ascii?Q?WX3AGcH+sMVfCT5ePsnUy0Zc8v57vnWH0xbAmEtowKV0a/rHRnP4vOFkjfnz?= =?us-ascii?Q?WegfcBWImtccXmgAjNGxVR9SoQSVk3Wz/wrdgzeFXDYquQ/9a2T43emnIxXT?= =?us-ascii?Q?vqGT7RRxIBLm3bkWcU3UWg9PENHLb45b3WrSTwG0zjUtcE0e936qtlYv26FE?= =?us-ascii?Q?2PmS8rffPkGRdCJg+GBpCpOKzzlYz3GqNQpSnyUSj5VUNU6zST5Nmk3s4erx?= =?us-ascii?Q?t8pK075eoXL9n26+3yIQLX6ywX2Fg5orTSLUKTKbqD+Lq/3e4Db74wq2lRD3?= =?us-ascii?Q?jEyOTazFmglIukTVd6dwB1gRI9mX2iK3+s+71J4z3nzk6SFF33DqpjUch889?= =?us-ascii?Q?TjbnvgoeQEopI20WRUdZtKUK0O2W2UnAL+YC1yrEc0vPvXlDVJDKe59vlTKt?= =?us-ascii?Q?UVHniwRa8ODJdpKwQ8SlitlqZdFWa9Vo5iOS+Fo/8W8xgfzkitgXPhKX7XUe?= =?us-ascii?Q?GWpR13v0In2RIoyTiZGG5UkQDw0lpK4o/itDWWOtvjCqrYjiaVfs7ZWRv8VU?= =?us-ascii?Q?gOi5o2lZeUHOR5FBi7zQjjkH+6PlCcpJf6luSTQV7TzyYEP5Subjr356KArC?= =?us-ascii?Q?w9dtU4K8WyzWEVex6wYmmKzr+JUgLSnfl4cSzdv5DVBDRiBDZY8WvVnDiAyO?= =?us-ascii?Q?vqOVI0raKp5A5zFrPZSkvUUbtUb7rFRlVVcyYcUemglhQB6xpnBdg2oSRQij?= =?us-ascii?Q?rwNYuMMjuOt36RMtehLWT2EvY6YbDND7nI9mkETxZqNFXNZQ8DSt6GXTxs8S?= =?us-ascii?Q?tVH+1WS8pPI0vv6AOfNVjrCKGjgeHzJA9S/x3KZTbKwjjSw+zWElt5AtqHud?= =?us-ascii?Q?uQkr+CfIs8qX+/itT9WVsMWV9FenaH7i2A9ZRt1SEgeAO4k2VxfUl39FXUPi?= =?us-ascii?Q?W0m/l+rDb1cgqcnCg0D5T/V/q57El4B5I306EH72KjIg119KCK/Ga3/7sXoE?= =?us-ascii?Q?f4uR4PBUb9o1+YmHOtrGZuBlEBQWKlUGvCzVeJsAWJ4gG3V37I18g5uh0mje?= =?us-ascii?Q?d4Z0MUc9FDjuKn8gmfJ9qU8up+GUAKxIJ+lKWsAniuFBdyCm0xpwS07fdu+x?= =?us-ascii?Q?X7lz7RJ1BVpSoETvLeLlZalmHoDTX2GexZtqEIF50UombxURtiMATgZJXAlG?= =?us-ascii?Q?jQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MPOSuKWrGs8FudPmFuh52wxo6f0OBeDJD0kTQ1sWnXvnh0JAxiCHNKp9HvCYICUOfhxcZIfrOxZsA7IDCm8OyDY8lGLd5Y9Fino0352qL1xCCDoeZlxewt3sMB8x4yWYtoJM6LouNNnW0Ck1JKzot6iALYs5NuXUb1zkP0DS0DRb2mMZ2iEYzzJO1aENNFvWGtgt/F5WNZghlbQvkPsrPKoIqNyPnfj5KT61LimPwqlETN5mr3j0vBFKeOolW2QpX+WOLdBTcgq8m1QU0T4wVAC2WjCZjImqxlKzUpjBQuaUjTc4zGyTfHy2woUDbYTjNpUVbbx+LmD4imXrfokp1vC94f1C+jcjiS3nH0KZaanUmSeAFyEcEcbGJAw6rIv4/WmlGPdIStySDHfQ0XNqE94ORyKOXPcbXDRhpDbimdskiGBDMGkVEJizeU2QkJ7wJ1Frt1oaiYrr8LqtYYq7/fZhd2pyhqxYCFQgaoVMKxw2hR5blzvXU7ndkMv8q4wIH3uySXR4uWuLPa/A6nx9W6zalGuTG1bYaHJBtFrnT4FaewSqIipIZ/R68w7cm44bSpj9jcHjiRQ/CPCjOYmMU8ywMScq3UqqilWrIicerizZWuga5Gu/1ffdhUXVUY1eb4AP4FVB3VIsPejLsCrAdp1Zj/eAKajoox+HuTVt4glekFtLYVdR64CYoZv1QPkeg+fzS+a792Xg5nXwSzKn4jCow28b1e0jUUAb4FM595kHSt0i3sc1MvYOnRNwyADbsbk1XsN9/psIReSn+DamF1waAAAXQfbHxELCUcAKDyqfx/8LA18Ngja0iBRAH/wsJCvGqutdDq/s+5RwKpXPxmTPE1PgvbK911f9qq7skcYolB2qa7cw+PiObTMPzpglSGlrM7sOJsKChrz9nm8Weg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7549c03c-4a94-4ebe-1fc6-08db4596d47f X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:31.6773 (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: zNqghwzQnwcKOpV/h2jDRJAv4gTvNJJu1MeCYgLgPnfj16VCoq15kv0IIBwoHZ/1qhd6YzN26kb4A9B52TOIXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: 3xO9_bMCJP6cWinIR3pQ7wWK6Ec8R1b9 X-Proofpoint-ORIG-GUID: 3xO9_bMCJP6cWinIR3pQ7wWK6Ec8R1b9 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 1fadb5f5978b6..140fb271be4a4 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 dcab027b73440..535efc39f7758 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5700,7 +5700,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); @@ -6754,22 +6754,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), @@ -6783,7 +6794,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); @@ -6791,8 +6803,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; @@ -6805,24 +6825,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); @@ -6847,10 +6875,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; @@ -6864,13 +6892,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); @@ -6881,15 +6910,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: @@ -6897,16 +6926,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 @@ -6959,7 +6988,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); @@ -6992,7 +7021,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_enum(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 f1db333270e9f..d6929270dd36a 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 68410c6d97aca..4c195920f5656 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 536bbb8fa0aef..1554f90d497ef 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 75df543e019c9..ebcb3faf85ea9 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 Thu Feb 12 07:40:30 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 0240DC77B61 for ; Tue, 25 Apr 2023 14:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234375AbjDYOK7 (ORCPT ); Tue, 25 Apr 2023 10:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234349AbjDYOKs (ORCPT ); Tue, 25 Apr 2023 10:10:48 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51DBC61A4 for ; Tue, 25 Apr 2023 07:10:41 -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 33PDhpHA001846; Tue, 25 Apr 2023 14:10:37 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=0I/GuI5QEyZWq7urrTdN0//wqkgqXn6YNERYZgyoi84=; b=iLyayOwRgaqS6VULgSi32LrL6A1Mi8rl6huCf3y7GWxqOLIrw5ZC5J7qEH/URZ3lTFnM N2y/kN7LreERaikuNH4Z0pCRXVyndz0oHcTOkRMOuuxUiqk55/tpgD+vuBeLlMTZOL9J ZseDr6sqXsu0NqfF27X6Og9znvm9SJjPT/6eJWAWbd6zKjkq9gPb3dLGyBbX0mMUAIPe E0etNIk94NnAE5J13cGdagPVd65rFuZxSpBxcJQotTyQfbg+0yOqhlbb/7Zfp/C5rvvC Dhu9HlS9Bn3U3W58L5SNE3SLRw5doMyzyT95Ip5qw2wzf7I13e2vUEw1WXw/YoQKzCk6 4w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:37 +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 33PCfTaL007440; Tue, 25 Apr 2023 14:10:36 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2170.outbound.protection.outlook.com [104.47.57.170]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gcxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lMXnJBzPnofTcYXqWSlHwybKNEiw6I2O1qcUGfXmrXL3up48zAaDpk2eoRKUdUiVE4pSsgNR8QUfZjCspxofQ68Me+FmEGsqcMFjr4tZzjzx5MW823vGkBDKpyGahO6ecJa//4nUHWFqYILb2qoOe1/lrVDePOOwykJgRL1TyruCxxTB8UH7udhUA3WQkxbikeK7cuJY7EYie1b7ePZgQiBJ7B8NMm/IvgOfeZjbldNNlCxVRV2zeGseCUZRncW5XeWRYx69Hl/F1n1jgo3WQ4KicX75bm+w1ul/v/TvStxL7tBhCfSxD1EL695kXvwKG6Fyt3IYoMMYrJ9nfuvvkg== 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=0I/GuI5QEyZWq7urrTdN0//wqkgqXn6YNERYZgyoi84=; b=b19jTnzELAqQLnkwXB9aVBVeR+RkoQPKo0aLN9PjUI6p9BK8IUxdl8bpeg+2Ik2tV5SB9bMCz8iF0YU0Mtket5WnbG7PZf6/DqunFrzhU0AC7C8Nh5hP1KvSiazzym/SmBIBgrJ1hsgWmsqHKgKEv5a7twZhe7ic1B48ODThdr8ikQvKzOcV4EGkP7H9zhjRR1sOZDGqXP3is+5xAfbdV5ME1vD4oQ1dsIKF21ATnfOUMC+TWmzSlDKPSfDwZ1Ud7Fu+mYRVQbiBplpyXYAxsTG9URItwGth12xt8D8yXe8inVLOefy1H7gPujE/Djqc1dC73d3Ls/89DhNReikvBA== 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=0I/GuI5QEyZWq7urrTdN0//wqkgqXn6YNERYZgyoi84=; b=KA7ddovESqbI9ZuXrtfo1TdXU+A4tTLFAgnH5Zi9KIPpyJ4Eqp95kyWa591+CFgNisoX571ZFtryhW+g0vS0552C8bje0BZTNpspBPgY+jiT8CpcutyQwfWocQOR3VnGxxqNMv2HOQgOL/E7uZwzVUvGi3itIgyN2G8eZj/bPuk= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:34 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:33 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 06/34] maple_tree: Add debug BUG_ON and WARN_ON variants Date: Tue, 25 Apr 2023 10:09:27 -0400 Message-Id: <20230425140955.3834476-7-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0087.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d0::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_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: fbf0ac81-85cd-4a43-e343-08db4596d5cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xg7OOZqQowH7pqFKAVgIKs7LNJmas3GB35pehmUQvcdlRbXzYG/GhMcP1iwK/8vzBUuw6syZTlHtJ4XRNp91UgRkGQQ349uN3lfIji0QMvEOcZwHMw4lId10GYmyddIDNhr44tirI0xdIb8+F9kMvcgBUHfQQT62voEx5Va7xRvwRGFHzB6VMk/mIQAnIaaN86nXjcd3HjNiZfYPcWmjiVHxK/jYBM+6dvWeqGkJz9uFpAEGwRGGb+KQb14quUh5QFBbkoDe7/pFOPPgTiacrxRwB0jMBd3V73xar+1dY6QmHmvIEkCIB/bNOce3JviCqB48DDBiTptSlcVp39uOmSFofsgrFOm+XUf5lw1KJz2G4zEbsMLLo6BPkrT9xE6fCWthtPKf7+whfZQN+VabhoF/+TWlz5NroYu6ypMTASJ83bA4tt5XE1hj2kU33I2UMx1hL6ZoNyWqOzsGhjbi9HC9dk8JXYyfSJoSv0uVcvHunASoaNxcCSdZHYeALTk5klBkPNliRtrv6LdgI5AekV20wu5mqDEDgK4aUtk8qytgXkcuGSFZy/5fQXAqO6ou 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6666004)(6486002)(83380400001)(2616005)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oToTAqOtNx7Z/cUzwYfPBJxf5vCQ8v+proE5dYh8bZtPbHzok4lwcYlLYoj0?= =?us-ascii?Q?gmbd4CGSv+DqwzdEUjXOozOg6JOD/OS2pbhvaSWJ3HImDP/H9Z8mN5EjENk7?= =?us-ascii?Q?YqjwrTSUZmfG8qUzxmP3c7BCj01cO8Q0NRy4MFkZssERcmv9jRXHwft8bOTs?= =?us-ascii?Q?okcRQw/nfsKAS9uRMPSEVjG8AbxWvypViGCERWAmwIjnBckzBKzpgIzgVZJR?= =?us-ascii?Q?tXFj68ID/7tlusAD7TZuhVTU7G23TugWwspkxuO8w4UF4MVNT02MF/HRbzby?= =?us-ascii?Q?zFf9K/v9IzItDcxn1MigP192FepBPxOMDMaFLcsuIXLK8clu8iklHHBLSkqd?= =?us-ascii?Q?0G1VUJPjywBhq6Kj/PHCTF9QFcJvAgwkT/fx7s72Txf+WauKU+776t2QQpnp?= =?us-ascii?Q?7RoE3LTVIcwdZFPjI0Pl2VekViorwgSCOBCo7tmK5iRqYiCgqiq6U73UxFGI?= =?us-ascii?Q?tsZA28byVl/VVkDJM9/iZqTu3uwdgT5WoBwX2whaRani0TLLJJ0V8ABwVCux?= =?us-ascii?Q?bNlrUfCBoHcvT3/6sQEaqGZS7UadzGd9KYarXL1zeqmYo5D1IV+TCTE8Akt3?= =?us-ascii?Q?Kijv1p+C++sotjl0YNVrShq+ZvgheJJ049uRswFF4T5dO8d0YGIhsSj90t/s?= =?us-ascii?Q?UGJH++Ojx2YjpnjcVKgSwK3g4IuyCNMEuivUAE9NlD7UZevJUXFDRTCOR4Ju?= =?us-ascii?Q?vVkGiW2BE89MReL97tn9LQvbRUdsqJXTD3tGZKBFdwieUpVDHTV+iRoJgUHv?= =?us-ascii?Q?xJIPpH6J0n061MIbR5mHxyQZRFO0w/7mP/Yhyy8xe+nAkEI7IDqigSuNCwx4?= =?us-ascii?Q?Wz7sTR5FjrVFhUOENVbY/lDDxhjNP+ylhrr4fVkXDNrdj8mR/j3JrjCIFtGY?= =?us-ascii?Q?vGmt5oiY7HT/3nkazf376b1XyjESTpAkPM9OMekWRngYO7PBFJuqmjgo5pti?= =?us-ascii?Q?EmYWxbtNgCoPg0Q0iaZ4j2/2utT3zmL8tWj+gNY8L8R22bBw97p0Z7/I/r6Q?= =?us-ascii?Q?3t6wUNgAVcStDF6AcZ0x+nAMLMhtx+xtGYE3EjRrnqlBHA9AtEmVQBQn283q?= =?us-ascii?Q?gFJvWFuLGkSoIycXlPdr5v5VGbLyND6yD9waRGnHmcRpVG+z25hSzNnu/WXc?= =?us-ascii?Q?NIK5d3WaTNcUKkIwJhMvrMpViJy6LfWbeTJVs6hy49vxePKp+zpdq7IgglMO?= =?us-ascii?Q?XXOxMyxoqQSH+hQmnBMPaTH9JZB5nKu0hjfMiQ4m8RxnGccfBsstWLV+yfwX?= =?us-ascii?Q?kV7Qg1EsmRa+GPowuCr+irdemTpQHcx6Hs7r9kqtVvqwWJO6WwnqcOWiv+Ne?= =?us-ascii?Q?QibaLxRGrKLUxgcmLImQPyqdGB9WyJj9ozvXAW+RI9hWPJpZvZp5av3Vs/Cd?= =?us-ascii?Q?g569yr3FMYzhwPKLrCJ0+VnBRW7XmntjyEq+aTm+/ZcxvV7oGmVLLQNeVGtF?= =?us-ascii?Q?+BKp6evtGJCEmgd9OVT2tgZeb/OwudSk2E2hbOIYwmMYep7yJSyAhDKkEqQM?= =?us-ascii?Q?9Tk0eaQZ4AU5GjEv8c/arZ8sirtXO/fW1Mn+KEfC2SC0vrDVpFFyHDqUgISD?= =?us-ascii?Q?+wJH84uRwAby7RyNHz0a/Vh1IJGrdRD4ltB+HeSafWzOn8qDYgayg3LwiY+2?= =?us-ascii?Q?Yw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XkXV2nY2olg/j2RlT6He+d072etFRgvtsOnLMX2PDnLNUVYg2t0nuShj6MoBSA0bv3h9sEuBg9JaH7FVUk5oNUQJ1X7SYknvv4IlsahRKlL5r+glmS7Er/d5WjtZGWy1bcETNANVTLL+NDzDIiQAtXgmHvdU9svUPb9SctKYv+GK7OG48hHfZMJ4Te9q2memJIFxqw0mPU2Po79ViMaX6eaBQLyLJdz0AZhTh+TFmdeHGgFIEULWuFKT0MO10obijyTd244W31IImGVBofiIbGO0xbCzQbXJLAegvLiRiEHJ8KQWJT2BoUHIqEkDy1Ow1+SGrp+yj+uIYnR/Wr4c2hcLaUCaDgKt4erhEaOT6D6+b+4U4hlLy7kRyop7lvFDJxrxm/p4wcpQMpvl3M3faPds6AKvwQKOn9Mz1TujMVW0qGFTVvkjvZmAZ7Ox0zNAvWsZF1Bel2TSu/u1iTTbJigINKhf+ECUJO+QiKn1fDOOMy0reLBvd5Geeko+q0lsf8UyEXKqXy2vCbfK68tKT3mMQXVMEfUOXyZvkL3Kzhryi14UXqcVRchrcIOQJmp3m0/sie81YHG/eGL3msctXJLlNMmNHe0JGyzV7ZAhuNFPFmi4pb5ncHCqB6mzNjRcnemDhp/MG3f3nIesKWGaPYh5BjfzkVIRNJNU96oqUB9QqE+VY3VuI5/6A3sHSMAQUihg2R883rPMGw9cjL6aKF1uwNASDlOsBnTggZ/yzC45HeOVbioYTiz1JxxBTGhi4YVhUaqZ+SJUnMOdQcnSOzL/LnxjoHb3VCKkFIR+4Dorf34fL0PIc6I86g6OAWZLh1MSYnEOfWlmfXT3dLVmSvsPJcRClwwreOBFdoY2V9uueO4pRxjgApBPkoywljrFl3S/EB6jUtEGFarDvByEyw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbf0ac81-85cd-4a43-e343-08db4596d5cc X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:33.8184 (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: HzIrNTi0dWFLv6FVqxqap7zExmmphW0gtvHOsvjsCUd4I6ufNF7PLvDNxXt/r1Z+oz+Fy7oK7okJ6msu6A0kTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: V9ALBE7ECjArrnrEYKvFk5M2NUIC2kRi X-Proofpoint-ORIG-GUID: V9ALBE7ECjArrnrEYKvFk5M2NUIC2kRi 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 140fb271be4a4..204d7941a39ec 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 535efc39f7758..a4c880192333e 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; } @@ -7252,4 +7252,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 Thu Feb 12 07:40:30 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 EA304C6FD18 for ; Tue, 25 Apr 2023 14:11:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233986AbjDYOLR (ORCPT ); Tue, 25 Apr 2023 10:11:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234381AbjDYOLJ (ORCPT ); Tue, 25 Apr 2023 10:11:09 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D6F1146E2 for ; Tue, 25 Apr 2023 07:10:46 -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 33PDiZav006059; Tue, 25 Apr 2023 14:10:39 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=iD0HsogRo+KasGO0aQ8MARS1o2FIoUvczcMPAOl56mM=; b=hiFJ2wYC+ZXqm0dwEd+7PtN6HOWAgq6RVPycl7IZuN6Ach2M7WfVZkJ9NWezRXj4+Uo8 UkX+smTHU7nvvc+kfJqfA7w3Y9PyzPMmbijIyg2etBkDYibmfbSUV89dlFfxDlma/Zwz SxlAFR9O1xliiDRuOi3QLwPgoFRtrHc3ztuMxes+Xit7gRopEVKIHH88lPzQjPIlFMlI If/SvW5aeV+P4/Vz2pBp19oO99zmEwuTnm6Ll4taKsi15P4qSgDWKmQM2xlZfyn5E3ga g8FGnbDaL3eEjzC8Ghh6CxWgbo9iYR5T3msFxcu8SNs+a510V8aOGDapyPWoDbfrzah8 sw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgmd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:39 +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 33PDVpp8032767; Tue, 25 Apr 2023 14:10:38 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qsfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l4QfDqlQkGjNJGs9rz82EMjgTlKeHuggT4/lHlZqFgDO8VYtN+b3dM52Tkf6Dkubms1HhAitdP6gJ+wJYik40h+vFdg4s11l4xDcgcstfMwVBRopoFp5vnw+Cw029cp8sitQMdYmwCKw2i1lXU2R2ZyJQvWKyC70uKYu2Hw7SxW4XgiuYk4vx9+cMF+u93I4ALkna5whARq5C3GCAExeqYHLCPEn+ocodZAgUiey8WKBlaFF40rSSrKBUpLKiwKw9BOtEi5xp+aaIzJw+3hwniU3huMdz2NtmQXoBDjpqINFatY5KNJYKvgCC0C0rTLLT185YY5yil24LuI4XIlB0A== 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=iD0HsogRo+KasGO0aQ8MARS1o2FIoUvczcMPAOl56mM=; b=A4KPQr8MylyTQlDkbSr7XTghgPbDeD/wi4DYeDI2gmu4MPhPc0KwG8kBoYZadPuW5qCvH2cdYdLMRu6mKbupvwQ+IKfbtG1iLGkDsFt5HQAVk/i+h8bGNnrD9HF+9847SqqwXgkigG3uj0bxKDbl5+h03QGxsfh0VFBcZ29vHuy7EZAUmITmrHPV2l4CBvjT61ovUN5YAbKlKXv0abHNWOGjcF9u/tLAz+onSno1fHWPQfLgCB69qraeaWBE9uzSqgN0XmczEU5qZB94AMDNvshVsrZ79q/ypoc93U0ZUQ8SSGx/X+KxG4Ix+xJeyjYP+25tgnRMriGBC2ZIL5Ui9A== 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=iD0HsogRo+KasGO0aQ8MARS1o2FIoUvczcMPAOl56mM=; b=gHSXvMTkozXEeBaK7Da5ellbUf4g1nTL0UQRqAk+M+sqz8plTRB7LJZ2SJuaQVfKA48d54ECURpwBrJaecXM8/pWg2+sdb2hdtifaDBbXh/0QicgXm3wb6NGRQjaTsU9ra09kyOA9nIXiBYK2YPaim4XjnOwArhK3vL3YxjTMvQ= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:36 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:36 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH 07/34] maple_tree: Convert BUG_ON() to MT_BUG_ON() Date: Tue, 25 Apr 2023 10:09:28 -0400 Message-Id: <20230425140955.3834476-8-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0025.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::29) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: 2795938e-4c95-4e43-b927-08db4596d72d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Bxwr4oJuEIKFrV0FOOqrkcHTzb+2RfEg//fEQq11ghu/cCk7dn1507AdEdsHXQcnd5MMHfL+F+2HZkogPRPPgwa0bHjoSizE0xpfcIgulqpa1H6BfdHVC7f4P9mdHO0pSLwedIUNXXaDgCTa+LIXO5F+kV6vj1O3vH+YfHAwLW2Oyq5qNrgeRPGzjfwqivKboASJafn8Y21vh2CgJn48TDhEsrjki05ymC+fou5nwvkCvkCeUZgbslDZY64HhAjhrApXU/h+sb89UXTbvMzTdbAUgimKkzlXYMIgn5tl4TA6tCF6SUqJcxd73rN752p45A0BIAVw2pcGXMDrOl4GFz7KTRnB5b5Puolu8yGfB56BH3XdOKWi59SnLL9umGBuKiQ3fKInCaBo9A6j9g+RgKV8sa0HyLnhqvwLMEiajtU7da5FBRgWbBBWhTP3O3iSCzraaJm/udPn4vIxGj7x1TUsXgoxTt9zs1JrFyMMYSTQtNEhQwHMVLDqH+LbPEBjCPdAkNBpHuH/L0pSxjOp9Ks6wxOKUOM5cBHH4CizOmcM5iEs3MBKsB7AapJimWf 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(4744005)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6666004)(6486002)(83380400001)(2616005)(6506007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jjAa7HXxMWJakVdfJyVaub+Rkl9hwHnUtiHL0I/UYIYoWXx21a1FA6vLvzpj?= =?us-ascii?Q?YVeR4tikYHklJFNYNB71OhXLdi8qDP7RW694+EGGT3h//h6kOWHnAr/wmcuB?= =?us-ascii?Q?N8Njnf5G+qyeIUOHVHgfzaY2Y1q021rgsANI7yCIWUWG8S6sLx9b2N2DhBzi?= =?us-ascii?Q?rC11Ynzktdf9anL9DBwDziTl1KNc1gdekE2DYdIEp9PcKuReEs2iqhHdg7iP?= =?us-ascii?Q?dg/BCzG7CFBtcH+3WCNnJn5URQcOjTrPwkSkKyj0DxRMbV6BKwuD6C5qMFBc?= =?us-ascii?Q?YyTu8lkugm7HJ6QNrAE3z0jhVkcRBRkd1QnrFrbRpdQQ0YtW0R5C0/jE+rJt?= =?us-ascii?Q?geE6GBjjuF0NloG5uXaUcFtD8qzBRzI+WFsPvkG7Fs86jEE4QNe2DOL7lPBo?= =?us-ascii?Q?ny8KDcBLjXgavsOUZCSGlJhYAqsOq0w98f+3BY+DgDbg0I+nldaQ+2gGhHKA?= =?us-ascii?Q?XkvfYr4XtC8PqVSJm1AqIKeo0Hh/jop/f7v2kN/3GjFv9Nss8hU+r5JhIkNi?= =?us-ascii?Q?7dESyk82NFHC6woR00EN7wZRiM36BGRwb/lWcXzEdFnJrnAfgd1TfvP1Ok/1?= =?us-ascii?Q?w4QebyZPk1DPR7F+ZvCnVx3TFFgMqJ8029wtXkPOdD2un07AlzOjX9PpM6h6?= =?us-ascii?Q?21KZ+miWJGA9kR/3eTEfI4vs9IbNuPV1wTZGWI5GxKp6VSmcUvM3G7JMGwCK?= =?us-ascii?Q?CGmi4ihSSq1YOE4CPS7GPiZPxRH8yPyRcOAiQ6xm6nutnvb4Gvd8dchWwMCJ?= =?us-ascii?Q?47ZfpXO9byMf0wv3eGhzfiGqfUuKY63AXGx16xbZGtYbXhnbGpxJu4wkXzNb?= =?us-ascii?Q?Jr7ZW8y72tL7ELstDo/qbjv0VfwPATwpmuaCQz7EsePH6ov9Spr1FCCtNfIc?= =?us-ascii?Q?D3sxF1y9wFuJlWNfKVPP5nKx7OE8r9uGV38G57TN+YAfwUVJO4qPACT5+6ew?= =?us-ascii?Q?MgEpAfxJpWjFwPEs6FPGlm0VnFRkv6ZNpvser9x5MOdai5rKCVvbo5IQaRqh?= =?us-ascii?Q?r4w+A3PIesvyn7VL05r1WlgakIysGRv7F45qKdtxqZgKVxj52Rk6EuD3PegU?= =?us-ascii?Q?DCxMuvdxKO93yci9x6uygp7BtJcj71kssH7PW2uKY4lhKsug3Nj3xJpscXgt?= =?us-ascii?Q?PzvGzd1vz009CfZr7rSuO+TA+rw0kPG3tjAHR5Mz0rahmEdJcohhPgLQC4Iu?= =?us-ascii?Q?jUSgaRLRfNf5uf7sP5goUVN4owdjyAIMqgBFSOJZcEW4BXsgXmOPlI0LIs5p?= =?us-ascii?Q?3moKFvBXVhiGQ2llI24+o7Iy+n1vf8oLgYQorcFMGZumPUZgTeHh/Syqdm2n?= =?us-ascii?Q?Yq/U/oPWxmu92zDfBGMP6B91hqP565FFZfSLZJICPvqymK3jxhivqkZO6eKI?= =?us-ascii?Q?XNqgB+af8JK9vn4eYJnmepDpvWBCycryS2lkqjC2IGmZuL+SGWbgxSbijJTH?= =?us-ascii?Q?K8gh+26BTjfvRJwKz2y9qrwuZfXDHz9kPZ8FtYtBw4VgfLFtab4gHMsBFwIx?= =?us-ascii?Q?/UPqvf7UCo0hHbPLMy+STyLQMakrwsT1gU5ZwTs5tf6e2+x0/H6rcTdXZA7W?= =?us-ascii?Q?wLdFGM/VXiHo3WjL+6YSTiKAxSu03BB/+2hKDDNjUPoxaA6gmS6YCcgEj1VY?= =?us-ascii?Q?Hg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KjQPDr8vH8VNk9n36ZFqueqaWIUknRNR81gmeLhGY4SWSIGEteDOImX9Peb+zyd8dP/QrdcbxFwCAl470mj2tfyUfIfT1Xd21CDrKwYd2s4tCvT22dKQyYFP5T+KMnpTIVO6B41KGqqYoTUqszXd8suADctv/RsQd8DPWiJUMiw0Qu2cSqnIfBWDI6A50ERXZsokcjP7mEOXX5ekK9b6bnxlpV7zntqtsr2L1oE08ebDbudh1fWs33Cq05x/Lx/bgIX/nprXeNk3ZMyp1p1CvEd3kBXIIt6EQw8tepYtdWksKyGAHAUJs1t7d57Phx6gf1d4rpTWMymIyjvKD+hJmxS7OZNmJBpFAPB3MJ3Z7qAQhlVMoqwWIrsqi/sXR0QD5TEmjvlh5Q+qzhZrSSYXdSknod3fdaQ5GIFOdsl1zLC8KCAKHmA3k2JU+fjR98v2vlavOfrxwDX2aIzuaWk8NGMRvE7/K7lS6k29ULX1RcciuFJZi38OdSLfrycm2PQpf+naBOam8f8vW1DNL6HjCFSYmFqY+H/JMewW0IPq3rJeZYX5Uv92mkP0XX8ggpFeyF+Ssg8oavRQCsjiAYfsvSTPTpFp0VJ4Lqp7gyEvjxLRpiCWxZlr8o4it7iAa8/VNAksTV1bL9akXlt2vmOOxfEz0KMPoaQB03SETwdIqFK0FoH4DsNZOV2PW89b8zNlIRIYbvua05Ld0mqGZY2qlSRlQ9H4EWhCss4AOrquKwO19RyOpf3yClp7EAsNDZfuIcEhgoJlUohRamp+tL5//2c47XlnQIX4RDbumfLwnW2JO7iS2AKFTwrRcG5KSiZAL1qK1CklLegUkWU55VJwoTcVfkgUtkIeR/MuwdIQ1JzjIiGWMx3cHSoXFTnp4anqkKQwZ02t9w4hIIFluVnkIg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2795938e-4c95-4e43-b927-08db4596d72d X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:36.1521 (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: X9z4i23d+Y77iDJyEFJ1EjjypIh91MknPsmgXQuFBK0xQyP+mH2P4u1qfKWeVYw6C3bVIXoF4RU6EAt17CcT8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: jEuX_2tBIcqy3DohtjKJ5jLbOoyCeuZN X-Proofpoint-GUID: jEuX_2tBIcqy3DohtjKJ5jLbOoyCeuZN 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 a4c880192333e..662a9ecccecbf 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 Thu Feb 12 07:40:30 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 523CFC6FD18 for ; Tue, 25 Apr 2023 14:11:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234364AbjDYOLM (ORCPT ); Tue, 25 Apr 2023 10:11:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234357AbjDYOKt (ORCPT ); Tue, 25 Apr 2023 10:10:49 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4271E5FC0 for ; Tue, 25 Apr 2023 07:10:44 -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 33PDhpZv001840; Tue, 25 Apr 2023 14:10:41 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=W5VCQae/u+KrSguTgZokUl+Fxo+cz9ZckZBWA2If+Ro=; b=lWCufE77AmGsxA2tWrVhV0M624iWLtyRFRKheBemUFQviJnb2lrOYtSXaHUU9xNjyIiG yxxt3Bj9ARGv7iBvUK6G9XM5WTYOcXEC8+4iZZtY+5P7Gz6dzPSadHRGu7oTirrtt4+k EE6uReHXzE2RQ1V85Z51RBZ0Q+e+wVa2OkTacrA+vEA/w/mYDufXCQ9b/G3qwe1ubzGy BpAsWjphbjB3f7DMmzORKZ9H19Lqqo7dMVthe9bITK+2dnKA6wX6elmv8cOHsksHE3f3 WhL65PaVbPxirF2tYEZv5rYuL2lOZbTxFnlwYwjkeqrcsqhLtWmZnVN20wgGfBBME8Ur Ow== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfc3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:41 +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 33PDn4AA006793; Tue, 25 Apr 2023 14:10:40 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2173.outbound.protection.outlook.com [104.47.57.173]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gqy0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YsmQml8gpNTVmOMsHMUjuRS9WBVlYGcIAYbr6jwwIt9koLOYKngEUBFBqn9ZKL+4sVHSv/ud3cUIBVTOgoi9zsICMbKszjQbrmvWzOLPupd6SkoZ9HYP0weex0g1NSWPlrECrjXgcMPlhccfIB7Rl4NHvbV+cN1RG1++SLTU4PzVgY2Bg+0uiRYyuhwdbnoQMvw00iGXDaDrsER+Kpr06U+7UbEOUtaZlhBAW7t6j6e0OeZulDx2/lysvgOo+OZ4jOjoXxEhEiqKUyOq+yFbniw8s7wioriBKYXEDV44v56UuiThwfugmF6ZO9UMeER3MDd+MQqtdlPrYCoVaCxzjA== 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=W5VCQae/u+KrSguTgZokUl+Fxo+cz9ZckZBWA2If+Ro=; b=IZ184cMrl/YvTvhuVCz1knmhrYVZP4XTzewKePnVfidTbioJbXfMcL9OmJfjA1B1Q9Dt4qMZAozlr6wC62LYRu20xqpPHAeKg5lIe6tXeKVd2pvhtBRyVCV9JI6AchH2kE55nVk/eR6FOxMrzUrTfxhaJRJwi7YBHZhY6dkJyI35aAYxHD270Tn1i5euaEEngsyNK39lcz7odvmWwvaJXTbYuxjVea5de2kdPbINMD/ZaEeIv1jWYr7UVtIHNsjUoO5jY50mbZgAxnrLUlGDGdI1inuHnXpTwvDAj8qkLFZsIKHjH2xV+aSxnrDLU1stdFSVEzeJXRoN/gds0ebSXg== 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=W5VCQae/u+KrSguTgZokUl+Fxo+cz9ZckZBWA2If+Ro=; b=h0UI1LW9JGpXzcCp5F8tl53iZNRwY7EI3/GEG/3dLjwR/adSCGQ88e7YbJMZUwoexZjOGWKmCKv6akCKOMGhnIjzDeLrU52HXefWEAJNyFDXUE2MQ7XZRDJWfiusGQq0akq1ZNDXAWmMnmgCtXJjGtX1IeSr21TqBk5jTJu5GIw= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB6081.namprd10.prod.outlook.com (2603:10b6:510:1fb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:10:38 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:38 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH 08/34] maple_tree: Change RCU checks to WARN_ON() instead of BUG_ON() Date: Tue, 25 Apr 2023 10:09:29 -0400 Message-Id: <20230425140955.3834476-9-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0010.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::17) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|PH7PR10MB6081:EE_ X-MS-Office365-Filtering-Correlation-Id: 34799008-0dd1-4355-03da-08db4596d8a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R47gbpjty5yCeT9VWfB79v5GCXyKTzIapZWZ+n69fg3IhlLke3pLQ0l55bpkU0crinIw1Y8gp6Ix5VrulNH0w2iATiilce0WEMAfRrAMTEH8lAfg+o1wAwcZrup47/NfiMjgI35kxGvd7ZtjOVgMAyPgKfno4tZ/aaBvzNe5sNHpJ6p+hPZEfZKjEXm8Dn9LTyV8Rjf5W8WgYlGOcNlei5/wutk72UmsILSLhoCDtVRCsbWrOnilzeCur5v0pBGp+aswNP+j0z2OYksw7QEYdAr2hO8lk0rZ7M1pde8kCWbZfr+F2JSmkSJEhGeC5WEnOYNn5PjVq7oWOKFBSrfPS9/Aj3qxXI7o6R/icZfuA17ibtAjsa3nkY3DJBEMuPyuj0GnudqDdD9uRmEQZMq79Ll0EPLBb9REAWEs3oFSdLGI3RCMsfeEeyhgXwE8ldX8aizeusXvQbkeBzuooCigdmOKB2pqqIukuvAou0x5cmBz4ZdO3K9qkR7vag9/tVjwIDFG5jgFQukEBzjnMRbwwnWfu3id5O5q+nkJ73EC0Ypl7q/i6OGpKg0dsY4OtYD8 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)(396003)(39860400002)(366004)(346002)(376002)(451199021)(4744005)(2906002)(66476007)(66556008)(66946007)(6916009)(4326008)(316002)(5660300002)(8936002)(8676002)(41300700001)(36756003)(86362001)(186003)(26005)(6512007)(1076003)(107886003)(38100700002)(478600001)(6666004)(6486002)(83380400001)(2616005)(6506007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NeQf7pFMZSmOiYDZDpOT13FSsEkYGyu7lm6jQfAsMmFvLxkRKb4JCwhWzUUd?= =?us-ascii?Q?H4IRi4WdpKdBGXNUVdEOUnZckDNG9R1yTdZiWgPOK4GVHVjUNET4v/3VN4Ux?= =?us-ascii?Q?l14aakPqZOiuFm5UDOd4+9bVjgpNMrI9UP9Y0ooYicxlCycovvi/KO3lfOTL?= =?us-ascii?Q?krz5AZg8cGJNQRH/36ocXPd5Fwu58Do8GRw0PKT2TFi3YiF5ChfQ8o68RTHn?= =?us-ascii?Q?pTadwtsJO+RV9AP1441XM3JW4iSH/TrQgROePzFHR3tndqzAHmL4Pv7DATci?= =?us-ascii?Q?Nxw+FN3UQmGYZiIz7z/lnTJGTYoghdUNoHqpDHta0uXKDJGrihpluvj2+3wF?= =?us-ascii?Q?48PHSZfqyWae2Kyh9M8iKzHziJyEmHu461fw2vUYz2cMfY7eIqj0Fj2f7R1G?= =?us-ascii?Q?KDfQpRQNiQ68nbaJu7Wkph3y+7m4JcmxLvLTLQZ3A2TC1lg2Ac23AEjhROs1?= =?us-ascii?Q?rGGLHI/2HIV/1vS+3+T5sWfXdrRye2/wnUARoc+tP20exutMfDH/KhdLDCLp?= =?us-ascii?Q?LxcmMFfcLiWn6k+kqYkGXBpQrDA8aR+IUeeCF6xeEUemyX9EeslRUjJZdKpc?= =?us-ascii?Q?A8OFubTL7mclYo3zGcbDo5tpVIB91Tw66YDbdLAC4XFrbOeNxLEwYMEKmEtE?= =?us-ascii?Q?NFCepN5PlztMIJZG5Pk6me8yJ9VuvusvkKsPK7ONJCifYQKQp9X9Mw3vRLY3?= =?us-ascii?Q?EzufaJt5h0CJDNiGpxW60YSkon4AgwOl0X43GkHNxJc7WvwbndkWrfZqtiqQ?= =?us-ascii?Q?s4//Li8RCkf7wzKm4UmLCmzB5lj8OZWu8dzzxPEgjX7ILjM6C26qBw8rcfNE?= =?us-ascii?Q?vqD8T93wigY00Ex0lY3GQ8sBwbDlTR1i/RO/SsZyftlivWUtf1Vnf1Pwy8Oh?= =?us-ascii?Q?Kv1fkDydF0BNzNh80TOfKLfDllsd/9au+yYC2OAXMbsTGCv/FPPNKMU8l0le?= =?us-ascii?Q?dFX/C4lONMwdzmLPS6x+Qdjzv0FeAcFCCblScich8hgK7bnvAFW3YYWj+CEh?= =?us-ascii?Q?TmGvX1x6v+a1D0HA9ufapnQ57ky50lZ07wxxjX/jSQSi4f+SwDQ2tm1lNuEo?= =?us-ascii?Q?p5CA22EHSQoUZ3MoYNa7gmGkDxOhIiqxGNwEs2IVRqDCDAIarf5ONL8gnLOn?= =?us-ascii?Q?H9CEduLpeO7an32Q4YVO1GPIuYzxai2ckd2emEjcvi7S2SqMDMNIxjTTun7O?= =?us-ascii?Q?1QKpQdFcBXTH5HvvaMliKIS3CRGXXWhpxrHIROp84IeyT/mWOV+uIFdv2d3o?= =?us-ascii?Q?3mTqU1vg0aehseHkdcUDk7e8N2dPk1embLOkhpskaRmjCU+OWxk+tjdGLKZu?= =?us-ascii?Q?nZlRXAtbfl+Kue1yHnYe2ZUPOumgafq+hfCao/FmAyb73sPXbCxmWUZugzFB?= =?us-ascii?Q?dr7smq7ztUeB2OUZRz4ZlGcXp1AddT1RUhxO99Td+lH4uEcaCUwhIsOAcona?= =?us-ascii?Q?+qPA2oOYDfeQvQiP+Twoib5dPeTQkT0xWlIIV4xl7wuSaPre5hhp2OMTK5Gm?= =?us-ascii?Q?FAe+zElD9g0bc0DnBz77klN3Y9BTT+avXoODDWI4zI6OZsjkMblImQ+5jisw?= =?us-ascii?Q?MZkT5TJwJKrruAgPR00+671L2mYZ4BF0VU61y2pwDTO9vkcrkYC9+9TRmiVJ?= =?us-ascii?Q?7Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QmGXuLNCVrHDlOFt+t8kUJCZKcQbeAhBaz1QvYk1HS+caC/K0rFN96OaB/bvNiPNPHA7vNXxLkY1ml/LnNT9Z2ud92aTCM6djOzlLRKuy2txfxN5PHCd51n/0ORgdeHxJolUP0C/jJGYz9dt9s7RoQm59StLRykx+KgsQwbgGWmD6bEauz7VRrccJhYUmJJaLodqvIKAgE/WpWxxJZGZKfamKGDwt+F5+8zxd7HvXLNWeMlFnWXusCHyewdotS0BadV8Artjwa2EMtpmo3ZFcnqmroI/liNskJydpc/cN3OI8mo6igM4WtwQPGoI5X2F2XuUixoobMdBH294tGx8oguJAsTzW1+UHlQPIdQ25ggzSZSV22VjQcDce4UaXGEAEc/o/KyM4hhuNFkX6FUM80BSBFrKY1R9wnvhP3x4WqDqoVUa5lNBFr4KhUigfaDa5Q3iQNX94l2cU8SCYlBQSzctNFv6Qf3+dPe7CpVLkBlPCWEPoat6Rsxuul5JBeTHe5eiqkj5XezEjhML3pTQKJ0TxpR/yMQHxzUEUCkFCGowbX/P000ZndI9zKxGkV5SX3vTL4sxFSFY9g7xIRvNSgwIPJJoJWmyA8pCyqCGWn7Uh9UpMUy5KV1GshFWf0dSnZ/nMELHTRtYO+2AdS8aMStNSknXKyaocWmm7CA6crPVroTqzZynUuRRm88RtwQ3mjBpr5vCWd5L6oTOrprVkENb5/zFdDTcR4dt2LBDdEL497yQ3QybGw9jHeAqQ43+/cuY1WkzBIOUWGq+DdMpOaMx9UfsDCPysRxUckfo74zNw/ByHFEfpCoafUT/cseJxK4K4/LPQToH2+WprtUQs53NNdPuH4lXDlmLFW5DiVrZ/ChDcg6RmVtBkOHKuiuq5aPV9dA3hZjlarkWgPfyVg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34799008-0dd1-4355-03da-08db4596d8a4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:38.5971 (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: Q+twtW2KcbmfUj+gUWNF0JtwHoxra9BjoROlyJ39AC8yMQLj/JtohWW2yshvpkPPRDoCSr09KCg9AB/m0g44Lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: JxUufsA0INALTwPkJNWfSch5F7T54zMx X-Proofpoint-ORIG-GUID: JxUufsA0INALTwPkJNWfSch5F7T54zMx 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 204d7941a39ec..ed92abf4c1fb5 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 Thu Feb 12 07:40:30 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 46502C6FD18 for ; Tue, 25 Apr 2023 14:11:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234423AbjDYOLU (ORCPT ); Tue, 25 Apr 2023 10:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234387AbjDYOLK (ORCPT ); Tue, 25 Apr 2023 10:11:10 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2AB1146E5 for ; Tue, 25 Apr 2023 07:10:46 -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 33PDhp3u001833; Tue, 25 Apr 2023 14:10: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=YUghTuunJgcPurK2yB3sYGEpr7hZME8pxAnTfemiK8Q=; b=Hin2L4Avha5hRrApUltqdITx5y+OjvHvVoPFqStk7Sybqyyhc2nHKKRe+4bKVhdcMmYr qjVQIKdf3SBtGZs56Xk/NJfjmCVjwO+BMdS5Vthwnatz5ELGJal+fRMsaelIbgNdrKgu yJl6nBCsoKrFIx+vFYhfdfoj7Gn2mtIJxxAMHPSJ1P2lhmzj8kQ/M7jP9w2UVCXn6ium 1lJeAlah52ZEFGGDiQfkMi0L2k4rKMfawzoHPf19orudkmP463JvpDhXEzPBuyN53YEB mDRZC+pTiLE3ppAyd4g0UoHkxtmN6TjThymkb/l+EfpW9YtoNJsEi6YMKGHbPjSnafAL gQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfc6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:43 +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 33PDHQcq025044; Tue, 25 Apr 2023 14:10:42 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crbm3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SaUhzlafQQ9yYlccNTLHD4M0s3ccdDo1Nz29H2rFN4b3ZV9vTgpNhOCsgf8DNatz7lZ39YLJL57cn5Hcd6A3Ac28tATBke/BLitoDcUEWutOupP1L1lEpDzMByICrfhNu0UqLac+CtxWFUG/27R2xg1gZtQXAC6XbBAWij+r1g1sfI7VEaBdJ6hfKySXwNIAtrJ2i0kTwjyAZtcW0cPbyD2mwVCUGvApXnTbHkhYH9t6Apszw6rGpPyuNdeM/yTcyivCiSLTAwY99Clxs8Ff9utrlfSj/DISYvQAMIJd1GfKagfJRfVYccr9y77obolzZJC4r8RaTSoPHnoAyy757g== 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=YUghTuunJgcPurK2yB3sYGEpr7hZME8pxAnTfemiK8Q=; b=OFxMGWKsI+iJ3RlmcJ2+ljn27CQb1mYdimwLOc9Qyxwx14Y9oMnzOG0L1X1Hke54nWzYoHs4sEZgjxRqS4I6d1eZ2VCqP8zqV6wxLcPdXLrM1Y5EJxYfGdxVKaKozLhzFllXsGDFSCSEnZPYsY6idVhhZogFjPR9+v1LKDJvqNKvIGnE6Dt04iwDuxSXoAEoQbu70RpsvCFgnSsggd88MaZJTU5VGy+XtYLBtRcMPq9gNlBbWQvDx001eGJ+ccwFM3k6FbiJC8cp//QPvTrX7SbmO/O1RfH4HuDloCUneuoU3dSm3IzZf5Ldb+6Cor0syog/F942rew6BuAhHFnyXg== 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=YUghTuunJgcPurK2yB3sYGEpr7hZME8pxAnTfemiK8Q=; b=PQPB2CdXqlm1iYT9hz+kpjIO2eK4c6xR0uMPZCKkR2D5GhEqt0UeAGaAwSJtumD8lZ55rW4p0+lSg+xJrmS5a+LuYyxAA1Op74xV4oPuZphT7bzWNk2iOH6KYkKYDVUYfuYhoOGTfQU2tnbA5W9Jacu+H9AuSJPsNLIRrgRz5LU= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:40 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:40 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH 09/34] maple_tree: Convert debug code to use MT_WARN_ON() and MAS_WARN_ON() Date: Tue, 25 Apr 2023 10:09:30 -0400 Message-Id: <20230425140955.3834476-10-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: 02409481-c407-4bd9-ddc1-08db4596d9c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0G3jzgU4rwtAw1RPHuNn51OpKddVO/zf0xpOQMHLzegv3KXJYG3UTzI2kIMzSgNb2+sq2IJklliS0WCBho7J2YhNQ0CK8NhH5jxDnZs2lApAP0tx6z4S5tNxd8dfn0Nl7Z8ba0poQ6xNF1Kjy7RLh8Qdm+YgFM1ZIVUIKtdx2OJNC+tHM7c9Bjlf8f/yQpseFy7MNe+nTbHUxcc6AT494i8Imf2+cDjV5gHx+kUjMA2T8TzKGXFTbjzmr3bQD4pW0U3Vn2651F8504Xdha8sGJ5rGLgeCum4+c25CpKbFubNok85PKHUjQG4td/GRBMFuKVMCul+yM6uQotOWK2Qw30B1und0Rnfyg5MXArReEYm3DEgMzYV/oiKfpSZ7a2RhU/9MP0JLlkzhBIEKLw6DElAbZ86ZaWCrILx5qLCBTz7c1TXStJ9jUbsnTXvZDgGbrDTbTDpY+YGfErCwn7Bwm7kYoqjFLnExuqK0OY/3m1wLU6F4kCAuDFJiTrghoK5t8huuv/xtV47/3xeUsEjF3wV1ifgrQl5i6dl14QmJTH2lxie5P6LHa87AVwPW3k/ 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(54906003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RwIIdaExrx/wPTlZG0dy2F5q4YrrjYEuz9AoLvH1kzonWfzi05zeBiJEjHbR?= =?us-ascii?Q?kzVHv/hb0VIZxRks8bvhK9Ht1/GEzjrD8IXR68mW5ViwxGCiX9mT83f3nHKZ?= =?us-ascii?Q?rnyBrdFhpX6M/wBmZEfQZ9WA4qAXrqUcXi59c23UnxmXh4Xw5gRik2wKNRgA?= =?us-ascii?Q?niBsGKS8EMY7cN567NuqFm9SMjir/TiKfrntehgeXEr/Kw+L5VlD6zObhmHT?= =?us-ascii?Q?hYSebCqkBo1eQpoZxCKv1+hIS5Mo9MhPZ3pqBLbbnuSnruhiD3AkYn2q3D91?= =?us-ascii?Q?lPsiHjRP44OeWFO+iG+WLKjP+iX+RQvF65U2EV+ioUXtsIwSY+OFHpJJ8Toj?= =?us-ascii?Q?E/Ai9/CLVkc3ia1jBPXDyiArUVfxaWwaXE/51IH4QLKF+FsV/eJWZuQZCx/L?= =?us-ascii?Q?abnLdZV9boTQd86ZYHL56ywkgU5s7r1f0mEuVP5cPGPZKCUDnaSrhjFZYAIE?= =?us-ascii?Q?EFGwoMt73T7ElfmSckSfzpZ4ljm/+Cdts9QkoY+a8rtylap69cz6AA9MpmFS?= =?us-ascii?Q?z3g7lVu9cNsBUnsyUPzwMc/I3De8SNM73Fk4Z63UUnUpUbD5r7uDOTYZqaqy?= =?us-ascii?Q?KqOaDyjLCFIxZCU9x3HdbvCMHVdV8tvCYL7qVXFe6tQt5vt9f1E/KdqIygUO?= =?us-ascii?Q?BCgcCa+DakyRSGyn3qfNQGYHWcYSWGTUZn+Uo37ORGrsrLvPasbUjbiB4qrQ?= =?us-ascii?Q?g9uS1qKbtmULDupkBlEiAoby1ZXgJ6owiaO/HR3DR8F/5mjsU/3VM8f2sTi4?= =?us-ascii?Q?qM9CLf6xP6ix8CT5efQcV8Px1QGjiuNH5hswHtO5eveYT2DXGEJRd7Is3p8I?= =?us-ascii?Q?weyI3h2RwcK0XDy5CUCp+y95wX/X3TDUXUZBLDAYJQ9yUofhk7DpsY9GEZ6X?= =?us-ascii?Q?B+NMMzZncr/+gNeIyxTfod7D28VPnUq3ptMMYwAxnCtYM6Z9Dajr63QJ290n?= =?us-ascii?Q?oRKgHk8ZHQhSoMti9zYDqu3Gg6a10gKLtQthfbYxGylDqkxuxgiFHLVRh38r?= =?us-ascii?Q?xkVO4NjlQT2rHQUDCk/LC9af2dV0hilX3uECT10WjDic0/TrgupAMDKnhcaf?= =?us-ascii?Q?LRMULtmRERqCqtj7TYUyWUta/25IQVaisXBw/yeK2G9xcycz5dfa+aesw6Bt?= =?us-ascii?Q?rKdb2xXWrqoRuM3U4yn2yL7DdeJZNaPKUR1qkHwr78qIdxEOTUVCg/N57qw3?= =?us-ascii?Q?dGJfgJAhJ14ZrkUo1TGvm4UlVU9JyY1B0vJPdC9z1UpXry7bzwdcG1qWHF3Z?= =?us-ascii?Q?YOOFnMMDQdGN4Yg4lFFRidFyVp6SMofU8LUTmddGkvkiX7/5B7sRn1PjTqRt?= =?us-ascii?Q?976tDXfoaaTacGnSdOf7OHOWo5M4Jgxkxsla1rftoofkpkWgIjVcl/ILN6Hj?= =?us-ascii?Q?cm/Gvyb5B6c8mWH3czO4sQvpwe41TVExsuDZrq8WFsXIL4jCuKark+2bn7T7?= =?us-ascii?Q?PDplyXxJoUD3ZZRYWoQscfkYrTv5L0Z6J5x0B8Jl5Fjpd+73NEw4Jqz0WX8I?= =?us-ascii?Q?EBhYlbGQbpvv4WcnaC8g7KBYgeQi7AVMS5pIfScx6+5ZCcL+0CZOdXPMHP6f?= =?us-ascii?Q?+K4WVTiI9xuyAAR99cAnIUGVdjpLMI0ftW1Vc4qEIcUL4gHhQUmzMywXFKZy?= =?us-ascii?Q?nw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: W8HJUHT1x9IrnTeVlUXIWP5NrF8vOIljpWA7kk7BCtggvonpJk/DD2/y8earwYs0JltKvZHp4BsWwA2iCaU/tj+GBK8v74Ych3tyHJP1SIYRBOrlaKCrRxWbfJrGkemLHHE6lluAzIXH4vSP9rQ9QhhTJzm50RmluPBWofpAHKvS2umodeniEIqdNBovzxt2zRoVYhXco2U5rYPvS2FHtB1HCSnNb6kQVxwN2n5WWOtFSvcOe/QWX45fRIXAefN7srTswS4thwmZWxfqnyoj5yuL2+yzo7MLm4zILn3REziHVZTZb6bSpcfEXIWCgZikNxl8J844qp7Cgx/1IcBUVM/TwfEiU8GS4bB+UHHuW2lOQjHqY5KEAvX7ebFeJyVIzzZgFQyaAxd/8OveuyAiyeSzVFvp4Lk0+xCCi90syb2ZRd9ZnZ8LJoV5d7bEpLPubknSEHK9fgKnGLf2R7QjbigOPPMWdB+sBdmuUe1SsTaUWZ8qS4FWG3leJWwhhRV0fRI3si4sKUJZ0nnm8R+S9ZXmaupz3efY+Yj+zRl2ZjvoL95J/B5gWGAHY2iA076qzb7lUBslq2X2qtUfukeDwTX5QQ3G1Ki6n4rBBUdBL+4JW9bMuk9YEdu8ImeRP+iAWDSzZzbrl8ec1Q8G7ixIGgDudklrR2TUw+Ks1fgET/VBMuETihzkp34/GvxZqbToe9U0Ss1DXo31BazNIsaxP+3gm87kvjPeQRgACZmV6HWx3fiPMm1CmUh4kbzp1M1gIU3Sp1nBxiExWeUFMO0tevHOSy6eG90LY3QYxnKpP950/uYfE1k29GYS/RP9nbpjOqYstsnrA91zekFybmBmeN/U0MXwZQcjHCgwIc+AiQ1DRWCgxb49/nztUC21IVuoZjJkPk45up5mc0JAi2cyDw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02409481-c407-4bd9-ddc1-08db4596d9c6 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:40.5061 (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: ZcOeidtT3KyzcbJtDWuur7kTqo84HOUhF3VFRh63BCzbnECMmJeXgIjCaCTVJB34vnmHoZDI/lHYmbd2Vb0F+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: WOrgBsNIbS9dHqb77X7Rz5YXewIieZT5 X-Proofpoint-ORIG-GUID: WOrgBsNIbS9dHqb77X7Rz5YXewIieZT5 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 662a9ecccecbf..d22a337e9cb6b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5699,9 +5699,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; @@ -6530,10 +6530,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 @@ -6679,7 +6678,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); @@ -6690,7 +6689,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); @@ -7134,18 +7133,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) @@ -7168,7 +7167,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); } } } @@ -7227,16 +7226,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 Thu Feb 12 07:40:30 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 53B2CC77B61 for ; Tue, 25 Apr 2023 14:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234392AbjDYOLf (ORCPT ); Tue, 25 Apr 2023 10:11:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234388AbjDYOLS (ORCPT ); Tue, 25 Apr 2023 10:11:18 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFF3D14F5A for ; Tue, 25 Apr 2023 07:10:52 -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 33PDi7CU024310; Tue, 25 Apr 2023 14:10: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=aZS8RD999fUgHdsJnnn80kjdGzDf6FA1XiFSDSQtpFI=; b=qSl09W8wn8ygealFzlkj4JZX1Pz6E7GJPZMWyvAHJt/ow+H9QOcNxhgnBhcq66P5GQBW s/IXO8Ti51FPvKCsm16LAVlc0roQnQ725Ursv85tczGnPRzoRtcEcV5CLE1cv6UtVigC /+zi96+u7+8QcfhpYnhHlQBJZFPnpB4c4yeoJQZkPKgLLBSxsCimzsCsLUfcM7+0a0EO wje1NITNOYuDDaqDM8/h2qagBaWsVqRUj6muTQ+4j3qrpHHesohcC9OCWwJw9DUaYpqR Jg0MVE+Tkk/uXIciS2sWs7xL5AS6GzdU3sLxK2I8pgssRKoDcOfLi+pYKl6SvF/ETnz/ Tg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46c45fup-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:45 +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 33PDXeU7032632; Tue, 25 Apr 2023 14:10:44 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qsny-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ginNR8HuvBZAVH04OcErruBgsBGzEYbAZ+EOiZqD3JxH6lE7mcl0P7XPqRVUx/Bf5+j97lEpqhuWlhB7CMy07zszG4p1Y4+3kXACU/EYXvK0vF0v+8I+f9/X/FNx/TbhahISU0DaXxAvaLrEAhrw5kwBy+SZerT1AAGnipsOKr1B/sKnN/R1hXr3eQFp2TB6IiMwYXGogCbOlIIH3bAEIbyhazo+ARXMD3ZK2b0SswqNH/TtOCBm6gXgeB3H4xnNl0MOYKG1ucZjC846F6oNBfmGD57NhX4X3BYTa+RGxAdg/wQJ5Luu7AEgN7JYe9mvoeo7lDEF+xiS69xOqa0NAA== 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=aZS8RD999fUgHdsJnnn80kjdGzDf6FA1XiFSDSQtpFI=; b=dtX11oAxCfvddo2Ll2Jc/Q5Ik4rZ21Go0dbzL2881/DUhfe6pxM6Ulb8B6ey+N8SB6plCKsnXq4NEpcsvD+6BL9fwX+7zM6giy193hGMemDeaTUTH+7eI8YAFq3mpnCHEsNm4Uv/oXdsflgcmDunyfGBKeYmPfStkgX3qiDExTJcwxh6is0pWmj3xoHz3YUYfDn90EVE/ENWdHA030DDv/nyF4hMAoxUliCcDn4NgQ/lbWwbZK/w1TnHbAWoLr0ZlxLQBmb+1yb+vRAlD+PlKwiXDQr8fcWNIiyvDEHQIIhDKVdjQVX1rzVGfTVAKuxR5IJsKlme7SMsCn2xLvvJnA== 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=aZS8RD999fUgHdsJnnn80kjdGzDf6FA1XiFSDSQtpFI=; b=hovDSzQ1v8EhmDQ1BJk3ZjZbiql72Uq8Zj+WmFgVsiIbr6jjeus3paq1PFRAJ+vY7aFfARYRGjKhYId6ejJ3hegQBjCyaAxo98I0VtCNf/o3SmM2pDLdhIfxtPxng3Bajk+vIAqTfV7KgWWgWGe4GcW+9OvvWG4iPqCv9E1abt0= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:42 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:42 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 10/34] maple_tree: Use MAS_BUG_ON() when setting a leaf node as a parent Date: Tue, 25 Apr 2023 10:09:31 -0400 Message-Id: <20230425140955.3834476-11-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0103.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: d93acc99-006c-44ba-535f-08db4596db06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sdJzv/Ff6UGp12bjuFdwmtH7FPD6WH7Cdb1Qi7UsoUGDmj/pYcKeDWGAGs+RpvlQGiXzo/uUuWDOYDDPiPDu3V+QjzXQULWGvBNAaHLUe1K+n0Sdvzx4F05xVH9xq/juUIyuGJp5YmGN3XewqBMaHHG3WPt+vbqBlED+mDYeZPF3rSgNLCGPp5GzJCePfaYregtI56W9Oh3cjKaIfwEtK0DPj4u6VkvnT3vz7U3oRC+EPmqLeioudsL7Z1DuDT4fGDYprQ1oME2Mr9Zjh+2tcNUO1dNU8QFm/fNQ6hoqGOomLSpfL5dZpadapXM/0/XvzNWAn1wz2a5PDiAEV/sr31DpFJuKNGllKKqf75b6bDmBNCciqTGHocT4s2FzxMvsgZbi6OhB2c5rRMa6gt/6mtBN22eEoVmKn8vslDbnHtmbHuuBpgoGtR3e30zZQpohwiqOKssCO2AjABsgFPVJ2xH4LrHXEEad5M9j050zhAwXwO5sVMz9S6G23PkUbKfRSdAHjUUakZtDoAcSAOzsjsIayeXWqvqe6eaGQvHzSrgVLqTBP+wu0L1/QToy5mZo 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?At+f95QINEROlHceWSzT+Csbqqc1ebgMRM7/V2ODqgOFnLoLmMMtklo62sRO?= =?us-ascii?Q?o3oE20IkeJS/x6Yq/d6HhXNu9pPqZ0y/Hz5h1jkK6TXUhq+74gQ0xEOCNi42?= =?us-ascii?Q?pOo3HHCKgIMHIui92yJGHTZaQJLq6liiLVyx5Gp6+W1dVhXsReyQKDtO4lHT?= =?us-ascii?Q?KOuHA4I9ItivGQgCO8ena6GbPCHph6aRL4mNHS7vtTWdyHXV8Vd4yt3oPE1m?= =?us-ascii?Q?+t6JJqdyK3nmXiaP7sSGSFzHb331qq1rm8JB0ZAdoOaVngzyYOc2UCUGu59/?= =?us-ascii?Q?U5hT3kScxd80Osu8XYQZOe1LOpa1LQN+LtkXujnCOlS6KlnuVCxMC4rsne4k?= =?us-ascii?Q?HESdTwgv18aXQSfh3wiaBG2cQiEoI5I4c3b3FiL6zXWE8UoDeN29L32q1d1h?= =?us-ascii?Q?8c1rd9pmqsG8vLDCnKF/ecmfbq0tw6bgUJ4BnmdyK6OKovGjMVtvTVfwgMRc?= =?us-ascii?Q?Hd0BDd8elw32cv2CsA/Xv86pEDsmrPojTguKzDGzyiUhuD0y/50Z/xnLIUH3?= =?us-ascii?Q?wcBRdf6MRL/MXxsMFqkJgm9dotVwtm2Y0AvHqmGAUwQnPLu4iWevIs7e0BLY?= =?us-ascii?Q?q83dfE07GkdKlHqnCCmLyLXol0k2TWcxl/OjMsr8vrWZPUGCKlPq+VyPAuup?= =?us-ascii?Q?cGuIvT98PuQ9pP2Ov/10a92YT+e58F4JH6Jbo9gy117QlkMLQQvQj9KxDIRo?= =?us-ascii?Q?wnbTLcM4JtBOsLyT92ooDP7DSbeRshz5YUBP4Hii2vmRJFmsbpQbgysgUeMh?= =?us-ascii?Q?GQ1ZfMUcySJUPtABCCSMHgqWunHPBxelvFLCYnEeQELbJLG21PMqWvJlgYlN?= =?us-ascii?Q?gNSOBKmEEmxQJKhO6sSzN1+bQl2Ki1uapOO5GNWYUH/Xn1B4fNbQfVgclKC0?= =?us-ascii?Q?25vTDlsYKcnJ0jJ6sykBTiApghRCPoTEaBVkYRgWO/wtEVpHUmoVO2levsh3?= =?us-ascii?Q?3/UXIgxX04nYycFSx7kmnFmkW3bbSKudK5j5UK5yL3IYzBCYGnpN8dIv6kL+?= =?us-ascii?Q?YPYfstoCrxB226jSQhtYjKtmRquhuluV0aGbKqJvvfGeUCdHS80Yn8jyZeRr?= =?us-ascii?Q?qDT/dv47LYYwIS4iXuLGe5XLEZsrCmYTfYYJwlCirjvsjz04ym5QiijZ7vKY?= =?us-ascii?Q?IqNPbc0Uvb/0/+No5bEQHwvlsBHfRfKxXmzGruztBNB+OyEGqzcBkyT8CJCx?= =?us-ascii?Q?ghpvmGMpJhk8Cc7hg4FhcDwI5RzK5PCrKKHn4NgWbe+SFJtZg3FxMYNLo7VH?= =?us-ascii?Q?nQbSO/4zForp361mK+LFhY5gNT7AbVmyJxxXKRIPj8aG3PCF6NMVOUSbT22v?= =?us-ascii?Q?TOHhZV6iYTUTGQcXjZZyzN3ioLYf8fle69ZLTsJKxVAADssEyRPIFLKN9ih7?= =?us-ascii?Q?LJ0Q/2umkJPb6cMBwDhCL6Yu4v95r34I0gKiMjI5FVldYO8B293fN2WCsq0j?= =?us-ascii?Q?nj6/yePcmzNZUk1qZmx+0HU4+inLg33Ytz69AX7KFC0bN1jNbbmZV7/39fkn?= =?us-ascii?Q?RTxCuF3ZongNTxsHTju4f0dQvk79UOc5/YIiFWeQMAlUA4AOE8l37tgqauRn?= =?us-ascii?Q?b4PGEXSVqVmnjVIGJF8EYk1To63J06giFEnpHSDO9A379X0Pbz/nBcPs1IzX?= =?us-ascii?Q?VQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: l6eGb2ANKC23jqpNKfgQQwUc/LDm9z24Z0EARmqZGkSzeCa9ZZxXUVEY6BC/LS9RjxL21G83C9TC9OwRikVeN2JEwoAHOP9fLt9oITOhiE8Ltg4Z2H40Q0kT6tqqCWPtHMbdqbvbSlOaWMrEqa9x2zul139jL1UJT5M5rmSMywmZS20PmV50X37bZ5jhhPzCKv/xnFLMUt51FEZD5m7Xg5tQUPbqqgD28w+euKOLEfmwUBQ4Ta7kPIR6+yBj2DhYBCU+SbU5BBahItnaj3LXybvSkn11mdBox5UISwOoE8C2UkmybE5QP+LgCxDbbCRyUdYBnJsbx0VnWM9XWeH6tQxQ4gL51JtsW5iAJZSN83yTWCMhqmWkb9mE7tTgT9XbT/7NUc7yKg8lX7Uu/ABbeO2ZBbfP15cjxkNodbdNUV4qSaw8Tg97NdbFUKCUAkcmzvH3C2MkwjOeChGimtHa4zNyT8+sOs2ZjyVhNRtiFDCuqoZ35CWPG/950j1voYL/tN7YtOy2+9pheL4o9YQAcr5LeAvTrk3a2rKw4ndK0KY4lRO8u8JM/am5khRnWWGXWYrI2NjnWfrw8sxNIkfVT9vZLPM+5DEW0qRsWr/SFlL9yBtAW7k6pkgJ8TwHJcTw9BJW2uxg/CJaT02veDiXQtb4HrkBXk7cjD6zMePU8G0BRNjTgqt0DaCLCwO9jubwJr4xx89MLsJUH8zIOaWzJMBZBmx8+UDVgfYry7HnehEpEmCJMYOGBXB6kHvJXJuJQsQnmMBplkypqnh2SBopSZgEEPCWBVOoZ2zFAzPiv8VgnEVaavU7VvaGhzBuqR3oVmcVy/cW0R29rptw417WIbNjKhSa26ZhhjCGyBopMsMt6FI55zN9HAsAQHPqyx9oAaxKs7Tih9Z8QJRhmm66Dw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d93acc99-006c-44ba-535f-08db4596db06 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:42.6032 (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: LSOynljhkeLzPFG58VUq3pVqNF6RNcjAbKMqlKlWLuBiN0TSKeIgdr4aB7s9VLteKasChsT7/Ki5RIyDrQHdvQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: OHm_kFK_F9__pGBtlMlXIDF6DwxufVgl X-Proofpoint-ORIG-GUID: OHm_kFK_F9__pGBtlMlXIDF6DwxufVgl 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 even 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 d22a337e9cb6b..441592be039a2 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -453,7 +453,7 @@ enum maple_type mas_parent_enum(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_enum(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: @@ -1741,7 +1741,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 @@ -2706,9 +2706,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)++; } @@ -3105,12 +3105,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: @@ -3337,8 +3337,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 Thu Feb 12 07:40:30 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 B0CABC77B73 for ; Tue, 25 Apr 2023 14:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234447AbjDYOLj (ORCPT ); Tue, 25 Apr 2023 10:11:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234428AbjDYOLZ (ORCPT ); Tue, 25 Apr 2023 10:11:25 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0206D15440 for ; Tue, 25 Apr 2023 07:10:54 -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 33PDi2Zp008719; Tue, 25 Apr 2023 14:10: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=Kft5REKonD4Srs2Rad0KiajjvtvFMzXh9RlWg1rTwc0=; b=zdAb5kmUDIpWXTaQEWuke0WIsYGjPdIGzov/kjQ52yBXS5gd0ZZTo/c+c+9Kd9yTL4hV mBX3EajBSfOE7+CuNPxSe/ZZ9u1P/DZTJS48mixb7HrdHye8GHFXpB8OLDBMJQoBYON6 ExOxMIDzIuWNf3jYPcSbfu0Uj6hhB0+hEewSGGoMJmlGaGIGmNuQPLyFGWtqetcYFzCa P7+8mlzq/oFH5UJbN+xfiervmxSoM7UNceBpjBc3+Q6uX61oZVTB8iC1zEi6JtaG1mTJ hiSCV/A+E9E7URcvq79eVWrFPCW0dzAYJreGGY55sJzgQ9xepP90rR+DRL3ojDONTM62 qA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q460d5e4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:47 +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 33PDJkRf032787; Tue, 25 Apr 2023 14:10:46 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qsr8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gMt6jEnHj4hTQXMbJXTjr6DMOYNSGu0xyrFe3DYLEaFLtgHeEzhbpkYSKMhUUjIXy7ZEOkksO6W2uobot36XaTpcbAEDuAavpxG4hqg8vZ9K9WbzEi7B0dKOWJzRghgTgsVWwf1Hq2m03OpZhhXngkTxgJRe0KwGdSov6FHeIIQvMsQRDwx9PgB/rwR1cHxBKK/HoBUNi5dy+m2ov77RkOrVM298YB64999VleO9gmmRzjz9mRsSAmTrqQajbyK+TP9Pnz/vEszqY+fMg4xWmkzWB3DY4VCnHFsdN0GqKQBYyzLqPJjxIZR8cyGvUPtuoX0FNA6lAoWfKOArNSDKlQ== 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=Kft5REKonD4Srs2Rad0KiajjvtvFMzXh9RlWg1rTwc0=; b=Fbc2K9JmgpIYp7C/KEkyTX4DuWHCg5Zk3j0KQ74cxCB5sTlf43nyIvRABFFt1ZBVYcL/W6ogtHnrG1jGgpAT9eN4UOs94xiG4jIZcaOzZewVqvskNViM5nrpGDoL+O0IGATkJrz4QaiJOsvtk8WM0FywPL5nk78QTRE1CmUAXIaeB56clmKii0DNhh6bgXVll9WD9693UMj3zgeDPxiuX+6XRFQzZZ7Z1tUCdvlyLxk7a2/fNnJeT9W7FcNoNT9OMYmSPjSAMdZ1g43SjI5NV0GHOLmdqHF1hFmZ400N55wwGDP/uYfSkJenOgPjh3Rt8lp22qbiXaRDY5GC8NjogQ== 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=Kft5REKonD4Srs2Rad0KiajjvtvFMzXh9RlWg1rTwc0=; b=RMjzRY8uiUK9jV2+rgDxH92+P6FtAg2QwzwTRdzmc5weyIF7YSmdRC/rPSQUogEjB0xcMjdQcN7R1aqHl9JgHcYIHJyk0VpeON1fHPAwoEMecrqn0rF50LpxyD9ZeTzn6XDOdYjpi1aeEZAJv79KwcdrKyFC69wcO/yqk1oSc+U= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:44 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:44 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 11/34] maple_tree: Use MAS_BUG_ON() in mas_set_height() Date: Tue, 25 Apr 2023 10:09:32 -0400 Message-Id: <20230425140955.3834476-12-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0059.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:111::9) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: ddda0046-44f1-46d1-7909-08db4596dc56 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JcFKy9KdOnTqTRWczZoXc0Wt9nPjLTFhWEspg7ZEVa7G0WZF59qX1+huAhHhB+JNVawYmX00jNZG0GLU3WcLqO5sPc6xGAmsTQJJFOXyuKisCpoUKNtIVIgEG0ExLwcGrlnKu1ltZ/e2iXsdT1HH1cQ4zmf6swdBaEe3ZSUyQqvTgvwQrHwwf+dkNuwN7G7kETAASKGOIJziqYQ7PogzgsioI6nFkYu7aY2QYExSIK0To+oEudN4QBoq3hutFSCK40K/6Pw2G1B6+6zrne80o/anyO6fOm/s7WWCz4FcWc/WtcWG8A0fFnppSDzykVKNVyBeClFhr2KDcMFtedC6xQ8EaMZm7PIpiYoXjpgdbFSvx6UCe/hxCxOWtPQ/aoFuTxjDayicZb9jxvEvgsPv4lPiVsTkvkv7K5VDrwAHZgqGO2YqZ3b2dqPtC4ydS2szosgIFCjsO8MgD5cX31O85vwuDPt2lBo6Scf3zBT3H8KD4aGgUFYJbxYeJwIjT7du+6V+cNzXkMzQ7xXZzBDjQ5bdQIGBPaMC8dToEl+C4hUpvFX7xyQ4aeHEvIR2eQ5k 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(4744005)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qNdUQDsn4vejCg/kY7jl5scHa+z1dlQXv+wFUYUer0lY7CeVZVf7GgP6t8ZQ?= =?us-ascii?Q?IbpnZRU5Girg1RJXbvXnqtVKr43Wpmx2nNnkqB4uMLqy9o0fufIRnoco5U7s?= =?us-ascii?Q?1pJFU2Vgm8UlFh3dLwqbew3b+yA9blqdc/QB9r8I/GBTolHPDu4I0xVeaODG?= =?us-ascii?Q?GJXfu1fGi1i22NVh+qDwTa7f4ncvtufGsSO8aY6+ymeHo2youknKAo0FhUza?= =?us-ascii?Q?5m5B3U4SBdagvMkkXO9fpt/bUq01jBNKPpaiEZuyBF6+EeLdX76FbNGJ34QG?= =?us-ascii?Q?+mRcsBYx5kdE0Mf7whwH1nqZuHn/DwLK91BFs2Mf6h0SS3htgtDksTrGAYs1?= =?us-ascii?Q?3kEKpKkeRiZzKM0sqBtIf2R/4s6Pth80gROGl3w2lOuYdPByje3UzYHqqMP1?= =?us-ascii?Q?nzaZwr0smXC3hetUDD1CubOSfEPUwTHVTGJ0VKPRayAW5sPKpMvJKmR+VVZ2?= =?us-ascii?Q?Dlr8XffZ4FI+F1k4e24ye61Okc1v+gCXTNKas3m2rQWfxyRxeuYNH+/NuOhF?= =?us-ascii?Q?B+6dd4VdNctlmPpzf4Uf5vIzCHZxpN43MpfYf9264hYg/zUYiQcln490sinP?= =?us-ascii?Q?C59qsrvpLCqKvOXGZ8B4vBzTpJwtVCG0YFH7Ur7yYMJQ9nm7KVlIpzuewlZ3?= =?us-ascii?Q?9LBFFWkXuQQUJAFdfegn9VsEPQA7Dv6KCm6JGNpYdq4xrUSdTjMr8AeS/WAQ?= =?us-ascii?Q?C93zWYmnWThh5JrYwpVhFxtuI0waFx2mhUcuzZg2rptLL492VYuhuA5G1uAU?= =?us-ascii?Q?1+QG26LYt3KAK4kmG/zwOYYP2zOwwvDacnjE+cBYGJd4fCZjczgXwkPV+w+4?= =?us-ascii?Q?1JqtGKg1I2iWw5lvtws6iRuPe1PtBwc0Ot7fCVukeTJS+KietAzuR6rJ/uaO?= =?us-ascii?Q?9DHVtGUoiRDwLw1joVSThPE3FHeXPoDPlskq8JgpOTPnHha9OrmXS1aRO+AC?= =?us-ascii?Q?lztB063WdytXTFfVUHEIKBsxPPGI9+3J+3X/QQ1E98qeCTlwG5xs918nBJts?= =?us-ascii?Q?t5DEw8QBtAHx8Vp0j1ftSy+h6jNJLz5usTUeLAppVj3noi2ayImkcZbwSPFQ?= =?us-ascii?Q?Nu8MSuvUIe7mRAHm+6ORhSY7zrDf6jxZzIEAxEH4Rnr67UVAs/M/8RuMNYwJ?= =?us-ascii?Q?c6IwO6Z2nJ81ICUzO7ClBqM0v/+tmlDYxfX6msEqCuxjh7GPmDIxZ4Zt7OFg?= =?us-ascii?Q?ICW5gJiTlKda8qeiP6NChHGSsztoNV7GZzzoeYv0ui4eOxbwojV+nqPVYQhW?= =?us-ascii?Q?tNi7Z4j/fL10vdrwMHkFqqhMyVPUnC/yopiRLJgjcPCaxWAyKk6yN3Dx+T/Y?= =?us-ascii?Q?0QJNWRrOtXoAt7u/V9c3fDUy+gUPgnzpQe13y+6UNDa+51bnYviT6W7wGNZp?= =?us-ascii?Q?E2qcKimUzQpHNIfYyvkbepq3cXWoaUmYxkYGFbfH7rcPS8oS3FsZOKXbCd65?= =?us-ascii?Q?Xw7zoaV3AHFa52e2vMovyHfFZHzU576UGi1KN5ThQInmo02kRU5VgIVDLdfR?= =?us-ascii?Q?tNcrcXaSLXGFo8zJ4zhVMacdhN0weQ/bK8KqjZCe1waq30prv/ZXNYPPkzyE?= =?us-ascii?Q?GhlVXzCasl9SdGTMno/2+S81+mvu5FE0mWNBr01DxVhb0uww14bK1873Xe5Z?= =?us-ascii?Q?0g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: R6h7xf+iM/jVjHCn3ZnV3MqmEx69BW/X30b0+EhDcYyqUtYg4ck3BGtEu+mIviTP6WoJGCvhecxJU0WY2aoXZhDs9k0UAufEav+FH+CLPpgcF5jy8kzvxsxTrSdJuznmvO7ltwiBA3gLuFXKOTawzIEOFLDPqcLP1mHA6Z23aoh3QUfTHHqpMFA/9VyL/MmwaVy9t5aDPMS4Be4/lbdRSPtYQ9qajolBHRCzOEdE0z5yyBRFkLvQWNqFGmIGE1d1Cv2zi0jZx2nDIn9JhIl9T1nSWmxLsGKLbgKU+a1yTabtLyhdR9N4KpIMTd4vjciqBfVY1hGRWN6L+Edp0dW2DM7zaL76oF0jQvmxLTXSwoWvLAxiehlQmmQ9F8QtGwn5WnVibGMKhjUmy/WjV+UPFGZhwsLh5I7M91hVcLZNn2yhWJOtfABZQQvpmlqGb+xEpEPJuQ81qX3ZnhXMY7W+JshM2fA7GxVBEIJEmibX6M/rHNVClQO9h3pBbcflBTCF4LvC3JWRbls5WPTJeFua3QAicYUh6nwbhR0Lb37OtkDrZoeAqYucRmDiT47OPxPm+/jerbletBLjNBXkanlqSnf2qsnMCJKDXtHDkq/wQ11MM3KgB3v5ZaCI7HEEjlAOfvd2s110cG969xS6iqnaeXAq9WmYhkV9jS05HGpBDLOnqPLxjvN0xV0X++YuAliC+OiAGZagOsmEJ5feGU8tNwfAD0hzPxiKMuKaKODK/g3mbNv4aD09/D0zyueUF3UqgMbw/eGiXK8JA5X3FYrvH0Hqhe2pR3q/rvCm8hXGtT4lD7EH73faRDktIQfdzPJI27Nir8/FHHQ43zDFL7QmexuDBv0vCWJ2SbAxpM/bwasKkPhpA37Acd87VANFBc8/fnmJmublQEu/Xjjn8zh3DQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddda0046-44f1-46d1-7909-08db4596dc56 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:44.8060 (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: iedxUfOvok6JOIKU0WreE0PJzY7ptoLO4gjIJn0NiwEsKZd0YUKDelWhG+Cw+boDTCynAH4A9avLVCRY9N2M+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: 5eCsCrHMlg9rpdwdkJZY6_BwnNgZGZVi X-Proofpoint-ORIG-GUID: 5eCsCrHMlg9rpdwdkJZY6_BwnNgZGZVi 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 even 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 441592be039a2..f1ce3852712db 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 Thu Feb 12 07:40:30 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 723BCC77B61 for ; Tue, 25 Apr 2023 14:11:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234464AbjDYOLn (ORCPT ); Tue, 25 Apr 2023 10:11:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234396AbjDYOL0 (ORCPT ); Tue, 25 Apr 2023 10:11:26 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ABDA1544A for ; Tue, 25 Apr 2023 07:10:57 -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 33PDi75n024299; Tue, 25 Apr 2023 14:10:50 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=dQI17GQLfY51LpW9gZrstzngT29+VqpfaYKOYKfoYG0=; b=GsffDF5u733uUYrMFmn3waLnCoCz8dyoQQXj7n6ye8aAG2wQg59NhiIPZ7aPDOV8NMqK 8VJ4TUXGwcA6Rl55OaG6eNZhXXLq7wcsHLW6OTsTKQod+3K3qtiXTwVRldtcDK/tL76B r9zZOIQkVrIAJ9Pc/No5pQp9BSQ0HsbD50ZYT1JznHIACWJqElxGL7FyRh443zzVwkVU OV1eD1NguDPpr0uRPodTLretbg+vR/uWupS2kOyIk6lqXbq7D2rSqHT3sn35UlfB4Tgx 3hQh75fXnnUfVQXDsB7nxEGflAZhjf/2k0ODpGTf/fJtSDlmdmYx6VpSy75sL9B1aN11 UQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46c45fv2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:49 +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 33PDUQRA007393; Tue, 25 Apr 2023 14:10:48 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gd94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HHAOZlWqu1Ahfdh6eUUHYod0dVUHa+zCPyjG+k448PZvur5t6OSdjDlREo+V7oQQN+0UQppauruqVQ8HmshLM2k9WIfXGepQVHu/QndDMs4vQgc6dI3rTQnA5vXZphH9Xa9pCGEVIlOLw1YWkYhZP4MLT4s6A8f3hiky+Zbiq96+vdWuXwNXg4QbeR31RhtIyYylVgNXyS5mLO6XFiIj9/CHgOV+2xwi2fVg0FPk17A6fTz0CcSb10RX8Px8YUR9ighiT3zXNAdtWWj7huCloVK0XELDneLX32smk3qP4mD53U6bdvJ2zII2sD8mnwPWr3dPQ1S1qvHNLumybs7etQ== 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=dQI17GQLfY51LpW9gZrstzngT29+VqpfaYKOYKfoYG0=; b=UUJROVqsq47FodhDrAjxyp5sfocOz2HWFMNKbAEqF+rSvjs1VuQ5MnzgP/Cn03mGUcrGr/qxiKzi5H1kucJGph+7TaBk6UKs1sXTc6pe6zBPkKkftf5auWZKSobLOs9fzUFZP180Ieynq8+H8+Qx1Ygzt3AnJps7Qhg+JB0t5V85taCNXGj9PKucNKhEy8jsdE2kkDibrodUNEutrHjLF/68Hi0AbGbwB9etQSDRPhDB1+tBQi64SYi4WsaITjf6/0EhYi/BWeNssC2Jem5GhPVvcs1Bsxr/JkbRK+uRb2dtvy/8ucqchvgN34RCqaJ82oRjJ7H0LLOwjLAtNYGR/g== 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=dQI17GQLfY51LpW9gZrstzngT29+VqpfaYKOYKfoYG0=; b=fYilZPNWdCCSdvnbopIwggdXRNiJH0TL5rgY7Jp2NpqJRzOTKWTSlfT6Y9B4HiNRRRHwbrFBtmLGWbWTNYs9y0RtekIXfQD6x9Mj7TrTEzBGT3KEAQLAsR/n2p/TqSrh3+Mb0y7mQh3pbl0J9uHq/H9fmz4e2RYXbFnzrBl7M30= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:47 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:47 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 12/34] maple_tree: Use MAS_BUG_ON() from mas_topiary_range() Date: Tue, 25 Apr 2023 10:09:33 -0400 Message-Id: <20230425140955.3834476-13-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0080.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: ce01c4b1-cc41-4e06-4efe-08db4596ddb7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4JjAe/a36ofjjEJ6UBXCShY+5zFfZdmJf3S1Kz75m8C6IN06UHVJ0DBEMzFDkIoxH06mbsbu9t3fKyshHumrMoaLywv+6qvrpsVLd+/baYc2N5G7ZUlB0VHpjEiMYNaKkhM03OoAi3Qy/o52o2k8yabopMEUZwoXV7NY+CTiG/GKCOX2TvRkgyQz7PvqID9kBoWJoJ6Pu1/uHNImvCLvxiz4XydWpLAaqF0Wd3ZJLgwrwlTegI0WuvDp1uD4HNOcoXuwgH8TvxIoRybjTQdeHOdgQa3Uxcy/nUTbRym/ampkEMAYABJTCxi+yce0/jWFrwpPnWxb33eQF65QWmKYOpMfhHY2yEEy1gNLp0DZBoONOJuE1jUtBoJ99ZeiDC4uxO2xj7cIWrX5OQ6DyXmd+KiP15HcgqYLrWSUUF60zznhOKvuAx/Tl640a9RYLB3UnlhN1gE+XnlYB0/utZQfO/Usmf+FzGKbZpjJ36vK00J7Jy0OeMPB6r3ojVdSsCgslGK2VohQJbCqWMx5UgJzf2x0TOnzXm8eBauYs7e8c1wq7MF+sHcCVqJz4v2Ajfxu 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(4744005)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xbXAWEvXKBa022r1UZuprTP+Acwr8qBtCNQRvxgzT4C1EPNX+AEeZnEKOY1L?= =?us-ascii?Q?6G9aKWAQS77dvo835yR34Ic+sXn1ZiMEAat0WX3U7WPTxDSBHmlRmjxh01yr?= =?us-ascii?Q?UchvVpGUVkvJplJ6QrsKB6I3Si3uC4ZtdzHxy6TMQM5T9NtE87I65J7Nj7VC?= =?us-ascii?Q?HAOLX5JRooF85hatom9MUJnRZ4VHJnwzKJKtVEUwU6OF6q7lgzeEAVz9cMEa?= =?us-ascii?Q?n1julFNRZycVr91WHUBH6+URAT32OH8PpYcFoYjwwIcxDdAZdImtxkiobdiW?= =?us-ascii?Q?6xw/c9QKY2o3Lu1wnKEVOeg9CKPG6hpm7dG0NfX5W/0YirA7kL5loNKe+uyR?= =?us-ascii?Q?rE8zx/HGJp0BSmdsZpVluT+ccQ9/qmutD45kdewoUleWNH+eLW6rojhnA/vx?= =?us-ascii?Q?p4spZlFVoQTwJNtErNd2qa7krss9X81E68/wZZFTzODaHo+MtWSaWLuZUZA5?= =?us-ascii?Q?2m9d7123yPryvcie0dZbA5SUBSQRdy3bIs/uKRD19PgdsDC9x2biuoSbZAsi?= =?us-ascii?Q?5/pona2rLSGzcSCwHIxh9/tDOO7xBlY46baMg9x3oI8/28+BL/bj2oJvb+Ih?= =?us-ascii?Q?/sSCRvWxi0Cs3eldp1f0gMC0lWwmIBSBidguHolaZ1/3vUxt6bAXnqQoaOD+?= =?us-ascii?Q?6kF8lngxs4jllZyjbSwzKKNeHCJP7lZDHEwEmTLFw5PHc2i/41F1LtDiEN8N?= =?us-ascii?Q?AC4dGzcujzBC9bCqg8LJsMTSQEep/PnfSwbujWP+QIo5RbdWn9lfNxmxOvDp?= =?us-ascii?Q?hzBHFv9w5MB4CMEjNruXdt/+HcIccMwrHm7rC8bdVeevv5JiwiJcb+ia1rpY?= =?us-ascii?Q?cjHceciegRQ7O9LLTVYfwX0TfbNVDjwpF5PMBxLvvfIqGm2qKc9nnahs46Nt?= =?us-ascii?Q?4h13frQc3u39x0gehpXLH4SE+lKOOH8vcA0EdPMwWGQ+ERo56KuYzgmlSF28?= =?us-ascii?Q?r6A/H50GQR3lHvZ3ay6ARfixUvW7asE8BPUQLKPLkWZ8qXIhLztlVegXtbrW?= =?us-ascii?Q?0hHOJlZnZldZuEH4cIBYzv6zsIJZTb4hMfoFXiDJnJ4lOVdD5W6QT3E0hqIx?= =?us-ascii?Q?L06SBE4LWSF+ak7n2ZPftJbRtRnHR2vEmVspTT5FGJtHBvD7eWavP2ZuuDGe?= =?us-ascii?Q?Q/1OD4mVWBHDkeZ64bEsxO12dxI1KVB2ADS6xvvY4PSOAAY+fvj790nlaFor?= =?us-ascii?Q?bQ69ldzN5112JofvoaO17Kr296JYZ1A9lMpKP3VGZxyBSx8rzYNAmH+EfHx4?= =?us-ascii?Q?rQ3EFMr9OVCBo5bSjoM/OYAJqWSLp74/WJKlNwtbOQu/8Zd6BFVU5V8e3n6n?= =?us-ascii?Q?cmNXlWA7at785U+14QBYtr4Uq8nzBe7hRClTES93sVFuC8vDmnT7CWRs46Lp?= =?us-ascii?Q?jJSPXk5Vb4arE//IFdQx0nW7nQEBUhb67FsU6kSVoEsvnf/QViKoemUuthhp?= =?us-ascii?Q?sV8r7HZ0oiLGAy0yZVIxeF+HBjAlvBhVAP/bjCEjDOgEme+STNVaq2zzdaBP?= =?us-ascii?Q?1GKTWu1bS3TdyczhHlAN1NIBRpvKWQTFfhJbh+1hE06bLMCfozl3aIss7Nld?= =?us-ascii?Q?bPmOm3jCq0o/iu2JwyomM10S+mF/hy0ovJnnrWondOob4l3FsPGunk+7NWEm?= =?us-ascii?Q?4Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +IaQsyDUazjxhAPupK/sTBxWv2/oCiLPfQhpb+YKatAjuyUdaWSuPYlTOXmb14GBX86hOtfSi1YpC10NKp//1cMq2EJKxDP2HOHi9fNxkOQ2SfptEfknDhj71kAPGmV5rRbwT8cR5SdW64OpOWpHKuyspC1M9qD7UWQdACA9q+f2Sm1uuG+MB8BV5NR9Ypd4rYkA1DCmCgvyDA0/i2JJwHsKV+YRJD9YCyQsGEd6ruIBPRVT16CxirPKG931l6NHZ079NpxexrHv5PgCxLpBuxBJuhtk28ek2SsztiUaf6mxm7mbAcPt/gPygR+wXwegBQmYwIOQYYa1L4tffn2c5Yi33qaXsQlBD93Rx1rNOgC5w9Ad+7lveFCbiRydT/8/DqL1BWRPWUT3EX4UKr4crZyf0ndbxMCrZj7qmy/wkNUc/bod3nVGeGUM/0WgjbyR1fwxZP8E302DQpE0wCsueF/HMAwKFVoxnsRcLvwQfZB6b02Zk3dCpKFSvRuw4AFI0S/zjx4jczF4CNRMel8xB3ki+ltqgCN0V08McqmdNfQ4lqJKIkSN3Kl9dFLoCn1N5KUXDOMHaL9/bDgPTdaMagR488jBfUUbGZSS14IfpMqAesjVB8QqQ1aWY4EZh9ekU2VDV6mpDI2GuVrJBGURiNMFZKlW3M77uY0maSkJFvT39tzSW0/5FUWuqNs+1p00zhyix99733S3bP7CPb2H8d8geu4LkGpSRJ1rhKbzOuiEtuZwdPs67hqmXag4j0ZAEGQhJrsxnL2+po14oCIZZjTHlDMlU+pGs8cTD8fPLBWYQPignwQTOS5o21ac72qwiCmG7PPAszCGiSojMzK2s3hk88x3mBw1nNp/lSYCxFoDp4S6OV5w+KAsreZguLtn6SUTzfaaYdgEm3acz118eQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce01c4b1-cc41-4e06-4efe-08db4596ddb7 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:47.1100 (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: oyETaNh/Cszjiul96GjpYntb4vVfjtYnX1I2t6bXRYj9xoqEcfe30iHUWufMIxsQGfGmEfEjAOkkoHn380MkVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: Pa0eAAczEWgPjK72jytBzlBsdpgjZomV X-Proofpoint-ORIG-GUID: Pa0eAAczEWgPjK72jytBzlBsdpgjZomV 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 f1ce3852712db..b8b8e5d9ed7e5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -2346,7 +2346,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 Thu Feb 12 07:40:30 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 2B880C77B61 for ; Tue, 25 Apr 2023 14:11:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234333AbjDYOLw (ORCPT ); Tue, 25 Apr 2023 10:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234435AbjDYOL1 (ORCPT ); Tue, 25 Apr 2023 10:11:27 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8163A1545C for ; Tue, 25 Apr 2023 07:10:59 -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 33PDi7CY024310; Tue, 25 Apr 2023 14:10:52 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=vfyDtNVdaiXOS6IVC7r5v1wf5CbCuySYD4Pb34MHsQE=; b=dVn2vtMomqKAosKCqN3WwKI6GtbVE+uK0L2dIzNmTHxUp0emIwkNE9oIvPAiT417VSlg RYIkPNwiGTmIuD6+TUVKPiwfTwLpG9ofwtvo6n0Z/kMwiD8w96z/X897pN1oTIin0W/5 wrURgfFBp4nqVtJEbtlW1LkBj4tsT4LQ5vY69MeAhQmF7/bAJ2GDvesjEjz25ye0Qj5l uY+bA6cRHD5DIqOmsKuOvLPxclFjzjaw8XroEHRmLyxkOjj6PVcN1WyJC1LJqlSezgTv Xus22mLcNMppokaXqHXau2LV0pjNUxmp44v+W57vJBnMRngNIArApybWlbyBvTtRh0zM Cg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46c45fv9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:52 +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 33PDGhel013616; Tue, 25 Apr 2023 14:10:51 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q46168dkf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fw5022CHiGeRm1fa166u5E4nSJ/MzxzEhXACImzNAewP+1fZy0i79YMbACM43VIq7+Igv0sPrtSYibpDwmpQ+7xGd9PaxSLl5fXdHFesl52QuBYrUdEOznB5JLo99gWRyH5O5Gzv1adZ4X18K/SEdg97vEAWpqjmLklrREBuX64wFA05IS3632ztUvV2s9/fp67LgUIq1Y+7U54bVhg5dByCW3IPFM1m0nWhViafzgVECvfvzQ5YjSTwkxTP11GmlSczpaPcqRLSilquXKhhYxHjuUXvmhuZpOs4GUoiGg7DO6ajrOwBx7+HNT/g+Lt809xpgEDpI7Gq2PmXLLSNIQ== 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=vfyDtNVdaiXOS6IVC7r5v1wf5CbCuySYD4Pb34MHsQE=; b=IWjJCM+BVeMi0RaKRCyiAC6b4qdwIyCM46OV6hDcOJTX2t9mOAJKExJ6J/xkud36Z2HMO4L4gSD+rW8zhMLxRd9ZC4bH9Zmx8OkTBDYIi+VQM7OVc/NijMMKhg/yNOJTrDPhFLblp0E7Kt3TLnBQvySaSW8WnRg0Gwaav5r3UFiVXcGtfgIebfPSfFdDfKa9G9zKol0ETMSu8cpk4AGYEZpray+xnK3r4i4rJDGs+Q/h5YPCqJTMsb34lhx3AFohMqAc/jaPIG6RIQLXuP7exBmvqXIO83RL2jCLSyc4QbTV9/6YGL4AhSMERbmkO1dSezSack9NsKoA9CGyjj5S9w== 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=vfyDtNVdaiXOS6IVC7r5v1wf5CbCuySYD4Pb34MHsQE=; b=E14WM0GMEKJbw8vEAwUozSLZlpQWo+oxYWbtkQ4M2I34DiaKEoDe+SUv5sx/JO2/MS92h/ZiazWcnFfxCnJORq4533n5WWGwzhDCXJ2MRghNh9QDovc/Wj6ZhlrpDY5MuNy7JMVoQLE8i5MBcV4GZUqpwU4BovdSrgWr33C/484= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:49 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:49 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 13/34] maple_tree: Use MAS_WR_BUG_ON() in mas_store_prealloc() Date: Tue, 25 Apr 2023 10:09:34 -0400 Message-Id: <20230425140955.3834476-14-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: af8f8780-4ed8-4c0b-fc11-08db4596df2f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ArNqEuaLqkYU6+Fb/KV6c4vfpUYMpyM1hPbQZgtDwtp4KJ6v65Xo/p5BiBRX9XsEXkUCPf8kLmc0zFzUgDBHWEItxGzAA/wntTf9W36jQEIfkti0KVlo7oHhGNBfAeUyRhoa9giG6GZZKF2rdrU+cpwg/mcW/Ebq9BKb7hY5UhNO8LYACkDUhPtntbzH+rwDvBZ4LKjoZ3uPKa1je9VR0AS2S6ywY2/+ueSof00kpbI3bUqcdhlQ2F/N58nD9d0k4NvwV57CG/63UFOz10Bjz2bn5Ek8h5PDZez1fJOGrDrhBSQHMK3SWaoHh+7BEeR7QS3wewniMyO4dwF0mpoPVS4if6jHS1FQVH/W6skJ8D/N9hRAKre+Ab1qB9gAPBuvniHMmS2hpzXrHXXHtbkabv9lWTvxQIkuqIRkypgzytQBUssSupoIyJCu11ADogC0o+hWqWHchOn7DJjF3yKHcY7eORVqioCk6XBnI52c7PWXlMd596F2HenXLvI8zU7Bjaj/0k1Gb1UJUeR4E4XDyFwYp+PJW+jWBT6PTmgV+dZfPBJCy6bfKRSbAZG67TQm 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(4744005)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2lFq5YYX9PWnf3HLG5sl7oB9D++m91p8088gjNnSvFDMgcJLVkKXbXciyqoS?= =?us-ascii?Q?BeR4OYhydm8V6MCWAvDHyPxKsZ/JWdjOakUw75fC8o8ng441WfFtohsgZj9x?= =?us-ascii?Q?Vl+gXye8eofuqoAGVuWbjVjjHU8GMGNnbZPdOa06QFjJGQMgfH1xy4AgRfww?= =?us-ascii?Q?K1Uj2MYwSKN6lzY+lPE3OMfwkx3S/3O8lXs1OEuCpNBM1j5Fx50Gh2gOZ14I?= =?us-ascii?Q?UrFWgjzaBFYooukonUVtxGqp/Y9CEvC2xEI20eORNMnEoXoJ9StCMbX5OvM7?= =?us-ascii?Q?pNHeUA/Za0x57wHkNHAws7SrXPnGC0DUAA1I1TgjlWI/J8w740eIYtKT3UMq?= =?us-ascii?Q?fXhMcSVIi+A25WPxKOzjoM2nvr0mtzac1NqH/avd5HDkM/Q+9mBNPw+PAjGO?= =?us-ascii?Q?TApMxpBePG3+ycwBoP48QoeWmv8MhnKsl8EZAQzUZHIU+HAtOFe4LbdDhKC0?= =?us-ascii?Q?cXOLmRMMjULl9mzopb9dFrKbWqzqBmCRy6OuWuJ38Rd0mCu7C3pFQbGZ7WLA?= =?us-ascii?Q?ripT0n5rGeZb0vJrIVTg+AA8iny4DQ/yEmM6ZxbeD3k8FF7eNvNQdqQwinHN?= =?us-ascii?Q?K/enez6PQmEpGfiybSBqcuduee8jAwY67b8fDemrqHXAxY3ONDWjylO+di5A?= =?us-ascii?Q?u/ACUbqHzWDPEJi+l280xfY6A6UqDWUH3Iaed+b8oIJemy590t4IvXFAmhRZ?= =?us-ascii?Q?vXZDMje92WEKqN8SEZK+DWvUWDvsePnMqeFEnNzxtVEAGFCuJBrlek6K2+M5?= =?us-ascii?Q?2AJDhjrLA9WHLS9HkJpMA4n3Txopmqlr2GSU50Hj5iJt/KNgTqy6lyNbzE7O?= =?us-ascii?Q?11WBaOTv6bRHDSKrZxp0Lsu3YrApWRbkYnYH5789KoUpxj5EFe0f6jLMHILk?= =?us-ascii?Q?/LrH4LkZCJ4nCx6F+EurnTGHliGQaoq0KCvXS059tI+T/80TM5g1yzT4bbaf?= =?us-ascii?Q?er7cXfQiKmqfb9Zxum41IY6E9IQEL9hFWfOA1FXEgDNZsnMu+UZkZILaa+CZ?= =?us-ascii?Q?GpXHN+6pJ5Z5TZ2xv3qV7DncljhFWLMnB90z5b1H68BsrEbJir6OX+yTGUWy?= =?us-ascii?Q?SL1Ewnyo/fBwPDVuk6lxg0sTvTPLd7Fw1Hjqt203UA75hg190IYOWusdnh3+?= =?us-ascii?Q?tjNv36D8ioNJNr1jRDXecJ0dRVb1AaEWwMNHGcTGWzD1lWv8SyMphyadvfkw?= =?us-ascii?Q?Jz5CAcQd0gEfAd3wzkdNgI7ioTU6j5U38jUqChLrIlAy6xmqAPHBxpLqxdpS?= =?us-ascii?Q?OwsXoBKAZyAsoixL8wnozvLpsqRkfCshL+IxxCiURCGWvvAlEil9lWQmMOQ+?= =?us-ascii?Q?JWCYrkrd9kV4Esd8/6gGFLBflJufG/41dEsAB+dfw2l6FbJi87x1itPyk5H2?= =?us-ascii?Q?kE1f9ZWWq2NYKFb2nT8TZqC9BZcQ/CP9MVKZp7vvU1EoEcjwIQ7SYB/kNpAN?= =?us-ascii?Q?fVvjRRU35TKlaaup3jxUf/Sd3ZlHm3iVOsWpcoNXC3S2TzKF39Yr1Tbop4jh?= =?us-ascii?Q?I/6YJY7hlUAnt3Yyj0ucoUOLBfhKRfQcC8P1kjD1zDO/n1CQr7O7LaWHf+2h?= =?us-ascii?Q?jv3nYfTjXiiSuoxuOE0lvL7JIvWXGx+10PTuNXaHviapNaK9HCM9+ZvMKapr?= =?us-ascii?Q?oA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Av65hvq9+OPBzaxNEtc1E2Q1dKowb0Hy7P7NiuDuQI6MVVudyh8Ww40jhLF+ev0xKjJdDXZe78GgHzjOcRJZMMc4EQmLKhMJKv47BLYyWRopkmJWuSHiTdGGudUjszUQwNgKo9YtGCTtX9H3QhuF5jTL+uqsWazLZPq37X6fQYI/d4GfQ4cWElqkA4RqTGRejVgsrbMY3qPFcsmSYmLY8xvwnjB2U68qt03Lkt7cFMHdF8GQGBDql3fiaYniWl6MEIk7jt3xW5aHjM6fmlmzaEqqfqmuqcuvhmb7JxASdXMHBZX2dtXTW1QRnjtVCTD0tiyP1rWFb2XEN00jsuHZXuuiHzmZNj2BYrF9Tz8GwHk4ZwgXktTwTZMYGUlRnJhedtHCSeDqLooEmYeX6XEuaw+EAhGxwKFgOBzeCFS7cUccsjK9e6y7Qsl7OpZnINM03sgLH8xXvtDLJesjh4dFV9VDpjWkItRDLlwDDNwYZnnDCJDFkf6ElobNGyLo41MD2yp0n8rccRo5dciAanOXPunQmrifxk48OEQvgEMCSlc126Eow5F9KGq4X15hh7hcvLi8eQkSryxduWXz1btKUYOS15x6et1e7k+pKZOmqTX7NsoL2QNBeG6UCwi9HYpCMMBkRioK3w1hwzEpeALUXAjj4hnodK+qwJ7PTLk/j5nf+cOP+4gXAPk0bq/U7KX9kOGNV4N22KXDORNAx+TFipzjc7ZWLt6Cxg+ERmKhuxV/+78bJI3h4s8neU9AYHLj1D8OmDXuws5rLF3KaGC3oFTVT6TmNnkZMirAhfwZp49nApEQTPWI3KtTDCgl5ebBmQ9GZRZOfzz0BfH/XCr5R1X6p4YRimrt48OmWizOLMM0v+6UMWEAwixbe8CnONdyanK2iq5xWzJmHLouZ/r/Mg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: af8f8780-4ed8-4c0b-fc11-08db4596df2f X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:49.5911 (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: Ujusue6qwXfe72NXNjKIlRucHkFi5jA7UXaPmdMdnTGksPUB1NL42su4Fi91GQ1ZslyYuIX1th22ljjA+sMhtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 phishscore=0 adultscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: YCXe04Qa-LOInenH3wgc7AjEM7OMjHEf X-Proofpoint-ORIG-GUID: YCXe04Qa-LOInenH3wgc7AjEM7OMjHEf 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 b8b8e5d9ed7e5..28853ed23fe8a 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5762,7 +5762,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 Thu Feb 12 07:40:30 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 E9DD6C77B61 for ; Tue, 25 Apr 2023 14:12:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234416AbjDYOME (ORCPT ); Tue, 25 Apr 2023 10:12:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234417AbjDYOLc (ORCPT ); Tue, 25 Apr 2023 10:11:32 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC7C01618A for ; Tue, 25 Apr 2023 07:11:02 -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 33PDi9q2010211; Tue, 25 Apr 2023 14:10: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=d7fYXLb2uNdiDnmhWsfvxET+WevVsv0mGGSF+vPIia4=; b=VU3zdn3nVROKRaej4BtAnFkCKEIYAzjXg4Ym7gz2Q/bNpOHysmw9YO1vLKbnJZI43Q3c EyZMsLOM07Vv0ooI3jesu7V2TxQZHhspwUcsz3PT35zpzMPlxkiB5fuCJ5HK4gX9XMLe 7HqdpKWFxmaDRihFXNgGJ+wgYyd7+CcWmR/epPCntmdma6aoFDv0mPb1Xb5Bd9YoCiFI SxVlpNbORN1psXjkhXDegRR6X/5pXX4zYweabO1IDXjxaqBA3nw3o+z1fqTm0XgLWebQ NPe9nBUrR3u+vqrviuCZkjAbU447XmaNlXtlKtsmmoiMUz3KxIpG6lPOXnb1pa3eQTbv 3w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q476twdfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:55 +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 33PCgvXj008521; Tue, 25 Apr 2023 14:10:54 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qngs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFSr54KuY41ickFt3Chu614BWBEgmYmX7ewY9cRLT9VagUwLY179cf2D8huvemh8cLHLQ6BYocf5qcAFT/3DHkIMnzUZe8r3Rn967E1iiMKEfRGJSFbG7x6GAqnhYXPuvHPD7hb07xttO28m7NjxVazVblvC1YwLxUPBu3W0jUMNJjq8c9gzc2BEOo5lTM/PKmERQcIS57bSGQTGaxw8kFAYpv7TjJ/+K0Fk4pU/UmUSWBxy9YG5bJQra7qzYTstowjX3Cq0vHD2fbiJETqtyA7e03T89UAixU+G26W1H94+6oKCeVPRHlpfrQXvvN8HFsZDfL9PZ18RsQmPMWUnjA== 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=d7fYXLb2uNdiDnmhWsfvxET+WevVsv0mGGSF+vPIia4=; b=F7j3o6krs5FFITidDDCWz7a75hwhrpUkrFALSsmlQAQL8xy8LUMh2/FO09evFE2OHPWxAZwWgdIaRrjlFemWxAIG8QQuHsbHRZnJSLRvjpdIkGUUkZcGOt38ccs46oM00LXF0raVBNtdn9B5AU2jf0ahf79yOM7ah8KAbnJj6o2ItQaPxiIMxwftq7NBT0km5WDZhcA0LTGSlUtnJqb3ZEAEdOAFF7HEimnlcJhITWW8kSX+qeh9B7un1uv6fbJBEjxZpG17EDvrYgV+9MRullfVbnsYyTHsT/ZxBBjtfyodNM/HrFgy16Fnqhj/OpPgB1pM8r4oiHEezE3zG2ldhw== 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=d7fYXLb2uNdiDnmhWsfvxET+WevVsv0mGGSF+vPIia4=; b=vD8C9MLV2AVffOmr1xnYECAxxLPENHH/09wyhUfge8h5XyVnjeCQ+7qpqzzulhhr2cwfsTwKTF/CLmKpFwC13e19agyN4jnPBFYl9drirewDL4sFlqzTUMXtYIeafdhYWg06sTW9ulMVcfZO414IZyEleMk0mpDLCVNzLVgHp4Q= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:52 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:52 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 14/34] maple_tree: Use MAS_BUG_ON() prior to calling mas_meta_gap() Date: Tue, 25 Apr 2023 10:09:35 -0400 Message-Id: <20230425140955.3834476-15-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0104.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: 787961ff-3d77-4645-3058-08db4596e0d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXNil1XXM7MxmqwOuyGMhiaQSgx2EtBgzXU6YSragX4JGzf5htQKqeO3hCKN/NRZgBKXdTPiOcHkh0uT6eCR8kiyyD2YMyc+2Zz5sMhLf3/LjHwvpcnNt0V4hZIT8qcyGa+b+ICRNu6IXq0GclrUxmozvZ7gR0JnZAQZJUGPpaaUCMnpb9L66SD+2Wpte+y04Se/Y/l0dAuoL57pP+B6MqYFcpRmO4Ccl9JmkyqsoASvpt96UABACGcqe11eFVHNaIHaVs76rTwXsR5ejRvCEDTPTfD9JC+KfOjVLFXJ84wIN31/JVr7vlVrDmPBh977cOwl+/VWpt0NwhkkHai+cN6TGMOAVzR70/k+SimZDMMXyhmNTEikDoMjJ9HxAQsSA1yb/MT5/4sWG2FMW/RQbn+IuBEnZFKZ9Cka8BF0LEZW9mMzpmW8smLDQVjkRY2/MEZGVqLyK4IY4/yqsueae518TdG3h6GP3SZgIPv2MEZa9oK2/+EAuizutT+X6Ze+fekI7WrquomcRr2nXsZOQZXMyQkbdJT6zPUS57zr3JcbP1+ZnghFVPPAwed6sEFS 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UmbGOUkjO35asDLl05C5HtoKw5m9gEBQAbf7ePlCVqKjX/bqUde4wysjY1Qi?= =?us-ascii?Q?zBksmu60iE0Tbx4law75VJyZPvLT4yORd6CooBjPedqr5+4OKVmEnS+zGngL?= =?us-ascii?Q?eWqjYObanA7MqNWbxFN0ULfG6+bKk8dWVwYOHIiwchhBGwcXUPV3TlT/Mk1q?= =?us-ascii?Q?PPbtOKT+ycaSOiFfaU8b50bErqiln3Zi4OMjB063LRQ64UbCEwaYlaY5tvIl?= =?us-ascii?Q?gWXZV1mB1+eZfUQBbb8Sxh2Sqz4ZNl2INk2PBCeZ141DjFhA3NWyiyJOw9sd?= =?us-ascii?Q?Kn4/SQmTEX0j6JYY5Go5FQ2oUA6rLoiGd0iBodiJdndQFIOAeezZ/Hfr+4Yq?= =?us-ascii?Q?TrhpUl6oxmLRHfj4RBRhfwuEs4uQhcSxq9gDqzqAgMZZsvR/XPIjC74EeTZq?= =?us-ascii?Q?0yuDxhXVEoZbBq7cm+J2GWBQKxzKFDZIJDh3yh4lWowhVNS44B1sGUnmvHjs?= =?us-ascii?Q?VyLjyKKjnP78CuwehvW0V38MCp+0S4IMjg90xpWO+nEAeBs5jkQYKeybhQBz?= =?us-ascii?Q?3ryBJKb3gFnEybT6KvZmgTP6ZNRaloMaOpPZFQQRsOe9VnivtrvKRNPXUXfm?= =?us-ascii?Q?CrhYcALQ/JetGyT8ZAjwffU987xGk/bzrV5bhsk/8UZpHiWjW6kTwk69nWd1?= =?us-ascii?Q?+CUWOO5GTOX9PiYpPqne+vnf+RMxS93c1RDy59Ve/qbs1M+/4BljNck2IvQE?= =?us-ascii?Q?Rjoc46Vv9KW/ArPSLJCL5Uj6xaYSQmted+p+L9aeMu+WtCRh9/m6rShqtjTS?= =?us-ascii?Q?nGiiccv5m1sQYcHLstvbbFPrCVwhcA9ZdIORwle+OuNC+NGssborFyGX89KR?= =?us-ascii?Q?Om/h9YXRG+Pl73XnJx77T2PkttFkUmxO7DcqEmW2V8199Wbvj1q8KutewT6B?= =?us-ascii?Q?A5fKh+16Zar7sr+swTYgurhhmv+Q+YjzBIOUWpsOQ/YlyeqnSCfIvF29iyaR?= =?us-ascii?Q?EuPtJMFLrmSZTMUtKRy220abVTfy7FEsb/ug4OcOo10EllntWtow6TcKdpvJ?= =?us-ascii?Q?YpTSOkQ+tKXpL31yfHTyVC8dzs6s952ymg+/AlXa3vzeXb5wETDUW2TXSeJa?= =?us-ascii?Q?+CWcej7bDghypyPhusebFWoRd5agUVdzFwU8tJf05F8+KMSmaS/hoymE/m6Y?= =?us-ascii?Q?bl0AbqIlETPNPYQ4iKhAQ0ZSfJKMcnwCRWX/0kOVA2W887IjlRZu++/OV/Hi?= =?us-ascii?Q?zF8SnMPeJBN0pkpp1q+0/Kg18rIag50WoKQ2IV3Yor6ilP5tfc3pcPCdQubP?= =?us-ascii?Q?htGbBYsZwfO+jtc1lL+27yGBSK98tbJ/Oa4iu8/POQaC9wL3Y8E7NRgqDdtr?= =?us-ascii?Q?EvTfTs3HsTQoIiD0Eoy+/xB2+iL7QQ4Ty+9fZyIpf9AHBuKunGMTk6IaSZNi?= =?us-ascii?Q?sNywBEB0YCXWYohp6B6cmbdSq5hMgOZn66+6I4QOx+3ryKfTQM3f1T9uJCAO?= =?us-ascii?Q?9n6Gyk5/ztOq822+pPalYBLCbuSn5dBSA6SAqMeXbr8tmYBcRGIBE0Wfdn65?= =?us-ascii?Q?BTiXSLmHF2JYMr/UKNK93M1tKfo416oWTmWP7/Ws0/kEI8NwopU446Nmh+GA?= =?us-ascii?Q?5NaQB7mddUezbh82g7JCcPvj62tM18mpRKrUdqp6R5XLoqbiPcd5tPuXWqOK?= =?us-ascii?Q?jw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zCj+iwc7ibhvAWwaztOpd3eMWLCCuUos8xvDu9cnGbSHoL7j2uP87efCNqbROCJCvUVi+kKaIWOjCzb+/f7HlRKmcLJLbxCwPZyhRREpvk9zFtjuU2iltLiY8u391PEeeaU6wqgP1mrBmG0mKdS5yV/ecYti1yswkuF5Cx1uLXgR64Adttxp2u001A6nRyvvTW//h9v5uyVwI65nGoaN8SJLk/vPewX1Afh95V+/cTw4QfmoeEcu4PX/5CV9sYfQmxINDfpZfYwcVhER/28cpjtCXxeESjiLbc2qcDvYuFQyWzPo3mwZZ2VRB5DWiS61V+ncVObL2h8gcdpqnN1WSMrcBZ+OBjnXKI+gZNmSbt9mx+SADgg6rocPSSmxpoyB55OiESbLy0XaqpPzvdLvIBqFsXplyxTSVv016g1+gHU/JOL1caYvp9enHqaTxdTWS78pgxh3N6F3+WWKkRZnE73KCmrtV2ISFJmbwmI/g8dodXVpOuud0n46vQBW4kdDnOSwJxxg+4r79C1FQhULL/2IyMMjTK+Hz6zsAd9g3iaHGfoVXK7J6yVXbsnrM4ssfs5mkmup4mHmRoiQ7xBa+zKzVQrdWWZSB+kErJy6wGqDNFgCtxve5fPUfSMxe0V7/PoTcO1MP1TOxI+TzWmS11HSMGlxdosDCmykRtSwCjMI+u77pyzjcf2rcFVJan4uFkzDtQm9BmxhD63RmFeDCXa86oeD5AFOfzEgWwS6V5htII5c5dYunirsuKIxAL2AvAJE/s43q7UI564VaFcq9YGRwDAmLRHPKmAT2FaRvurJSQezURe5cSGTLf8+EoHmN7QNmbrNbmndMPoHHhAqK2cqWNg4/HoHTy+tTGL8EYn2UWABiWgBwdSQftw9NFHbENhY/oSTHxTdHrvjfQAVbQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 787961ff-3d77-4645-3058-08db4596e0d1 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:52.3473 (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: qaDuxjkW3De/VsMHPmHzaxfZb9YxyNYSsK/jhDcutjw5IA7caPf0b3/5UxYLAWTAUKM5sVrmQ6Tbjge8FERXOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: 8tW21Y9JmusW-b4L1T7Tem2eKyufveJm X-Proofpoint-ORIG-GUID: 8tW21Y9JmusW-b4L1T7Tem2eKyufveJm 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 28853ed23fe8a..41873d935cfa3 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 @@ -1629,6 +1627,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; @@ -1662,6 +1661,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 Thu Feb 12 07:40:30 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 8F94EC77B61 for ; Tue, 25 Apr 2023 14:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233857AbjDYOMW (ORCPT ); Tue, 25 Apr 2023 10:12:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234437AbjDYOLv (ORCPT ); Tue, 25 Apr 2023 10:11:51 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C0EC146DC for ; Tue, 25 Apr 2023 07:11:13 -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 33PDi9iF010199; Tue, 25 Apr 2023 14:10:58 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=Aq7cOJYOEZDek1MKEt0M3X1mC65LkWTwAvUR2CCJKTo=; b=hcvXAqoSvHYwUqSMFTp8UWgNCvrTFL/0rZFjWx+3n4zG6LAHAA88bVWRW93RmfwcCdHi AzDZz0ev0KeR/HimqCFNlpc4NLQ1JX+lBxh2IfxFPwzLaDzyqWbWM40caf/qTfh31q3W KgXvbHGMCRn+5VqZ8+2eQOq/O5vcQAFo+JnG2QxahqHJiXscce+EAY2nFx71aw7zZAt+ 9MlCo0MUGTj1wAp5gx17KzLgQCJDlmYmMzegg/S2GqjXw6E+FAgTTYJEXBwqWKMKPI5m hiOH0jnjfUVU7QhKmDciR0TFL4tWWTc5HZB9dZYIFSXQE/nZtnuqlOurK+RymPUHxNUk hg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q476twdg6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:57 +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 33PD619K007429; Tue, 25 Apr 2023 14:10:57 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 3q4616gdj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a4yeBkz3Svhmnf+WmXBTeRv3tymTT2BwcVF7AZT95ox+XUHoX/7vtuWCaA5MQ8HWGPFwcfSkkKDbxIkWAHm5Hu2+rPPx9i5VE7BQmuonO6T1rb4k//FIQUF1cShZGw8bh0LKoaMu/dcNbgbhhAsMNJe0y5yLHKIs7cjNV2yzZd5o7+EZy4DzWR4D1CtcOc8QaWr96LQo20gVUhfe+qDbeRuZNbTc8m9JhyvRMlEQk/fzimRfKJZoN36J1SCIxT49vF/9vRXYwlJR3U1Rb5xQjpGoopfi4PbtI/2fbD2GTMdo3x4UMikrHRpg99DhTdbjJicDO0NgJTj8qDvAEJgQKw== 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=Aq7cOJYOEZDek1MKEt0M3X1mC65LkWTwAvUR2CCJKTo=; b=CRGr5+ClLbKiB9oBFRjhdPL+KgifGvuySz+jKIW0bghzuBFZ//Uxy/G5maqKIsJighriraqjVKhJkMRjZxah6PWvgokYIzcuvo8R033D1vjm7It9ercyK/M8+sPplAirYtw2ZrWWdLdmRqE0vpi95wVPAJXyUPpF1pjATLMTM1JCRVjCsOjfihdbt9C5QFGB7J240Bj2S/VWn9zpBL2wnUeyHdDGgAseCJYmZz5Qkr4Tmw1RZ6Wk/HMefLVbJkczOyHwdoeFHneCc9P2Eowhsfaf2hhW43THIqHS7RksKo4SUV6v/hvHZ4idPGsh3OL1/qHj1vt6UJu7aO4VkQK8gg== 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=Aq7cOJYOEZDek1MKEt0M3X1mC65LkWTwAvUR2CCJKTo=; b=FRoxXJSumon6F7I+Nw8dG/GWmcXnfnf7ozcpUZ+mkSXwM7PM38D9S26U4mDaLuy7qF4THdAphRJb3vLWYMpi/gFTIJH5nlCCHqKk7d8p0t4xiQiJS+DYMtg7ls/cyGpoO9K94ot/yxGH68XMaEcmaPlQsCGxWX1I/1b+XJBM/ec= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:55 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:55 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 15/34] maple_tree: Return error on mte_pivots() out of range Date: Tue, 25 Apr 2023 10:09:36 -0400 Message-Id: <20230425140955.3834476-16-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-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_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: a4385abd-aec8-41c7-db65-08db4596e268 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u/0TrPY4S4ia/9SpO525lh6BWPIFxOzHblePuj24VMKP47JAV7kv5C7EtlBR68jsTpX/nG+JUaOde3NZLrOkkoiMGbnHPnNjk7seARZnXIlcpvBui0MigPpdVmJatdX7EpbS57rbWtF9G7TlUGr8ld6nweOKaDUI3QfIjdofF+erkpOREmlc7UfiKZYNSH+J88VC+vgqi4v9Vnkocdb1kLq1avdIXeI7FnJXJ5DTZA5Wl0Owy3EdI6+C1bIV5sfwMck0UpDzY7TcUA0jqbi27evcgdn7+5QRozY7wQplkJQLWaJGYYKzxPY98B80ZtIvRl75h7G90vpqesqHFvoktUCeqBKiJ/ozWdnBFpRfcsrCynrzgrQPONXpAw5F5XRlIsFT01yaKAViaz6Q1dAxeGcUdVr2D3UVb18jk5JjmahaznbtujnCLtyy3sNuVvTr6Sl6QxLBoh1uiWnvQnWGA4fzVGgi0cOoIx4+uLTjC50lc6Vjb8tRXoRIv2F0Flc0wRki0vhNEFLQ5Lub3FL9g1dZKLBDPP7e1ACBvMvzMN4NETXgW03EMFJKLwWz3EYp 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/Wbi9j78pmU7kChc3u+U1S3Qmk+F1oASjQ57warXe2PhaZ/ccu3tLtaPMGRm?= =?us-ascii?Q?4fzc70/+DxgANuwo74UTYxBru8nawm0fQjL6rvJoWUzN8N82I8Gux6kZqpri?= =?us-ascii?Q?JqRZdwyT9KDrJJEr3DDlyo0vgS/BEfIFKYYtr4Udl2dKwiOTZ6O9SwUNSWOn?= =?us-ascii?Q?2gOguliiyhJHFZGOiEprdD6LomIGNDGclewcxA4W/K06bvnBT+En1Lnc5/+j?= =?us-ascii?Q?IlDnRKhQ/6Vxe5rlOwqsx4lBSeVDvExE0vcfPHfqSMjOKOsuC2z6FF3w9fpf?= =?us-ascii?Q?vfWJMJ/OeYq/yNKj/E6yb/SpTkgt+qJRLlXweKkKfw63QLTZIlEPu7roFQcB?= =?us-ascii?Q?5FxCo7Yx6Bh8vbgEUIOhLm8fyjn/O7SuW/2xpwjhrCXRxstxprIPJH05XWxO?= =?us-ascii?Q?lFRgMAVtxLFw1r27JjcLLQv7VvpnY+k6gpHcCJcFPX90HJ7NWJhfzEQk5Q0s?= =?us-ascii?Q?lh2iqyj1RcOc/ZlwwPoTkaw8EZrwt7OT5Vj2/nSP0tHO1jxcfruE/lCzEzAV?= =?us-ascii?Q?YKEZ3oBx3Hv7VWEVlF8O2FIgkEYscwxf5LFJw22n3f/FzWdlIbHoGyffwIuD?= =?us-ascii?Q?NSMe2XfmWTH7hm3rD3KlSXuA8CeRcw6eGf0arNPTo1l+x/DALKCyD38Nj+HH?= =?us-ascii?Q?atMIQfDq0+k3lMI/0ZsT9nv9v+wkHNGFJKTAvcG2PK3OJf8TYIX/2ZDT+/PS?= =?us-ascii?Q?JHPCzQ5U8hkDYwb4314m/9tB4UNCFx5JdYK2rHuTg2ySkGDMJnjzLKBgltQN?= =?us-ascii?Q?EZ05a5qC2InXiKpm1xsD2F71nnDVQJ/lpJHZ0Ii1VCWFjZulxiP2mZhCDrjT?= =?us-ascii?Q?SaFML6Q4R6bV4L7rpOe9Sb296+lquX2l3eBdlgpX1ozoaW4KFDh4LIdaV2F0?= =?us-ascii?Q?6lNB8ZYZNrGB7BQ5pLebe2bKhzwrAgtMgDgV2djnTuQJr5Gf09kdnta80mpj?= =?us-ascii?Q?UnIHGmWFQrVz4/JJCFd2pvv0nydwqjp1BRGrccfB2Yts4Zte6tvXePEwzE1F?= =?us-ascii?Q?8Li/sdkz+qutRHav2Kq20I//PdKklSVAMc63AZdcCoLZw+/bwRBIziqAgdsQ?= =?us-ascii?Q?Mi4bqLjfHR1SwWWjDB7ks3KvlWZYOdBYV3hUkh/PmTOkgyVRqF+plL6xssx9?= =?us-ascii?Q?AdJf/q+tSrKerz0G3f7sw5KH5R0ght9xaArPdoFuWl33qMYuDCFYfWN+9Lf5?= =?us-ascii?Q?YDaYQNG3TSR4r/qZ78Hw+92o9Nzkuj1K5q4SlamfAzNK6DhUi4/nwISdGx8s?= =?us-ascii?Q?hL2Uw2+vqU/lo/C4MKjbIm1Tsa5LeSadvVWh80rkB+9Ga9A8Oms+2TLyMz+X?= =?us-ascii?Q?Du9QmL7zV5PSitIeigJyrLX8J9FceUx41MncOD4yFzjDMGijm8pgWk6N5eok?= =?us-ascii?Q?klI20guenw8k/NZpiz/ZLGNORitniX45mzU3nL0XNEF3aXBgVW+8ZUUoGiQR?= =?us-ascii?Q?GnupxKygBh5SLJL3lsVQeB/25k6CqE/nt0dLGnrV4QACM/VgEmMn6JfXm/mM?= =?us-ascii?Q?vtbfSjwpiNjOI0zjWRRwDUUTi4rm05v9ZJvdpNX3bwzB328nOUMaDZ6DSybZ?= =?us-ascii?Q?78bvPpMhZm8qo4194JHCg+JETv5KSQp1OgIkB86K5iFAgd5mSDY+O92Kw7hl?= =?us-ascii?Q?rw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: yIeYUt3zRoHLCKWcUCKcJoEUbsrlB6MaaJv0eq0FEBFymzc/7QgDMJKDhtXJ+JTqUiI6uONqpEtUVx4kw+E6Cigvai5qDUIdgFoYCg5NuXiryrFmhs1G6gzADHcZ9Jw2MSmQ46etjJUdlC2OsATUvhuHFFRYODqn2Kh8gUspRiEG54j12v/MV+jPKigV13I0A40f4gjm1VIkG4cW15Nfg7IDz6GfGPVerUUVvZvkUKOMw8W8sW8IAT3PAUvZ1Bm0bYWxWArET3SoouHugYhKsBHQ05r+vjSxc+fv4uePF2MUTCwd5/4vNs+NytNFdl8WhTRbxesak/wR6RnRT3Txc4AnkGHBJkJLYQxz/5isKlDXYLCaITs0vf4EoGXevMeFCiJNuzwaaYG1yEbuMHGlorkfgEg617DXUysWP7aOfCO95vPxqv8Y4PUEdowKpOWEpXRXYE+wiIMg2Ux3YbPaRX7KC3kpASS9giinGOswVp73cFL9HyHbhaoOUkfqfbL+ShVy+4qy3CyJPaKnfNHYrJKn3AU/oiQPGMmZSy6Q3hUTcZmRmfV1TlOFBpTw6wEnc6C2OirDSaqSYxwrZMfq0GPpkzV8zhBswHnynRf6Hkn5Y7AdUv7X5EQT8QS9l6m1I0Co+eCXvNLtu5HMEb/FgyuNNPI0yjEBg//pVeltBfH1yvnsCuQvfzlPzdnXtKvbVVcIMvg/EbtjKbP/QYhl9tYB4xn8cMhmEJjrc7JArP1Q6+H/uyQK867m87pndYgDrvR+bgNNcNQJMx+C9AyFVZ8qK5giIFb2w5Wgt6kogqyODHY/lPrKzxN6xFlLvXRo0ihrqGJ9O3B59Pt1PmmA2FqtzzfTnhwrZuXHhq2WOY8KE1CaminG4gO3fuY+WwV9uGiJFQQpHmPhQZywIW+Mgg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4385abd-aec8-41c7-db65-08db4596e268 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:54.9805 (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: 2i6jh//QjStnlS4POgAajYLYiWojIJenShCs/yALIv0rDVSVo1vn7HiQiqDkFQ10j0gOwptjcX0WnhNL3Ti4sg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: FklFDom8mGTOD6g9MWzntqFDJ3R8RRwz X-Proofpoint-ORIG-GUID: FklFDom8mGTOD6g9MWzntqFDJ3R8RRwz 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 41873d935cfa3..89e30462f8b62 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]; @@ -5400,8 +5400,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. */ @@ -5418,7 +5418,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 Thu Feb 12 07:40:30 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 D67E2C77B61 for ; Tue, 25 Apr 2023 14:12:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234407AbjDYOM2 (ORCPT ); Tue, 25 Apr 2023 10:12:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234410AbjDYOMC (ORCPT ); Tue, 25 Apr 2023 10:12:02 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FB3B161A8 for ; Tue, 25 Apr 2023 07:11:24 -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 33PDi2wf008709; Tue, 25 Apr 2023 14:11:01 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=+lpEg46sr39rnxF5o1iqmex/V43BTeuXtslxH1aiM7c=; b=364wo823laCctebZc2Ct6YtWK6eq+n98+VXSoPV+5uY2EeYDSLK4EkMLif8Tg6EPAGaH A9KqUmUeUReQ0vLFzVWBfaKLrOJWPfOxzlkaTmFSUi2jmFVJHW3hWglOlQLZGShpo6eI EYlYUXRlciNCCWfEsdohRl5nKtoItqcl05JrwiY52F/ZddXOpqX7YnpBgMg04vOJ2dWg GHhnsfRAIoXv9EHP8Z9m0CcGOsmMZr+3XL1cVotOzQcWcN/4WRwmdsCB4955mQ6tcUTI kA2vDd1ogmK074RiW6+1SwtbHF/Y41N2xpHqNnbExtSd0KVa+KFTEqtr3yXjq2k5r139 zQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q460d5e5v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:01 +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 33PDvWoB032832; Tue, 25 Apr 2023 14:10:59 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 3q4616qt59-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:10:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gtrm/1lryCkm3vm2jg3PmG35RyBJJqZ5051Xobi2VSP8XSErbVGozotMKwEh1SmJrTz1WHAun3PY6oP5uLKMdg9DKbCJw8gKv+75Ztw/FAX8suqRI90qo+GQ+7zvvTJ1NIKWp7TII3mS5luc2M72F6iWSVYz3DwSdRay695mj/oQpDoWEbL3/6UKd77hA+igD55Z2sgzXIWhgQGWkHxyPS6AxnS6zjFMJfSZk5gHs9qaNSXu+pTbap0XIqSG0Qo282I35Ozdy+Cjc1xZV2HxoJzIXgwYXSn2CCTdQhoDtH5x5IoHHD8ffbr8ji8adCijL+7iQi48ZRTJhgNyxM6y8w== 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=+lpEg46sr39rnxF5o1iqmex/V43BTeuXtslxH1aiM7c=; b=Odtfwnax1A0Ex7p4wgBA/vS2ibwB7PrSTy5NcJvotMO++lJm+HIrEHy7It2MPJOWw1nEJ5SEBi2azyAjU5hPwDhjwCTrA6OqAE1z2/U1y0Q1ooeLpl8MuwkwevBQvJ47GkQswwLXXEVcZ0cJp4Se6aNAmroO9L0/5/aCdeUjfNPsvHeaAxvgy1P7osJxzrX9XcAlMZnX7EvPOz8GpvKGp4GoUx+ISiu7qAu10zf0mF7OsH76ypXS1IHwMbDzbfJ5gW/RopDZ7UsT4nWRRgVjwhaqD+l+tzKyW9rMo/JF5O802fxCD6bwuvkv+umnrdsO3kFgqLaGsWsA9UEfTe/QWw== 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=+lpEg46sr39rnxF5o1iqmex/V43BTeuXtslxH1aiM7c=; b=jkQv9OVeYtjy435dBqw2d0UptetPgN+r2Qro1H0F43SSfYI3/MXz7GT0wm0TYW/ZTqIqtXOZDq8Sfg8iqOfVP/CjwXOl5KIy7sP9OgHuEaCSUMft9EEGqlIda32GzxNF/XZ2zQqsJWW7vuz/87P+677r/8ob1h827StE7owOx2k= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CYYPR10MB7650.namprd10.prod.outlook.com (2603:10b6:930:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 14:10:57 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:57 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 16/34] maple_tree: Make test code work without debug enabled Date: Tue, 25 Apr 2023 10:09:37 -0400 Message-Id: <20230425140955.3834476-17-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0104.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::9) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|CYYPR10MB7650:EE_ X-MS-Office365-Filtering-Correlation-Id: af704e12-0371-41bc-5f89-08db4596e3f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MruODaDCX7tIhXFmd+jH7QmAD5R0jtw/XQsLQwXWluYh6yySziwQPPY8kW/83Xm3by9/LTZ4xoFfTwgLF6btpZU4YAmJLohfCBUN8XW63x3MI+R6O0pnA0+ISOikOZl7yeJo4AY+8NK1jaJZIDJ/xrx9MbBlcdoSNNYm6M1D8+aZLFnCfIHrVUBpJDnFrZgA3EWwfz5BKVDG4wkBXl//tg0OoiO7d4rjw/hkjmcujugii7vXpItWHPpTZXSpzD5UR6Sb6CsjGpvD/9zASVTeFxX+S6kB4bmrFTcrW4qkQNKXrzcvSDqf+UktdG86B7TPqegr1ojukY5IIq/+Hpz7ANyyQNZJBXdnBaWBTO+osqxc91kZhOSSHWbedLZMUfJeoEyedbERXAsBAWEIFA3L45WgKoaaDx694VKNNHadHAebxQ/qQpvyRpHKc5+4MlBO1cJfHH5vOBRkRGk5qYupUwEVRRRrLL7fkGEnog6veyCpak7wuPQ9CIQtM1cRoWg9zab+97m4i6p2hFnfXln7euGhxzI24HPIoZt0Gy5mMtfGsxaKz11T46930PZfiOJX 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SoO0ivU+/nGgqA2FYqeZ13fSoX3eGGKHbrvKC+qg1Aweh/4NcqIDi0f9gXFp?= =?us-ascii?Q?yq9zQ9mVg7oKdpQ6Nc0rck92H0WmfITH1Kr8OzuA2+pNMR/3h59+FFWSUnUm?= =?us-ascii?Q?mMnC3clq8t6ouyVuvm3Al3MXf4cv+fKnBnJCpky+C58DN1RsPmvZM4Ff+DMj?= =?us-ascii?Q?sjXbgP/SLTLcUypIdVBsqqM/gytWwywcyTf9lFyL5pW/+4v3oPaZZjYnKPGk?= =?us-ascii?Q?Rx7xyZ38jpH2UYx4johTU3KdWJWikaqH+YybqcmZx7CmVpG7H0T6sKb71REE?= =?us-ascii?Q?GdPGjaqni0iT/rYSvAnG5QHGTHUjVXFY02sUCNlYJ0ios+p3x3Zyu892xoHq?= =?us-ascii?Q?J2uCyy3FuPrBXLRrw8P+qHdOvhKEZbtPEd/5l6D16lXpwFXKboFa6ivpW5mh?= =?us-ascii?Q?BGODIf4dy1RAr2F1zYeZIE8wtKa795Qcac31i1bnePNVaOaVQcqUtbwzUCuZ?= =?us-ascii?Q?s32sY2Lokw55og0dMVACu7CZfk5Gt5p/eYn/2qPJBk5Fxg2ZI/4yEF14BDbM?= =?us-ascii?Q?rycRNVAj1AUMT/Pn6WxST3lIEkgIy3/yESe+qJfDC7I6bqD7IT8E9alRwKNw?= =?us-ascii?Q?T+tTeku9oTCitrH6Lqiq5/dru1v6GBTMTpRGAPjaDwjXtQ/1+lcSQRQqBOhV?= =?us-ascii?Q?BK8zEIFj2o3GKyl96d2vCzuJeuGnS0IOEnOOQD953hKfl6RbaNjQkEUGTOoD?= =?us-ascii?Q?UIcbvFu+YjPGqzAxcpCfkia93PGHpXH9uenP3KbsT7ICl1gRNN3TEm1OngOV?= =?us-ascii?Q?mkDG13r53g7GH6uDh+2nh8PP7i1rWs4bfZtLZ4wcCnQeNR+vwlklCEU248Cv?= =?us-ascii?Q?vGkuh94hNXP5tEyMa6l/DRDGSGWBoxkRP7+JPgFMaVnpUcuXBw2kDxN21RhG?= =?us-ascii?Q?dbbWrAJrtIm5fjny9SOxoHHy+WK1AxoHzMATXkWNsiSSG54r2MsRXzP/u5d5?= =?us-ascii?Q?r+UK5FY9bjzJEOLz2ctTo2l9/GOQEYdQxDoI/T/67S7iZXelyp6PuxcB/Zg6?= =?us-ascii?Q?BAuFrTOd4RgyahQEThfY9UP6lIUy2GrP23/l922eWoH9ED682LKGVITURNM4?= =?us-ascii?Q?LQ4OR+wQQZ2jLxXaevm6AnQy2P0eMKmJXKKgycbCOJGECHQJ66UyO75wsUar?= =?us-ascii?Q?6VIVrOxCHMLcKSvPUgjX+5iGiwaTrnmFcLmHxwmfF1Ilu6YhtVJ5Ln81td48?= =?us-ascii?Q?aMi4Sbz/8FNfEUKCVL9tAfEmLE1pdXTwM7RE+t86+3PERscyRs6Cz38gXWLq?= =?us-ascii?Q?TstqofJ0Tkl1bG+FLFaSRZ3IKXPL4UvNPXNvbEYUGS7yO2xHdywqW3nGYWOw?= =?us-ascii?Q?QY6cx5u2QZCEnQQwqXycVy9+aWd3AHoFC1mXu82ghEuTCGSD5EuShYwPTtxP?= =?us-ascii?Q?CPs03Xk9SJmMHCKDEYZsmbGb0+b/EPioq6xSko4JvT8MdWTiHjYtAUZTl8dH?= =?us-ascii?Q?wBDuSGH/FJSQrCDNAtGEr21WkYJtTq/PnvXD2+0Oh5OZxdcC5C3JY5tiqHw5?= =?us-ascii?Q?liRRmvpEWfHh9YJh4FQVFmGnmaZ9e1SmKG81xq5NeENZ+oHJXVGWx9Nvj4gr?= =?us-ascii?Q?i+OcAkdrs5+YubjNHC8JWm2cUN1/uzs0R5t5dlV+LvrZTBZGkRbDDxEO2ggt?= =?us-ascii?Q?FA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vn5tK7tYS8ZIGClwBCZkqUoZMPceYVbUVGMZCOQY74YVNLpNt1XmC2JubI6BoV8WjNp8Sy0DH+yOmD6Qdk3LskTXFbcCP0C9/cL82hW/LI/L6M+ApnMlNG7sMKW6Qe27yzS7/lv/pQoUAd3q+c8m9u3tn4f0ENqCEJQ06ZVhuHvBxZptnqtagzP2yITAmyPQGIhURNG1ImzMLg9ICdrZVlwxDDg9Z9PHAk1kZQ8JA8PC1XBpDdddvOsQULv79AG0nfc1pCwqxjtdKlQV1mG2FC6XH72ehpwZ8xwLuF0cGyrpWJ/R2nhSXReCFxILhorQOiV/BwzSRjLC5yphFR14GMVHY7ryKMvDdiRxlLYyNYohXXYL/pVkuiMv/b8GzNS553S0/zxd7ZfH2P3dqez8uX5y3bnWfEOcIOpEiu7yHw9waE5aNL88xU/fvAuytOnxQjopX+MNV6LJ76lKv+4ezHTqhn5o0nvMzRjFWG5XxRDKuSIWKQKJ1KCe9IKyzcS1M67sANskDVhOilRdTCP6x20x0749akSkF3ztLJstq4kx4DZssQQ3NUKI0bXl9lf2Ttybu0/c7c8aDV0JctMbWaqiNVxP+SlM06kUa9FPBb92f6Oyqo1Bvsf+9SZn6wOf8enPmUcKS8rGnRAXKO3ZPesf4L9/duHqfmD1EY2sRd1NDnq/0Ujdq8UqTibop7/QBPTALMcbs/FtYb8je7X3msYek1lg0v36m3Npsh3FycxNxK1FjJ9fon4PZMZvgR5U86Go0HpIX22ruKHhkiLKfqO8Nh8ffgYWLvQaLZNGqYDElF+IECbIOOhMMyNtaKuNtO4+Ro7Ut5aWSZ8BI6w7WI6HqXLFWMg7FCyYBb76omm78rpI/1FsnKnx+JZIzgvgjxMTJs1BS7WVMhczBDF0wA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: af704e12-0371-41bc-5f89-08db4596e3f9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:57.6140 (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: yUeAJVh1cI2x4Q2lc+k10dzXcCuBpuUMtvAffRdNwW4Qyp5sJZ6jfCWhYKDlQZJKqtk2UK8MSVcTGkYGf3/C2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: RnHf_S6vxgSSqgrNiMM4amDHUD7O0ppE X-Proofpoint-ORIG-GUID: RnHf_S6vxgSSqgrNiMM4amDHUD7O0ppE 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. Signed-off-by: Liam R. Howlett --- lib/Kconfig.debug | 10 +++++++--- lib/test_maple_tree.c | 9 ++++++--- tools/testing/radix-tree/maple.c | 1 - 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 5cd8183bb4c13..11736e17a62d8 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2281,9 +2281,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 d6929270dd36a..89383eedb70af 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -11,12 +11,15 @@ #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 mas_dump(mas) do {} while (0) +#define mas_wr_dump(mas) do {} 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 ebcb3faf85ea9..cf37ed9ab6c4d 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 Thu Feb 12 07:40:30 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 19A56C6FD18 for ; Tue, 25 Apr 2023 14:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234400AbjDYOMo (ORCPT ); Tue, 25 Apr 2023 10:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234455AbjDYOMP (ORCPT ); Tue, 25 Apr 2023 10:12:15 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F05513FBE for ; Tue, 25 Apr 2023 07:11:35 -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 33PDibUa006082; Tue, 25 Apr 2023 14:11: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=IDIXK2KxMTW9l24QIc5A5LUq1e1m5wDTil92Q6ZsfZI=; b=F2/E3rgIlRiQizG4c21HeLETFab/WJ+eGJ8MVfREY4zfZziejs51CgDZZMEsxsJV5weN Vl84MmXnviDckg6+eaPY2scxJdReAbfB9771Km5GWQ6kI19BWUVbKQTBm4vqd4SuxAbC KV6oEnB9QAkQetmpUEw+hlpb6qsMbP7IMdzbqKiIjq7rADIjRYLxmY/9i0yowT1naIDj a+VmNr7AkdtS+gWtm+o9ibK9HWbKySrsLy7bXSi5pcdIv0MyIq20gRrU5Dg5OJ05O7t/ KAX3Ssp1LHAhzU8BdcZ5pbtSOi1mYNSc8BYBOLcegtb/Z4Ni4MRq/bkJ52buGZ8RUjXS Ag== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgmx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:04 +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 33PDwhPU024866; Tue, 25 Apr 2023 14:11:03 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crc9d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=amKVwWdFUFob1I2Iyqgj9RRw8l9fNDcBVcC4Obei0iwpIQ5tVml8I+SYfr3dYiE/fEd9dEQd4pUcaBxr2VTFXsMvfjRfFsjP7wGNkH2+8DgKeV9uukYrOefCYG2p7ToOKfRldmDWl1OGwesC8qkyCWxu69WIGe/bpzJMnDpBn97S12UJrmPmdSurIdGPN+NdOe93wtFzM99bgqH1zvRt3ROjDq2f5UdOhRSJu9tfc2ZneQuhNQoAUXl2iLeVs++3qeBaykS8P8MqGGUbK5M95ZGnFXKSxYqxtlNpyGcxiJXG/cHLphcXFM3g9wKZUgoYRdv+9lesarxy5/rN2KGRkQ== 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=IDIXK2KxMTW9l24QIc5A5LUq1e1m5wDTil92Q6ZsfZI=; b=K3bearJhH60opWe0a+9/PWPUuSuJ6MGULNlJNVgZi1DKJMZfwRE3XW8KtL+q/9us3YTBmDy20drFNioepqcI3Vi3SwklisdH1xk4LlGtyoZI/rDJDocOQgLG0biSKtm3U3IXfCzRD1C17xBLRWftlZus1yWKr9DwmLmkt5Di71LoQPuEDFXOXtmSy60dfzz2pV75F1McJuE1itGhLyXorKTDVfKbXZcL/vF+tjtvzolMT/SBDT+3VA4lmx1odCBRL1NGlHjYqeJq2PXQWiiVHf1KMsLSR101gzk/t4kJRFINDR11GGwIHZ7i9L3lLYGCej+hu2PLvOtSfsFPuM84/w== 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=IDIXK2KxMTW9l24QIc5A5LUq1e1m5wDTil92Q6ZsfZI=; b=AAV7muwAByXEyF1BmwFgjV/rqxe9ZcqlR0WA+71RcOx4ePFqHJsqB5mKixDY9+mynE9mhkUX9AJbkAnGwzt/c5p26WbSdQqeyKfYCIM2Li2rJyEWg6dBIUxjsnb7eb/XC/OUK1N+upZI4RdDHIObcdzLrRcX840nxMDOdd9VOJk= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:00 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:10:59 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 17/34] mm: Update validate_mm() to use vma iterator Date: Tue, 25 Apr 2023 10:09:38 -0400 Message-Id: <20230425140955.3834476-18-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 21f99d61-8805-44f6-c0c2-08db4596e544 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zN50abmjqPFUsd1eECoIUtesi08AqXyrHJjUdLbbp2b7nm5uDZmb4te90NF8ADPGu1ouftjhSxVph0RfGHkDFGuOdP4Hu8JSYCBrlYuTiAYCI7da8P3HnQNtIGRufkJs3waNe+CxKxFRzCUlzcpi5tZDJz8lbDftURo+VW9X4PtHrn02iGPTHytTiqz1zH041pYWKCqStCcE7ZIZ9a9hhfLsuLSTPz5Ijv72fYAzRThOGAbh1KaCdwRCPgQ9glda5QxDWs0DluJNvv4NHyRBspjmlpdU+z9v0ixM08oaNFv0j0vZm/07CdaFFJ2OjgucFUXmdDWhq7LmQJbZ2Zv+859lrcYCDDjcM7bfi9amcOWo1RgtTpGWCihyuhGq7MVfeNAwoz4bLNn+mRg/oTyqqyDN55E8yW6HbuCDYTazhAx9eEZgFnqgtR1ibAvenBmSlXOjm+0CuO1Ovv6TNos1ZD0sW8zFFEkIbm9xT7Cw3IMf81/Ld+5ERGPwRpF9eW8cv9aOltK6x7tlxmTjzi413hhlb1H7GkQgTMGHnqDElY+CO0IY1LoBU5w9/wZA8OFT 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(15650500001)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?396eJHgzi+KmyAzKCK2IaxSdWj9PE251K3Xby7Y9bkRRTJcWQVePTgjCDw2h?= =?us-ascii?Q?LUxPSibvv/y32ua4tAyVme1DhZf82+XbSuPh/Dgo2r00gWeHoVb1MeyoNItz?= =?us-ascii?Q?lSRrpYgnM7Ap7+KSw40NO2W4icdDovNWwULvii5rpg0aLnhfgd6/bOqfVQZ+?= =?us-ascii?Q?FZsspISQRb/eK4fb8VKacgMQp/r0xhBN8KXIH5tztdNjrBlEREHVViTleWHd?= =?us-ascii?Q?OU1nzYJbHyWfvU7tx+XcwLSweGs02tn7pq8pocBK5CVB9ex8TNoocWamJxXa?= =?us-ascii?Q?YFAUhKsR39hHF1+SxNsF6QZ+IRMNO1eFBcFYsSo0nJltqJnoxMK1I8kso8mX?= =?us-ascii?Q?Ko6sYqDYiSAVqdkcU9Sm3/bSJrybqJR+viyaN6uc8ZGP8LsGTS8BKrZ12a/6?= =?us-ascii?Q?KC6uwgR4gRxpda5PtmBAe3WcMwCLuyq7uqBRI1374dhfHomCgBsYcrGNbfQ9?= =?us-ascii?Q?pdNAFr8N2oxGlBStsMTeDSDLPRIpF50DMLXDu50WCBzxjiMxCOTl5zDZmsR4?= =?us-ascii?Q?FKLAiAcvYCfe1jpeARFK4B6NKyJT5KZpCbIJsNF5YFCaPUJK1CEig6a5sDFc?= =?us-ascii?Q?/hsFSRBi/dVPIo9GWQAz5GLDaU0ckMyHFKw4HWwP7+z8Z2YDqs3pTXuQFP7M?= =?us-ascii?Q?o8mN2GrzbsIFhOSdzgg6pXOcN5BH2Eplruf+KPOTneoOoeuTOnWaRtUF/TPZ?= =?us-ascii?Q?MR5Bh/VEP1fQaedJ1k4xWSrXx8/1mzVIUeJHFVnC6wP1dMTvCuZnQI55N0sZ?= =?us-ascii?Q?DxhfcJj9+T7ebH+wFcovSB+jxtCy7JlTTsbf/z5JkVKN9VHBLK/mQGRJgq+n?= =?us-ascii?Q?memLIhPO8iCQawiJdWNHM+A4PAkFY6OyPcZLZbwP3RGb9x5OYA8KqWVouU4y?= =?us-ascii?Q?fOObQEJumnxfQgWArG1WSFeCyjZ4pRcJ4JOsNHGUWo17SZGpdfyRgjZNutlZ?= =?us-ascii?Q?iGKVdkow3caKNLy1JGCkewdoflnHa+B53OIs4d4kyALTx5grdEEy3MMW3r4S?= =?us-ascii?Q?2Pt+aOGHJnXrgIsUkSsnQ31t3BbqIB5Bkj4G4Mcmvm0SWdDHDPrB1dPPd4TK?= =?us-ascii?Q?ndwhz1Hb2cB6venn6VKeLfogNnhhg2HMH+ylW1aoCr8/e4/46WzGrgGK/KDy?= =?us-ascii?Q?Czgq/Zm5zl+Vtrsm5fgyB2Omj6nH9bJVUewmIy3xFzc2WndO9ZEvNqAL3uOF?= =?us-ascii?Q?WZQrymnr1QnB95vyjbeCNOzW6UIdYOByX2cLWx17oHhjPv5VBfRWCgslnY+r?= =?us-ascii?Q?LgVHg8qd8uZKqfIPKeVZi/u09n9FkrhbhAxpPjDZ3QDCNyhEqjFnOBDGxwVJ?= =?us-ascii?Q?f2V7wZZahBdXmxrNPY6UKmWyiOttwzp6rU9Yyjhxg1js2fuvQhZSuspebxar?= =?us-ascii?Q?HzIBvEkGRmQBFPNDOHFQdZ1jPqSmYSd6PVBSvd66UMScl8cD/Me07RE6LBdU?= =?us-ascii?Q?vBYIoT0aC54w0ClAvcOE8CpiY1u8icx8+QiF5ktLPpt+hirWVv1aAAONhw5q?= =?us-ascii?Q?UBtkEU/sORSZyqmkqW2ACc2wkyWIP13dF/7usIapmIvc40X1lgEbpsrCroUL?= =?us-ascii?Q?lWhstl06wKPbNIrIr2v9UGfbBR4e5JGPgu0/sIGRGtEDZ5dPiWXTyGbHm0/T?= =?us-ascii?Q?yA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Y0ko3KTCyT2dsAvfRYz7jsEf5R1d3jp8AzPib0Ot3XU9V4e92k+VSUl1nzwoqeHnZJssrqBJnxCFKD8CV+NKK1Fr9T+N8CbmiuXo4sjEtH9P+O6zq2hfoYAZ7sA+CqMyv5OoIeu3YUTMpXQMMInqh6L+c/rMZJODjh53x7vnSHCiZ9EbRYZCMom757ME2jjOzvPvP5srW7/Wgy8Qm0y4XJYoec9p4QjxO77cyJxPD0+bOZ/v7Wfgtt/XoZys6P29TGhGaz1hH4368cg1fGpR7jemjilvKwz5OSnDAn8i2lzM6f1vnsWl2L2bnNU2XHMiS9/L4KFD/MGhhEYZdhiyhmrID1n+HoL1rHh+DKTrHmOJDYJuK7IkaafJ6Q8H/35YyLg1NU/yqYtDgjZ0a7jUzXiBjK4Idn+m+3P8jJaCpF8Dt5Kd5ASBdIqF3678jD3RlT/J02o93q7axzj69z/YVoIOpmkHBoW/YmCNwwtbQ/SE7izoRrnMv8b8SRJOrL+1dwghgtb8CSa75XOELsl6Aa6nMlDMaFAbaJeA49CKjy5oC09CzeVNe94A+nd+rO1qQFckprYEMUTaInzdQcrikb4xolOloKrCrFAkrM81lHDgNsdBd1a3/ICafJm0a79xb5DgJS3asKrGiq1a8yPGnrk7vTkxvSYbJtnRO084gxiwu1KrmDvKZ40Q2MNim8/cKYn45fFjD0jKE5kvY0Ymoc/oXZfT56cIo0HqzkeamLOTKhE6/KjrlhuPp0Dj0hZtrjxWZ44o6mU7FdnyenhYX+EOQ0nhgPSo7cAfjUby1doXHav51QDYW3WJcOeebRHFCHKeFH+AzlkIFlChjIG8mja6QE2YBvUPImNNwq7b6W7ipJqOVDCitF8Jog4fSc4SSKloGgCEwUu2qnupf4wBdw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21f99d61-8805-44f6-c0c2-08db4596e544 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:59.8182 (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: ZdjlA5LuokpkWLJQXJ11XDaSCPQcDQAYptHkI4yuxALdVWXJIYMJbYZ/Au+q4u4Xy/hsMkc6D81NKpqGTb7HNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: 1NM28iUJRgNdxufKwc_s7uWBcb8dcIq5 X-Proofpoint-GUID: 1NM28iUJRgNdxufKwc_s7uWBcb8dcIq5 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 b8728d11c9490..7c3e7b0b0e8fd 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 c7b228097bd98..ee533a5ceb79d 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 4c195920f5656..8d1a8bd001247 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 1554f90d497ef..d34a41791ddb2 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 @@ -2234,7 +2215,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); @@ -2292,7 +2273,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: @@ -2301,7 +2282,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 @@ -2936,7 +2917,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 @@ -2958,7 +2939,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. @@ -3199,7 +3180,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. @@ -3258,7 +3239,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: @@ -3274,7 +3255,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 @@ -3411,7 +3392,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); @@ -3434,12 +3415,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 Thu Feb 12 07:40:30 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 CC552C77B61 for ; Tue, 25 Apr 2023 14:12:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234446AbjDYOMk (ORCPT ); Tue, 25 Apr 2023 10:12:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234444AbjDYOMK (ORCPT ); Tue, 25 Apr 2023 10:12:10 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2A4114F6D for ; Tue, 25 Apr 2023 07:11:34 -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 33PDibcD005249; Tue, 25 Apr 2023 14:11: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=PlmOS/szkQ4WyeioHt4vufA0c5KhqWY6gRcjYbxG4dA=; b=sWlFQZ+qgJKWKvJ8tGfh+pW8GvG/RjcSdBYDhSwItekx3ppKcjEXQSJHgA7h9J1Jd8cn etVSO1TKCMkdfLJYb6o8cfA1MI0xqme1QNWs6SdwRtOjiq1lJnsqfYRh080koWFaFnfL hqEYGNmb+U0U6v+Ww/l1qcQ8cDtmmQ+nJ80Ef4ENu14CN0Az0WQvmCOVDjW1CMNblOsM 80O5S0GyFc9plUkZKKnX3h6sLnmHf8ca7pzCpH+6d4ciyzS1+o60An/dQ6D59GwmUU/h +/mUy52tHjDNFRQzzPKSY4kvra9uLmEiMoXq5mQh30w30S4eW+Y4shnAxre1Je8KN9VZ Xw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46gbng8y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:05 +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 33PDwhPV024866; Tue, 25 Apr 2023 14:11:03 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crc9d-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Duc0siHIquKObAEbhJEGKiN3+oqmvSqsPXpRaytDB/Y/CIYpCP3ZrQGP4UFjZp01ilzV0+EoonFAvQgpLeQ+QWHYHSetaBMxUgB4vpuT0FrPUVECEX6sIFD5GQu4jXOq71u1VaKbvPEdNe2oKau0MIKbpQteUeFxQTwpQMuDsCUhB0v1saGQhLhDhkGosfokBBouJJN9DLuHq1UFUHe/RoGZB9VqlfS9JZFpOO6fVIohcF+VJ90JcARpKcq9AqQ9XRmeiJYmvI5/vJsC38OUwgEL6CDN9mc7kBlh2gF4M2DdqRjQ0NhEliDkF2S8Za0zGrysaWFkf7hyU4orCW+Wfw== 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=PlmOS/szkQ4WyeioHt4vufA0c5KhqWY6gRcjYbxG4dA=; b=IWM2upYHMjrwqQn2c1zncD8A2P6YtY0AprQgNlUHRmkBNc5rgjF8O6ACh1TWQS/D17V4uvzKwYvggJ1wDzYlNB//wDrYcEfNTfrPVADQePT0knpMYhTya5uipGcNYHKg7FsLb8/6SH5JWW6S64NtDcmvPDFmbJ1HSUBlbJK2V7BvGG00yz/vEvTRiPMiSYxiBxOH6J9MPdwxLCJ9hQaRGB/ug60sDi+4jCUKqWluPOzz0RKd3GkWFVTStMKJpsnmn1k70inoi3sO/L/YLyKGzzLfS9OFSipO6Gw309sI4XE6JJMBaDNAzUtrC1I23GCKEJPVlbZHUJqceU2UVKmINA== 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=PlmOS/szkQ4WyeioHt4vufA0c5KhqWY6gRcjYbxG4dA=; b=FSHJM6h57HzUFZ9drklWs0zWsLNg97yL2mBotm2bxYxFfCkXyGioDeiZU7oiffCZtQDY/yYglWo1mtBV5zxFCOq0rdO3OZuOC/VZ6UmXpAnqqJpsVoPgz6x/HYgMAGxgRQUNpEsYsg60w2sTRNg9rm1+1YMRxlKvhIbIDmb2mIY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:02 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:02 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 18/34] mm: Update vma_iter_store() to use MAS_WARN_ON() Date: Tue, 25 Apr 2023 10:09:39 -0400 Message-Id: <20230425140955.3834476-19-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0083.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ff::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: a4f1e9c3-6bd8-4a6c-8028-08db4596e6d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K9KKxVugNrc6XiVSyZVT5W5wWVwX8l+tOYr/1+B8LNt9j26cbNCe5b/GO2eKmTrq58VK2mUgzDB1tUbUsTsoFL3GsV+aBbq4Rkg6OZS9fcXbcFoioHCBGF84dsgo5HjXDcSO+kLYJQ4Xw1iI/2xd1Lgzb4/61A0DzC0XEgnWaXPbMw3/lBX11ZpRmjp1ioQF3jVe+jg/Akmbl8VSbpNRJkoJjy5UFlxafaQGN3MC9tVZnQti5o4FBg64RhJJyO6v96MIgcyde+xC3r+HBu8tgcVIbg1Ah5lU4eY2teqZPDJlCqO3SN5/R9fyemVcjqygTVOvOcQ+naZVn/or+Mu9PhrvwJWYH8bUlNq0ZmBt6oSvq6tnPnBeUrUFDNdC7VIMERr7XDgUaeCzAhTQ3kpi0h8mF+5Bx44ZcsgtCOTEhTURi/oC+WMgZzTZm3Kngn6jTVkjK+r9JMQFwzT8NcqG5w0jpklxCkha9tL+pZ6lw2Nx45XgnzJUXFmPEudI3D8NUU7aCZfrrYz93/gCD8dxiOSacGaRZSHzq9aULj49m4iybjaP7Il3av0Ir5tEe1pD 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wXkWA8QArP4h1oqP5mlHlKh1bKVSo5bL//6/3iwPovBvD2vxVI62HV1I7HJt?= =?us-ascii?Q?zTcdmH5aPPBopPiosd7imnB8zaeLO8gVhzGYW9kmgc91EvqIMoCjQbs4HlGh?= =?us-ascii?Q?l5pXh1V/geoxn4IiFXHnmBiSmyNdjWLD1pVhAkuVKprMwCYoa5fB91uD8YWJ?= =?us-ascii?Q?wlvF1GY35hAWfKj9o9dwk/7mp9yfCu08CSnJsu4a7Y1UPmaU7R5MhZKhyvne?= =?us-ascii?Q?EmF9FLdVSr0yukn8Syb/viaXjbFCsZw8W0hk02/oSowkB9GAYtlSXPuCNeri?= =?us-ascii?Q?9Um28iv8L0kT6aBJ8Az1vvhTWDfbq9ofMhsBCaFPF/qU96Tb2xBVAwIqbKRq?= =?us-ascii?Q?a9oVEZ0K2EkevrDi7KmnBBREXXLKTzUAbAobuGlOqEKa45h4jwTAU+ZnDyh2?= =?us-ascii?Q?yLfLJGVzUdm0HmkNLZn8cMN7q8Of4Js/ohj8n7AwedS+mV2gTWUiQR8jjQIs?= =?us-ascii?Q?oTJeyKVRpmD4T1zcEpZekEe+ot1i43mIapZVFyxuPl6avYNDaYW/Npguzxpp?= =?us-ascii?Q?akLCi6xTCh3BEfb3oMPj8gRpRx86fp0Sxih1wMn7lITwNLiMYNY8qUXkrM3f?= =?us-ascii?Q?8hAbh64R6p1+Z9IFXlYDRwIRojPUT0wCzssGz+jnqSXakvF0dT7rCnxhVYPI?= =?us-ascii?Q?J+Xc+osnQiWtrDVYL7nDYqiG9dcum0Zqb/lP/LE2OduzlQci3ky+AJmMLqnp?= =?us-ascii?Q?X4uR5TNGFl9ne38VCt1pdWE7rOwhPAfBUtzemG1SJFvsjXLM5lcQ7Iqr8xPp?= =?us-ascii?Q?M6gNGMlMS9KfINBI7WjNiY0RjhNF190mzi2l6xpmeNFp/RlX77MQ/xTUQxWb?= =?us-ascii?Q?K7R/StN7wZHhuT8A/PdCNG0o4ptfi+DhHyAyC9F8ge69xM2xUYncZcYLeLP9?= =?us-ascii?Q?E5u8+eBIA34iM9Xu9y8PTJHab36TAMbBlWQ52MlFMUK15G/Qd8ug5ADPjW4n?= =?us-ascii?Q?pRLvYO4BjTwNcqfaC2VdLve2/ZyVwE0je0zBPP2t4uPIbCxyaD36WUY4Kx8E?= =?us-ascii?Q?uqgpEu5I72ojTJNBE1UD4fkkcX/tYSOzktzHHHoWsyCICZp63ERIX8zOGQGw?= =?us-ascii?Q?3eWlRznAA1VSK4fsbqwcPv2zYHUx2RLV5TOnWS5vzdeTLZyKklHpSG2EilbF?= =?us-ascii?Q?Sgwldxgcif3nPTthsqR5DBOicE1F7H/8EaB5i0t7/9n8cxDMZNZXJg//3Trr?= =?us-ascii?Q?KvWexYj5Il7jJ8QZ988i82TO54pJ9jKW/HMH3P+c1vj7dsMJlbOz6RiEoIsJ?= =?us-ascii?Q?hrFmnD+euNjH+5/YViiz5VK6t+Fh1McZoZm0M8HaeDYUCGtuA5xWs7lJXXzT?= =?us-ascii?Q?ECMteuxOxAPXkn0odJADzEv9hlw+i+uIyn+L3Ert4lFZjakvtPTtxmV7wAjd?= =?us-ascii?Q?gF/yPkWeQ8j8dHLZdnlNUEhruoam3F/9jgHKr4T+IZEG0iymt7PGKNiSchML?= =?us-ascii?Q?GMDXV9/IAiayx2zYLLw6qosPLz5iY6XvF7DvFbc1l4jh4KB69qRQ3Co872Gs?= =?us-ascii?Q?3I3fp7qWYi0lm1Y30aBA6F8kMtcXqjacxJZFtwb1pIX/2iGr31W6W4ujTcnr?= =?us-ascii?Q?egtOjY/UK7FFotW3ADikcJp2sXTZXuVtdJ4t07SuD9vCb5mRHSm6zW7nj7E4?= =?us-ascii?Q?PQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zyk+JndoPwUW6mj1AogQQIDUDtc9JFcKADgzZFlEm/jJ83iALjVXYLNwR8KwBAwBGFtUCDrUFq4Vh/7+fE+wvHn4XE7y/X1M8rw7FmPXUuzN+2wHKpB7zS14sxU+wttOU9shUcwhHL1fWGclp6ts+Jh/jofQY4aybZyncwk4LRrih/vu2iUtQWXXVuZT+r+QQrT45NZma55fWTvO5cZkhnvjrkpnA1LQwVDHbwJl7bWgtID3IyZNLY5+J0p5hwVD1mOSmiHrMU72XYGqDl4la6hOOld5dxJt2YiEya5TFYsGCNfVmaNmobe9dzYYw3nekEC6ztoxtiegIsFa52n/QKFjruyagIKvp3tHpPPW6LEfWL9Mt8GepPEfp0PAwdhvzBkEZg30OKs6bft8ynnY0lzYzIk3EZKCvo1JPHDtTDFKXqpQc+VEnBasSjSDVH3Kenh54lFpy9Uk+7QyEq36nrAg/lSeU2t7oEaqo5mTP4B1re8SeYXfVk1OwF+h3Ey3tOli4yoso8NN4Z0BvO1tjgs3rMFv5Y7Ro7YI6MHKDUeBv+53Z+fgAPkXcdFi6YkGBvKcqM8qG0rUIeJjN7qxm8aCU55nAKm4XJcBGgnPhRdHiEpEpqSv0dE9wSflmR+nxuz0+GedB064HOVa9C7k963oJ27XkMOiFB7WViuD2yvTIidEEuI2KAAyBwyjxk+ngJEcxKPfWW7MP8miBq0PGYerBGEI83rVURCJhGYd36/ayLMEOplCAX/0W4G/6JijNtsQr30v8Gu/cMdqzjxtaDJGT8nHhZ0TACuae0P1HXsSnZ3RJocCvhph4N+22Tvsd82SWZPC55TX6pILI+azfJ/AFK/krfQjvYizrMYNQfMJl7BDfLF+THZ5j7S7yguqAfcu+rfI2nEJ79qVjkP/xA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4f1e9c3-6bd8-4a6c-8028-08db4596e6d0 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:02.3701 (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: KJdyZ5pEjlo6FRLjYS77igpTZ5rH7HVUSMBqOBnxiDGE0GdXULqKiVyJ3jA488rIaH0gzxLhM/4X3oRy5+GUSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: 13y978_N0BgYI3m1yxMH7up-_yVuiL7c X-Proofpoint-ORIG-GUID: 13y978_N0BgYI3m1yxMH7up-_yVuiL7c 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. Signed-off-by: Liam R. Howlett --- mm/internal.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 8d1a8bd001247..76612a860e58e 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)) { + printk("%lx > %lx\n", vmi->mas.index, vma->vm_start); + printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end); + printk("into slot %lx-%lx", 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)) { + printk("%lx < %lx\n", vmi->mas.last, vma->vm_start); + printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end); + printk("into slot %lx-%lx", vmi->mas.index, vmi->mas.last); } #endif =20 --=20 2.39.2 From nobody Thu Feb 12 07:40:30 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 1FAFFC77B61 for ; Tue, 25 Apr 2023 14:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233846AbjDYONM (ORCPT ); Tue, 25 Apr 2023 10:13:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234055AbjDYONC (ORCPT ); Tue, 25 Apr 2023 10:13:02 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 679F4168C5 for ; Tue, 25 Apr 2023 07:12:10 -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 33PDibKb005234; Tue, 25 Apr 2023 14:11: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=LyTnByyQ/uRkrpAzi9MfH8841LKGO6dtdk4jEIaJp30=; b=dJROeIB9zEwpcqOk8ZWrHOkqQMYlacwf4RQZnk91vk6AEojOaeQPzy6e/A/PrCdYWwIU QGgBC8dULRJe5C2rICix66m1gHl9fTpBci4lyhik9cyINOQ1yXLnQoe0xVeGaW57q2HL mtgecbWahLGxBQ1Gq1W4Vii9BYYY3E087Hj0viVGDtcpNVOQ8f2qqPZFt0crswOKN7hc nUfk89y9DSwYV9eSNoxFSJUrVVgecBGVdXcKWtz0ZMIx6Ojkz/6A6TWmNjN7+kftGq9f WRv6pjX9ZHzjqN4IzDG6fZj6ezCO8i40G5yLcII4H4S8wQVMShVZCEr1tOi/Rn6ZgIf+ Nw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46gbng95-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:09 +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 33PDStKI007334; Tue, 25 Apr 2023 14:11:08 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gdyp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nDziNX30JiLN685HPPEEwkHilidODjGkOE4oeOdg9pwSzFY0nA7/jndeHnBinxDlDrikOO4B7Pwj/IVltECJ2usvcdt54NNopFk/OMmcJ8P0l11/xYqyGrIE/nzG20yStDo2fb31v75lMvP56T3fo4k+RG8NHSkMpRsb2wl53MtbyzDveGhURo6ZtKNvKQ5RKE51S68PwqS26f3AS5L/rBYNTdEjLmDShKhHTyt7EA31xxlLklLe2HgcNKkBDkPOuSjY6/2GHD9Lft7bo1LUgm4jvbBXmbCMepGOLjsl2fwQV0miVnJLDmgmCaiwAtERO6NrV3+8NudhLGp7O5J3gQ== 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=LyTnByyQ/uRkrpAzi9MfH8841LKGO6dtdk4jEIaJp30=; b=B6IXxISqxZ4ybdbBqUVp/aIEwnYcXqehItiZC/tygHwDcJ2Wg3YRWQlINgpSony9ouvQiaa40eQGKPeEkNNCnz9G5RVU7V7S+BDoEl9ZLF2kHNSfuW6PaT/WfMfSXTDc6tsOyCBY3orUwTMya5WNRTECm0o6E6q2v3tDbAg7VrDfnfUoTr0Jnjg7z9Y9jA17bnmnh2e+v2CORQzF+zq5G2HArIX9DkkKcwvGyWLJz/wD1YyTgZdAnyhu4xHbtFYqUbevEjgY6BsRiLy+gx0034P+RM0iKBrqpO0cseEv/fgcMgwBMnYgBXkeqt10F2QgSrZSMqItMX+wJptxuT8waQ== 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=LyTnByyQ/uRkrpAzi9MfH8841LKGO6dtdk4jEIaJp30=; b=Xtt3BeI+en/oJjD5wV+h/wyuV6hq4+jQ0usnTG+pTK/+oFB2BLIqaPbxHyaJPN9W3J2z8RZHF0lfQlIKy9EAoc8Yk8oFIJcuGNbu3QKfExS8t40VLcasFR0LH0axB9CMdSqG9WjSiEy4059MSwsFXiqGLyI3yUgLtyK1taCANi4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:05 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:05 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 19/34] maple_tree: Add __init and __exit to test module Date: Tue, 25 Apr 2023 10:09:40 -0400 Message-Id: <20230425140955.3834476-20-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0343.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 1aee9f68-77a5-4a96-0645-08db4596e842 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: axtT1yCiob20CWh74C79FkUmlSrEPhQXDR6355vmmf1d29ClKlrMqtN4mU/Kz3xGtl8Fwo7CmL7SDHE/SBtYTjSf5urNN8ohbdctB/5KG8SnTqBNibPuXoCn31itCfQAFyBSP/vli16vSgI/jcJtf1jtD1Hstih1QruQpD9B4CdZ8cV2/vQ9n6fG34vos9CtSUg8Vi8JCeM7M81QZl98b7TIFVtNj9QudBNg7vtZ6PemNZCuUwuBMjnGEMOJjlL25lFP4P/RI/BjDpzzjO7U9cVcHO1SKSjkWADNJ4u0m7+VRpJtLQtNpQGKRmgVEFLbFv1TJgTyr4clfDQi94CGsobXgpzOnf5Ujcj5r4X62TmgTf5p3jb2Oy15IWDla4RTBzTFXKc8FA1EW/bA7cUJV8khSlbKIGU5rOIUB44oSdvTTZL6Sg8Q1KRq4RIHPBjv3Fbr3wFIJhdC4UoBSe4SH9WhrCJpxa+x1piolQDRsnkOzyyijFvXIF/6GCeHrBzbpZQCnn9pWfWHCIgrNYSekjMs3XZB4BM/a/3dLC7qoVH9fguL+lfSKEtabiplP4Im 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(40140700001)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(30864003)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sQrjJPxs4SqO/cX6ICYlh1bFJijYi6nPGUsrjTP0WgkxW4RwEv88P1KPMlt8?= =?us-ascii?Q?S79zozCKrGEg2r8SzJZzGgeb9mJhxcoUOVF9vkd2XHTaqP8m8Y0Dm3OEhR9g?= =?us-ascii?Q?VRhs4ld2Csm1pKyFXiVgpxaS4GeMb1E1bhayVgWYNephfRJzTbrno/9+8OR/?= =?us-ascii?Q?gKhaKbRQQFdR+ELjDIQEFsipSyGesvQr7D+MWMxUpgmx0OkHCwbhy/SZ71j+?= =?us-ascii?Q?h7UeVZOGQlq5wHTxfkC0QLUZivS3k50s8OZByGjF7LtrweP2XoQOPUO5S42I?= =?us-ascii?Q?skrdEU6sgJrqkqTu8saHh2gbgfQdkGDZsFyTMK3Mynd0QDVrV3yOa1HB72HB?= =?us-ascii?Q?79SxbNJpwGzRycRo6ypeatI4WwNBr98gYGGlNSpowsHwmf4RcStFtmXIiuPZ?= =?us-ascii?Q?dsp2wrecjpgIrrPUM3eCeTQYYnR2F+1Z4T4mcQ+TuJY0Aob1endK1U+kBWZ1?= =?us-ascii?Q?c38IhS028B5CwwGSwvrKVzKH8tjo5azKL2XkPTp7f0OO37pUv9eu1fL0NVtz?= =?us-ascii?Q?uXfGcm7PsuTET3AOtUserENdDikx+sKhPhszFbTx56ccbaM7v73OtuMeashG?= =?us-ascii?Q?805DE9NAEP5643zgGaRrjjVexQcva9PRqLp6ex2igkP8cpL/1htl954eCbsj?= =?us-ascii?Q?DN5kWz+inoTF8ZxDMNHK1iHY8YTD2WZh9ruaDssMBM2If+HOxkwgIAK9Cs1w?= =?us-ascii?Q?c2QnMU0ypZ/hnxMvYXWUeOz9sxeibORsp8lmnjkP3W+Rzlmdd+UFsPoca7JL?= =?us-ascii?Q?CaYNy1oI/xDac1mMNeIgPaeH97sapzZQbvXdF66Z+tiwoOLDbtqnfeqUBoxP?= =?us-ascii?Q?w7c3F2LpDvzjGk7/DNa3MQnEjOJQhmgKZhLr7rHJS8UdT+ybVfRcKHxek8Rl?= =?us-ascii?Q?qSHY1oWseiqsozz2JdQpXN7mzT6nYZHxShcVJHRxouYHaFOmadv1mw1mlJEF?= =?us-ascii?Q?7T8xjsD4OimrXJD++lpJz7O2vm8dju9P1Oy71Mvhx3QkN7QVN3z6ph/gLmhx?= =?us-ascii?Q?8lYpIdBjfrmZj8WvJmudEmt034V8+hm8vE4ku29d1+BHhMg1jUcewNu9qoRr?= =?us-ascii?Q?d8uYlXy56N30fglVoEJvgK2llzkD4L566DboCO4s7cLo54kcQ3qd3TB0Fddg?= =?us-ascii?Q?LG3xIutznPzdSf0XrkJLGljIW7Lu0NdD1McQLVW1FdVwr6/VossVJxo+IegI?= =?us-ascii?Q?a5tYDEaa2gCzthi26vCH5q0OWWH+x1veX4Hn8e2AUX3wUwTSZhe+I2x33ng0?= =?us-ascii?Q?lEtzb7MMcYr890X539BZZwaSnJ8f2lziWOkvb30O+/Fq0ugbnpe8h/xswlv3?= =?us-ascii?Q?9kPAxxwaL1J8NXn37m25mdjrJgOSgH6XR3oDkpIUbiu/A4EBTfSX/Ppuckbj?= =?us-ascii?Q?1g614VRqPEWSYhtkMWvRROTmaHj3hxqX3qVeKbjoKNuqIODNEcufGHY+GwhR?= =?us-ascii?Q?xHb/+jCdtCZMBOl0dV8NssFf+vSycWlrd33zEPoznAZ1YthJxAj0DelH/ULN?= =?us-ascii?Q?JUxOJPPusNK6wbiPc67iMC7mQJCCLvFD/U0FmvXW3KWGDd8/8BJIhdf0wzEF?= =?us-ascii?Q?GRIFhJMw4Zc6783ltHHFwYahfZt79kAR7Ej0qlLXpq12fuktwkkSomW0zEQs?= =?us-ascii?Q?Vg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: selLX0GmJM76R/PG+X9WjAn1w2gOxgd4rdsOcRaWfsXiLjjJAYtfBP9tjIituiTuswFjW7LDpFdI3FznGqUe1QS/uTA+uSYqAKqlcuatclcqkFlYj5Vx+0ajTb43xf0iOUlmCcQL5WKBw8O5m11LwGvIqpvOTHndVvd5UbuC30LZm29UWGh+I9bi7Uo2Brz8rKZ1umdsYmwkK/TKmF09GDB6bVQFW+88kgyazMaSbLB6GhqPmQtsBFbqcbMod1g+pZywM1L/1pya/YQW0YIz/DoQyQZ3muHGHCLoc4QS5JQTWbWYgTUPPuaL7wN1x1HKfWIfQkCfbhgDE1xrC7KVgLRGLWkGkqJo0f+9qlSrskyzAwJEKcjpwLGQ+aZUFzJNseHKKvCSjYJV8wFngbRRkiilCNiAg9xRohqS0AJsGfT1JR1BfZCXlPHqBl3BXIg4yAKITeN5HKHZpoXU3eGVUJ15xsBEDUUNJ18eeQsDBtX/LLYlRbnVPR7EoLOOKupoZnFJY8XgAePajZUYkqaG8fNgeGnOmzbjHj5J4o3ehA4f08fMoTysDzi/z9dU9fOdiVbucMnf1jFjT6WI5eHliS+OD9TZm+q8ZzY7sbtpVU2Lo3AZhCIqk/9UbyRfGkLiSz8GCBGMk3EOSNTEYhmk6lFzvwSwYi6eiKzaT+ULsFUI1hJ5ObGLqZjlUKTZhrcSNZ4+EmG+O9IkpWURDx4vz3alZ/2ATZGKDkOT2KKHgmmUw5SkHDwEFEEZ3/sngH9DqK50UCR7tmqLtst7TiqQqlW/pWI/AOG6U6v8JhNQa13kafc5BkimYYhzJ4TbFwWi+UP/UbpWwj5Um6PQzCk7pJFMCa+IjztLUoD1ryudt683n4PPDnDzgyFxosQl2mwMWEjDMudlKlL+RfMhhYKlVw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1aee9f68-77a5-4a96-0645-08db4596e842 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:04.9226 (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: k1Nn/vMXMaj2i/912FAtFMNBXIYxuMwCFz51YoGRzy7YaJHyYz8POIRFFvp7K9rFOQ3jDRZMRZgnXYHn4RyrUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: Ng9ADVzju73P3iXYLtnBrDhhnUCp0kqU X-Proofpoint-ORIG-GUID: Ng9ADVzju73P3iXYLtnBrDhhnUCp0kqU 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 89383eedb70af..ae08d34d1d3c4 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -33,54 +33,54 @@ #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) { @@ -97,7 +97,7 @@ static noinline void check_mtree_alloc_range(struct maple= _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) { @@ -115,8 +115,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 @@ -125,7 +125,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; @@ -141,7 +141,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; @@ -157,8 +157,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 @@ -166,7 +166,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; @@ -176,13 +176,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 @@ -197,8 +197,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 @@ -230,7 +230,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; @@ -259,7 +259,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; @@ -278,13 +278,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; @@ -309,7 +309,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 @@ -318,7 +318,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; @@ -357,7 +357,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; @@ -574,7 +574,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; @@ -619,7 +619,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: @@ -627,7 +627,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, @@ -655,7 +655,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 @@ -675,7 +675,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 */ @@ -786,7 +786,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: @@ -794,7 +794,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, @@ -821,7 +821,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, @@ -836,7 +836,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 */ @@ -945,10 +945,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. */ @@ -1213,7 +1213,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; @@ -1237,7 +1237,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; @@ -1281,7 +1281,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; @@ -1370,13 +1370,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, @@ -1390,7 +1390,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, @@ -1404,11 +1404,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, @@ -1567,7 +1567,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 @@ -1580,7 +1580,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 @@ -1596,7 +1596,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 @@ -1615,7 +1615,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); @@ -1632,7 +1632,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); @@ -1649,7 +1649,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; @@ -1673,7 +1673,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; @@ -1712,7 +1712,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; @@ -1780,7 +1780,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; @@ -1813,7 +1813,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; @@ -1855,15 +1855,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; @@ -2031,7 +2033,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; @@ -2044,7 +2046,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. @@ -2441,7 +2443,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) { @@ -2481,7 +2483,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; @@ -2569,7 +2571,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); @@ -2588,7 +2590,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); @@ -2673,7 +2675,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; @@ -2717,11 +2719,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"); @@ -2991,7 +2993,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 1bb0afc213099..81563c3dfce79 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 cf37ed9ab6c4d..03539d86cdf0f 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 Thu Feb 12 07:40:31 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 BF04AC77B61 for ; Tue, 25 Apr 2023 14:13:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234440AbjDYONB (ORCPT ); Tue, 25 Apr 2023 10:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234450AbjDYOMm (ORCPT ); Tue, 25 Apr 2023 10:12:42 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 631CD14F79 for ; Tue, 25 Apr 2023 07:11:59 -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 33PDinSF017700; Tue, 25 Apr 2023 14:11:11 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=SjQ+Ak+LVQQqfW83hoX5RLJcaeyMVrqOz8zEeR0GSQQ=; b=AoyDx8ruHtcrBCl1SO6Y+t4PgA7OOtpw0qGrBNrSWidwR9Nj7AC2c63UN8LWAHh1SKyB mFoO/ZjTHV8c/21mqQBPPuH8Gy71Vs3MtJLKYn1qrwMtGrx4kVzpuFFSPkAzC9e/doCl XX1K5Kw0yGARD3S/idAWsVObRW+7ec1qJcMLbqU8+rpJ4KXr6bU8qLWn3oC9Z3tqu428 u/gGmanqZvwdN0KbQQlBzL42FhwJvPSTd/ugnzDlfR/0NnDn8ApT1EZA4pgrENv9b44Q bjW4RIiSQSs/z8F2vXK7i7nQXSICag4tvE+ZEY5+6n5NX7/V9BEfKVCmULSaJsYS/8M1 ig== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47fandv4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:10 +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 33PD1ftv007351; Tue, 25 Apr 2023 14:11:10 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616ge1p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N7R+ro0G2UpapPaqembNViyryMV8YFP+oxJWhZo0PrDD0/GtYnhdLSjYxnTPVS7qf7GDWVDeopCyuVrxtQsadKtBAyV022dobogsK9P86Qz3xGDcX2YIF3bqqPic/5U+T3pNphXDeuoW8+KVAAwvVfDRSa3u5AtNrnsRozCOEgyFIlL0l5MSF4Ny2km5jAHgTPoVEFBCDFEFszmKWpgIfO4Htcj600/RCxQS+oSP8w+5maBlljmdDL+EpFtwfIrz/nXEO44R1XfJcMqRWO1T+p/Kv5Awm7i6zQ9VI/UWAueagf3TptYAnOWHl7g7DF5xcJhJEOEShtpY/qthBNTyFg== 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=SjQ+Ak+LVQQqfW83hoX5RLJcaeyMVrqOz8zEeR0GSQQ=; b=TXvphHfaEwGWhFwGI5JUwVPfm0SPYCzleaqloae209mIIg6m54O1BN6GYu/eJQU4soryO/DaFdofKa1ffOkaL97QlARwyGTkjFlmdOHRcefRALwTosSR7tA0kt/O4Gga/UTvFvKmMFY6QvxF0E7OYQKEJulr+g8UXoMqElQZhlwTnUIQzIuH4AyFq/l4DPtu7DjfJRRjJgpq5sO29durZUrAcX5nb8TLLh3siH5EsG8Ij2Vb53VQtomRuITEIPV4a+5qtZ58iyDKErYR+YVSfFnjbS53W7IeIxA1FTzPHDw2+JFjBct7eONLVLWkxtbJ5++wGRiC+9sJsiRte0kHmA== 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=SjQ+Ak+LVQQqfW83hoX5RLJcaeyMVrqOz8zEeR0GSQQ=; b=HMds6F+PKN1PyAzUeHMPzwBxzJX+CqzZMoDTX/M0epMWol/b3QPFXX6iaRgLHP6H32ZniBv/K8UTW0ENvtUvuoRdmDmiAXo2H2CRz5gvP7XXCBmK6nT7INWFj+M9dU7b03/s9dUd1yYFLSlL6RpLgGPQsbMlD3I+iyGzh1UFLvg= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:07 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:06 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 20/34] maple_tree: Remove unnecessary check from mas_destroy() Date: Tue, 25 Apr 2023 10:09:41 -0400 Message-Id: <20230425140955.3834476-21-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0095.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ff::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: de23e635-4957-4187-5511-08db4596e97a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dVaWCPAh/MG/KhTJZmqL8Y0gSZqcrSGBqKn1AWca4RxzpJ+RzB0fmNe8m4qHJ+GBibRBbvYW+0iowXMa+xutcDQtT9d/SY7f3BHv4vFEgstza9VG7UyNJqts5ZaQUFOGAJW1h17mjfHze+P0begRgIGqW+3FKiVOydxlMocCjDDYz7+tHCxxMuHNV+o22JB7dm9H9GB7WzXALCNlvXRf5s3dVpjy1Gqvn9Y7kP3z5fSwr3kfEdzHDWrk4MwGsLima40CIvp4o8BZv2zUng78NiqdPB/xOTHbaf6tns0tr6AjR7HU5qROJn1e4e7dTHgIn+hFl6RyfA2LlA2Kz0kbPDrIcfGXzz6RW8AZ0xJ25SLRcWtF1pUDIaPhd5k1zv30lM7Bl1+Va1ZZfU6tJXuPRIAZzrGuR1+nW1ixdyQ1x7F+Z0zvfRqK/bPWHIf5bwsF8RL/c3PJ8ie6yXXUrm0AOOiDmbLBVODjl+d0KeEcYSEe0sq0j7n6HlnsYyVDzp87BjfDISgm9nNjbFv5G3ZS00BjUrQzjYlzQ+1AAw8GpN4wMv6YhQR0nhEFDLVjKc5s 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(4744005)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h7/0YI1QAHtoy91oaZIFXmdrSy5U3vdsOSgulVDCQaifD1CnJfwlIkm24WxS?= =?us-ascii?Q?/kEwBZh+fY9N4I3BTPabtsfsB6BriHQ/IPO7rcvDNzh+rX1GixxrO0h7EIfi?= =?us-ascii?Q?wwlLHxMpvssxhQxifvyNcuQWooEQ8WfIodUQNT914MYp2bztZDgl0/Peheam?= =?us-ascii?Q?G7QTF3AiXBC0tmYYA+g0jvzIZLfXRZOuOlBjZKpbhAM+cf/rW48tXg/fUyp9?= =?us-ascii?Q?HlA863lKnMgls7bZCqeC/TeNO7I3wUNaLmk5XZ+2Dr3MWCTuWOhyDWs2SIV5?= =?us-ascii?Q?e4+HmSI4+mgyFECoRRFCRuWulIZLjLUghmVJvZqMevsxfvg4Bq032tn/fsbT?= =?us-ascii?Q?ww/anUOEYszdsX213lvktqD4KuRlIq5bl4yvzBPzCEuUZlJHUXywkhWdfHmV?= =?us-ascii?Q?chl66Ge/fKR9wIk9jsjrRHnUad1Nx7ZOzBNB9v37alPsrqr0fcFx6XAjXbP0?= =?us-ascii?Q?jhGscpRM9XnIKOfxOrGWe10C3fD9zBofExrAgXLMlZLW1IjEmeYy459TUsfv?= =?us-ascii?Q?FTf9OWse+4na+GKsaZLgdlX9t+H1yY+lN2tp95fRYnF60xPin1alOoylj96G?= =?us-ascii?Q?fF0/82m27SgLbVmuGtw0Ff0j0cGzM5Tcm1LdinQbOM+ypbUfrgDXNe7dRdzb?= =?us-ascii?Q?S8YpjTtgIyaUvOrk7ALGYhi9HcAuVOoDYz9M7voYfF/n7bG6wv0yn/PEtSP8?= =?us-ascii?Q?Y0z04pdR7TGy/N2pYGM31Biw1oc9kdZR3NS0YO3tmFD1vnfZnRrgWpfAKwOi?= =?us-ascii?Q?9cd5dtpd/t/urS+QSBY7Nh1hZajmJ95K04MJ8SgLNffe+KO6kE4JuFrCnaIH?= =?us-ascii?Q?O49uXIDqTE3FsJOP96QZy5kf/0KSN8hQfHf95eiv7uDLOP0YYzdpIOtwuT0B?= =?us-ascii?Q?IRm7Qamj483LtzyzCxmoB9PrYE8EvjHwbkb2H6JMTQKqeno8LAASG0n3IZy9?= =?us-ascii?Q?+wnc8UMPsIcuzW0878IHV+N8B48oC8T39XtxEDvtAHHL7xox7O2ikS0jWr4s?= =?us-ascii?Q?GK+SOG47yKDwTLXb8W6MRwVIIN1fC5uBVYzpix0Iuk3ih8NQujzj1ZVjg0E1?= =?us-ascii?Q?Oaf3Df25VQuUK+ToEieTsryRv44zwLex1Z2rzfgyuCK9ettDiBvhW8h9hnjk?= =?us-ascii?Q?pFzq2g3f/zQluxWFtVVPCI9o0b7DZAv7ZmSUFsBdA1LDVYJTAM7gD4H8t8Dd?= =?us-ascii?Q?qqlQvGaVx4V5BKq7Z/kuFdkYyWgkxK0pOjAfWCQOhGdow50bEJGHd/LBC8BZ?= =?us-ascii?Q?6ugKrBvCBnNlCAaQw6R+3UQO2XmODMH3i7oprh29mmQ2aeQU6p+V/EFrjKoE?= =?us-ascii?Q?iMwARtk1qQYRZji3eNkBA512DEwkBXYI1HUVIB/7NY1jPARARj0UB48A2B6E?= =?us-ascii?Q?NmBjhwuv2IB5dXeQdaQO339SyFQAbzuN3QMS910RZQecBII2epDqZdYGsq52?= =?us-ascii?Q?qdIEj7/vAse3yc4CINWn2Ka1FkAOC8+HA6PDJaQKrEl+JiZrGNw6Hgv+qAZb?= =?us-ascii?Q?/gO/kMqjDkO787VHU+x0UOmViJK70Z+Jmb9PiPQVKsNi+xuxKcARJW/GY8Rq?= =?us-ascii?Q?rnbzyU8oh0jb1Bk6S5big/EuawyhbPql49j3k0vVxc7V+YRRyPg9etReponT?= =?us-ascii?Q?Tw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VJ0oowK4FL+rEYl/l/TEnGt79E7cL3divJUyk4cZo0yOqPAodWBAjKLD/wJoNVDQ4dFWcFB3aAcS5NXEHfnLN8MidpOWyPMnTwqDO1FSGe+KswbnGy0C/rNWM8Vu8n2iKzX+yUxgJszFzkoLuCY6ZB/l3lIXWoYJ+mBhzvZqKg24GDuvHk7zZNmJ/ll4LMHJytreGjnIUzkhOqSgIN/HpY5iat5MSuLYr6a1qCXK9ZU1y/mbKJi88Hi2nqI7LNyfYEmLBK9OJpA4tErUE+CD12zIKb8ekcuIbtmVwfkI6WBvYY8FvuHuZRljzm7V7ygTkuMThyau18WB76nAUEZBNQQNQcATEXZ7b9I0COGVa1/uA4Fnq6O27uVmBn/8J1KAHIbqsQq3pl2N9yQVaeB1i5SQk/cSE6yctVqO9vrjLuRGotgGdikZKA20lEnRl6VviRuajME6Q6F3cDwBgkwy8T5aCUDke+e0cPU4Qv4UCgCjboVrpFz8/mIj+/7GbDcwIz654TFkvulLGP6kLzqGhmmzU4pDeGrpvaUFaK6FlTtkl7tsUuRXhv2wwHDSJlxPn2ovMF3yAVgi/bBSb0XCHGO2UzL3uP7djgCQRG0GmJvVQY9sqfiRJTSO8PA0hzAevAIETN7jtj//6KVKYezKpHzqnS6t/iHHIrBYXd1aG4qyXa0mLMEAPld1BnEA5wZ9iRU1IdOEL++J3qfamemFEQlHk/xceKhAgRKwJ/X7EH9Qa61gMjnpnPiNOSMlK98TDaSFAAqJssFK/okwtdwJUY+Dpe4gvdh1y9ghFuY/UIkgbtfZ3wVwfHK6BdpENfmcnvOVJ7UsHqdjatXNTjgwOJol6yU0qN30SVfim+cAIhMAXib2xAFfo3++iZh2Nngu3p5eLMkefJbjFmoQf5p89w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: de23e635-4957-4187-5511-08db4596e97a X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:06.8755 (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: aPVhHYnH1CdJsnePG6dqMG4SMDezdR5FedTzpffSmhL64LN72cPeiKDG2pXl2XYMN42LYUQE6bAZ0qNmb4dwtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: -bXm8Rt6vYSv20pKsqoExK9Grz8M8Ktx X-Proofpoint-GUID: -bXm8Rt6vYSv20pKsqoExK9Grz8M8Ktx 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 89e30462f8b62..35c6e12ca9482 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5817,9 +5817,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 Thu Feb 12 07:40:31 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 8FD51C77B73 for ; Tue, 25 Apr 2023 14:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234409AbjDYONQ (ORCPT ); Tue, 25 Apr 2023 10:13:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234329AbjDYOND (ORCPT ); Tue, 25 Apr 2023 10:13:03 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DC3F15462 for ; Tue, 25 Apr 2023 07:12:16 -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 33PDi1SW008675; Tue, 25 Apr 2023 14:11: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=zk1NC2fG6tYl5ET+sXVIUCMom8YlQoKAotPxuETP2bE=; b=cMq/7R30hNd7CxCX+HQut/Evm2eJoDydFZYxRBMsz7EHue2Qw9VJHrDs7Stjpl1vk69O pYN4Wnl9dUHjql19zzlJd7OeBdnWh2Dit8USV1JOtM6vgfOS+oI1xafFffNob/yq/yJ/ ggBEB3RrgD57dDJZHNM5Ti5jYxhmikGD7u0eT3Hg8iJtUeWrU0WxYuDEhPhltg6r7VGi 31B+Pl77QWU5pWH2/laIJPLKhgVYWJ11W7yOtKjWBbT+T9rV3aJ+sTXzOVvmeLbX0ETR iw+6H9Rkf8uxew4SwnS7h/t4JTvJi+Hk0Mhm3EVt3C9c465/bc3YPKu8emMOHoAhD1pG JA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q460d5e6s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:13 +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 33PDXeUe032632; Tue, 25 Apr 2023 14:11:12 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qtmu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+yfTqRRhYxW86E0jI0E1srfJBPTYoz2vIR4X8LDmJW7ResI1jQaFbcjidbInjxmZkpxgcNuzUhjhAI1zNzgeh7IzhcUkR5j7tt6Zughf9FAOfc3M4YEkksDWUCtNEQw4fEJAWdxb9F6oMUvYOBMk4E1XRNaFfhdaNAWiMhHL6r7zlK2pz5Ibiur0xoAbcsLeN3QgLiTLWTwQ9sHboNfkmOL1dFgjFLK929bdrYFIpFeU62tUc8BzOWTHrc4K1VuhqjLMNxYRkS9L/FgVQJC2xCxG+/mW+N9QTuGkGuYNcOZSr+cFfIOiD1Y2q0Cw1cAbOWvWkIwDFQhMvWYV5xRSQ== 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=zk1NC2fG6tYl5ET+sXVIUCMom8YlQoKAotPxuETP2bE=; b=JpuZ6+i8sIca4M7iDUhyI4W7Y5lmkvAyynQ+49WqNX2ea4rgm0by8xzmo3GXnlIpdx3zqvKCXtZRbXYqBkNtZ3AoVl499YmHPRg7TxEmXDQ14pAwnK0o+sR9r+dRS09ruYSjpbRhCYhiaAhR2S29O8m023SJd90oe2mS1t6SqlvRzkCPp2RYW1RBObzEg5kobcBjHvHxUwSfFI4oc/6+tbydoUxUN1XoSEEX08LAKM2CvWoyhtJjTddl4U5vFB0RI/WXsTezTetXLfevPIk+y2UtUrsSAuT2tOpOVXxHodQ5rT3SOlAbMbeylHWSm86S11Ig4plVnjiiISx0uC9syQ== 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=zk1NC2fG6tYl5ET+sXVIUCMom8YlQoKAotPxuETP2bE=; b=OMCljb0GTlhdG3KLfeIU/WcViSxYopQab9UaQH8K86PG1gVHebRdprxjeKtIt8zQmCGRbCyfjBYkYJZwi0pbUXC/WL2dREf2I2eMyRGIs1wFyS+PyBvnOZRlKbGCkI4CYxC6FNFTstllUTPWWqZfPj3A4EieWaG0SSQqZAFqmg0= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:10 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:10 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 21/34] maple_tree: mas_start() reset depth on dead node Date: Tue, 25 Apr 2023 10:09:42 -0400 Message-Id: <20230425140955.3834476-22-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0011.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e9b0886-0df9-416d-70da-08db4596eb65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Lg989TkU5CPsptCc/e7c78db+ozSMAioF6pXWKSFA793/AR+pBK6ZVEcD9Zb3RE10YsnpORhcoLwVh0eeu3v0wtdjLyaF7pO0MW/TDIG1v+e2p8nY7AOiCdYcNzHiJXh6NlD7xp4nqYzYwybJkFVAH3TK7vipfc3LKWUif/3GWglpbDeWwzGY3RD5A50NupaPyTilJjuNU5woXR71OzeixOIciGF3wr34Z3FoR539M2FnsBvz53z2I4iuG/a9EW9LLk/MS/qSqKOjb9Td21OdCd8HYB/OgbA/BwxDJdEIoV1M9u4/dL4/KOO8CEZHzUUu6K8IrtbKlFFAey25E6UUb+j/s2/AhFc7Bh9QugghHXPFYmDibx9RdzhBQb9pElhx/46Ue+Zh4gKeW9zVYY2YPiITUtq+ag/+VtHpxRO29KT8l2Bo8lQH5CPVEiYbWOKWLRtv0IUX4+6RWzUUnD7wrV3FhqZqszciELKjoQFc20zUUSnsSYY+zZhoc7GytkEd+HC5j5y0TvfyDtrcrCmkUOkCoHo2m/hzmkBvxj0i10v6P9a6zJxyu69zXPONJI 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(4744005)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qxeKpFQEgsK8q++75o0XRPi3QzeX6iubDanujPc2reUJgwdrtoRHJLW8Hk8m?= =?us-ascii?Q?lrugWRM61zIQneXLa8hwBw2VQEoiIh5bKmWHQTt81WsRtOZHi40OwR7GpPpw?= =?us-ascii?Q?HRkpJ+i0AO05pZq9sIbPmBaXcNTWu5TrTFj14AcNDX6sthWU6tjFv8PzBGWU?= =?us-ascii?Q?W5Ckb3sVrEvual9iOknz37oPW3fxdqG7mlyUrABQoRYSrrU54JoQA2DBiaRP?= =?us-ascii?Q?2SAxTDaTblj7L0YyGuZl8MmNXiUxNI8yZXhphDT9hrSA7W/5f2X4FqXcYWBZ?= =?us-ascii?Q?o+m3K5u5NljHeTVviOXArDR/RbeKLioThb5ZTwaGnH/iiegwqYACqmhwjbsD?= =?us-ascii?Q?QB/kQct+ZKPy3qhaeRqwrNf/jctOCYTPmxL4y6LKdPonWEO3fOAx9UnKByvb?= =?us-ascii?Q?8x4q889v7qGHkb+LiNkIr1rf+n7tzHk3lc21NjV2npaNER30VShQNrg/4KmQ?= =?us-ascii?Q?nZWIiXscc7WJMTmD21sZ+oqHwlGI9RlIjSVwePjC5oz/NRG0qg9L2Uj6l/Il?= =?us-ascii?Q?v2SNHLHLhHNJ0r7K97vjxsNPM9C2tQzeVDOs+x5RRT4CuFmYAsyVcCfqDNj0?= =?us-ascii?Q?636r2ghPDAKA7yEt8CMx/v0pB31WnrmJAxQqoag5SvIHoMRrar067kx+T9co?= =?us-ascii?Q?mhD8lE9Kfgtb0PwHhiWluuWBU/OpWErfMCA7DrCpxQy3+pV1K040vx6UT0Zd?= =?us-ascii?Q?Wbg36HFIkr7u3TbArmABkt6sM+ZGSiMcMxEsAhd8nMJTzHxHDOvZGjZnBPyb?= =?us-ascii?Q?YH1hpoP+XSZnseVxy/TQ6obFCG6UX7vO4b2t45BiL7rAy6TWo2P+UGN+WFLH?= =?us-ascii?Q?/lMvspI7+oFReLI0WUYVJbd8wQKxU7IOFv0tKmFxVc+nzz+eJeEEPopP3yRC?= =?us-ascii?Q?igBYBm9VZNcX5xzNbE/TOJJ0Fh4OH8Z7YF/XvkRXa9CfhfJI0dDyuW8uglOR?= =?us-ascii?Q?xfdYrG/RjtZBZ+pG6NvT9f+6CCdM+KHjeA5I3Hxz0nHzIuL07vwXT8ENweFO?= =?us-ascii?Q?dZl+EdLaxwjCpIACTYRjsx7yAmA4UP4G7jINIup2SdiKrFxv94dqfpaNmL1G?= =?us-ascii?Q?fU0yBbmPTo5XG9dGXz5E66X1rKjeXBwVFWY63uPgQqHmnGQtJ4r5evy282ej?= =?us-ascii?Q?vlNMfxCO5yk+YCIsZ9Abp3Isic4aVAJqqnjaZktBLgGZldjrGtDXbyhzhHdL?= =?us-ascii?Q?PrXo42egw2kOg3tO4MPJygx6JRvWMz4wP4W+3u3T+efeF2xA8vK6ZTL3ooTC?= =?us-ascii?Q?vZHopkzKG1xXFhMMYoV4lPN7v72wF6De+ldsQW6gbSboPjCcLJjWMlaeNYb+?= =?us-ascii?Q?90PckiLt/BLv4gclKBjRxiWe5F6AOh14GjZkRp4WyObL0MD2kHkH3zQZUqNp?= =?us-ascii?Q?SapMsM6o+8IzlxZUcpYT4HQ0f5iRC0cr3rh5XL/z+HSXvgp8NG6lLP9y1Lc1?= =?us-ascii?Q?y0xlefs1jDXuL1C0wj4zu6Xk57iGfCVyYi+901Pq0oYF/+oe2/olIFF5b8gG?= =?us-ascii?Q?Y2ZBvXuAhZ295TkImeEJxo3FD5teox7djDHDV0Gj6IYcXGSiBpCvpg4XdTlN?= =?us-ascii?Q?zViL7d+oBzzzyY2TOFi2BBY6khaH9iG/xqbt6T2zW4qeT4yBk0kpRi3vytQd?= =?us-ascii?Q?pw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ZUh2hfdNdKQwNJDv8HIzVZBD89FnqDV5ktzStler4GGaqK4hDg4WHd+7mOXaosi7xrsHHldsi/I8L6HzRjt2PhFi+sCSwK9kRPdlkcxOPLIUB7uKDGKNuJiz5IG23c1qtZVLKRLWK9YUwUBrzuz2JpyuQindpGZRcWBMkEL+99CrnEPu4kI5uIJq7oNtUYzq1n4Rhm2KUnsPQxkjDTGTlVbxs+qPULRxIbE27Gz7JVrgm1jw/LA2qaR+HbcgNGutXZw7+8rBMTTvn3q0IvZrTkXqdcTTbZrin7cH4zhOqIHds4/L8XoEmuejgG3Ec6Jf+TAaI0MAGj9nUZ+sG33gOR/tA8NfOayT1W3vFPUWTzlZexjYYNUiTdqAJhZ6lApNGv1UK7tuxf4oEzClNQPWU483GcNBuT0TdKbZEEe+gmeFIwDrVsR8zomKg5HOoBETjbECUFjY1tDg+3MCOxfPL6TXB5zhQvNyfal4glMbijRxAkuNukAPcqohRKILdGehtF4WeQH/PRFp1ZRY/I0q8/NZZASgb9UvpJe6ozO5IYnMv1ktdYow7wyU6j6NCCEhdHsfH0YcT+cQG28f+FbkVgvJhImAJjfbQyaaS1QJX1JSHN2JZXDwHUKHt3gMoguWVhxHhNm6Rc920G9TkX8hp7IzIK1YHtoeuJRG+ptHVql941tzUV0TAF3/KG9w89tAMxLJQIAlkLySEzYsIa4Gt13XyrmP8L+9np+5uBcZsDA0iOLQ3sm30P5VO8ZbzrIEG/nwhrx4LNxBoum67sJkAp1zwgArvgHrBh67DjOAkLxnZAkl681L2t/KVYDqzlFURUfoP7EoHrQ69Ij+JimkbzRfEWuUxX7ZTxbM8m5cpP/w2Ap4UzncuC0loFTrZ4vGBgh5ZweRRZZyKY+DytJ/6w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e9b0886-0df9-416d-70da-08db4596eb65 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:10.0794 (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: mVi6jQ2lXihf0a/DwSfRRQC4vTRP+bb3GJoheCI2pJ/Z7fNkDfxpA4x0rWFsGkgEZmSpQ4ItyHgYf/5dRAfrPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: CQ_JprCwYgSqd0-Xfigb6jQnQawjOYco X-Proofpoint-ORIG-GUID: CQ_JprCwYgSqd0-Xfigb6jQnQawjOYco 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 35c6e12ca9482..1542274dc2b7f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1397,9 +1397,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 Thu Feb 12 07:40:31 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 39E9CC6FD18 for ; Tue, 25 Apr 2023 14:13:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234475AbjDYONf (ORCPT ); Tue, 25 Apr 2023 10:13:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234465AbjDYONS (ORCPT ); Tue, 25 Apr 2023 10:13:18 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7D193C15 for ; Tue, 25 Apr 2023 07:12:35 -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 33PDic35005263; Tue, 25 Apr 2023 14:11: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-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=a7fPAWEOduXYw/G/3/MYPCdJRMwWOwltmUWi9khAMRY=; b=jiVMh+JOS98b9e1hjX665z3BTuuupH3/SAC6IsZ2/SFXg4qatGhbVzYYokJwbKMvn+8w iHp88U7I+mWVkPjPkEnleXmOUEzFwNdVaprWyfvw2nzt8k+wSJ3xr+eQgTzz2YebiAgx XQBk5ZIGNW5j3tyxhd3EqXbOKxQSwFvzShnhWlMn3eAXZKhhPMUN3wAi5TpMO+pn1BXx altKjklC/nm/XBSJs7arAFjkg23bw9M2wzxyUC/dY1QFk5T4UI60JkaOUiyvmaHd6cp3 wYjUcl1aR4TH+AZLroNg8w1Pb4pxNt6d8ucvEq6iNCvmI8JjALd3FekHHQ5NTu4r+luJ eg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46gbng9c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:16 +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 33PDo5Zr025221; Tue, 25 Apr 2023 14:11:14 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 3q461crcpa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f9cayGSwC5rx6BGOUach/bIZRejNbWmD1R1aNfK8vtIyXSaBuYQCGyuBCra+enCvx9sDOle4hvY65mUofRa5Ejzq1K+CohNKFwPUDC3xAXTW9p3+IdQavixtbfToPuluMcthA1/PWSuLhSWudtHTSlW9yxsvnhSMITji74c/i88r2WuXacNFjtUGtmiAwzv4uHdQjHLUbKyvojGV/h8v8GHpo/IqeOxM7AmEqs5W/L5Rvk8gU6y0IZ++yijIQjqOl0ufuVtexXTcrYWHM4nA+Nt3V5gnuHGIuE0TiHCvq3dRX0d2Mp+nh+QsSDrPHnu6qAG+aYnjkMCABNHThRnpiA== 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=a7fPAWEOduXYw/G/3/MYPCdJRMwWOwltmUWi9khAMRY=; b=IBxR93cpwr+sIfROqb7OfVCEgL4dhgZW+XBZM+l6o8yFMkAEuDIF1v6vYfnAm9eSv+UF1ZpNUt07ke8NUwTs1vD6GFHj3BAuHYzika2kO6Dws0Doq2LQ74VuG2vkdbjyx8VH1wFZ2JLo539Zd6o2UT7yT/x0omcXfElVhRukWvq9bBgwtfdU6skJh69IZ0KFXuAb2LCSWQDH5b38O6vUPcjKkXCpAQyB5lSUQI5OtPi8maKuUlOjxPKibvMK0zjyxHYQIpSlWKQMPWV9pFsqRnpFmIhIvM8O81LLNI86qj9ZoJFtncQwit4KXNF89HWmeit4N4FYXIJl8e2yb+wTXw== 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=a7fPAWEOduXYw/G/3/MYPCdJRMwWOwltmUWi9khAMRY=; b=itWB01lFw1awA4HXqZZQ+abmL9supCCVUkB6dFp6q6qXnvpsFldv6uC+9SOebkqpuLRMcvavARmM/uxxbDcpiUE4aoVfB/gdPH3CyYoMMMqxCj/73DnnwylbY89T/x63lFM0wbWyS9JTU+4xCCeSVf5q4vaWD7rBssj7cLWDe6s= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:12 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:12 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 22/34] mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes Date: Tue, 25 Apr 2023 10:09:43 -0400 Message-Id: <20230425140955.3834476-23-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0029.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:86::35) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fb3e998-a05b-4a26-b99c-08db4596ecfa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WS/KgJGFa4g9iZTMqP4Jpyzt6sIZOreNfrnwGsoO/qHwd8tF9SCy6h7d4Arh24wgkuWiuB4kHiKe4+MfDyCYqwUZK0cAqFhHSn3UOh6U6ogGRY3Rupqm7xTRM3EIRzeQO4IXb8y/ZHV2yaOnhChhT6a+ucIaQUn4TnDw++fr9I0jEPpaCl2Tv5rQANMJmnlxyi1TZqVwPnG69fonNJ55NocVxJ8cquB5bn0iOfDs8zN9XaI4H/tHgS7OqBDkPe8l4JbZEUeQZOoFCWTVJ3W6V0MsHO1MYv2gcwhsx0WmGfKsHdttjLvsfG0ogQum5BIZzaOK0A4IyU5LoaLvru721OeivJ6zoTbmeBeQzJ56lwakKYrGsrk08GrGoeV4yhbxwvvwTp/f59vPlM70MdLCX3hG0yNVWunt702elT6xXBAshI/zM+FoDCgn4vEQbvA6hLG+j5H47X3fdK2dA9H526rEF2opX0fEaj+daFw9WVwOEgPJEY3jR486SUs9EXkhxptckZNKJpdAsVCfKFJGXbwERpWhl8bn0l7wDE51jFNGV5sSfWha/d5RyaZ6Bv/3 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(4744005)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4C3SLf9ad9Xq3Bq2R5PS0e+ln4hx7TObIVVktpClJmrlrcyhrAkfYDexvmDf?= =?us-ascii?Q?VtMvl7GLJOjU5WcMdui06CXR4mR2/SCPPXQsvfEFM9HqOpArqHYiTLkkuorb?= =?us-ascii?Q?ng0djiCQK7QbD5jyrEUs5ApEjSjz8CqUMQah/LtuX4Z/n1xJyhECktEbrBls?= =?us-ascii?Q?Rwwc8ahYbGfXQ/zfggairBGgHeiQR6pF+l0zkMKpBVtejC8R/RJuHvW3NbFe?= =?us-ascii?Q?rR7PHm5A7DiQ7dT3/Np4HkVPb2jjmR3OloePW0kOUmD96rk9Zq8lFpNs5/Ol?= =?us-ascii?Q?4KwFludoNy009YuYJsstJPDgOjil+GIc84uiVPR7C9295kgy9afPmJeDUqzB?= =?us-ascii?Q?7uNo7tftzP7iVEobrAocxSarpGrQXLN267FPxj3L2/D4MAPXZQfnuhxRzXY5?= =?us-ascii?Q?K2bttwtpIFPK83QPn8l1gx/aWx0OZ5uQMEOemXxzVHr/ZOLDn6w0BuhyD9Fz?= =?us-ascii?Q?HJ/++ae9KXtlXrO/7yc4TPqfAwg3puDYepGT7o03UkcrUOy/263Nc4ycDn6v?= =?us-ascii?Q?Q6mGREBTu4B6b9NojDml7QfTbRs6g7D87eIAY2r1doN5xQeodLAnss083QfJ?= =?us-ascii?Q?Yn2N9JH/HcRujLbALkASOJ0Zn95SmJ9aHS8ENmWAEG2iBE1HrWeVwVQIsxWH?= =?us-ascii?Q?WVvwqW0ryl/vS0jNUB++Pm8xgprdQz270NyYtliCLX2nyXMGm8dkQVbHakdH?= =?us-ascii?Q?NKK95Eqy5qKiO0Fta6Hd81+CUvqCKZF2F3S6D0TyIDdErZra1iIqwr9/Eo5X?= =?us-ascii?Q?T48B6XtQT/ExUKe7xWq3PZhUtnCpOeUuvvZC26TGrOImj4JOwezss0F8VXaO?= =?us-ascii?Q?M5vszBF0gGbW0ZfoUnK9buZn7fhpgT9ZJDvki9Ee64+A5r+kBnTuwEwfeAcY?= =?us-ascii?Q?fVbgLEZNdcBO/GWJILo0i1XpVCIdc1ji+U5+NruWSNrf9UI/kd6kneBV+Oxw?= =?us-ascii?Q?ZbNykSNglasFLyNC09lJaBTDOFKYH4X8r5bjUivtsUgTo/5gwzqqRf1Yjv0H?= =?us-ascii?Q?1mToNNj0aoLUYZbGAAzOAYJFM4YoMtU+TCrXdCaRiLQCQh9szW9145DXjWz4?= =?us-ascii?Q?Xb7RaCBUeEkTSPC1TgETFjFSLti7VJI1RrPw++AQkXuOSOeQHNRjIHKGhYKx?= =?us-ascii?Q?jxrOP8CqcHs2eZbYQ8ZbAzuQgCnieDIIYt4QGRnNcRFqk5+cKYywAjpNttey?= =?us-ascii?Q?QryDAquPOhSnxz7LstXcQGH9q7f2QO2PuNQQ2nWKcFyeSFtQJ7mpZLV7mykl?= =?us-ascii?Q?khqXR+t7mkyQGSX4+AWcMBl0gIeLAu5i8q5+cibwNDDLF6LuUqpSvnwQxx84?= =?us-ascii?Q?rO4MyJc+QBDcH8iPIOTOM/2o3tr0+4ZIJpidEc6QlRqGeJ36Ej3U+cP/2nDT?= =?us-ascii?Q?M0H9H9q/ybyauJlf3rHd5W/Kix8FRFv7tKMX6LMbShFTuNm/LuUE8HGXen8m?= =?us-ascii?Q?r8Po2oV7jx9rGTqVJigyA1utiNlNI+krRQusY8txPk2f2ZeiImKCZMr3M3wM?= =?us-ascii?Q?x+Eg5sldCq41xXeXf4OicvL2WAk9C9jtHoLCRlhk+lresQYDMY0A+O6V5DMa?= =?us-ascii?Q?L5YSSr/6ilVVhuoKfxKP2Kdfptch8GRoqOiaC59nnTiXR4zK0MZQdODbJHO3?= =?us-ascii?Q?gw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ejWzLphT3T+ClNk9wQs1ovWh0d4/g314EuMqF82NHC37XSknO/Ai6zjemP/rqkkTirgznjxrr5vBQH8TZMoUWN7ewC9TmNSs9bRzkHs6zGwS/52hjYyOf+DNPtRxGL8bI2KYi54tHVr5WHXY2UOcTI3SmtaqIXMCbxJHEfDPv8V8DOoUVeBgGJUvEttWfXjgo9+z9ASMJs8fVMUQGB8/53WPbjgwz3+jFWcp7W9JLJcEFUKkn3gPywSqFzFife1eFs/qt4U/U8kv0HUEphi97G9w7rfei0XXq7vXXS3BEAklFZF43ESMva4+oZiGK/MnJQIYqUznNVB/Dqb0mzQWLVYhydVa+bZdUKw2tBwhbID2Zw6V+qPkK8ByM1IJhKZH0jki5Mj1PDyOzSxK51sAehL/BqCBYsU8XzBOkaHia2vwh9/lzD2xIzskAlAt7Ww/6wM3ePav+oCWIOymAu65dD/m/0yO5+kp5Ol5jK1IvhCgf6Ja8fj6YydWro/BRCu3YqGYoCMRVGF1nq8DR3MbrPy7KVX8QFl7vJr0f5iiKIEmpUFTCNqPCiSsWV8hJtpHP6azNEm4CZoF+GX1Pg3KWWuzYRh2YnZUW/eWUaZFIhlPXNXZOevByP9GaVTpkZiN7dEcwxfo7zYAOeFndtL2zZ6OZCDW4uwAUPycxE4H8hcytjgvPTttrLZwMEwaAkW8xQdj0xz/dNXr/KQ+XLbzk6S6UfgRssfTBARTLwgdZ1mRG/aE6CxiPwwU0NWVQwDo31O8gvuDolHpyExJfbyctuqwTccsm5cFJPjHQ8qz6S3+HJTxPu9/+yx2IB0xt85pXVlh/qzeLZoSeFhfZ25h3qheOQC5aJRjhpfeE3iCx132djwLy5Jz6SGpLm7q1oRsvCAp+S0uU5ZSrntBgajnJw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fb3e998-a05b-4a26-b99c-08db4596ecfa X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:12.7224 (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: DhGuCQPMDQzc7TKMVLxR+n23Go2gXGHbD0ytXjDV3XE1+irZ2xCienZ/49WMd+qHM/zTtr9Bvog9EXxBVEHE3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: V3j-aEsCKsoSNYX7ECsgYiDCn3kIT5Xk X-Proofpoint-ORIG-GUID: V3j-aEsCKsoSNYX7ECsgYiDCn3kIT5Xk 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index d34a41791ddb2..c0140a556870a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2391,7 +2391,11 @@ 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); + else + next =3D vma_next(vmi); + if (unlikely(uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas --=20 2.39.2 From nobody Thu Feb 12 07:40:31 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 10495C6FD18 for ; Tue, 25 Apr 2023 15:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233452AbjDYP2D (ORCPT ); Tue, 25 Apr 2023 11:28:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234277AbjDYP2A (ORCPT ); Tue, 25 Apr 2023 11:28:00 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1718D312 for ; Tue, 25 Apr 2023 08:27:22 -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 33PDiT6A022532; Tue, 25 Apr 2023 14:11: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=7WvxfxD+srrNnZyxfWsPROhv0EgqoD/8Wp1bZvKRdD4=; b=l+rxpYL7HMLuyr0Hvt6LeDsIk8lbvqMFReGtog22sUbrOHiHoZgAJXScT/N2zIg2lg6t I/XuI0rQIetuFwUz42dPgG/BqAr0t/tdOj2GArNdyEWJAIKp96ZcPFXXfNJrtsZbF8SE ggeMu9H5OS6346MFyssfdPRQyYh+OYJxNAbPbtIhYiF85Jqk5wDtmdHvbodrjbLKNZPw HdOYKtR2JyWpWHJRh7fMIs5VucEiI/fYsqzjBM0rnBeaFp2g0pLK9S/EkgsSVBlEBC9x lsvoymoEq9esUdFyv6VYd6be7cA0wNOiWReKuuFGmcpl7KBYORv67erVyrqo8RH50CZ6 DA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q484undsx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:18 +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 33PDZh63008655; Tue, 25 Apr 2023 14:11:18 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qpax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l2NvE8t2CCjaACt4VSE6n9YAReX+NJHNO7b5yw3yaiBfILy5M4Ccosw6d2eKNz0pxSv9feFDHHkKiq6VEY4RTWqHfcBNmakgyUNKJDx1A7EsVMRQ3cfdSD9jd3sfObi7Z7O1T4dkeTTPX8WMUTL8MJipmCV7D7cqYXvmxCIr9kLHlrf/hg9hhIyQOW+WD+9rCgHSX+WNK4A40LZoTkAFKno96Fvy/SW9lsKPF8pCJR2DdXTWIzmoYSMkq/3HHvlwgXLjxK/Lz7RnDGdY59hLwvd43J89jPgUyS4ZXU4Xovvi5t/1WdixkH2poBf9bEqRm1EihlN6S6OhXW6NMdlq4Q== 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=7WvxfxD+srrNnZyxfWsPROhv0EgqoD/8Wp1bZvKRdD4=; b=HseEM0TcQ51mAuB3VNMQN/54jACEUrd2fBeZbOMK6XfferC7O4a9eCgbzGJyGPv6YeH2i9hdfHcAy2kt8xsHkZigGgJe9kYdy/jJkmUxovV6q5KrWsTMponIvdkifhOLq0RYN8ZZ4v1EwABwFX01XkTF8h89Iyqbjjb104yUP976OnArcrlXPwWDHD3TvgIhykfXPxjTqLmJ7chd0NZuGLBVHW94H1cJblpcEaMhcfi0Sql0If2Sj8VfHtx5eWAj+nXNla9gvzLqYKLAkWBJJjo2aRA5dRP/Zq+cjtUclOZ7Qj0YH0c9fu8VjxtavlcGMw//RTwcM+3YPH7R6MT+Rg== 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=7WvxfxD+srrNnZyxfWsPROhv0EgqoD/8Wp1bZvKRdD4=; b=DgBdnZPTwL8MRIZD4EEErmFBfVebQhKbj8zYAKJGxXDgOpqlyh6B7xO13QUpkC90n1Hr4d7R0GkBaO5DYOOk+xUaKuz0L06b+r5US5DgwFeTPcYv48VVxBj9IYMkWAIltAfIhpZTViPUG1MUhPCsWdjibuUqnJSxfQrRuTrsVN8= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:15 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:15 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 23/34] maple_tree: Try harder to keep active node after mas_next() Date: Tue, 25 Apr 2023 10:09:44 -0400 Message-Id: <20230425140955.3834476-24-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0109.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a882c61-b27e-4436-b284-08db4596eea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xF8Z9iy02Vl9yNJa6yOlquWLM4U/5xW2dCoYXKSYUx5Z3nEJoGZRz6NyqxxoPMYO3kzKMF66iMetewRzQmvCVCiaTP4xzXglKlOnBDPmSTcJCngdcF4rbpXKr+8UDJxmIXl5lW7bNBUshhhB/2Lfcmnl8gNiRhhdP6VAsXwh2yA3/AqD7AjOo0+nkANPdIrIeG1cBeaMTmzDLE7y30kDVaOyaz5mLOY9o2c85LvEPbcAsLrRml6ABTjqMPG7GWdL0JoOH5kL+AryWSZrAHy0mY3ecw3KIozjPGq0sYCNEO9m1j7MVWoBwionmsWMXX9fKBwGGty3AeG2pJXWTrlYek1IHeRD9dGyZWGlpqxKu9EFgv29qlBO/iWuWWa3GcBZr9LiNGucb8u+dJyxdik+2wHWg4BHm36AWXDMnpKkeDuReKeETY35sNAU2bzcyBAdkgJBg/9zO2I2KTtBcOpKIT9Vt2i8Kfc/tcfrmN/HzJZeW0BtVr3wMx4n3Xnw+n0CPEc+vSjXEciZII7g39She1/FwNpxcgdUpxDZc8f3l+Pw/qoJ5YUohBOiwJEIpjXFToYKE8ZHZ8aNlI2j5S1rzAP4sZxemzo9HF5x8nAK+I/TVcU0xgdAQ5y9Eb13/LfGgXaqNSJ6eVzW1rJY8WMCJg== 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005)(34023003)(148693002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+uol0bo3KdgfB81IXg4cQZVhRzdgiD5MYRh9mEC2f8/6DqlAhMDj8iqujxSc?= =?us-ascii?Q?Rn2aEdABt2r+G3Df6WupObVo/cz0TdCRYNb4h1y9q/Dmhgq/g62dBdmes931?= =?us-ascii?Q?OZgkoUDHjg5tP8zNcmbAnXJTv5d/CFfA++yh0TBMy48dkmBZfrvA1GyCgRj7?= =?us-ascii?Q?NM7hT2DPl2akgE63FpiSon8YoUA+sZ0JtCUQln0QnYkp5WDuhiUgaPb/CCyS?= =?us-ascii?Q?VDoNsYmNROGtVQ9vo+8gkVefNKfJzLXWOa7oPM0XbOfo06rVrPlGNQ4TjPbh?= =?us-ascii?Q?x9M7wit+WCkaL123bCrMVezkxxRPAGy/pXV6vQwUXsvptKRSyh8ahSvUESul?= =?us-ascii?Q?+wj0rEdGJSesodCh4F7NUsddu2ySepQueS1l3xNIF6FOEQE/3Zvbt0U4Neda?= =?us-ascii?Q?/dOoXRV5mRbV+jCDp521H74g7eLf51IAOdqqjTcBWDMA2jXVXOweI34mimtw?= =?us-ascii?Q?cOL6ymLs2v6YysWkEvEVZkudOcuH6GemFiuIVvPD4A5Xxw1OkNwZyZFDWh71?= =?us-ascii?Q?DuZtvqId2TRzRaVcko1CD6XBcxnIpClfpVcZzTd8WRNz/1J9Hf9E737layQ5?= =?us-ascii?Q?5K0xSgPnuCvwSmja62D5+Orax7DIftzN1bpzzX4xHC8TkrHCBQN1GggNyhyh?= =?us-ascii?Q?uIzCEig0gMlshbiN59cyhdXd55ApCmElf6xptVQbRkgUFBuKB2AqkNGHRw23?= =?us-ascii?Q?BjwJU26WT/d+wWnC/+whhKKO9p3axda6GvmLzxRNduG4LOc/SQ1M9hNunv3d?= =?us-ascii?Q?0TtRxRP51bZqQYyIEa47+H/j7mgrvElVYdKLnbubKljJzssUmI5qs6439ZJW?= =?us-ascii?Q?BF2tbWbrGTeUnZfDzmxk+zl5XTTlyzmyOpT9DG0gfqAkEhBavf7HMuNg9qxt?= =?us-ascii?Q?eqpRx1Oc39xgidfCCZ9d6tW2uLYPKRVhId6pAzSDZUMEnAufbm1N/X98+oZn?= =?us-ascii?Q?s5XvL6a7AHm2XsDJQIOKKHQhf8sZn6IntdIwFoZNygoz8b7ujLnPD3uhhHJ9?= =?us-ascii?Q?MnPe/5TnzhsjZQgaYjMTnLowTU/0ctlrMbVxJTPp3jyjiJmtGa/nkBXJwlgo?= =?us-ascii?Q?VuQEIu16uaf2gAd23lznLM4cWS2S6gpr8qaEfOekeYqd+2wpoj2wFwMIO1aj?= =?us-ascii?Q?gxvrK91gri9gdNsdpKdWnwqD2FBnZIdDxpxj3UKf1NOV1jPwCF4HW7bBlkNb?= =?us-ascii?Q?n9h8rsb8rFk9da7knOzTGYTCLeBnyfFMM5RiDn9J0W7lKxKJtr0j1xGBz5jD?= =?us-ascii?Q?GfOhWameMphvZ3bpM9j7m8Yhb40ckx3EIGXVRlvZPGM1c/6tYd67pOhEZ7Bv?= =?us-ascii?Q?L3cDvGhDzJY7rVdAQzIr5oUXECvIMCF4Rb2BElK7Jj192EqupESMVTpyYgwm?= =?us-ascii?Q?1JWQX+AzTdnTHLopCyZUAB2obfyuxaU63hpuLK2MKT6UDMQzj/NUicFAKeVq?= =?us-ascii?Q?8qBu3HJalZEsCIFOv7tJ8Y1F4nRetL/yxzQvDriMoLYoJt8Rxve4Zru3l7tI?= =?us-ascii?Q?i9DCckll8pIu9zdfhQS36ttAhtHbsNYE8Mv+RgUYE3W48imRtrCA702CT5YY?= =?us-ascii?Q?gxUXbr4IdmW8DjBZju3sPzOZVPXnCPhEHtBdxlTv9XGnlbICHiJQv9njJ/dT?= =?us-ascii?Q?EQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5sxA7SnaFF32wa3SNfcKuB8ByOlk26QlO0MfOUViqy/cs1g4wQh2F5TeUUUPRBpTUGSk7MyMmEaVloO28AcscPEdP2HLF/06LZtMkz7QYo37jNH1Rz60l1xrKukEGZjSrutT+k5uQg7Utb+pPEuMOSIF6dKI83pCKf7prQfzYpwMdlsRcWjsghUim6+yj8KOW8yipNJ9HtLWg2Z9xOtCTb4Mb9+XIprqkureWs69/rgyKVzpT8jxxIoqoE2f7C4xnpkGPphq5cR76AwCFGZ9yACXP/S0VBoP5WIPZAoxVYeaqrF0HCEzUUiysfdh64iz99BSwkimgQ5ch6eACP6inNmx35CYnIT5O5/jJAn8WwcBXITxGv34r8sAy5RlDmOkpbhrtAU+NEB8IvMLN+V+dDiMntOD+AMmZrv85RJqdPZ0SJm8TIHb/ds42AnQXjzelaIgmIGlw7hwnz/wClj1O2zzHQi0zE7Al8UKUOB6GagfsjZW54+b7viq0E8ISbVvDznUsWkFQRQhCLUEPwYzTlz0sdZXAmIyiXmqentbjLEvTRBM3YT5Y4HrrtwEzkIongh3CTAGytesd1cE0Qsgcs91yDiDQRO1vbrnlLlT3wfFXiULcqpCoTE+JTOpljCgfH8LuSmUKjGP1gXeSraqsCQM9OQVx0pxG5dxx8nV9zZRXxPpDLsI5ErbclRuNwMeReobeplkv8x1seNFnV1vJ5jNWwahltgJ0Dv3UK/4t+pwiN3+YvYw971dG9wPFWveZVHfGvPv4QEgd1RGkd1mApVQ1t1PgavdpEVlDS70gBW5AwgMOoIAjCC2cMCgjkhKN5s45ABZMiJ6rG56G7QXL3b4yIAblwqnl5QBtYiNCSak5u/btNlgavlU8UY++a+0XixqVSe5H5Dtmm8uBybo6A== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a882c61-b27e-4436-b284-08db4596eea0 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:15.5023 (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: KqzbQnfANxGGj1kQjhxrZXk6utvhMKvMQ0SvQVC5iJbboT3Ju3Od8IXgSIdWlYo5kGzkOjqgefRU/h2WKbP5bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: bynY_zJYe4DUneV7ZV7-6mUfRe_XRueG X-Proofpoint-ORIG-GUID: bynY_zJYe4DUneV7ZV7-6mUfRe_XRueG 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 1542274dc2b7f..ef7a6ceca864c 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4727,33 +4727,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; } @@ -4782,21 +4774,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++; @@ -4815,12 +4801,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; @@ -4830,9 +4814,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 @@ -5920,6 +5901,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 @@ -5927,16 +5910,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); } @@ -6060,17 +6043,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 */ @@ -6082,13 +6073,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 @@ -6519,7 +6524,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 Thu Feb 12 07:40:31 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 60F0FC77B61 for ; Tue, 25 Apr 2023 14:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234107AbjDYO6y (ORCPT ); Tue, 25 Apr 2023 10:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232927AbjDYO6v (ORCPT ); Tue, 25 Apr 2023 10:58:51 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC1A849C0 for ; Tue, 25 Apr 2023 07:58:49 -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 33PDioRg017723; Tue, 25 Apr 2023 14:11: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=LjlCxI1yd9tgEAjJz6ebTiSqyap04NE9PQWsvKoR4z0=; b=b1qW3VziproRVSYtuLkJPD9lPOc2VtYOpFFLTrwdJCcrah1V3MA9cV0bHGnzVJh/gNpj X4u1R0gl9Mr8C5/DI+y6W88Y7B+cnkrtfHawuiRs7GfdJcGQZl70Ki5BnJJbNaoX2SDD ZRfZ//4OhFNmIVAC3rbPwhi7X6/pFmu87benFPbLzHxEhtTrZOqmbftUPb0aVyYrOwX0 YigdmiKw2rEU24QMbKuNFjg1hFjao3lImWbZW6e26yEyNXHAlDcgAXDFfXF+8rXP1BXZ iu3wUpZKUAVzFoDXrVIhzCv0LuonjWiYUFR2BzNMtvRm64Yc1G2ZjSsOr9CDBYFV8pFh xQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47fandvm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:21 +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 33PDBwKs006648; Tue, 25 Apr 2023 14:11:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gsa3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bCmKuo7GeWUyGUKVfdzejin/Mn7qdXxMgUm9/gW3Qysj3QkKbz81aY/K6iwHROqi3+97idEdvNI1gGBY0+sxhIRdAZbz241rZU8x/wtIwU/3T3WnfYbKasVjOAXx+lDdJuWJyuq/6n9cWXGIwTGVISUZ8kbRohCHTR8iutgU6yTdEBfCzChBXlJXrqxsmeY7LQQsASyLdWDtmpKzl6MQJ/ePaWaTBQYQAQpEI6H3YBAv0OTvxzg0iVY2iuZEDB6XcCuQn5Q8HPsN2xQUa2LvNc75ASxG2ldOM+nKrLa7Wt6jT8MTf9dfVgIW8X4tNkW2X8xZXOC7Qi/md1+J6YWnLQ== 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=LjlCxI1yd9tgEAjJz6ebTiSqyap04NE9PQWsvKoR4z0=; b=bB81MCQHPrvijuXk5I5efJXday7zaD1ze1jmZiIw57FjjVL2v2gHZN1XVTnkxJjQzsp/FoyHOTTDqyuIufrwl3BwmwxREodsqZ3jN1+Iij3AqFtOcuRD7dZU0FR4hdVoL/WYbLYNwMG7Jpi/WhR17czupt7pjQ71gYUzR08QOIwJAQeX1l8rhgJAAFpBlpK7p+Pxip8S3EUbPFRwZu7Yo/JIHnhWrG65rS2+p1F8mwQn16KLkti/q3wTSrj2MHAyY9koC/teve74tFEUu4NRZfgS4ivCWAC5vrThSuBAR5cTmOL9sqmzUfHjjXhvwVtbFCNsP8hdzuE75l9qUpOiFw== 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=LjlCxI1yd9tgEAjJz6ebTiSqyap04NE9PQWsvKoR4z0=; b=u9HsLFcq1q1FYTdEYanDrwSbjWlqc1HcwvfNazJ5NJzB4mhYJ1UDYFId6cTxTCrKDuWvFy6d8lX2U1Ed1kdO9RylCusnsA1e+UusoIRLUBIi7Pn1OXrlr1a3m7ntFqQuHCGNJ7o03mG3jROBsze1htAnMLDzWvNrr4bS6k2oDzk= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:17 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:17 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 24/34] maple_tree: Try harder to keep active node with mas_prev() Date: Tue, 25 Apr 2023 10:09:45 -0400 Message-Id: <20230425140955.3834476-25-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0213.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ad::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 82f8dd6e-ad7b-40dc-c5e3-08db4596efdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jlu6NBvkI917q7OAKglGkRB/IOpeI7HNj9I/F2rwYgyRLdFG/XQDpKANMNrSIIpdjUvoEI2wVL+qKPy4P7SSP6Add4pMsIHKaKbkLlFa2Z8fcZCMxtafg5rKKynMv1/0OsceUYQXEFdaSo35xZMmfxbZQfbdzpXTgTGYTXheqhEWv+/bjjxio+MiWgww/GAmaajgPRgvTUoRxyixYcevlZCKO25u7EP98jfYK3xD23mFZgo2IcDNOY8WEQbEkYFsFTSHTds3XziaR6GfqpIrTt1tqglAxVGn2urkwA8HUX8fDEmXT5uaO+hRGTZbwYbrLkvo8Kydn2jw3f7uzIPANymJ1R1lF/7IgVYap1zN45xw9rAKCTSa9P62FJp0Cs+ZlYNRg80h2zYf95K1iVZS5fT4UaJa4kTAxt2IlKrVrD+t5kuKy1pK3wuWJyDBRTHGUWjrBbOedjZqPQ3DI8EKsu3DWK7YHoTy/T9HPN8WpGg2jKa/ap8BD+wmRyzcgmmIOCrClHov3swU6/IhMS7Dg3Z6Vmz06/9V889nyb8vob5v4gxJNxo1GtZllqy490bm3wkFiitIhFanZuznj09kYSMFfDjg8m9gQ1QAk8U7JcNGXLaaQB7YgEjMo5Q+g1B0Y7lKIQDSnHAAc18GMKF1cg== 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005)(34023003)(148693002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4kDY+B1M1yhelL/UXyb/5xBKfmDRw5Pn0dw5bQKWAoUHS4RHK1R1JYAPMzC1?= =?us-ascii?Q?brxnoUxZM9eXfNXBPPn7rYVmPrj7qVrt65GXtMYIJdWteR+kvqkMfbZDYa7h?= =?us-ascii?Q?6kFtbIOVBiulWs1WP16AtzCvuCSEgBct739mCr5RvIpMVcnn4NyO0Kn0tVxQ?= =?us-ascii?Q?CtZ6ALeFHJGdtRsWR9SlHgYP3muf/QLTBK9OXCBIoxdSxlBZix9CPLw1W3RB?= =?us-ascii?Q?CbgXLoVukyOd1glS7bbFTRDk4qlcWfdOTihYj5wEw8WjnCO3uhb/9XkXkhZz?= =?us-ascii?Q?ysBf0MswO/uqtOyrPpuvMDgbxTwuPd/+U/CF2HLCJC9D+hnu9ElctGMX7nGn?= =?us-ascii?Q?EldVsKJglawrya9RfQImK3RssDLRtZojVTdzrcgeycAbPXNaT2oy7/Xo8l0H?= =?us-ascii?Q?tDhIn3EtdzZk0p7cx2wKUFuCkONYpN6ssj+NmdQ0Q8szjoF60xRK5Dl0nqR3?= =?us-ascii?Q?Wv2BNaDGkn1OlSiibwFJzc5pS+nOjMlRJiRcmUe5YNIulNk5z9/a2ei+gDxN?= =?us-ascii?Q?CoZub/aZpAFRErBbfYyib/p2HJG3setIcOhASllIcQL589ASXxIFtoz0LrQC?= =?us-ascii?Q?aY9n/k5stWHz6ApevEV/Ln4pKsa5elT9wmld0rXsfW9ULI4zMyqhIHgG7c8r?= =?us-ascii?Q?N7Ex66o/S0OVbaFQOZhgF6ZWCAz7jdtOpvkGdNdloq1olkY3Eac9ZlEYwHcX?= =?us-ascii?Q?fnqDSJsLTSnJgsK6C43zM3dV0d5CQwIJQ4VmBjsNWZadInZNqs5x3txRbDX4?= =?us-ascii?Q?jUunwalzPRWSy8FMe0STnn4Mw60kx9zeTUOTEgMzATylcGQxP6cOOhwa0UEz?= =?us-ascii?Q?qDxZT556yafKN3i3cJFP7RMboZtP0oxixVSxyenB5Trakr3t562X5aSwKWIw?= =?us-ascii?Q?NbLbQTLZ8UDjCtT+EIeFnoSWM5cLb0R+v5edIv/6FUzzbZIlKJZVybGuC+DR?= =?us-ascii?Q?g7hiqYUd4vF/xEoTQCjCtqA/QkwmJAQtr++PuxEgrFHCqcQCrekT+Gt20Nqj?= =?us-ascii?Q?Vz7pmWEp5+9k5puV54Tk4oQ4wbtJAcBkari8E11QFKbULOzK37OpY3syfpSG?= =?us-ascii?Q?bb4l3vV92Z+gmfNVbCPHdKu1/VIbeIxxCUWL7n+hDSrOdvJLl5jinO8hBIEn?= =?us-ascii?Q?JG19v5pAmApt98qeQ4tivDvhWYfQkbKVFauuG+SJfeqw1+BkP/s/sPcjEWQL?= =?us-ascii?Q?zNlfv+cDOpFIbCpaDFEn+jM+4CR4CiYNlNVG2XeM9LTGIoqo94PZsG5YYf7G?= =?us-ascii?Q?SzrJI3tRCO4m3KMBy8F8xuY3GkV9iIukCeKOcM6x2ifyzMgaWpZKMsOsQbYn?= =?us-ascii?Q?SPoNzvyM8Kn2MlfBrPQ+a/9x00Z/8HCP+I5zYirqDMJeVyR3do+0mDVSngXs?= =?us-ascii?Q?joUoIA8rlHOToEBoNyqRnWT2fKt1CVfwG97TAc+z/aSrgXmFwOgUBoRcOz94?= =?us-ascii?Q?AtL4l0uuN8LKPHrUFIVLK1DZxtdjqe3GI16BGoSKOp8AtkLGdRpy08aeAvHl?= =?us-ascii?Q?EkyK8AuFNzNduV6AWXifHrjBhMzrSck67UUSgWi/NmooPXM1+6ufBqGdpFil?= =?us-ascii?Q?V5F4/Ym7XCw10xq7jIr8dThZKUWrHUJCgxIBHVkMfX9UWiQpVBhoJhHZUiqp?= =?us-ascii?Q?Gw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: OtH3qyJNK5w6N/V9pbzP3H9Wr8DaiadfVB+bJEz+IpgGlkNTh0qVgULXt+ORS2nOXE7c2rqeAJSuGjPhv5wHzM1JpR70UPttk843i4+3RGfJvBEiFGmCbOd8v3dgYNvhdBMDCuQrrauEuHhN1w9xQRZrF9WWzqjcy2B6Agk7HWuUxrs7LB5wE0UhRv8vfpyEpMZzHHAMC46XLk9IVg47ifbCaIJwFOX02AtMedxG/djXHIVRk+Tede21MxRdTSGouiHV8PRTlAI/5DtAdkandMKJ5dVjEZZf5u69+M+c5KrcdKD0ymjc8sWjKWuGIHFlvX+mlVuru9m9cTvZ42jNFjXErdxGlkRELcIG/b0yuvUDfZhDOqW1Wv+XeLmywLMun08CnmtZA6oK7KWen/Ty86qPjTt3BjErVAHtHxmpbe+z051SLMnPpj+bvZHaXleqTiGgOBqR0elp41G8mRQG2/JH784Uf5I1KT1Bd0xVMHAxhJea1kyyMRry+BLnOM1SIbHlCaPbkfJhFFmzLPHkcTqbcZ1A1qIJYK30lrYqelplnIBALozRE6jxwOYrv82bKEwUhj9dGMyiCEdsIU10k+pI+rb71+jR/JNNj6tOkgqS0Ii/Eqd4N9H4aXHbwLLWhZl6wbRA8tBAIY8NfHYr4PACV/VJgsV4olhUGCF9SaaAfrbaJSEzOyJ/oz1ZG7mR5SpuZ41/rcLA1C/IfFq0Rr+SEZJBQrqmUbAKUqoCWFz7z3NMDNtsN2z1g3528yY52F8XBw4edyccqFXmD3YLk7W+w/pmhDAk03KsDdgC9eIxSasfGOo+Db+NGsM0c2XE/YpQ73Flj2hhN822kcs7BMkYMy5Y+ARa5lncrSYydcoWK9gnGdmUv1L58XX2DdTtd5RCuNiAHxSx9yxuDMfW/g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82f8dd6e-ad7b-40dc-c5e3-08db4596efdd X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:17.5993 (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: U6gb4qHGiIDF8j+QwmNBBQSS2x74LLYvJbJA9WafTILvyxSueuhlWAW9h+uO2dwVvOiyvMB3RWzRrnex9p2MLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: SgGJfYOnvijv_m_87PRucyzLAeumF0po X-Proofpoint-GUID: SgGJfYOnvijv_m_87PRucyzLAeumF0po 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 ef7a6ceca864c..20f0a10dc5608 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4828,7 +4828,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; @@ -4842,29 +4842,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); @@ -4873,32 +4886,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; @@ -4907,9 +4921,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 @@ -5958,15 +5971,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; @@ -5974,19 +5980,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 @@ -6112,8 +6129,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; } @@ -6133,14 +6158,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 Thu Feb 12 07:40:31 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 75763C77B61 for ; Tue, 25 Apr 2023 14:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234453AbjDYONr (ORCPT ); Tue, 25 Apr 2023 10:13:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234478AbjDYONg (ORCPT ); Tue, 25 Apr 2023 10:13:36 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F9EB146D0 for ; Tue, 25 Apr 2023 07:12:58 -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 33PDibUd006082; Tue, 25 Apr 2023 14:11:23 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=7H2wIy/la9zGER0MZ6oUbF5r5hWOi2yPIm1zTd6UTEg=; b=SupMEHNWvFC2qxRmU1f3/cXRbBlk8w373wL6wH1C1r7VRB/QswI7JEnl4ME8aIuS+WiI 6s6KIbyhvzCemImzWHQUX5/PyhGnXuOE727+0yiHUXzlFTw6Crmv98AgzlDAPdbqLHj0 WgSmxkLFU3zLoYl0fcrifyDA2sL6gQU8FmCAj7axJQ6t4GyiphjlmITSY+CmfwENTnEz sAOsniINAi4l5J/mdHwGazzm0U7HQYQyvEC4mnZAauvu8+xOzFNnjiXl4HtMR/8Eufyi BLSWhY3grQNRJmFWLFPihtYkg986Yf1rWIwyfKyTUWr+k4/B8cmPYl/CFTwu6eZUAOmS FQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:23 +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 33PDuJe4006705; Tue, 25 Apr 2023 14:11:22 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gscs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NaH4avUehhEodfV55WfSHcuAGfU71+malbQxHsgzpEDcoDR1da+Nb2Rl3VtwGDl8LqH/RVQiCzDJNm5v3IHRVY0MjuOx/WUHGI9XpXFsG9Vc6oC1YK31HL3uYNEjl9gSGu5kJZl3mORRmVIHy9n5ka2qe1tFNpa/Ec7CkImJSGajCYCcItJgTI9oQqZD3p67Lztv18KBKFgVh6jxoh3pBCWlupgu/DlaQytK6wS2jINJlaY8bMGfdpTmt5NiPJUptuFoOclN/pPyW1gReobZ8qGQlBs/gAKueJLKPTnJqwXxtGsu2q29bbXNgvFtO6wD3uQX0zfdhRPEUarYQxnyWA== 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=7H2wIy/la9zGER0MZ6oUbF5r5hWOi2yPIm1zTd6UTEg=; b=WTQZVXLTdIFmmUHiYwts4yYx3zPTWNnuKKDNsxDh7Y0dJPnZUGl3yOBD1B+FgEkCkxdhqLQqNc9MwlA9piKAb/LiJofbld7D+Ys1Gc6labLjVPH2wJ0H0f43PqlvE5M8YltBETDaZ6N6m7olDLqIGvba6rm2ggIRkHaPFfM6iI56ceRQfoXRQZPRa/5X5D8rz6sE3F2VSWAkv/UfwMIYCJy2WTw2ionWugGT7D2y/UMw0/6Xgq7pwEtORGjlijckt/vO6LDn5sM4U+XDOr5J/RHNX5ODafqxYqPCsG7oTwtKzNPqKWnGJ50eQoXWcYQAfL+C0hRKGHp9AbFrutSRxA== 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=7H2wIy/la9zGER0MZ6oUbF5r5hWOi2yPIm1zTd6UTEg=; b=FxllB0eU6lfWhxvE964CegWS+dFY9VIB4fWMpTEHgmxsVboRix5abF6k6UvIqvtT5KqFY7eu3u33ZUB92nUGhoPaI9hpKpJ3tX6MQwrcX+3dV76SUpfGN1v05h//FIcKbP+BkeRb6Q83zJ/jW+16Ze3Ka2LgRxHHHQ+LSkZogGY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:20 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:19 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 25/34] maple_tree: Clear up index and last setting in single entry tree Date: Tue, 25 Apr 2023 10:09:46 -0400 Message-Id: <20230425140955.3834476-26-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0021.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::27) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 573cf4be-fba5-46f6-6067-08db4596f143 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gIo3vjtUgup4kgpTOaZNKlShb/0MFhY8sbk7+jOt3WRJRMIQ+wtU7Ocr8hpXqX5WQ1IUqY8iiIdVmPTPUFRcExVAXH5gKj1as7jBGoFHqTdCmIjpVYw2oiAKvrXRON+Foyo6bFD19yhQ3x6KndlfImnvo0rEAhTQ7F2TD4DRUlPlwgjFfU2GYrDYBZPYb28VwIFcWTYx8X3xXjSaKTgE4ZVLMjPeN8qQ/kZJv59CmJBpoiEDhQqnITEOZbq8M9bvWWS7hpy7CIpXOcE/CqBM8TdrwOoF+kRuz9FxToUA9FLo1zSIajc7NYHyBcGtrujtvmZ2+PopRnilrrq28yAfE+RBMnP6fnLno72OQHeXZZ1REb2CBALw/BnxDaauVwrE0mjtKMnZ+xwp3gVD8FOrcbjpWPy4T4xAH/7MwR0D+q+smn/WcLcaOxcIZMFEB5PSa+tPrwEEhrdo0/IvtTujPPTVfEiiJ2dYqc2CRELrvnwgF2xlq5Uibc+FhxzWCy+y82+evrwAKlgwW8+Hsnqhk9Ovx+I7dMWODEnlzdslz1FZrGIYGInuMpvCy8NAMx7Z 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zq2g3TaS4CTH8JTC0UiT/vd26CAuOBcIqMiTrXxzenZzzS2cNhOdGpQ7SfS4?= =?us-ascii?Q?6KcwJuf5K0gkQgNr64kqzxG8vviosE1QkNQTJXeuAi5PKxhcNDWWytKJ4cFb?= =?us-ascii?Q?P5o5YjPTmZdYIayRh5CuazHXrBBLRQs7yPRQcOqPuvFsnMlmwR4hRyYzBz4W?= =?us-ascii?Q?JRxt7+kmyLB3rWbsEXE3eIq+EV/+KwSPtNUvIR2s0xdQgaO1Py0xo49PZHWp?= =?us-ascii?Q?zaspcU6HY2lcBHjm5KFlqZDUkBaAMojgjpLv/LM7DIZLP98qyL/OGADBGue/?= =?us-ascii?Q?SqHzMszRBwIA8Waj69vOTzclqSjge/sERUmC19N38JWg6S22skEqsbngqhTs?= =?us-ascii?Q?NYfg0vkxs4iMDKtCPbGgKS6phJwtvgRkFxvz9YSjPTaThNZxKNe2SE2vWNJc?= =?us-ascii?Q?EaEcu4xP0Kt1kbURyqskL0+VmulOgKZdZYt64Hnx2bQyT/hxgwDdmUEFeoIV?= =?us-ascii?Q?aKdQEifqrziG5Ysnm4oMnvUBoVmKE6n6LZadd173jYzkQ+BisIy2Sjr5/5tW?= =?us-ascii?Q?oIzuJmw5t26YDZE6OK/ioAVaDv6V6150pCCDCYLYGX24iVwEI1hlN0zHsJjf?= =?us-ascii?Q?vlM8tGTmPVOWvykw5NbemIPf87fJBfNwdsz+uoVVvvfFZpzeZfcsNqBF3sdi?= =?us-ascii?Q?GUsSgMzQPxs3NOFGCYUqZyXhjAVCZTI8Sb53+wKnUGwBm6j0ld75OSTNResu?= =?us-ascii?Q?qnNZrKbcn/AGN+bmA1CUUGHu5QUCJQmuItr53WgTCmUbU4XvCYabscoPA6Nb?= =?us-ascii?Q?gQZJrXUi+ObHSMuOOtrlusYLUZg/oxL2ifnVLckY9dgX18mfjsEvsK4qPXud?= =?us-ascii?Q?cvQ9Y2Ectc+vQSTA9qVVgv/nHFSAeZY3k22DyiQgdAmJSzD0wquunFVAf+XN?= =?us-ascii?Q?ZiB/XEE0VScE7AVE1WYZjGWAzyYQNug1T2gJWRqrfSVC+3Z8Ke8FMypXEaRf?= =?us-ascii?Q?DqEsEQ8KPXQXWlc2DZ2VrHHE2H4Gx92Xqyy/OHMNIEeNW+rB2SL3NiNKprHm?= =?us-ascii?Q?/aV5shG2HDW3YjmBuBllNWavpi6+Rp2+zH3Hy1Fccoee26AMtNJ7kL0MFSbz?= =?us-ascii?Q?wLB2GO8zSx5PB1jqPuXTDs4iWmZ97Y92d8ciFyMUTs9cxF6jc1fzWkFs2BE6?= =?us-ascii?Q?kEPYzyva/u9DLacXr3Lv31Xq/pT6V3Ks+Fld50IkgovhHTfrU16xncJne80q?= =?us-ascii?Q?CCk/3sWtpz8+8GZnF3OM0GdOioVs0qxVCcgiyTzcQNbZpHa6ubdZNGVOQQXf?= =?us-ascii?Q?+0NwAqYXFUSAM7d9E4ilZxjtMTIL2CEgC2nCMLxgzQW+8eeHHSVu3Gy6b72V?= =?us-ascii?Q?aOM5DehnXU7IGTL5tAee2rmq6n4k8x0pwlO8QPADBeArlF96Pze0lin73aGo?= =?us-ascii?Q?D2a8SSX0iBBM8SkCWI8SNELEbcMrvlWGTZNns4OnQkJKs7x/z9/sAu0jlblt?= =?us-ascii?Q?9wUG1M5/qnxV/96TieE9R+K2QD0shl/zPrM6jXEVm2ok79yrnh0njFnMeDk/?= =?us-ascii?Q?4y5vqGC5E67df/4UlFZZQBIiBYmTdqd1J7H47qWn28TWL0xpIhDsNIKHGSj6?= =?us-ascii?Q?eHlUQHBt6LV3S4w65Ik8c5J2JiKC2ko3smirCnTUagSe51kApv68+XzLXEnG?= =?us-ascii?Q?uQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DZ49Xnd645BQavHUnaTwjQHKC0KR/SQeq5wgz6GpvuiQ7TuE9k9P+5YDCnRi84slLtz8ybbYayXJU/Umf7Y96tbzSVQONzYPU2YrYYfgdM2qt69Cqm1Ao8ZQ/pNb/GDu4GifkAscNet5b3yTH9uhrPOQxKtQ4tLXtLmGKC7bWXnkhV1PA42iOWC+p7PYRPqh0sZ/dbupFYVOBcMhsmUCjQWF5c6TrTElehxQKpnQR1klCc/u1uZ/K9uxg9bzdbVEbVG5rGmpgwdn8Lu+6Zw+B1WlycuLn00uS11JZF6XbdkBlaGKJ4TnEfyL6pAI0cVD0s4VJisI4eROwACnupLBdHDrIWy6kW3opSqGTOe8vYqW5HT/a2OGYwifTLbXyMcBmkazinuDH6BGQgP2Yk9NQguqVprbXWE13z9UI1TDdul9tjUUJ2MykGWWmjwa7b6dYLeuhFPXRAaUAfN9ZZFC+nPgk3aN2mRQmnXlAYJkY1j8Z1aYq3BzmwJLS+ulnpDOVx003xaro/HpUBQyzh2vjZwQiqyvGcP5ZqtPwaTQF7nHUsm+hdAId3nbx6XUrHNsT0ILPnGYLP1myRwFm+nfTWdtEud40jOPxXtVHNBSpqLudOHQzEqSWSqDqJFuQ+xM/phjd4FSUMocoejpk49kYeJpNCZ/7vnjQmchkiKFKbwE8w19cjDjVv5sKmKI+BkpTuPNXsaYcZue/p6F7UNw0JzlyqEBx4FVoUrmxwPBTT/y/vndU5b/CGoSfZ4Tsu6P6Lbj/2iJ0BlD8b8RNn/lftu41+NrffAnYky+BenZyoJBn+lUzKRp3hHxrwThS7YifX4VS2UhrKg7/X2MJy6OX/7ibW8E2ytBMZj7S/TWMKot2dGHlom64Gt+DnUwWTDc80Rd3C2s3Bjx8Ow/7DMX3g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 573cf4be-fba5-46f6-6067-08db4596f143 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:19.8877 (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: Iww0KbDh7aacA4pNn7CjE8th/hRsJEPrqNk2kh7hjsvn4EL94+NXB7I3VQLTilzdAQkMh1Y9Aqa5YyuC3QwH/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: aSL3LELxtz-Ywa_nI11Tg0jxIXMZdS6m X-Proofpoint-GUID: aSL3LELxtz-Ywa_nI11Tg0jxIXMZdS6m 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. 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 20f0a10dc5608..31cbfd7b44728 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5099,24 +5099,25 @@ void *mas_walk(struct ma_state *mas) { void *entry; =20 + if (mas_is_none(mas) || mas_is_paused(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 mas_root(mas); } - 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 Thu Feb 12 07:40:31 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 1BBE3C77B61 for ; Tue, 25 Apr 2023 14:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234112AbjDYOt0 (ORCPT ); Tue, 25 Apr 2023 10:49:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233940AbjDYOtY (ORCPT ); Tue, 25 Apr 2023 10:49:24 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F10A2E71 for ; Tue, 25 Apr 2023 07:49:20 -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 33PDioRh017723; Tue, 25 Apr 2023 14:11:27 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=pEckK2cnioWLc0ybURTU2AWzV3oTPeI2nzG2oZt4+uw=; b=J4fELOQGc9VtoeDXJcMhx35GxDORwWDOQbRz2ws39wwH5/77rte9hJqbMhPjJdfCsm2p UJoNWAf4ARxL3MUzoYdfRgNs1UcXPHn+4mO2aFX5J7ND5qe2MLJJ9KrPbMSzEVidy/OI bmlPy5iD+CNer0kyOju0Dmd/jn9WwKofbox7jRpNLWBJ3Yd2JNpJOZQTLqPiwXKDvFUE SPgFX+/HL/p5pe0boliow/GCwZGOQwqEfoNDZI8n8rqT1Gc9MGcTqBPeydo2zpIardxF brtiwMWebm4jiuUXoBtTjwkQvyf1LSkl5dwM5l5bAP8i37yU9qCNGQcYBhi3coXanAQQ gQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47fandvv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:26 +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 33PDAP9V006669; Tue, 25 Apr 2023 14:11:25 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gsg6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nUpiPZL/5lFiBXprTpAYtJJVUpBS7XTbTnEzBENrItNEICVFW+jqZO2sA0h4icB9Q51vZN1aRpXbICTJmHhAtqHriJiBS9ZfDkdliXTbkDPqL/ke6SdPq3t68ld2gZkVZtFrRW8MDS/njpIBK0Hu92OjBgjMN241clFl3XEQMl2ufjzKcepTCza2F45K120AaonKKeGmw38Q7oh5qLMUiVOOBkZ8F0n3bmbSs3/h/AVp24gV+AEX2KeUMYJc1q+4ZMjd9/ay9lZTKd+VM+8Zv8FVbLczmF/+fAGJJmnNzNzA4M9ap4HBgUY+oiHNTJ9iSYCt+qGBf0pZjLsdqLOsog== 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=pEckK2cnioWLc0ybURTU2AWzV3oTPeI2nzG2oZt4+uw=; b=hT8WI6PhFqv8M4YSsuPj/Pu2sec3srXefSnf08bFm5bLRcH2edBUEdDlBOuHEyMC8Zhy1Nr+J2RMNfIGBK1BiFsjlclJWeWbr3XEFeYHwIgX/+8ovTSt5/UnceFezrELwe7pd4EhMaC1QhfmID0nctf7ltA8txZydDrCneXfyiiQLKzW46OmmqZDlJsDeRXqXbQK67OtA1HlfnJIFa+O8Na7h3JZPVJFvf1eONG5HVh63ChG8PutRd1DPZIvZvV9dlF2wV7YopBKk6bDidUtQMCfLTL69bI2Tdw6Go03joJIKnhAKjJlwSMaDyNVaZq44DOM+rcanKm+LZkxyoLvJQ== 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=pEckK2cnioWLc0ybURTU2AWzV3oTPeI2nzG2oZt4+uw=; b=HXXOVfOPM04Yg5kDayLUSZ/7neX7zy1cTnUbKdEcr7WF1j21qz3Jte8DybjiIcsXB5TXF+KI14CovCnDphk8t7E4UPbOTHnqXBSGLu51PdUTVgGTmhiTa061ExaN9+bf+dfvRoQLgvsNjRAwlvJjNs3WWy7lOi/jRfDGL1PW7QY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:23 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:22 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 26/34] maple_tree: Update testing code for mas_{next,prev,walk} Date: Tue, 25 Apr 2023 10:09:47 -0400 Message-Id: <20230425140955.3834476-27-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0005.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 26436b6d-d75f-42d9-ce0b-08db4596f2fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6I/om5ZpEVoGBEfjeeptiNy9d3W0F4cGImXsEBG8HcVBn8j7AYK9ROdY02xGT7+CJirJnTErRyYCP/J+uCy6CxvChpBw2hukeYMqW4QbAitCNfrBPqNTQXnd8nHjrENRWOcsasbvKN+yw1GbnOKcBd+gDIzlfVZaB9DaJRoMpyDMMmacdX2bowXEq3Xc+SEMOKkmh71HY2WV7uNooVjFruJw/9kU+3f2WO8aOwo7JhLl4YCWdqQeGn7pUaq5F2mrTyGI0UJKrYMwoLztY0YM7qkrUwcxbrajYvXq+2jHgkClqIGotZ0FtKyzrDqd3XMM4pfJp5/FgvbDUjewFgJM7sF/yYSuZtMsMRfzS3kKsdngyHUSxqjCP98x5BXq+KwJm1glqRHI4q9gSY4Cx5yriH6A1i2vbu+p71hmW3K5RbJSEG2dMZ59J/ShlXQLhov0HS+53Xr2gXNnXKzbxiYXaagk10bJdZtFDXRqd8gDrC3t6G4FvPEnmo5meyDCrxM2witBba+Pe+P+DcZGkd3I20mbHDkXZ2aOsL8ETYHOfFGq9Zc6cI02T2yASTm35+IH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:tl;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(30864003)(38100700002)(15650500001)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TW1taUcwMTFubkNaUy9pci9DOG00OUhPd3lSOXZBVkNETFdLSklEKzF1MVNi?= =?utf-8?B?a3VhTS9RQWdWSDlzY1V3MlNCWXhmT1JhMCtjTlB4bG1SUkZCaHU1K3N6Sm5j?= =?utf-8?B?bWJPUW9KS2t2Q2lReXhFaWJhd2xtTE45QURhTEo3bGhoc1dic0FKa1h4VEs5?= =?utf-8?B?NVJuM0tsZzh2YjBFcXc1bXZmSFNCUlF3dlRSRmJ2T2I2aGRhVTcybTNSUGFU?= =?utf-8?B?Vm9ncTNJcFRpUDVnMU95S2FQQVQ4YWpBa3ZiNDVLeEQ0RDRtK2RoV29jb3dr?= =?utf-8?B?QWdpMXExQzdtNUt2U1Q0QjlMRzJ4clF5ZzZ3TERkbGRwUGVSelI2d045T1Yy?= =?utf-8?B?T1dKOW1WRkdCYlhpeXlkTHBzV2JRb0t1dk1XK1RINi9kMlVORmc2STk5UGl3?= =?utf-8?B?amt2UW03OHVOOE1XRnJFK1EvYWlSMHNxODI3RnNDN255NE5mbFpDYkhxVlpn?= =?utf-8?B?TlBISmJzNGNGMGxMTjhEc1pFeFZpczY3RmhUdFR6RTJXWUg3eEcrVWxsUVE4?= =?utf-8?B?bmlocWJ0OVRoSFlNY3ppZ0MzSGFydnNMc2d3K3IvR0NRTE1MZGRIbjRTdGNC?= =?utf-8?B?dElZQlAzRHVtTTZSYVp5RXY3ZHg3V3MrZFBpaGlWVTF2anZOdHNKNmRNMTNi?= =?utf-8?B?cTA0YzZraW1kczA4a3UvM2NuZ3RrZ0RaaE5xVTlrOVQ5d0hrSm5jekNEZTVT?= =?utf-8?B?cUt0U0w4N1dLM09NcVdBQVBmMnc2WHN5cG5CZElZRHFSWDJaL1ByMEc0VFc1?= =?utf-8?B?cEZOcTdtVGFjQkNNYUxrSktiMmNhNXBpYUJmeE9lVGpMT3RPSHlzRmxyNnov?= =?utf-8?B?bXB4TmVDWjV6ZUN4ZlE1Y2VlN2JkVk9KZlp1dzB4V0xhcU9vQkNwbExDdlBH?= =?utf-8?B?cldhNDMydEFrT1RabTA4S25wU0duZnlsV1NGMkxrc2hzZjZiNFVwUURGZ09F?= =?utf-8?B?dVFhMGZicTVWNHdCdlZpSTZaNkc1L0kxaXEzZFdaL292aVdyR2hNMlVkN20v?= =?utf-8?B?NHorUVBNSUd6eU43Zm14WkZvMVpIZG52dXJIWXFKTzgxenp0U2pKVm9aZWVD?= =?utf-8?B?Z1dwZHorZDhZREpsZ3c0dmxJNTRGUSs3Z3IyNzVGNjlRRDF5b0xNcTlXQmFT?= =?utf-8?B?aWt1ZVZKZnhFQjNXczA5Y1BKaHhsMXJ1M2g5UC9OYWdRNzRqOHdoeUowV1pJ?= =?utf-8?B?R21ZY1BnUDVCbEdNckYzTmRSV3ZQN2ovbXdxZllrR1hiNHhWSFNmQ3hkVTJz?= =?utf-8?B?WmhZT0x5NlZSR2xXeGw0Ym9TUVNFOFJZSVIrRXd4clpvNjkyeXpEeDEySnhI?= =?utf-8?B?OHJlc1pVMWtkaXBmVUdtQkVzbEpPSXhUSTNCOWVRbzVjMCtMbi81d2c0TC9t?= =?utf-8?B?RlJ3N3BIRTVva2dzaFV4OHlVbkx6aElsTmVGZDBwbFRoMVZaZURLaUVwKzQ0?= =?utf-8?B?QVBwQWlWL09xcFBvb3IxM3VWYUxEOXdhbzZNa25oRjdmQzh6UWljRjJ1WEZN?= =?utf-8?B?bDJGQU54ZWU1WGkrY1NTTEtxYlEzL0tyai8xN3BvUlhLM1gzc1FrRDUzc0dx?= =?utf-8?B?ZFFOU2ppN0xLdHhFbGlwS0lGOGxPMmhoQWszb20zaGZ5cWovcGtjb2xZYlJH?= =?utf-8?B?M1Zvdzd1cUJBajBUUWJFd0p1NUU0ZHhCb01NcVppcUF4Nkxwemt1U0lPZ0hZ?= =?utf-8?B?ekN5M1dCMEYxcVV6LzVtR1NaL1VlNjZVY0E2elk0SExsNDdDeS9xdE5xcS9l?= =?utf-8?B?MWlXb0lndC9qUnBOUTdmMTVtb25kdlFqajg3UjRSenJJUW90RTBzdW1jMUIw?= =?utf-8?B?WTBwcWZzSGFaREEzOUFXK3BSZS9Wb1UzT0U4NVpyMm5hVzVRZTM3WTNaR0FW?= =?utf-8?B?SzYyZFBlbUM5WlRlZVFqbHFacUlyc3pydUhjSkNyaWN1L1FQc245a2ovbG5G?= =?utf-8?B?emxndDd5MjUxM2VERzA5OHVtUDZXT1BicnhvRXpSQTBRcUhjMGppSjlqOWVo?= =?utf-8?B?Tkp5WkEvQjM0ZTg0bkF2aTkyUFM4VUdwUmpLRGYwSlZRamFwWEJqUU05QXJL?= =?utf-8?B?RDNzU2xHb1NnTzlzUXJ4dWxrNXlrYlQzcFg2dkRVYnhOMVlWc01aYzRIdi90?= =?utf-8?B?YnAvVDZnVFN3SEhwT0FxUmVpNmpEeDRmMFFIR00xMUdhTDBQWnBLUURxK1Z6?= =?utf-8?B?RlE9PQ==?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qsn2kYBTmS9STICrlbzyTNGVQ+KMgSgtGFR0RVqlvQ5s4PjQ2xEoXXC+iZJ2ACA/zPntKk8BYTEsxYQv3oWE5ZWKv4vMKHeLcn7qNpR8fA3TaBY4cent1sZErhEQzsghdmlQ2B2dM3V6dBI2TWzsSj6e8x8iMB6u3BZHAS0CaADkZJb15EV3p/dl4GN2P9lZtPa5PDG1JISh/TpfI2kqqbg3690wPqVm2KQXSOqVyMgQXs/YhvD24pgkOgCelyzOlwYMOX1KAtcuFDzw//8eSbBG3Sp43z7ns83X3xkui6aajMJuQPeiPF4+6rzjkHua0zvlswl3LiepNTj2VPgieXaTwJo0KoL3KKSIHdSFK3F3FEdBw2dlglb+m5suJwmlLkrgdwo54xOhyekQKC1yX4hSZMYs8GRexXPPNaYIMmvztNKoJ+1TAyxX0dHFKEE5xVFO69djiJH1hPflmSVv5uHUSLGEPQSo2PBGsFJUY4GuUchimeARKPMae1qVWTGY8eOJyN1O+KX/HBsZ7KIy3CdRdswcqds5nM5JYCCKuJwi7pVQtku3wchWjFJcfOGkJGnKNwhK4tMNVrti8+EZmC3N/Ass9LMdY8E/H3qFVqYEkVIfKAqWlgptcg01N7TGS8n9SO/5IysOSVVxyUSGxiivd4f61UcLFDqt00CLco1n7NZut0gGd2Ej49hmAnUzhoMQd9rw9ogqzqxD7+tkoXMdlhSROfWOQV6hFaqAqxoR0f2FyH6UPDRucFwepdR5Y3jSkH3Qgzu12f4I/qNQcuwxeoDIknmxsIXXGW8l0rACI0csWkyxPRob3IpXwfXnQLuoE2FRthuLVZtvl/jf4AjxqHJFUiXhc7CuExNuXfhKS5N4Eu3QxwrmqruMUHlDng1J+Fsyhgm1tAjXu4zD/A== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26436b6d-d75f-42d9-ce0b-08db4596f2fe X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:22.8047 (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: k1SmbuTyXAi12TPjmswMsV2COJ+hN8pi44qEk6n25Si/HWsNLxptGhLltxqlin8fh+109qI7f4yb+a3yXZDw/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: m25avwC20cHss527Nwg9wvf_uSeHenWu X-Proofpoint-GUID: m25avwC20cHss527Nwg9wvf_uSeHenWu 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 | 641 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 635 insertions(+), 6 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index ae08d34d1d3c4..345eef526d8b0 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -1290,6 +1290,7 @@ static noinline void __init check_root_expand(struct = maple_tree *mt) mas_lock(&mas); mas_set(&mas, 3); ptr =3D mas_walk(&mas); + MAS_BUG_ON(&mas, 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); @@ -1300,7 +1301,7 @@ static noinline void __init check_root_expand(struct = maple_tree *mt) =20 mas_set(&mas, 0); ptr =3D mas_walk(&mas); - MT_BUG_ON(mt, ptr !=3D NULL); + MAS_BUG_ON(&mas, ptr !=3D NULL); =20 mas_set(&mas, 1); ptr =3D mas_walk(&mas); @@ -1359,7 +1360,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)); + MAS_BUG_ON(&mas, (mas.index !=3D ULONG_MAX) && (mas.last !=3D ULONG_MAX)); =20 mas_set(&mas, 1); ptr =3D mas_prev(&mas, 0); @@ -1768,12 +1769,12 @@ static noinline void __init check_iteration(struct = maple_tree *mt) mas.index =3D 760; mas.last =3D 765; mas_store(&mas, val); - mas_next(&mas, ULONG_MAX); } i++; } /* Make sure the next find returns the one after 765, 766-769 */ val =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, val !=3D xa_mk_value(76)); MT_BUG_ON(mt, val !=3D xa_mk_value(76)); mas_unlock(&mas); mas_destroy(&mas); @@ -1979,7 +1980,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); @@ -2003,7 +2004,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; @@ -2015,7 +2017,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); @@ -2718,6 +2720,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 of 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); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* prev: Start -> root */ + mas_set(&mas, 10); + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* prev: pause -> root */ + mas_set(&mas, 10); + mas_pause(&mas); + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* next: start -> none */ + mas_set(&mas, 0); + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* next: start -> none */ + mas_set(&mas, 10); + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find: start -> root */ + mas_set(&mas, 0); + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* find: root -> none */ + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find: none -> none */ + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find: start -> none */ + mas_set(&mas, 10); + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find_rev: none -> root */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* find_rev: start -> root */ + mas_set(&mas, 0); + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* find_rev: root -> none */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find_rev: none -> none */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* find_rev: start -> root */ + mas_set(&mas, 10); + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* walk: start -> none */ + mas_set(&mas, 10); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* walk: pause -> none*/ + mas_set(&mas, 10); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* walk: none -> none */ + mas.index =3D mas.last =3D 10; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* walk: none -> none */ + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* walk: start -> root */ + mas_set(&mas, 0); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* walk: pause -> root */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* walk: none -> root */ + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* walk: root -> root */ + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, mas.node !=3D MAS_ROOT); + + /* walk: root -> none */ + mas_set(&mas, 10); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 1); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, mas.node !=3D MAS_NONE); + + /* walk: none -> root */ + mas.index =3D mas.last =3D 0; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0); + MAS_BUG_ON(&mas, 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); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* next: pause ->active */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !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); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* next:active ->active */ + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr2); + MAS_BUG_ON(&mas, mas.index !=3D 0x2000); + MAS_BUG_ON(&mas, mas.last !=3D 0x2500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* next:active -> active out of range*/ + entry =3D mas_next(&mas, 0x2999); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x2501); + MAS_BUG_ON(&mas, mas.last !=3D 0x2fff); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* Continue after out of range*/ + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr3); + MAS_BUG_ON(&mas, mas.index !=3D 0x3000); + MAS_BUG_ON(&mas, mas.last !=3D 0x3500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* next:active -> active out of range*/ + entry =3D mas_next(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x3501); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, !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); + MAS_BUG_ON(&mas, entry !=3D ptr2); + MAS_BUG_ON(&mas, mas.index !=3D 0x2000); + MAS_BUG_ON(&mas, mas.last !=3D 0x2500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* prev:active ->active */ + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* prev:active -> active out of range*/ + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0x0FFF); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* prev: pause ->active */ + mas_set(&mas, 0x3600); + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr3); + mas_pause(&mas); + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr2); + MAS_BUG_ON(&mas, mas.index !=3D 0x2000); + MAS_BUG_ON(&mas, mas.last !=3D 0x2500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* prev:active -> active out of range*/ + entry =3D mas_prev(&mas, 0x1600); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x1501); + MAS_BUG_ON(&mas, mas.last !=3D 0x1FFF); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* prev: active ->active, continue*/ + entry =3D mas_prev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find: start ->active */ + mas_set(&mas, 0); + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find: pause ->active */ + mas_set(&mas, 0); + mas_pause(&mas); + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find: start ->active on value */; + mas_set(&mas, 1200); + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find:active ->active */ + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D ptr2); + MAS_BUG_ON(&mas, mas.index !=3D 0x2000); + MAS_BUG_ON(&mas, mas.last !=3D 0x2500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + + /* find:active -> active (NULL)*/ + entry =3D mas_find(&mas, 0x2700); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x2501); + MAS_BUG_ON(&mas, mas.last !=3D 0x2FFF); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find: none ->active */ + entry =3D mas_find(&mas, 0x5000); + MAS_BUG_ON(&mas, entry !=3D ptr3); + MAS_BUG_ON(&mas, mas.index !=3D 0x3000); + MAS_BUG_ON(&mas, mas.last !=3D 0x3500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find:active -> active (NULL) end*/ + entry =3D mas_find(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x3501); + MAS_BUG_ON(&mas, mas.last !=3D ULONG_MAX); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find_rev: active (END) ->active */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr3); + MAS_BUG_ON(&mas, mas.index !=3D 0x3000); + MAS_BUG_ON(&mas, mas.last !=3D 0x3500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find_rev:active ->active */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr2); + MAS_BUG_ON(&mas, mas.index !=3D 0x2000); + MAS_BUG_ON(&mas, mas.last !=3D 0x2500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find_rev: pause ->active */ + mas_pause(&mas); + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find_rev:active -> active */ + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 0x0FFF); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* find_rev: start ->active */ + mas_set(&mas, 0x1200); + entry =3D mas_find_rev(&mas, 0); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk start ->active */ + mas_set(&mas, 0x1200); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk start ->active */ + mas_set(&mas, 0x1600); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x1501); + MAS_BUG_ON(&mas, mas.last !=3D 0x1fff); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk pause ->active */ + mas_set(&mas, 0x1200); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk pause -> active */ + mas_set(&mas, 0x1600); + mas_pause(&mas); + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x1501); + MAS_BUG_ON(&mas, mas.last !=3D 0x1fff); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk none -> active */ + mas_set(&mas, 0x1200); + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk none -> active */ + mas_set(&mas, 0x1600); + mas.node =3D MAS_NONE; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x1501); + MAS_BUG_ON(&mas, mas.last !=3D 0x1fff); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk active -> active */ + mas.index =3D 0x1200; + mas.last =3D 0x1200; + mas.offset =3D 0; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D ptr); + MAS_BUG_ON(&mas, mas.index !=3D 0x1000); + MAS_BUG_ON(&mas, mas.last !=3D 0x1500); + MAS_BUG_ON(&mas, !mas_active(mas)); + + /* mas_walk active -> active */ + mas.index =3D 0x1600; + mas.last =3D 0x1600; + entry =3D mas_walk(&mas); + MAS_BUG_ON(&mas, entry !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 0x1501); + MAS_BUG_ON(&mas, mas.last !=3D 0x1fff); + MAS_BUG_ON(&mas, !mas_active(mas)); + + mas_unlock(&mas); +} + static DEFINE_MTREE(tree); static int __init maple_tree_seed(void) { @@ -2979,6 +3604,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 Thu Feb 12 07:40:31 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 2124EC6FD18 for ; Tue, 25 Apr 2023 15:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234532AbjDYPiK (ORCPT ); Tue, 25 Apr 2023 11:38:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233959AbjDYPiI (ORCPT ); Tue, 25 Apr 2023 11:38:08 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 532D2CC39 for ; Tue, 25 Apr 2023 08:38:07 -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 33PDhp48001833; Tue, 25 Apr 2023 14:11: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=mwgxS4v/JFSCwGiJrJKZtRQ4wYxr/0cEbmcARTsSEO0=; b=HO/t7gIMzf0YzSG+ozsRk2nfhw3Lwz62xpZ2JA+wHP17FPAQE+agjwlnf7BeLhmqrgfc PgJPqRnxuXyk5bTSF56N2B8Xz1/VHEnbRjhs37yU3dnTWU1bPLuXX9iSEZkkATgKBsZ1 rmdf/pz8loZh9iY8WG1bnPNZcxDAspvMV6LNrzfFV7HUQsEv+ItfqxEQdD/+mFKAnwBT AE33bIkZ5zvKcehx6HgTa2wezgMluWjz6ML0w7+OUq8+kG7rLjGU+1QZc+8RMlUtFzke NJPKVWmLdzbUOTzHZrZoluHxofDENpwZxI+GeMy2RgA0Ce5MD7cx8oHJfgygMD1+QLIh Rw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwfeq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:28 +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 33PDt2Y1008641; Tue, 25 Apr 2023 14:11:27 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qpmu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kOptfW7TqT9Q4zrXfd7n9NUEdxgsMiZls3y+ed73EaaPmv2PB2Bc/6QqBfZB8GxJ2CityXesp8cNFiesoZsFXI21b1Pna+WxAKgOP8E0VMUxwWNrW+agdkCC/QWfwLyBqLbuSXRtsbAE9FNV49kjDTRLNupLI3Hp+en1mPX0f/ZxXKwAyMqp9FTUDn5wo0iNuEAoKehBeEHSG1SSQDTKfU0a2khH5LwENVN4GJhEIx3CncNYpzksCS1kL8Hx76AknWoZ/kuTS/oDZISvoaziBaxs3RifZNMr0YlhXZlnnp4vUr7uScnnBe2EFS1MDSZoMU1mT1evudQ/ufjdGaEjug== 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=mwgxS4v/JFSCwGiJrJKZtRQ4wYxr/0cEbmcARTsSEO0=; b=mZpxxoYuYRDCrag36OtrZ0yZfzOElmebwhjRImhjQ2i4OdDs4Pp4SV8WqDRAr4onrfdVSsImZFyFPzPJJnQsstsCcocwixfBSLn171S/dAkyBj5RQeXNmGhHRNNXlbDY7Fz2S2HR8uhGbNiChsRtos0Gg7Cw/olpeNc6If6y2vouMHe5EE+1l7xYhLA5jZohvsz4dgeYxFJX0ReTVBZ9MCiOM2BDjIlzZ1Lu3wGQKXy67kLr91mGON+beBJCfjsGxgGJuhxvZnGti2xz0A3Pt/pwTsiwrIcAMIHO+in2EP73F6HAx6ERn78QpuoIxIcaUJ3zfconuyCyd7IxudFCRQ== 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=mwgxS4v/JFSCwGiJrJKZtRQ4wYxr/0cEbmcARTsSEO0=; b=FqnIJ1LewCDYvSvVa+3K613WBDkiYP94Y0gufhVBq02DMbJT0awxkrllf2qnml3He+/c0XOEGDyWHqrQmZ9j6tFCnH+21+9xG6VGx9fCekWbfZqoe/g9iyfP2iUVfPfr9v2FOxU3fNthiFWduU4DHulG4Oa8zxTCYJLxxkjAWj4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:25 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:25 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 27/34] maple_tree: Introduce mas_next_slot() interface Date: Tue, 25 Apr 2023 10:09:48 -0400 Message-Id: <20230425140955.3834476-28-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0192.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:110::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: 80cf6e67-e905-46a8-1aba-08db4596f456 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: enmu3md3v2fiEIRsk+qdbGSsKc8zYdrnjbo0+vNCruFrdgOdRK7QgJ7flEt2gM4SJo9cQr63IfCwHWxdHgwvTBMAOqltZ38Z9BsenlYMxMGfykm01YzE3nw8B3Qlgsd4GeoqWpVIruFejaPU6v1JS61z7KdYojj8+gRq9bokWfFldOSvkHAPJtcyg6oOpFnDEWgN6/8tq7uvfMHCMOxWhMsIPc4+EFXX1TVDTyxYbliYS90ITPdabqDZz+FiQ8wPy4iQyOb9aQ6H2iSJ24m4BtvafuwNFh6aZmrRGq4kOKzfebCjCGSsDezTywrnXgyQwp3W+NXEAvKrhVxWaUv7YzNIOkmGVaoGX38/f/xIkScJvIyZg1xd8MvcoYmaic2yQnxfB9JWzuxtkBsKOR2xIjbS8h6xT2cVZwrqppIdgNeJgF7syBIPGsPRuhAHYhNCdH9bpbOv2m5gXa9TkmbGZHZATJ3BWmmWNy7Ya5TDR/LokuW9Ezs6Dp7gU8MLDj76C1le3rIBvMbR51cdG5r4yXbdGaWd95AHbjnf/mUW2yMX/jNBD4AO1mmZkYDsyzyV 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(86362001)(36756003)(107886003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?l8nUKj8cnxc7XfYs/+TFxzE2eaZyVxMpzwf0oFiGHCuRoCOCoQxdZEq1kGWY?= =?us-ascii?Q?qLIGnOMN8nhqFE5c7TnIJOdEjE4S97yQveV13mLmt+YFgnTbSl9EOO16JKO1?= =?us-ascii?Q?6wRKtnxAIntdacUFncRIRxvgAJmX1r6uC3gCzHy8b0ftr18z/6Rshuq8qp2g?= =?us-ascii?Q?3SgFP9qPJWJhJYNaq0ct4IfMLGoYxNhZzQMNUYRKHm1pnlRRY6HxAcrEYMOP?= =?us-ascii?Q?1OPasellDBiXB6tOYNavxXWPrWJXSkU0988bI/nhme+dCz87nZb2g52rR1Vd?= =?us-ascii?Q?YcOiiG5eyV9WaWiFiS3SOU7IHuHwD5SDHaZMgcJ7YIWZiONAzRAt5kHNOR/S?= =?us-ascii?Q?DFz6LKE0oivBJ/NZs4qWGEnIuUgRaizOnvIYc5BhQRgdfzbnvgkQINp5A9Bi?= =?us-ascii?Q?syecjHwIYJtd6wnKXZ9RGF/egqLDoIH7g3jP/aZnjt37eHsxF4uKF3+8/oUw?= =?us-ascii?Q?R85Y9V4GbzFkitdmXjvIUczd5bfvFO+IxoVhKx2SfYATtsD55xZbBXn2gTcE?= =?us-ascii?Q?R1w/TELkGHP+w8FwZxECX5QY2sySRwiVmo4jDQrmHzXG2HzmXWfOyRqMju9B?= =?us-ascii?Q?rwW3ICFyxm9EvQjjITNb5C1MHLYuGTxKbOw8JiGfHKE+LwY3OJQgbNa19fuF?= =?us-ascii?Q?6W3DyVlxPXKPo55hUP1OcS1DT9LkudmYxKl9PCM7oTMdpCrxLFHV1SmqEtMv?= =?us-ascii?Q?oPWIGL6zL2j5KCp3hZbCmerPyyRqrKGKiegVNxAaGeYaYEdV1aodlSlpp9uH?= =?us-ascii?Q?yTcu+JME/8BXoEDoNfQ6mP/QO68wtLQem49w+3mXaEcPdpP+ENwTytpu8c7b?= =?us-ascii?Q?u/fWRJ7D30GmczVzvwNNU9DHDXlbPsn/CktENqvSguXR7X7bkKVyjR9pCvmQ?= =?us-ascii?Q?Fic8mAPJPLcnQmE7HCiZsSgXVNsPg2eCBsZfNZ2WGM2NsEP+tVOO48sJWA+j?= =?us-ascii?Q?6jtWe9uPp4FduMOOBVUrV0YCqKvprkg6t1hR8XmtIIDhy+PxU4FL/snUy7U0?= =?us-ascii?Q?lCNPl/HgHeovIuV3cG1+fstIDH9KglauSp39YInFYlJlmXI3nEZ/QaV2wSU6?= =?us-ascii?Q?o9ldr7wWaT+Di2aVDT1f3167jy1ZwDBsvdK0XXXQ2a7N8Lvy9vyIiGnjFnp5?= =?us-ascii?Q?Ae136FcOvayC+xwTNseo14qZUDeJT4LYF3s9NCQ2ThZIK6WvR38GZZgItLq8?= =?us-ascii?Q?Xd48WfLpXSKrheNBYte2KZzuxmisawgVwiAP79SLb8iZA3K5qru8sC6JssGy?= =?us-ascii?Q?X6UgrOo06e7S+6tE9X8eRkMrTuB2YxXUkWefU6/8Kjk07zJAJNmnhZJkOBxo?= =?us-ascii?Q?3QQgaywa1rIG5iffIvNYfICMvyF3ypLLp3xkmMOhaEydlB3PzC10tMbiANNF?= =?us-ascii?Q?9k1ffuHQ0RF0NfoCWMHvmQtrot/OhQrenBHjNW6Etn7UqUj8mXabg9w+3aiE?= =?us-ascii?Q?+eU4jBpIPM5ieOIZRqu07DOdoRHeg3basUPbIIGyhkET75o9alLMSlwmNYBJ?= =?us-ascii?Q?flXZGQ1MqOkqj3bY+2IGDF502Mwf26dtHJMd3zHYmy4HJe7AhXSg2uP5ie3S?= =?us-ascii?Q?+KeBayuiRcGTtT64y++ScgHCTiH5qy6E5d9/r2I1wnxe5vzBj1gw0+d511iw?= =?us-ascii?Q?yw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: oUBhhkJ3Y8g9gRMOjHt3whFMj6A0fFY0pI5x+X6lY+NZhXutGdz6+A9HWv7xigpgNDlIDNWFrV2ZcKImUeAwQY+YbUajNLjhU64s3A/O8n3gS9zQGqdr2h7vmG3B/4n1jO+IW7Ik3xxNySsBoHLGaZ9Y4P6FjvzM4D6n/PxvEznKNP6MBNvk8u7dK0szhCiNS4tuQzbsW89B/lHmbhiSMy+SpAllJU5A12P7DKQfQMIGVgrEi+plFj//bdB7qW4Y2ENh3O9CnWRTTEuqnTL5vZNyLImCr4t/OWmYSMC48iCa8oLYUjrnWxHmZrZlEQ1y47s9ZMLWUCq6SDeudDpebXlamXv3WBUWhRH2yObxfsDrWnHeLVRmTvCJh1KRZoA+lJ7usLxJ8poqw1EBiJWp3FXrwjWKkLJkw9eloNMxLB3sSmQckj+FdbMRMi6/un+bYUcH0bIKzi6wHZDuTWNJnDycLQVmtOf43QRv9rsOBsUQvBDnHR+e7gasxySTQDBTgYsxV27kUwc0rq6D1YYHvyJdL9CZ3+Zo36Hs8mMwdQGnDt8JqDyhzQFgOQjA0plD0kEN0rdmIjUgylhlJ1feaMTtZOUDHWyX3gR6Hd0UBAPUdcTeM4xscIY+CkxfUxqAfFgB2R9ZJKCKY/UjBjqOBxO2cdpScp+PIOXULrtGGvT5oPRcOoxRzKCmT454cstt9hMWm7Kzh4g/VCfIpe2BQuBvDXeFClGAY0YXVSL5WEvPWg6rZVTdgDRqAibZ4fXpRrRmYF/93ITy4XABnS6YsqaquG6UYZNdRvod2h5GM8civBnjYcnwLy3Mtjidw54BDHeM1v9Bvk0HczIHcD17GU2zDMySKKPcfE9Z/cSDc/5dIklVYcMYNrPaEOG0yaQpqsR5BbbLscSHMe+bfcB86g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80cf6e67-e905-46a8-1aba-08db4596f456 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:25.0993 (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: kpFWD+cwwl6NmAG9A9+jaO6yC9utag5yYXiHGIihob53SbljDNxf5i4VtdqIIvVAQsRSiF0QyO1GFCqAfQvKew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: t8F04wz0Ftsm1O74C-L1CQ6UaNqG7mCN X-Proofpoint-ORIG-GUID: t8F04wz0Ftsm1O74C-L1CQ6UaNqG7mCN 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. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 178 +++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 107 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 31cbfd7b44728..fe6c9da6f2bd5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4619,15 +4619,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; + if (min > max) + goto no_entry; + 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 @@ -4645,13 +4646,12 @@ static inline int mas_next_node(struct ma_state *ma= s, struct maple_node *node, slots =3D ma_slots(node, mt); pivot =3D mas_safe_pivot(mas, pivots, ++offset, mt); while (unlikely(level > 1)) { - /* Descend, if necessary */ + level--; enode =3D mas_slot(mas, slots, offset); if (unlikely(ma_dead_node(node))) return 1; =20 mas->node =3D enode; - level--; node =3D mas_mn(mas); mt =3D mte_node_type(mas->node); slots =3D ma_slots(node, mt); @@ -4680,85 +4680,84 @@ static inline int mas_next_node(struct ma_state *ma= s, 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 * - * 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) +void *mas_next_slot(struct ma_state *mas, unsigned long max) { - 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; + data_end =3D ma_data_end(node, type, pivots, mas->max); + pivot =3D mas_logical_pivot(mas, pivots, mas->offset, type); + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; =20 - if (mas->offset > count) + if (pivot >=3D max) return NULL; =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; - - mas->last =3D pivot; - if (entry) - return entry; - - if (pivot >=3D max) - return NULL; + if (likely(data_end > mas->offset)) { + mas->offset++; + mas->index =3D mas->last + 1; + } else { + if (mas_next_node(mas, node, max)) { + mas_rewalk(mas, save_point); + goto retry; + } =20 - if (pivot >=3D mas->max) + 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); } =20 - pivot =3D mas_logical_pivot(mas, pivots, mas->offset, type); + slots =3D ma_slots(node, type); + mas->last =3D mas_logical_pivot(mas, pivots, mas->offset, type); entry =3D mas_slot(mas, slots, mas->offset); - if (ma_dead_node(node)) - return NULL; + if (unlikely(mas_rewalk_if_dead(mas, node, save_point))) + goto retry; =20 - mas->last =3D pivot; 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; -} - /* * mas_next_entry() - Internal function to get the next entry. * @mas: The maple state @@ -4774,47 +4773,18 @@ 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; + entry =3D mas_next_slot_limit(mas, limit); + if (entry) + return entry; =20 -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); - } + if (mas_is_none(mas)) + return NULL; =20 - return NULL; + return mas_next_slot_limit(mas, limit); } =20 /* @@ -4845,10 +4815,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]) @@ -4861,10 +4829,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]; @@ -4881,10 +4847,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; --=20 2.39.2 From nobody Thu Feb 12 07:40:31 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 194D0C6FD18 for ; Tue, 25 Apr 2023 15:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234297AbjDYPHd (ORCPT ); Tue, 25 Apr 2023 11:07:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234404AbjDYPH3 (ORCPT ); Tue, 25 Apr 2023 11:07:29 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C07BCD319 for ; Tue, 25 Apr 2023 08:07:26 -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 33PDi8r3024340; Tue, 25 Apr 2023 14:11:30 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=k0fVwaKie4oTeZToT+Ho+LImSroGb0R9XHF478dE6eI=; b=FSSkfT69UmkFY3kLoipbXjkOQtz9Ct8BuXm2X0D3cD2bftZjj5l8AEpKid34WsYhEAPB NQ2/m0yZD1bHY7yvnc8EWLqB15+5FnJ28orHWup7MRuSaSDxATBhdE2HT4cIldxd5fo/ OrfzsnLZSPX1c1pNdQwbuEp+yVklvI0jqwBbSxwftRlyc1Ya9L5L5PzY+eQhqHxpjXH5 gxET5JeyAULdGoIkfvj0ieLatnExUumrjzjMMD3H5UliCm2rnDekQ1BLjphHUO4O64Lg PvexKUU5fez+Sm/4kGUGiJd0RpAEdfQNN015ECo571sNFFPYnGwswMMja/+EeP/8MK1W 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 3q46c45fxm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:30 +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 33PDRVTv008651; Tue, 25 Apr 2023 14:11:29 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qpq1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PzLMoy+hYIZr7JsgZ95rQwvl++cQZit/1h9NTA8BK9zr8q6Br5fr65ebxQnSgEQg78INhiS49uqwTsX8u/TdYSuxsT6hbnR18Kxed1bVEiAbkyaUnxwPRRO2jsKstt35l3NcDSKKG4DMbnVg9qvvvQEamRj1w1+qkm22bhK2O1L38AGtJKQ7yr5Cf223NE5RjBzk7IeMv2uUSX2lbp7Xl4le0m39nO42rIUFJvNEzN3F4bzSf3ZTtHAkunL5zxwAXoxkkFTlsws7GgazvFRG2peVVLFLumQPw671Iq5fKbKwVZkzjCRLg/8C9VRveT/0RFaqDrY/vwzyxIZaYtj6gg== 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=k0fVwaKie4oTeZToT+Ho+LImSroGb0R9XHF478dE6eI=; b=SPdoXrAUmMUlohSAgnrpbmN1jE0v+fqcR1lm5gTEsQwVrX8s5fZ5rPWuunACCdzY3P98ICOo6sZwC48cDd+htgpAFLrmziY0KDerQW5LA/5ctNnZI6HzYiUztOpVCdxA1kfxWe48UQQ8ptXqXZ5LZg3BYGILRGErWw90PzD1MRushOAaqR427It5ApQxxh6QRTKsbuc2dYj0uPD4FfIsUy6FgKFNBA5jEa/dnt6xU5l6f7k3yPCQjbt0qeNGfoc4WmfLyfA9BU9B5tj8/bGYMTPtwzPhlzDvptyFAYCZseKSk4Xyd9HaJXlxigOY/cOIKOII9A2tYXX5ejLxLLZwCg== 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=k0fVwaKie4oTeZToT+Ho+LImSroGb0R9XHF478dE6eI=; b=eZJLvWM/EmvmTSvjGkQir7m4nAzxOVAw8JwstP6s3Gw8oXNsWxrHXKAMnAszNxCG1kJmyOwZ4hdO31WfKmYJl97V2rSTqlSUeoGxUKnzjvFD5ORu2YGGjfn/Iv5XzR+qypFYuykZglIpoi5FK4Wz23y03Xi0IfdPnJP/07mkMKE= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5572.namprd10.prod.outlook.com (2603:10b6:303:147::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 14:11:27 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:27 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" , Peng Zhang Subject: [PATCH 28/34] maple_tree: Revise limit checks in mas_empty_area{_rev}() Date: Tue, 25 Apr 2023 10:09:49 -0400 Message-Id: <20230425140955.3834476-29-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0139.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::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_|CO6PR10MB5572:EE_ X-MS-Office365-Filtering-Correlation-Id: b43eeb0d-62b0-4217-3e7d-08db4596f5c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nEIdFEDEwss2+1IjqFJzbHJQUM1w+mMz8mH6v0sUr1AalTV8MvcqncIQhYnwqnIxfgnQ8uI6E1mnO6+T2UpBM/OqkNBSd8XcaYQNm3xLEUztVz6436U9I92XEdW4jmw24oJniwS+TkNf6AVvyJtRTqxVpx8wLcyXehQVihVgOlTuxiWrB88GNLhKOBIYZqMwLWsyKy6taVTex5N5mlQcpTWEPag1kYdxrajFG6B2WrVw5vLsYtNz1fJCvzHegPbSM3EAKaYxx8OjEUUWYrl46JtR6lnfk0ZBfxLENhXye4ZUtpmQ4ZLoq6W5BICT1ac9D3ohjvvuj6tYvuE2jpJcc81kCOqUr6Q6qho10VI9C/yl6P/zAQ+ksBscos0RNpgZVHJk+PxqBU7FVWPhsbv3WhPKSIGW3RmQAbhpQP+NhrWCg0gZEx0bkVI9xYieTEUqP/LXo1FLsXPX++t2LVaCxT4wzEvBUFKb547MndJ2CFAfLHGQWh0Zng1y0QjoTwzVyG2IABVRsHRKTCN6JRSO7Hd4GArbCko4+jQDm9X5tYU9V5ZFxfoYBaQ1mXoHIONl 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)(366004)(376002)(346002)(39860400002)(136003)(396003)(451199021)(478600001)(54906003)(86362001)(36756003)(186003)(6486002)(26005)(1076003)(6512007)(6506007)(4326008)(6916009)(66556008)(316002)(6666004)(66476007)(66946007)(83380400001)(2906002)(38100700002)(8676002)(41300700001)(5660300002)(8936002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kYoRzLumolKC51FHmeyiwKkwbMNKQSB6yUYY1Jeweok+GHC+A9h0zRu/O0IB?= =?us-ascii?Q?6yTp+bJNlLwMcCEVbCq9jvedmhqBbp0YwZjVW9A6crPr1I2SyurE/hAog21S?= =?us-ascii?Q?rFwGJOHvBu0KMBxgK18L3t/S5CZwOU3M1cbpcY5/LQFL76Ahfbl2Q3/L/W6A?= =?us-ascii?Q?ZJAEpt/aKOanUflCKvq60nUM2TxSLOzyNqujxZR1RSgMFXv8UE859MxNiYVE?= =?us-ascii?Q?8KvcQclVnhKZnR7Z61aJQlkz0YE7yagHHnrgII+OOpvL8bXLkh8x+fvetxvl?= =?us-ascii?Q?i7ChHQegiAAkLaTRLfabw3uGZLv3Gye3tKC13EoBvT2IjH8p7DmFhoZxnrIa?= =?us-ascii?Q?KruRfbgYoxkq9U27cqyfcDwCqOnAWb/+Hb/lZWCC9Lcsg4wBgH8yMmvs7EmX?= =?us-ascii?Q?ns3hD1iHqd14fkuFnddQbEFylkrcyZFLil1KBbeQYPPGqZJlpD4XQA8ZL6Yo?= =?us-ascii?Q?58zZyc4embZz6LWFvXg2NmOV/O9hAjwxTaLnE4O2ooz3Em2lrVuc+CXj6Sex?= =?us-ascii?Q?+OOIagYRrw/+gkFEzDVupA8RalTJ4pyLqSz2YI0+ahGZ6vc0ktOrCo6g9Hut?= =?us-ascii?Q?IKGs0ZCLNUBw/CJIhLJM0Zk7kGts1+HsKlXoW+q9hVsJK3XuDMF9RrUUEkba?= =?us-ascii?Q?MOCbmW4u9zAjuorqjhr0Tim7jHtbj9sICd30RRtBshmhAjMVtIlCjg7mkNhZ?= =?us-ascii?Q?qD7cw4VmgIc/bNt70jjWkJ5mRK4C1V4w/+cBmPwNBpAbnjjw66vQeM60KvXo?= =?us-ascii?Q?uBEiI08jnTSXWJTy0K0tArL5UhSR8BVU+aqss8dCCdKwiaiAPsuiwNyMDKi5?= =?us-ascii?Q?3hYJETKkxHU6+9CEtSXTO4zQEYQTU684MkwlzmG5JyQWxmU538C+v7J+3bcj?= =?us-ascii?Q?UF1x0DuAwmlCXlMEjExT2Zp2xvpq1HKVH51VY+VREmmf8zgcJcWOINVvNXHH?= =?us-ascii?Q?23lmXffdS8EVr87URcKWv2PTurh9TRAv8/8FHsBAgmG3DGHKTGWNliOKtaZb?= =?us-ascii?Q?7t69c7tOSudtfGB65kzKHHSBIoNOlfgzldUUS0U93ZteVdxq5oI5epyZ4Iv9?= =?us-ascii?Q?HYQc5TfqUhuCnhrginFv8fJG3752qgf3goQgp0CgjMAiEf/SxI70jYlKNzBq?= =?us-ascii?Q?9oMIBEiGgDhntIQWgWc3rzsNkw1MIhdOngcIDpcHE9XbGQlnX3ZaqPQw1WDT?= =?us-ascii?Q?fYXE169q4hPkb31v4+3zdtsnKr17pBMQAwfo28poGWYY15Z7am+EfMvRD2uO?= =?us-ascii?Q?2/gw/0aEHBYPVgMaw6TTFtwS7s5fhgR7adu+hopRcNc/qWwQXiAtrfpXLlhg?= =?us-ascii?Q?L6wB5Cdmkp1G35gznnzxf758+j98WzGgotsKptHIeJcmrmyF9/ry6UVn1vVB?= =?us-ascii?Q?cSrYmfbWD40DsCyjrPt26K3MhbX2kROFal+E0JNOtsz3TbQa2O5FAGXj4sS/?= =?us-ascii?Q?SIFeuQgqXLh9i76HP3c0gcfbtQPXDaNb60xBv3AVGclO1Nc24HKPcNCOd+bL?= =?us-ascii?Q?LtEuZhKvx+cCfr0Vf89K0MjzJ4Zb/Fg9z32hLkyRgrxAV4FON7Gf4/jBAO1y?= =?us-ascii?Q?c4MsZXgx+dHZFb119UI4+PDznaLtVCiH6MyY37AmK2ONowGDEY5RtrFX6e6j?= =?us-ascii?Q?Vw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?6N6d2R+FGZS+Ded0nvSdXEoS8W23cju8DayuWrM/dpG1gKm0oPi2cz5A+Kti?= =?us-ascii?Q?8HNc6wn8fKal8lG8tw4IX211U2zdD+TSfY2uvV1jItPjjqelWE6iuVMkwn/O?= =?us-ascii?Q?lA5c0fNK2WktiXMa15hUnaN2OLX1pPdgpRWLB7+ab69bTtA9ZMMUQTQpMT3m?= =?us-ascii?Q?xLy0SL2Q4wriiCK0gghZXhGTTcQqcbtcFd2vQSBswBfMPgJqbR+U6LlRBQLD?= =?us-ascii?Q?QXiaRcHtz4uDjHIo+aJw6VpT4/caFx1VIS9cmw/Q2Jb7S1V+XhcEaIoun899?= =?us-ascii?Q?Amv/iIRPN5DldFDd1r7FFuwYmzeBXQCicFYCmz0KcUF4oYw+nnKtsBnrLMzG?= =?us-ascii?Q?DkTo8YyX8jVZY3OlF3YBp6rRW1dcwHy65azzEaq4rChZPah845/gbLGj8flH?= =?us-ascii?Q?2N8+XAo1Qi/RT3WtBwodYtH3cywv0s2zS0WmjWAJMqlHubBRA0AqPWqDCHCr?= =?us-ascii?Q?AfmXCxetXQUsmoL4h4NL5gHKWFA3gMwYvgw8itf3rB+4GoAc4REnezxa2+D0?= =?us-ascii?Q?f4jYnnhfcaVZOJOCcSP5Ft5M7ggJR9o4lfOl2tOqtL3XAIs8zDC3P5yzfYIH?= =?us-ascii?Q?tm7NrubZqGH7jtSAqFAjw7zUS2YQSmwdi8ATNhjMjUDmIeShp+No21wiLi2q?= =?us-ascii?Q?/trrrde4tvfsVv+umIQc2mTNOlcLqNN7cyRCj8dan2fTBd8x4obftfdWDMED?= =?us-ascii?Q?PC5BhrUMyld1SwQx5rv8KVYDOmaDXKyXWwGDR1qz49K0f1K2uXUCFUORn8MS?= =?us-ascii?Q?aaGx2NK9z4HWCGXDb7olSIVbB/XaneEZdozUxqzqabCpJZTLu9JzMfukOB9a?= =?us-ascii?Q?4yHJB1eQfkIrqAQJkRZMcx6Cv5dp4JwayGe7BDfPgTuL6s1p8Z6IkPMG3sqK?= =?us-ascii?Q?dR71MRLnJ5ccX8l9D3UjRF7nKPYY5BwzKTkDrR6w8tzOCIQ1lJPk/kkXxiQ/?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b43eeb0d-62b0-4217-3e7d-08db4596f5c5 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:27.4855 (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: USK32S/vwbS5JgYh123LPFQnhNFJp06dCVmgqY2cURbe39Jb3iM8xxQyUqg+0nDogjJln7k4xbS5WqiqX7FV3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: 28P6BtvjL_-cDmSEjHX2Nd7mihE-pkLp X-Proofpoint-ORIG-GUID: 28P6BtvjL_-cDmSEjHX2Nd7mihE-pkLp 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 Reviewed-by: Peng Zhang --- lib/maple_tree.c | 20 +++++++++++++------- lib/test_maple_tree.c | 27 ++++++++++++++++++++------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index fe6c9da6f2bd5..7370d7c12fe3b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5248,7 +5248,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)) @@ -5303,7 +5306,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)) { @@ -5339,7 +5345,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; @@ -6375,7 +6381,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 @@ -6395,7 +6401,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; @@ -6411,14 +6417,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 345eef526d8b0..7b2d19ad5934d 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -105,7 +105,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) @@ -683,7 +683,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. */ @@ -695,14 +695,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, @@ -714,6 +714,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); @@ -762,9 +768,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 @@ -883,6 +889,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 Thu Feb 12 07:40:31 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 8AC20C6FD18 for ; Tue, 25 Apr 2023 16:07:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234676AbjDYQHj (ORCPT ); Tue, 25 Apr 2023 12:07:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234531AbjDYQHg (ORCPT ); Tue, 25 Apr 2023 12:07:36 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85BCA1A2 for ; Tue, 25 Apr 2023 09:07:35 -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 33PDiZFW006058; Tue, 25 Apr 2023 14:11:34 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=YYamRYSZTRjLgiYuJg4HLsvFp/mKjad4sqbTTV4Eyi0=; b=Jzx4n5jWalKA/Ufad1PtwvrojZOi6SIcpevWbIKkx/7r3nkpWT2IdbmGdm0cmxtejDLQ q82UPAdMLl+1Y0YkouIfyzwYAHgaP8l0o4HPNOQO0L0PU8Kx6jPj3DIaroZAz7I/YTuz x/HVDtWsT32pvWwmKtskzpe/aWS2I8O8aIyYb51N+ViBzyNy5kJ4D0FtyxQ1FCGnQdMq g7AIv7E1mpTI7vS+dCyiEpmtlLjxqlXhCF0nBT3ZK58DeUizYbPd+zyfcTzpDdGjiyRW UUVLOCxODGVrOYrTkYi2KGYrdmcSUrlmc56ffT0TJj4RoXlk5j7IzMyUoDvi/0n+PeRT aA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgpb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:33 +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 33PDi2Rb006664; Tue, 25 Apr 2023 14:11:31 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2172.outbound.protection.outlook.com [104.47.59.172]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gsqw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b/uVqmpqu+N3N1SwQXpLYyhO2my9RwNRQSSILBpveKhQ/V5HRRIS3t9AGuqfVfHwepandMMNlF5aa4d4b/9xeNfG3tpeU+CqHmjS8xaAVYehHb/WiCSFU5T6FMoW4PF+gcyzE1w6qrbCILt4OmLxlWov0yHpMvoJC7iW/w062fL0ym34WeQrcXSzaFdg0P3Rn2Ti0AtacJIRpWLNE8pe7PtL+bPE45sjEH9X1uhzexfn+HqjGesjZHmUQ1zZa96/W+Pmm2tHmRwlI59vCfranKAmaPNeaQY4NhKR1HHS9R7TguobzEeojYeInNFxcQ4cGxq1g6lney8/93+1llkYmw== 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=YYamRYSZTRjLgiYuJg4HLsvFp/mKjad4sqbTTV4Eyi0=; b=LSzDsZSDLD/YwFlcEObfgC9x9taZmuam5koClu5OHDIMrV5IXhXrrzFdnGgfIWz5uOP2RHC8ac/3j+uR6awVNYCu0DCD0tde12HvLl2s554LVwzbVp2TlG5Iwrl6vS21GENuYhfJJWZM5BDpnemT7Q8uCTr9lDARppEZ2Wgc25HWC51ObrXpq0hOlw5fYLv/uI/ZNWtiTivUdGBb6MdA26aqFzPpwMRa96IB4RaEL2pHXA/xdZ0DlZXX8f+12dkGJ1rwa2YtSd3N94zQlmwnM82ZwNXip6c+rFnxivJjwnHoid2yp7e0FWCxhIijwpzTN8XzEN+1togYWTxkgz33zg== 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=YYamRYSZTRjLgiYuJg4HLsvFp/mKjad4sqbTTV4Eyi0=; b=CCvuEumtzf69RmqC9XP663hzK4chfe7TfRCHa4ZDRW1UhQLyr26ikdN2Dtoi1GJWvkRavJo3+GFb7GtYwS/zMoJn/yU7ZVf09LRrkHGtQ9OHRyGyBrH1QQo7W5hNyAl7fRNAnqe6Q2WeNFFuiV6dM7ifqWup08xIMKlhxAeGTm4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:29 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:29 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 29/34] maple_tree: Introduce mas_prev_slot() interface Date: Tue, 25 Apr 2023 10:09:50 -0400 Message-Id: <20230425140955.3834476-30-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT2PR01CA0024.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:38::29) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: e73a2624-c676-4d7c-1466-08db4596f726 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5VpW36Zhzpec40RNopzK+43JtdMUir+8uOBT1HKteQcN+lkXcaTAe1Jr+fIZ2OkPmMB0ox8gk9+60o8Kco2dM9l8ZzuqDvlA/HtBLoc2MihSRw3lyGlg/I0DwYqL5Q6bEkBh3V6cjzJh8mVgt59VSHiNhFdy4ZQPaZ9biAUeVjpDfF+XVztQetUPjOxbxfAI+YlCWv+0lhxCz73768jODpIlhEKqG0LlQ/FLQiqImqOsM4A64fuyZ3IGf0r/JNRVInRkRgG0GqYA3bhm2RSAbktQGfWJw44gsTlJCeNK9vWoPFLtUEu05ejDzxzVSsDdCsPfUfZi/Jukc+pjKIa5Q2KgUoS2R9Zr6KZK901mETHCaNSkLC1DeLL9jndYM24efl4n83Bhvw6kEAraDR2lV2spngOc2lYpSndlTEzMtsrM2MzfMLkL7PZzx7Q+tpLmOqWmuBfBV+uBkspd1833KOBA8iMbqW75r7Lwt0CDccXiuzggDY5/U5H87GFCBQ+VSW2wLD0RiSpnb33ptT5qpbVCTQWF9izy/eII4u1zYO+1IkUGQT0Um1mLx+gIWLXw 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?z3Zv4eni6aaNqCt09KnOaqZSM9BCdlVd+Ex8GbyKyzCpYp+GaBORrjwGHei2?= =?us-ascii?Q?hTHi94/xnuDUF/vCt4Bab+/bqRcTuSmdPrg66WPEs1lYZNq0/2irAqOZw2xM?= =?us-ascii?Q?sCksUVyq3kAbkQT5aCfeKr0eCfdL9xeGFfCZNhjoZFFtg6yug+OoYbYOBvz/?= =?us-ascii?Q?zDe/RtS3Lq1naXu2l+IPGH6nnr/BJw/Wz70mxgoG0OGHurvzRPUXlOs+ydOn?= =?us-ascii?Q?72E2WYTWHcGuMvn8cGL1LzvjQ/6EzY2WCEx2ufkbk9zhbUz2kq+zGHX0Ch/p?= =?us-ascii?Q?Xv89bvOq0YDrzAgmvdvGkxlMdfoj65RMW175GjjBUum7NPdy7W4XLTXLQMbE?= =?us-ascii?Q?91SfMciZQ6tDw63f9fakWAyS8Y+2dBS+QiHNRkPGh8396wt6Ri3WP23UYxlT?= =?us-ascii?Q?59ydf9wWsJzOHjaKjANpzRzKotqXzLkYqR5X7enRbTUCZONiQnQkHCslUPph?= =?us-ascii?Q?M98XXc6MnvvG/GA6alsB/Okg+OATfvStOU57SRvKXfaOx1eP6J8Ix4AsNNDB?= =?us-ascii?Q?2IK+9MwRg+k8zDlU7LyMv44m9SvqxNZSbI2acYhU09MiiFVhQfGIpoxxn33F?= =?us-ascii?Q?maAEpiYd1a9LZ5nR9ylqqzasKyp9Fe3vr5WF80Bs6IGtWV/nah7QBAK4jMBD?= =?us-ascii?Q?CIR2qnL7zJ6kQ6Pnv1RAklnFzUeNuzpylJ9mX4oMe254iBxhmamvmJffrGA7?= =?us-ascii?Q?uPo18pE3IBJnN8JJGTpNVP+qhF9AhAIQOxNpBy+5cD/FFD20jZiSPYYSOruH?= =?us-ascii?Q?A7bvXaKn4Vxh/9JClSjaw6vxgqgURl8RpOrnxKy1zisE0s5psmay8ySRJFz1?= =?us-ascii?Q?UDuVkrh6jaqTbDmE8QX+Nhm/kr9Ed37blOdYAYnh8wxfj9TFrAQS46n0dyWE?= =?us-ascii?Q?UJIEb3AxjaOXIgxau03ryBJLpefUf4sO/pIkvnBCg6KBSrDf0lU1I2i8z7CI?= =?us-ascii?Q?8ZM9G6641nWyUczP8tEejxNF0ZFplOf/CB8ZCCe6WLoZFzSmmmy48mjSzvsw?= =?us-ascii?Q?T4dWS+QODoOUX9n13/n+dO/UalKtUr0JoAyQFRmLLsggKUnXlrldJoW8p2zP?= =?us-ascii?Q?FFsgBr9jyLCb3bAbKmqjH1IQdLFxd72040ZmwBHYICrPBWCy9FeSFl3awBG8?= =?us-ascii?Q?f0KL5Au/cQe5FZT9XZoeLkU7VkZfT4byYI1OIarbipZHSka9ylq78g+pLyVx?= =?us-ascii?Q?sQuICeByuljOuxCBsizb5XwLmgqDSyP9evVrzjI67iJEsuLdzfOGnGEF9ef5?= =?us-ascii?Q?62eaIUBb2TjSNu+gBFU/+9dDEQZZfJdiPdE0Ssiwxmq/YYYafmDw3HHRGuQK?= =?us-ascii?Q?FOKneCoZtxFgxAT0VxARcn0HkbQQB3u1uf1BZmArLGcml07rCR185tX723yh?= =?us-ascii?Q?ZvPD/3Itce9kbcaOzeKMAOYAbYl52lcYRalAcWaQFzX3A83XayNap9jeD2vl?= =?us-ascii?Q?GGgJVCOEGRqGa0uWffJ8f8r5I1o8707CNogtcdXagIi5W//ZiGb2DenAEizN?= =?us-ascii?Q?BHF0/rFSkvEj2946Xg9649LzNZysGT/4inmK2g46ZbMtVls9Zk91jHijZnYF?= =?us-ascii?Q?92sHgicBQjXgJlDX6WzRaGzWEtz+roUsEuu2d9YvPF+qTWobtSpik8XyloZK?= =?us-ascii?Q?hg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: efq4GwUnMOZtQ65lLeFEvexjjYGffu3eXDYWzgK4w52OzUC6+1V3N9N1KNKdjuErhDJwWSHtCpxnllOvSJkiq7BODMET2MRn2thwoFOR5Yrkz2oNbAhn/gvknDfIUdW8fmuOgTu3YpNAqLhdUqaCEWACth3BDjhJDtvqgILGhRfAkZJGmM8I0dQignzgN7o8tfRET0AtHcDFrTkydRuwDGIEi74atKnlTI/1dNl4ZUAiQTsrbvGpKFCzn5IQILq9F1COnxkaz/qBDU21t0LhTIg21gTiYqi02q1ZRnz7MHkw9tbh90mSv9pz9SZ6nZ4Hrxgp+bz4PvDnM2FgChW25lPboXIplIrUWpQlHJIQ3ZnYV8A+klteELR53glup2M3fzSmmAGwbsMqSJHvUAdOI192C7SWrjwhI3M+1QE1Ov/HzT4D6gx59zB6N0VM9sehAVB2sQDmLc+y8sROkbp4AeveoWufDjIWvL9rfU5MQsBe/q185mIn+gx/ab67EaWdwK1wjDKyloUJbxxXEce0pYGMYNb8xrK5hat0t3rBsnbzdvnQKeT7uuZ7uZ8UoWVj9YxjLVCmz6ow+sL9kNEyDnY5f18+5nLFPIegmGNfrXEGyxs5tQKBsyBKkbV0LxtxhAXIhtZLitoo+Kxdle/hAZe6YClQy3xsNHJMPwBCHYm0B/HZkjOumXY6Sl6uby2NNo81dlALzmJFIEAgisYvEja1sKNtk+iyuPfy3wwTua4GXM3EIYgzr1dU32BHldrhxtCtjx/4xV0bPnIKLUYFLKqqtYgsQDsoQ8bqyzF5i4jtsCJihnZYyvysh04iaqvmUQBFGfTazCUVsrSvtSqMmK7cMyV3oEAM6v+oVGdMNPyGV4h6QPPtv/Frevkv/JgH/Ao5nKsL0bIIsUCoqgVieA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e73a2624-c676-4d7c-1466-08db4596f726 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:29.8122 (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: u9FE2lq3YdVjZEus60R1urlrAHpoPvJdwDuFCKlIoBwKxCbMKQ8uXCwFTy1aOuKSAjkq7lQTpf7Fzr2WuYDJRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: yyV82fHQyKw0x2EgS-D7iU5jS3UIpNKH X-Proofpoint-GUID: yyV82fHQyKw0x2EgS-D7iU5jS3UIpNKH 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 | 217 ++++++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 127 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 7370d7c12fe3b..297d936321347 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4498,6 +4498,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. @@ -4515,13 +4534,15 @@ static inline int mas_prev_node(struct ma_state *ma= s, unsigned long min) 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); + 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 @@ -4530,11 +4551,11 @@ 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))) @@ -4543,12 +4564,10 @@ static inline int mas_prev_node(struct ma_state *ma= s, unsigned long min) mas->max =3D pivots[offset]; if (offset) mas->min =3D pivots[offset - 1] + 1; + if (unlikely(ma_dead_node(node))) return 1; =20 - if (mas->max < min) - goto no_entry_min; - while (level > 1) { level--; enode =3D mas_slot(mas, slots, offset); @@ -4569,9 +4588,6 @@ static inline int mas_prev_node(struct ma_state *mas,= unsigned long min) =20 if (offset < mt_pivots[mt]) mas->max =3D pivots[offset]; - - if (mas->max < min) - goto no_entry; } =20 mas->node =3D mas_slot(mas, slots, offset); @@ -4584,10 +4600,6 @@ static inline int mas_prev_node(struct ma_state *mas= , unsigned long min) =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; @@ -4596,6 +4608,62 @@ 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 + */ +void *mas_prev_slot(struct ma_state *mas, unsigned long min) +{ + 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); + 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; + } 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 mas_safe_min(mas, pivots, mas->offset); + 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; + + return entry; +} + /* * mas_next_node() - Get the next node at the same level in the tree. * @mas: The maple state @@ -4680,25 +4748,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 * @@ -4777,117 +4826,31 @@ static inline void *mas_next_entry(struct ma_state= *mas, unsigned long limit) if (mas->last >=3D limit) return NULL; =20 - entry =3D mas_next_slot_limit(mas, limit); + entry =3D mas_next_slot(mas, limit); if (entry) return entry; =20 if (mas_is_none(mas)) return NULL; =20 - return mas_next_slot_limit(mas, limit); -} - -/* - * 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; + return mas_next_slot(mas, limit); } =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) return NULL; =20 -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; - } + entry =3D mas_prev_slot(mas, min); + if (entry) + return entry; =20 - mas->offset++; - } + if (mas_is_none(mas)) + return NULL; =20 - mas->node =3D prev_enode; - mas->offset =3D prev_offset; - return NULL; + return mas_prev_slot(mas, min); } =20 /* --=20 2.39.2 From nobody Thu Feb 12 07:40:31 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 6BDF6C6FD18 for ; Tue, 25 Apr 2023 14:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234356AbjDYOOF (ORCPT ); Tue, 25 Apr 2023 10:14:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234374AbjDYOOA (ORCPT ); Tue, 25 Apr 2023 10:14:00 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E38C51547F for ; Tue, 25 Apr 2023 07:13:21 -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 33PDi2a1008719; Tue, 25 Apr 2023 14:11:34 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=bmSYkPqvnaVhYx4pD2rduyU9aD84b3mzvnm2w3DPPtE=; b=IidXUwE8YmdGl0fdrg5c/7jbYeFQtCa4+263h6INtHFTYbml8+Am1KIzppoVIF4Y9asO dVkKCcP5wsxuKSkVqIQjwLipFIcvJyIFdU4xhD6DN0QxLc29j6FwXuYIbx6bTmybUlDv jUBa7DGintogkl/0HCqDy1pKLMb4ErSh7CPtMvsQqL7HdEvQtoOq8Z0WlsqK2IoW64ne 16PI3yVEqPEnssqxdpST06DRk5M7gXO7oh0zgZ8de3C8kV97zCSkMNxsWGnsAjho72zj KiZ200zeMdcDANhUd/ev6bCjlf9PkGelSjJptOxikGvAPGggws1U56ZpZs5Zk5SPYgOf Gg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q460d5e7p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:34 +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 33PDbqwV013387; Tue, 25 Apr 2023 14:11:34 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2171.outbound.protection.outlook.com [104.47.59.171]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q46168f3e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSzV0xIbdRXR42kRAGNfHaBXU4pO6WTRNrr6KMpL1dRHrOAE+A7UzxNdi5M1yMWc47OsXMDugPFrziKBLmPba4DD9McrucikAFi9vFUqTPAIPLnF6RW7RNR3Xm3rhbZ/ItEh5G7mhhgUu2u3BI4JG00GcW+ZQ5aWamjdbHIfbrZuueLzT0GIfPkykSYd5BThT6AAftpTJJNbaKoicbrtmJK3FNyVAmYdWiwsYDz16AFDgxSCBp3svcxv90pY0tvnitwNEiDmvtlL2zAfrYNIOfWA+D76HqEhKbYIkFqSwy68g/PMlddMzfDA5FdlVenJ6lL2xjaLoJ5hIUz4UomHlQ== 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=bmSYkPqvnaVhYx4pD2rduyU9aD84b3mzvnm2w3DPPtE=; b=DKnRhQnY2VA7sH7ZKLVsl6E/c9GwS9UC2gdoDQZa7kkfUtfPtn7qS3GnT8TqLdYz9JSjN8L34dQzP2XuAmOz6J40vcPutlLG7gaNJBc55OquNVT9chH3eWruOEjYwWFQE5ZzsPVLr8S0DhLqFgwzQgBxwjAcjAnE0nslOtT6Zny/RVEyrdM7LNHr3Jw7mecjUy1q28wEKEHwK03IsXl2TtHU6jH6pZEtKurgCcFynwS7dGVnxqUftQ/d070r59RqVqqqHxcqpm0JasiyHY+1ElKlUQyCesHPNHfQ/z9DfjxX33G9LEJTHx3tZraWoxynobLl9uW2mbODAtWlb++YfA== 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=bmSYkPqvnaVhYx4pD2rduyU9aD84b3mzvnm2w3DPPtE=; b=KwWH1GQMrniSUDcG1pj14AhiUAgo9AetL+SCjcbEHfgeSMNugXslA7+sgxhzER+iUHQrHCWTyPQo2wmF1LhRrJoHb6jRqVOZ370s4IuuEhdkxh9xXYIS9EVyeXmueOQOiddlFScE5jTUZ5ULm1ap7k4w9TZtVrrX5rV6T/uZyuE= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:32 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:32 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 30/34] maple_tree: Fix comments for mas_next_entry() and mas_prev_entry() Date: Tue, 25 Apr 2023 10:09:51 -0400 Message-Id: <20230425140955.3834476-31-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0043.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b55d470-1da3-4151-aefa-08db4596f88b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UJ3yflsN0hQtib0jUvAetPlwu+JA81Gb2pDJYnJGB1r//TwDgNe+ca3aVpU/TDuQueRzGKdMjojZ+MBWJCdGDxJIrQn0Fh/orEhBH9WSWhDlH/LbYrZTYzBPQTm0Aav1yC7HHJKf/la6W6K39pWeiQDyw+e8f+IYH4KtuxmXKIGVJYoqoRHoRFXSJqZeKS9LnW0CiZd+/amHuN4QIoe1X/tineXGeJ0RmefMtJLJXR9zLCwFLiMDjikhqWObQ3+CEfyMbfokNLDFLqdTIsEm8S9KfXypIzV+No/1rk68YjdAm97EFdtZ6eqdhl0c/wesSKZHoUAmZuAyK7/EAzc+dVzgx4S7V4LcGsg9L6ygk5HaMNyYUlJoFzZ0Z7ictDDbJqEhHNprkYgGKPp/BCRXDtcqJqbEJ1o4nR7BtIOzGYJQR2bpZYFC48Cvui7REGR60MGyK0eMm6mT+L3cXHvizCdcBdZI8fQ7iYkI1HSOdYepWsVdUEuFE2xeT6xXJfdxvHEAEv1cHGSI0eYw97mEout52dSrlM2IOTWSE++4azHygdijn2sSRc18WEFvG1oF 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WJAcrmVj+y/ZynBoY+MvWbs67h4PhCQDyfzhP8nfeOLoBU14QfnQgIiqNKQ2?= =?us-ascii?Q?MvZlwKAw62BCMoVjg7DIYzKvyyfbox0rgU7TbdFMJtHxGh8mG0i1x/4v1EOb?= =?us-ascii?Q?6QJms766XJL4fZ7ma7iiJ3Vqp20mnXHL3yyGW2IXUN51+XEc42oMcHa4hLr+?= =?us-ascii?Q?/3/ftqM4POGbyhlPLzbhvun7LERJtOK2OEOliOrUoVa35T2VuMPsyudaqBbY?= =?us-ascii?Q?Ph3Eg7RcMP39h58MVuzwBZOYc0ybx6MUQSzZJdPt/CaEu6M80P1eGm+EktsC?= =?us-ascii?Q?A8AS61dcVlTPX/QE36GpTykyVwxpE67mZ6BcqfWILxjidFXYMp+sBl+GQKyZ?= =?us-ascii?Q?PvY1d2ZArVL9vA7WFwy8TghRPjlxPYdj3UF7JYfq/WWX/jVUi8A+HOXVOxRL?= =?us-ascii?Q?gvc7S8r+Y6460BtHrq4JZPcJOq67A7UvRMhkRcYwVmEZLRDbBltaBynmbhfT?= =?us-ascii?Q?YYSfxjQbssYUqDjRyHaiFLAR0TReBd1dzXCjafv0WDMIHjo4AL6ElfbL4ifO?= =?us-ascii?Q?xuj8a52ej8uk+HMXLbl/D4Vwe4O+c/9MIqKqBMJjmndWbeBBYVF/zraOChja?= =?us-ascii?Q?jYmbnudes9mtfjaGdB3Rw+cgBgFUtWMsDedm99vol6mke98QBJpMWATcm1If?= =?us-ascii?Q?M4/i4onpuT+V67v2WT9qQv/7m4vAkiLoeEVzT0s41yuUo7VuYNWREg6+50Jx?= =?us-ascii?Q?eJhvQlj26Tn1k/XVbZFdKpgoVRukZHy7VCDlEo0/hQDIek3NUbuJsWPBMNgx?= =?us-ascii?Q?GI+tYGoE8hmZhxWAKJp4vIctt/+LSlf+SRIPMGyiqq2bb61WPWbSZGoSihxs?= =?us-ascii?Q?F1KX/g0Ny3PHuEiPKiG8nQYLiHlTr+++XcQ08H4XQxwnV/FYzdScfJObJUg5?= =?us-ascii?Q?6OpavF7b4VoOH0IEFUBX/qR06hCjKLnO+Rv1+hXsV7y6Toh+UI7DvpPBbNeb?= =?us-ascii?Q?S6bvkZwb9mOy9DVolpZNW0VbfrFffRYRTdsZBRTG0+pCCYlnLfxDQVYdxanI?= =?us-ascii?Q?oykoN/Zm3gpLaIsHYuRpJzl5lntMfKK/qv1I3tyxWMefo9ni/92SQnu8brtY?= =?us-ascii?Q?Llztz2BiHvcuysxyPui0RYL39/tVcDBF+Dwu/5tBMT6/GZ+DIth4tHFXqceN?= =?us-ascii?Q?cUk5OGf8pMXKZ4koHD5w+Oh98YAgg5a5FIfbWm3YqArnSWYm/o7nylncCDh7?= =?us-ascii?Q?TFlx4rrzOqCu14sEC+hK0Sr/XjiwsqfTBV+myhxRuqFHZM6KfDjsJumT8tNY?= =?us-ascii?Q?7X7QoKPHljJwdMvpXeQtOdZBmSpNSBrPqfTly14zHO8j9yxlM48SM6hrxUFd?= =?us-ascii?Q?LtvdnpFhbaLDi+Zu96NSg/puRcf18K5OU1GAyE81y6TFjjNCb31SVTLjq6Pq?= =?us-ascii?Q?U50l6tZpWTa7MsTZC3Fq760XdcoROeMjA038prdPTDtXI9/8P8WLXlzw3REN?= =?us-ascii?Q?+tjkAZWrxOsuTceYc3T/MMfL3AR5DQA9iwRsvxzomYgFP+c7MQPU3Jzi0vF+?= =?us-ascii?Q?xQMKddC8Dz70L7L3MXa4K+KGOM67QMSNe49kAOWUxNpfesIT2Zdeb8YisYrq?= =?us-ascii?Q?05z1MdU7Y6x5kuEGhVZxNyz/afP0yDilQaoukHBuartjaihnx4sYf490H97V?= =?us-ascii?Q?ag=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3Hn4KpGMNiuGzwP8j1I1iDPUZFc0KkMNMYjG6V2SdyKbai6IMlUgsrq0XI7wfQGwp9UySNnV+MIUdgdPBBkLboeiRaupWy8zpHCkOmk4QVv11uCBaic6+MA7ysyCCqAUeDDBKrD7nQxoKQazx4v018sRoR7nVhr2hFUP9xHG6/fNZzghfh5PRjiJwNIAm0y7fI7/iodDe4Rd0x+tZKy19UAkBlE+eSvPaZODfcJo1iX/dt+p9IhC2ZtNVqwCdUBch1vnSqRMj4RiAScaZFqFwDn9ThSfTrSsCM8ZqU+RG574jZruAdIR5H3u14Q/yLRLkOW826a2oozqpocjUmK5DN8d99hjf/CUMj+g/qLzI2peBx14j1pykVIif9QZ3zwgNaWgZPxl79FhOEsA3DZ2LU2BfYJtU769e8UXG1zJgwaYMyCk5RHjQtZ3+egxb4fqRHkLFQbPsNVL0vzeLXLyTjtVh8lq0DY+jEEJztM3gWE2dA+qRIE0bKPEDLvaxIv35kxsQGiPUXqsWv7xh/Y6uANuaTw2p7VFDR2Vx05FuJu6P7mP1F4+eV5DXZZyZ1mqaRDzF6/eXMWIM8TMS0B/FYJRnGu86AqMejZYFADLqSZoX4V2HuVnjXmveeXCMCZtsTthH4eVgAEupPVJmuX2FmS3oHXLY2gFvFdDrInNfHZRR7eJKBeh1Zc9M0FgK1yBSB0H7FQnNegy2DI8eWnF84WRFF7R0564E5jWM+iJbSK9ya6921vZbJiNPXiFF7auUg6ihh+jclhMbGKq8mv90m3i0zk0YfMdfuJP9H75LC/VuPGXIAxprVeSoX4aV1XWDXzXSLZ4UtRgmTAP8XgScrHAikVz/iBOjgpSmLS8y2aHp60qBTicj+Pv0ptQs09AOdoNU6ICEY+fzG1XnCNHbQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b55d470-1da3-4151-aefa-08db4596f88b X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:32.1053 (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: CnjflXOc4C25tq6tjN/BFIoSN/0fRO+c70HN69fwSUZfsBOfwan6oD04QQ2BW8qasw0hZqlnbjE+Sm19D2VNCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 phishscore=0 adultscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: Q82MKt_jneol0Q4HlIiFu8b2jdiDyytc X-Proofpoint-ORIG-GUID: Q82MKt_jneol0Q4HlIiFu8b2jdiDyytc Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 297d936321347..377b57bbe6b9b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4814,7 +4814,7 @@ void *mas_next_slot(struct ma_state *mas, unsigned lo= ng max) * * Set the @mas->node to the next entry and the range_start to * the beginning value for the entry. Does not check beyond @limit. - * Sets @mas->index and @mas->last to the limit if it is hit. + * Sets @mas->index and @mas->last to the limit if it is within the limit. * Restarts on dead nodes. * * Return: the next entry or %NULL. @@ -4836,21 +4836,33 @@ static inline void *mas_next_entry(struct ma_state = *mas, unsigned long limit) return mas_next_slot(mas, limit); } =20 -static inline void *mas_prev_entry(struct ma_state *mas, unsigned long min) +/* + * mas_prev_entry() - Internal function to get the previous entry. + * @mas: The maple state + * @limit: The minimum range start. + * + * Set the @mas->node to the previous entry and the range_start to + * the beginning value for the entry. Does not check beyond @limit. + * Sets @mas->index and @mas->last to the limit if it is within the limit. + * Restarts on dead nodes. + * + * Return: the next entry or %NULL. + */ +static inline void *mas_prev_entry(struct ma_state *mas, unsigned long lim= it) { void *entry; =20 - if (mas->index < min) + if (mas->index < limit) return NULL; =20 - entry =3D mas_prev_slot(mas, min); + entry =3D mas_prev_slot(mas, limit); if (entry) return entry; =20 if (mas_is_none(mas)) return NULL; =20 - return mas_prev_slot(mas, min); + return mas_prev_slot(mas, limit); } =20 /* --=20 2.39.2 From nobody Thu Feb 12 07:40:31 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 A2565C77B61 for ; Tue, 25 Apr 2023 14:14:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234329AbjDYOO1 (ORCPT ); Tue, 25 Apr 2023 10:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234469AbjDYOOV (ORCPT ); Tue, 25 Apr 2023 10:14:21 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54843B1 for ; Tue, 25 Apr 2023 07:13:43 -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 33PDiZb5006059; Tue, 25 Apr 2023 14:11:38 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=Cwe2E6An3ilIZZ99/IBBEa89cMtvEgGITgAPgWQCdgw=; b=LR9i+Aorzu4QSjLjC3Rdjg7fTF1M4tD2gMlWCPtULkgjDJcYf7OjVXUHT5eIytUkSzO5 tVnYI5hA0wzV1cGQFeF3HfSe8BjWcWZZU5ZUte0JivfMhJT7s3AL/YnioPWIbP7Zv2gK j0RNbjdPeQYvIOhnL5HT93GSScc1fbGN/AE4ETYijQdXBA+s6yaqwuTFXZ+7fb+l403h UTCU+LUjsXLWU3SqGNXrV00GCjr+08zeFYsusfM4TTK7Rx9IIgaavQoMCAHpEjdvtc6V CB4xXLOt+jjUOvQl+LVvNEKE26TWgNHJtQFBMTXqBZHRQc1f+JXTWXzKb2/MPPLABGv9 kQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgpg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:37 +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 33PDalUR025010; Tue, 25 Apr 2023 14:11:36 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2175.outbound.protection.outlook.com [104.47.59.175]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q461crdd0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=glsvj7ZzWMCF865BrFcYWMDvxlsL1tHMUJ8lr0GK/XKrypvuhUT3aSEpXNqQRUaVeXZF+AwpnFHFbURSNzMkD7h1yYZ6sTDj/chkpCRy3cRr2B6WbuqLiUqbrrkCZWJvt6admIbgluv2s18K2c3qeGokCdNCtsaF0w+CDNA4D1MoyKRtujh0Th0i2JmHAGYl5NCFUXvqJlrJlq2KZ4SZQ9SU/Ytx3xUNfryNo3uQe1Y66VO8aMqammNAiS4qCel3L0ixDXnaKVpHogYmFNJ7W7f5KQVBc1ykTsBeQT31YVqShR/1nL2VA+sQWy7nwaC4QM9ge94Rq6YQ/UtLBXbJxw== 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=Cwe2E6An3ilIZZ99/IBBEa89cMtvEgGITgAPgWQCdgw=; b=FaUwWMhyhDO6liEAri1wt60hitmffEd8tENgVWh7fp6FfSrBUrnIz9AAVB+K4TJ0Dfrrf2Hg4ya1DDlqJAnqD/pyswvSn7a56mAG64U3YZZqgJ0GUvVB6LaVtZbb21rqH/KGqKhjlfpTlE54D4Ps8qjKGq927+NUH+tvi3DvmNbdILAxWi+YL6fHSQAO9tUW2+AxTPOUqfprRJ0giLnIVp0lVzHOl15006oqF8g0RpKfCl4dFkvC0wLhfQ0FVqawphvvXEQxVD/oxxWUrgK+8fidBG9Qjdty6ArHuZfX8ysmqW5YyUjIY1HXLkVgV74L9u9bTpGgAbdtaHDS5G5piQ== 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=Cwe2E6An3ilIZZ99/IBBEa89cMtvEgGITgAPgWQCdgw=; b=wfqeQ/5dibdZtJ0b44JHqdVV4A76dgyZ0WlRJ7H6Kl4Sypz25wzLc6ZDm11QPGgwM8j36HHN7E7MCOPT3Ijjzee2Zue0ELoLQEeLiZvggpuezKA7YsxpX1wjQ687YmGzkJ4HMrGC+K6S/veX6IGxExoD9ZmC/Zy6H250pJFk5Lc= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:34 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:34 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 31/34] maple_tree: Add mas_next_range() and mas_find_range() interfaces Date: Tue, 25 Apr 2023 10:09:52 -0400 Message-Id: <20230425140955.3834476-32-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0058.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: b6afc938-be71-4b15-d6b4-08db4596f9bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GtuSP45pr6UEZg5Hgw84rM5Kd7NFy+KoljiH5uzJy0ENqKifh81214k6K/XZi7q4snfBSDdJ2i0RUft448fa3vERyfiX6hnAD6f+ECMZY+FMIPv+MFXxUovfpdypcIxDZVV44izWFR2PL17RrQAr4UpOsQvyCQ+mkf1ujNoAHXnuy7hjGddisE3ocKjqeUM3Sxr7y6ABsn7yk+OK1hDmAnDHGGnkFQ46VXZxuMclyWPs7DUQWzjIg+8YG9IcY/cg6JuzZLLZXs9qJb3EZje2pRFYOxm36VkvhXLrxwD7a7M/KGC83v79WNF6bja8mGA+upXcosW1fUQsP1b7nDZIlFVMxeGpk0q7Hw3uFrTynLeoEB0gd0YkDfN2iHXO1Aq6IGLJwJwlqSFGDg6v+PzTF6c09SVpF3GfRqI01US4tgKUQIffpFnkIEmEqZMaf0Xj3osxcw9guHbl+kI6ZiUmDwmRHNQVidUIRsqeeEoYRz04guLWjRaq6ABIlZ0FK70givyx0XrJpC08D+5OtXUTzR4K+KU63qbWZAMKoQkkNvtQ3pLVEcbuFmq1N7OqULZd 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HG1JfSQDdLYL7wPgzuhLWVHWqQysaBACWe7Nsnb2qgy4459P2kpJnKS1GOPh?= =?us-ascii?Q?bqZZwobQerkTFtleKBqT178BOA/X9iY/LItCmgUCRoaUS8eaH3UhJpW2q7Hi?= =?us-ascii?Q?Zl6tR8jq1Sk1OiNJCszRi8H9j4i7xro7rybPXGTU+Av2sqfIWaHDEDNhVmCe?= =?us-ascii?Q?QqRUwwLSPrLka/2WnjBKvGbdoMQ2eNDmxwfxDMCqHnJcNIjqm+VD3BlRg5vM?= =?us-ascii?Q?DkYjxdPgw4Y1dcgnzPJbRgikJN/dGd29O0cCUPpoU/wW6dyNEOcJpYrsLV+N?= =?us-ascii?Q?iPKMPtthlAa+p/0ZoRrRgz3a/C7n2oAdTLjIjBuJ9vMmo5KBEafDuWdpXkI+?= =?us-ascii?Q?N8/hgY7BMFJeRQXOe69x2zy4KiUgqU9jFLngIYnP1XZlw7x7yEmuTaGja1bA?= =?us-ascii?Q?i01QQtjBRgoC3/ja15RWVsLgzPtgQUKUXo/gHfRmA+nNE4Ym243Ffa1rl098?= =?us-ascii?Q?wGLtIh/NbY1VJDey2Wig8phb8HSougk0QUBQhOqast52CRI7CnsVlthteEVk?= =?us-ascii?Q?heIGk9cswbaoUSEtLWZU/Q4aGpmymeNi0qMOrnhl+Af8YryVYGCCOxZ50B2o?= =?us-ascii?Q?UAQAjjL3vWMBnpNRIztulLRynDhV7VAT/nEDfE0fD+u5p3N4o4lM9mPW1OYy?= =?us-ascii?Q?GYZ+JfN7Y7bV5ywQs/iKm1AbOQaWnzH/1cCiZAAx+SC9jTL39byn3btMQhKn?= =?us-ascii?Q?ucLVLt7qc13xcne6NP9fWK/8goKaO6yUtp35cgq2xE643NzopSl5crti9+X4?= =?us-ascii?Q?TygvQPCBvbcDL7Km5xpJ+ZrmYwTL7U5OWs+b3LP9u0CIELbQ4PgbB2MwkvwG?= =?us-ascii?Q?GDuIKQl10tSQgYHELW/DHx6Jfj0mwzpRB5piA5cOknLxbVL5EJQhYA37e0A+?= =?us-ascii?Q?vzBM5AUiNmQPIYel4nL6s9HSLIZ7alFBe+/Ksou5V29uQqZ0R8Z24XBU9Ztu?= =?us-ascii?Q?7TeDR10For1xiCkLDV/idBEAjdVEsxZ27TD1HD8WS8dFKxUH28mq/DQJ2U4h?= =?us-ascii?Q?mFJWnt28etaTx8BsG/+q6vMgFZwSJFG/HpJxAIEgDv3gtIFzMckwLinRM/WI?= =?us-ascii?Q?AfXnaPLkMoFUUpfEVHOWC1u3bMKBSGAJK/XUMy+zo9CfBMUtcdzgVRSSqMtq?= =?us-ascii?Q?1YVH8UkF1JXt+TAr9m1Nyjtoqnoop2wmPkvLlrX8MJojkyAS/DxaA0TuCANv?= =?us-ascii?Q?H7ZJthMsZ6ima2qduhLqeLmSEXow7ewofzAYptgHxjj0sdMmvAUTk7NpmshB?= =?us-ascii?Q?RrmApyrTLq2PmHy7uUoCHo8oWAUuVXPQCcMaNnTr09nTgi2MTK0jlxLqfLbO?= =?us-ascii?Q?xO4zq4gXS63a1Ily05bG6mNIpna23yYy4LXuXa5yBxMfTarWaaUJVD/pVdFi?= =?us-ascii?Q?etUi4pIzKjFKES5dbFO6rhnAs2l6CfuM16QdZEBIP69PNgPQLWmVVIuCdH4C?= =?us-ascii?Q?tBvutJcy7btG/1Us9E8SNF7MXdPt0PNcVpHwRvcYZymyP19FBtFJe3L9ifzh?= =?us-ascii?Q?LIMU5A0Qs9jE6lhzFphfG98GaRqzYdjLI6n/I/DIGkgt5am1X/s8SyDNcV+p?= =?us-ascii?Q?5jV+uXxMjgqtXtwMRE2dvPyO/i5gGW0gy3W3B3tSOMxz3kBt/7SUGeoohsPU?= =?us-ascii?Q?xw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: utSP+mPRwwgwjisM+ek0do9z3BRQD5H51iajqe+9ihvp44GhEoK/gVT58o3/XRKZZB3uJg2gHPXS4EML1r8TSWqz4rCA/mx7u0SrpA3J+9lGrDAmBOo/Nu3/6gX03DQEzHFGGyTFAahmhauXqF6s8NVAE93UO2sRmZ890h9OU9vASp6hW4jojDX/gAdv0OFZxrohBRoQIMgGgf1hivdRJRKk7YU9a/+vkX5S0mvMvuWKkco5Y6wrY6YMYE0EtYc4/5mhmu4ecFiNI9F05HWOuFZGRXUw/pjY5fGfaKUyJsW40ZfKP0tlff4vp+yRn49N0JU/xLrW0vgz0UkuERJILY+btErS2YIQ0aTMZD6zvIyyMeB1olKYXOHqhdF+n9kw843PzhT3m0ibLLfg5UXXds27Pfl3dw5+c01JPDxyZmUMAdlsvyiTywKl92UA+BWv0K9tiXdh6JFidRNXlSEjZHBs7bybTgiL9AVihI7AI5yvl//RAgVUEfX5DNf6ChuHE771UKRbeBkhvsow7f7j6+B0eVikOoxm7iAMB8fEZW6cQEOhxmJSByeoquXaXAW7l0OPtNYjbkAhcPNTM2D/tnf/eUPiBMqXDZgljnxit+AT4rRarzETC54XpzGuoykMK2H0Kv/NnQoS20gjyHt/N0V5v+ENHmTzRcjp5gLLNhegZviAh3nrTaaQbS0geH852sjURMiU2i90KQQNdeVPDnXfsjSsf4xk4lsR50VgWH++YWOHKqgTRgUiu0irRmp8tpUxru+ohsnNHMWq3UlEckOd9BEf4C0Vi1bhboEjE266naRhUN9l/rwY6lmhHDxtakww7+q89525LCpSUrWG7CjYQToQWlHRPvvavi5iVYQ2h9owWA+dpcuS723F1g3lFRf/uTwb1mUFPl6kcCiGNg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6afc938-be71-4b15-d6b4-08db4596f9bc X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:34.1551 (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: Ndwc0dttlEvf0UkjAZ5Tx+uvDQLv/JWkyauggXCeeBgP1p1UB8ugJj6+4RHKMlbbKQDd95xopbYTPnm2EfMIZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: EIKEmd8HKhYWBO8pQTV797H4zd_xmm_t X-Proofpoint-GUID: EIKEmd8HKhYWBO8pQTV797H4zd_xmm_t 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 | 14 ++++ lib/maple_tree.c | 148 +++++++++++++++++++++++++++---------- 2 files changed, 125 insertions(+), 37 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index ed92abf4c1fb5..1fe19a9097462 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -467,6 +467,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,6 +529,19 @@ 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_contiguous() - Iterate over a contiguous range of the maple tree. + * @__mas: Maple Tree operation state (maple_state) + * @__entry: Entry retrieved from the tree + * @__max: maximum index to retrieve from the tree + * + * When returned, mas->index and mas->last will hold the entire range of t= he + * entry. The loop will terminate on the first NULL encountered. + * + * Note: may return the zero entry. + */ +#define mas_contiguous(__mas, __entry, __max) \ + while (((__entry) =3D mas_find_range((__mas), (__max))) !=3D NULL) =20 /** * mas_set_range() - Set up Maple Tree operation state for a different ind= ex. diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 377b57bbe6b9b..137638cd95fc2 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5847,18 +5847,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 @@ -5871,19 +5861,63 @@ void *mas_next(struct ma_state *mas, unsigned long = max) if (mas_is_ptr(mas)) { if (was_none && mas->index =3D=3D 0) { mas->index =3D mas->last =3D 0; - return mas_root(mas); + *entry =3D mas_root(mas); + return true; } mas->index =3D 1; mas->last =3D ULONG_MAX; mas->node =3D MAS_NONE; - return NULL; + 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; =20 /* Retries on dead nodes handled by mas_next_entry */ return mas_next_entry(mas, max); } 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); +} +EXPORT_SYMBOL_GPL(mas_next_range); + /** * mt_next() - get the next value in the maple tree * @mt: The maple tree @@ -5993,22 +6027,18 @@ 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: The maple state - * @max: The maximum value to check. + * mas_find_setup() - Internal function to set up mas_find*(). * - * 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. + * 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; @@ -6016,7 +6046,7 @@ void *mas_find(struct ma_state *mas, unsigned long ma= x) =20 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; @@ -6028,14 +6058,12 @@ void *mas_find(struct ma_state *mas, unsigned long = max) =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 @@ -6043,23 +6071,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_entry */ - return mas_next_entry(mas, max); + 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_entry */ + return mas_next_entry(mas, max); } 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_entry */ + return mas_next_slot(mas, max); +} +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 Thu Feb 12 07:40:31 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 87FD1C77B61 for ; Tue, 25 Apr 2023 14:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234434AbjDYOOH (ORCPT ); Tue, 25 Apr 2023 10:14:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234368AbjDYOOC (ORCPT ); Tue, 25 Apr 2023 10:14:02 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5326816193 for ; Tue, 25 Apr 2023 07:13:22 -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 33PDhpDJ001851; Tue, 25 Apr 2023 14:11: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=iKKn9jpp9wDQXc/pAc6us+ZOVLDwMdFNQWGi7o0zXuQ=; b=0WuAjC6NcX/tDiIOb06wWRpnbSAXWDFgfW52of2VYCKiDXqX8pL7nP4/v0qMDEn/Cpck kosVzk9gK11Rwk/sQZzN8gKXrzOQmISPVNHrgSZcJEpo+PH6gAdSHnswvEdgUt2XxTf9 4TsHuCvUpQlUGy+17AythpQkdePcjT1LMBCokcVcwPc/eAJXgKMY/XZr4ZE+mIucXhxQ DaOR/yOs2K2/g/h2nc+13xPJFuhydSlQp255GMzvz2rWvA9a7BUz9sXgAbqZsrgoXHrq MsUu+nSNdpjBFDoXjRVw2JJi49Bwq7BqPFji/1HXj276h9SyW8uZCam9QBvYOymJ3rec 5A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q47mcwffa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11: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 33PD909b007380; Tue, 25 Apr 2023 14:11:38 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2175.outbound.protection.outlook.com [104.47.59.175]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gf25-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lCdEeb/T+7Xpx/LeQ3xXosidA2QHQW3IybPeIRX/A96SQUq4E/ZijyDkVD2xhFz5r+ToCfzWio2DasB+ygzAmpktMJtGSuIXSNR/wHSTIYVtxUzTG9ItxV5zg6AJc9W8FQ/dIxCS4XPPsFc1u6wllJtce6IYR8C2dpk7OR4cM/JVGxoUeV2xNk0PL8FjAwf1+r/P7S1ZIWXvtRbGLHBEvU8QGdAzLMRKtWMX/PaGyEprGivjrfAV9j/Xes0i0Pt8U9uHaET/fsvgjFPq0Z6m0cW4wOYO1VN00XdO1j+CfyCuiHCxkUYW8JfRD4C6NqVAR2NMXMpHfN7ROe3dtRgqGQ== 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=iKKn9jpp9wDQXc/pAc6us+ZOVLDwMdFNQWGi7o0zXuQ=; b=TDDVU0vkb0uGzymsjHIa/Rzq1shxjIOSyJjFvh2VcqgDLsrX1zTAHr235CqtpKymADMVPpc7QNVYl1anvqKSvUTxHnS8vja/o6OegivdrK2JwmqZP3gjVsOairlbp3UL1cryLzLTxVb5E/G66tF1sRjJp5avysB58sUSvVQ7Rs3G5OKeuNCP6PsxKwz0FgLyPDsIH4PSYO8ZU8JDaz6b1hfhN5eWLWgAm8NNOgFU3uaVzEu6ycFBMVMVBMLC5sKqKhpJjpiOoa2CHmhHezbwfZ9KDLgzlS2aoQvpPl2/tUUF23cnFbnQ3a+NTM7xf1tiN86n2p/W2JWwl3M/eQI4hQ== 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=iKKn9jpp9wDQXc/pAc6us+ZOVLDwMdFNQWGi7o0zXuQ=; b=FdWzxGkeBEAIrWdzAOBn64ux3aqpoMpP+sHVvuv7C51xPveNMPTrXdDSZT8jkZHf22ER3JZBSDL8UO9OHXQK83Ls/bqyySVH/psRotoqPfmxzAazTrZKdbf06j2cCOfq6h15puT66y7kpSxy3g8GsgOixFoPdVZi7+P3/vFdKb8= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:36 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:36 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 32/34] maple_tree: Add mas_prev_range() and mas_find_range_rev interface Date: Tue, 25 Apr 2023 10:09:53 -0400 Message-Id: <20230425140955.3834476-33-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0371.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fd::20) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b816514-4344-431e-5eb8-08db4596fb0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LmZsL8axCvXwODMKH928AQr8MujmXuBMH8CBVffkW2se6Zuls2e0MY9DaS06YRu4KmaqCF2fyTVw5MmNa0U5HSAa30ymwY7ZZNx++RFn9OzSUZ+ii+bUgC7+i7MZQl9hF52SCirbzcMZsRqH3Q4d3e9NxB9LIy1/pp6KqGhQFlT5472QHxSLBe96MV1w6MH871w/9YZp2m7Ijyuwydk34Me6hiFiy4c5pPP79NTs1yuwPj1AMvfWG9V+UDNeP2jsjxGL2PKd1gviDpQwT9R67U/eKTidHkW0brVL8d9Aot98mb+4QpLDexBXIHdNfjoem4r8kjyMwt+xdK3FF/u+94oWWcM4X55eDLJIg3VhwEY8ZtvYLMpD0tO5Hl59dyqXcGePlVuydEIS8EhQxFXFCozNOn2na9F8GXsD/6ONNL6DVprs5o7Cbntko40t4T8pVq4Q5qBfoDZB53LXf39IHlfEwg9rFE+uJik14GNVzg4z0dobs7bkp6ChIVTyXYA2xX6by41Bb6A7QugjGqGDL/MJyC98OP8KvclB9o/i7RgLrD98JFsB4Eg4b3clbpDZ 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5PvYoXL9yWwIvFLR1yxE0Ym96pWkjpFJLsG6C2P0VfJ8G3J8o1CktgiWqzUo?= =?us-ascii?Q?fr0q5XZ44u0XNolVle23RTYXW2LkaOojL9OOvtPbWQxPpWADDxZgqhHG1v/B?= =?us-ascii?Q?V3hbsZzdToDveyUydjD0gXraMNGIWSOcn0NYksq3Rwf1NbLm2fL8qs+BprmC?= =?us-ascii?Q?TH3ZHME0K/IT2I06nJRbfzfVlgEwCt/ityaK7WZjZCxz5Xso7lFUHF4DCXzR?= =?us-ascii?Q?UiJh/8G0cLBuH9JkjLxX3Hlm9nby6DDQWcJsdziL7DE6VsCOG1fUQiG8+tU/?= =?us-ascii?Q?8K9+z5zfhB0G6HBxlUJq++y7VYW265Ph5ZeEUAuukMTIL12+xkhlkhUqj58a?= =?us-ascii?Q?f9yzJFLOitmeFiG3JFXrO5d1oF8U0tfShGebL31hDM2SzIVlgRTzNcmaSlG6?= =?us-ascii?Q?36B3vin0GZhu48s75HPAw4WoZia66SaBKazSjAds5uwfBdO2lgroTlxfyIuH?= =?us-ascii?Q?zPKg+t+Odke7d67/CCdbPuBtoyK4wHHHZa5fQkIkNOCp0zJ8rikESiSPkryQ?= =?us-ascii?Q?SYSM4LinWi9DLc13gI0Xfwy93dAzC8XE5xx7Stj6qiyuAQxBh/ONGyv+gU0H?= =?us-ascii?Q?eW0udcpZWXjvCX61NZYPvhT6AY7iKyCF6irZHYbtxHERvD+ymw41oFXehffJ?= =?us-ascii?Q?6QItY51ZqW7XfAiFF6KDP0AEHKerA7lYhj2yeYPBEVLN3aVIlBU2Wl6FxOfK?= =?us-ascii?Q?/i+vMvm2ZWxdRSZAPdj0k9iAB8RM9wVcxbYYFeDksMG8vwZrRy+m4OxUeZHu?= =?us-ascii?Q?4UVAMmpHmXK4LLzrWezQ3YVqeY2YqsA9V783eih1ifrmAx/IO25hpWyjPn9v?= =?us-ascii?Q?nQ5detpxfg2aeus27ow28mDzNDNTTAxj3d85Vv4tE/OlFq9JJayl/grRT+iI?= =?us-ascii?Q?ccRC2PIrCp4pNN6pKJUNW9KY1YM2zRNVCYlXo7c7CgtXAT3I56Se4GHxhHmW?= =?us-ascii?Q?BVEmZ881j86DVYzrMXZPXPxih1j97mghQT6ARYXjhD4Gas6vlCsLQN4PdgYL?= =?us-ascii?Q?cym493nPGKOGdPyeGvbgmxjTq1suQ1bTpTo5JfY9Q5k2oo7RReqgNPHyMAH6?= =?us-ascii?Q?Je059RCPhl0EQVwtFG8fvZTtgM8ttGYoAZxbXOyTgN+l6R2Md2adYIGuuLoj?= =?us-ascii?Q?MthNLdGjdAjy6D6ZRXvffbguA/FHTWVUenNBlFH6GC4sHGYRr2SqzrAYYXnh?= =?us-ascii?Q?HwuSW9PgYHHohqCke7RnuimNuiWH1fJnEb9v4oyhyXQKl5D/9uqXRwvGvR0K?= =?us-ascii?Q?4PiQJH4dGIwGo7k1K5zWB3pmg37X/EWPHOHyD+MiLJgku7SoVstjgDuk+P1y?= =?us-ascii?Q?Fr3GrN65LFqqNC2vEeXnoWIDmzJ1bgrxlRrXwMkrt3vlHs6LnyxZbFN+0ewa?= =?us-ascii?Q?R6Nd+fCrGSx/npXQvKU/ihAILKZrOisD8r/JFsR/TSGYfC0p/EPbjI6tnBdg?= =?us-ascii?Q?yc7gY2vvlQQv6g7sdiIhx4FTx3je8eO9K86IBMm7UVs1rJ296jo69xIXQft2?= =?us-ascii?Q?j1XfsAP4Zeq34Ok6wbDP/nSfz4ukbcFCcYp5fW/LKls+ngPpBeWpKNvdYJ6w?= =?us-ascii?Q?LQRiRSZx1tcPpUDh38cTG72nNrwgzgJEM4GhjDWYvtvj0ysNcPXNZyx08V+D?= =?us-ascii?Q?+g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xb/WV7x+wAXMTfu6SdEqfs/6M7W82kn8QewPaUskimyyg+3TMeRJl8gh45hUiqvSB8orxgAmrYM4lOpnX5UFH4CjJSbvTMBQVH3PV8ShjXzTYwNYG6sQ2NXzBIhh0TCcMdZ0tXfWiYbNXUlUDxSfNWHm00FxhzAoJ9zlcF4WPOrIOurb1DPu4EX+Z58ouz0w4BhleieARGzX3rfAjFEjbQglebrxIiOAFmkQBnw03gTjnzQd0wtbm14F3iXtQvFePq4ggnwtuATrhRYNSGVXsn6M4FBVkQuaP6AgjlLvTxQHeGY2Pk/Ewa2GIKiG9y4YGa3MhKoumP27x+ldTAHGNKVopOBdpzQcnIxDP2nuMD9HbamR0XtZFeFGWP/D4Au7WCD31L9iJex3vJhj8giKeKKDzqpoQkzF+659mrdnsStA2qupQhccRmcdKJC3oE+xIKPZuAcThr7qytagOS9z6nzhFh+WCzRAHr7XXjgugSY3bZjhllONPxcT7scC61MLkTgtjPNIvGLevh5euMxgLdt8qlnyPY191esLsZV2IuPwSXWY8+MSTFMclpZSUHtbel3a4dhD9KQ+oI3oeP9q3lT+5zV/Y0MingZH5kzGQUO6MI6QJTSQ89WP9IQ7Sm5xeDdh6r8+JnRXt/25LItXaylWbuRSeXtGbY0+GeURQeOrrOsDl4bjKxUMMpj/6HPaY3tK+8Ms2P0BhEMvrTTqmb43hq6n9ohFWQ0318xMvBrO2mOx+RaxkZkark23bgbqn1EbcPSrv1B+QV7rSynTKzEYu4E9M6FDHBgECVbf3VCXItnvMeXL31EmPr7Y1gyc+erO22tvTHZqDWpNIxaDt6quGXI6cJbhNtLPuHMkHdRijj4hTzm8K0QuuJwHjz2aFR8GkWaJLiQgii6MH140ew== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b816514-4344-431e-5eb8-08db4596fb0f X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:36.3634 (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: I7uqp+UdEH9ZvTY1PI6KqRNiPRYrSan5DN6iDEcAMCqTElZ9iFLtbFzpXC8IAZZQ9mnkDltOqp79pC+CHbXfJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: Y7SibdWNp3_ZxG2DRWxichY3XbQXJoie X-Proofpoint-ORIG-GUID: Y7SibdWNp3_ZxG2DRWxichY3XbQXJoie 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. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 1 + lib/maple_tree.c | 163 ++++++++++++++++++++++++++++--------- 2 files changed, 124 insertions(+), 40 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 1fe19a9097462..bddced4ec7f2c 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -466,6 +466,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 137638cd95fc2..04b73499baffa 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4852,7 +4852,7 @@ static inline void *mas_prev_entry(struct ma_state *m= as, unsigned long limit) { void *entry; =20 - if (mas->index < limit) + if (mas->index <=3D limit) return NULL; =20 entry =3D mas_prev_slot(mas, limit); @@ -5938,18 +5938,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; @@ -5967,7 +5957,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)) { @@ -5975,18 +5966,65 @@ 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_entry(mas, min); + + 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_entry(mas, min); } 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); +} +EXPORT_SYMBOL_GPL(mas_prev_slot); + + /** * mt_prev() - get the previous value in the maple tree * @mt: The maple tree @@ -6134,21 +6172,17 @@ 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: The maple state - * @min: The minimum value to check. + * mas_find_rev_setup() - Internal function to set up mas_find_*_rev() * - * 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. + * 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; @@ -6160,7 +6194,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; @@ -6168,14 +6202,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))) { @@ -6189,22 +6221,73 @@ 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_entry */ - return mas_prev_entry(mas, min); + 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_entry */ + return mas_prev_entry(mas, min); + } 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); +} +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 Thu Feb 12 07:40:31 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 1E468C77B61 for ; Tue, 25 Apr 2023 16:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234599AbjDYQaU (ORCPT ); Tue, 25 Apr 2023 12:30:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234377AbjDYQaR (ORCPT ); Tue, 25 Apr 2023 12:30:17 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B96283D0 for ; Tue, 25 Apr 2023 09:30: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 33PDiZQG006067; Tue, 25 Apr 2023 14:11: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=3DfKy7f3QGztZoG4jh+vukpmsr5aWh+KzrUG3uqoicQ=; b=ghpWIYvtEN1eKmgENBEwrDiNTS4Igk9J9Q7APWdfkby69/zBrxXIMUXU4OJUMwEA6ohm dbbx8zHJokmrXWvmwDT4VwHRVm1UcrFp04YW8UIINuuOzArQJo/3PfKLpxjgeC6cOspO yowXIeZtsviWB5VdW/c0H+ZY5ypVVgThwxYUIKn1OnmESHUcchkm0CHsghmk1jOm4Lv9 3b5M73ScVuXQduBDgi5TUr6QDcMnSSjIvZvA3TkoPUldrMnf+pyvMmQLR9Fdaa0vHAya RQFRIH/haekxp022k+FVAIQIsydO9BETFC69SwLbs4WYwm/YPI7yhRqiI72bfz1LLq0C bg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q4661wgpp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:41 +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 33PDUxeB006663; Tue, 25 Apr 2023 14:11:40 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616gt1p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AGY/Re3s7o3YcaU/vGnHRXfLr9sQagVcyYKR+ShQTnOgxIJo81vLVYl/4jGhhMRhrq4Tt3cx+07A5TR9lV0T5PxYh2po+jn2Nyqm8yfkMD4dIfetM+6VJG9fSS41rQnCQd9a5kVc2qEYUCW71TsdHkXpH62KQ1H4UUgjSobpwBd3K3uGC3U5uW4tNMW2IR0HlJVy7QpXbeR7vTJlcRo6SWi8tWCx00CQN+doNSGEcL2i14RwABfrfdjOXh2vAaVQPaYIg21IE6PPJAqSTFd4lpoj2XZgipwzWmSMAqK2XLzrpKyC85OBT7NdhLqUWwVGJBXAhllG8PscoynN7gBmiA== 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=3DfKy7f3QGztZoG4jh+vukpmsr5aWh+KzrUG3uqoicQ=; b=NuH97YwM4HsSa4hDwfkElOgAwVK/qeFvfTacTH0D2CjxpXxZVVaEKrlIgyV7Uga1TNB+TcvsqYi4ZzmictfMSZgjg1d5rkhcJu6DYLJhrIgrXdISbBdDOng1cK89StpUXCEW6R379CoYp8KNBz9gfuSIprYnNdIiAw3V+VT7agcU/MKenDHXoDtYeCqYTiEgHYi4FsaEHJIXjbOIFQDE6LvS//yjw8n834cmYHF28JbrOU/RSovzgcOfmwBldMQs/nyFkejM/OQ/wkF52bmxzTNu1mH5p9lHzRd1MFLnrqjNgsFLCLQFqSfGaTs/DpV8VP095c7ukqCmnzuB90A94g== 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=3DfKy7f3QGztZoG4jh+vukpmsr5aWh+KzrUG3uqoicQ=; b=UanMrA4XNOaMbOmIq80eO03g1MW6VWxYszPNCKdr/yK8r+1A04hYYawUBjWnEe+wxQ6Ef/OpbUMl7+qOX2QoFbTfFqy7tly5uaT6SmQWVcB94N6PV+lsPruQtqfL1w9wXit6kJOEf/HESrd6nGhnpF2q9bTnle3aF1Icbuh+Avs= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:38 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:38 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 33/34] maple_tree: Add testing for mas_{prev,next}_range() Date: Tue, 25 Apr 2023 10:09:54 -0400 Message-Id: <20230425140955.3834476-34-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0135.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::16) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: 09903fc9-71b8-4d4b-0dc2-08db4596fc69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VXMupEzGnDy4wHfjrQGrm9jFrzMBY0xvOeCdgOLFJSM6jeGfosxbsOOjy/GokW/2BmXZDCqsQXI17qvvfXVXU886X4oJu7kqhKW2tMMwPFxymXc7VbhjftUyA6KAhGd4ldttS04ncok8OjQDbqJ3iA3+5FVzKukr8/vNCSybcmFvYRK5dbu9dQ+JaR5sSe2IFwPRVXn53YWl2YdXDc4M1mT2S66YcaP/1EyTfSe+VZl5cLmEa8Vg4P6EK1lcfLfl5FV6gvFpcX0STrYdj5s76ukvhnTW6z2WxbwkIEtUoRgEyE8sMRNgSWmBTlPb/K7fbKf2juDkz71Leny9rA8ie3qJyrNQKuMH8cCdzS3SH+vGmYGM5KJrcJBGnA8MJmmxHFnLJ0hY49rv9RInEGWeyVA+ngAHVWxsop1G8XXNgd2G6VKAD9Bj4yUeMfauJ+RU13pxjJMv9PG5T/Q8gJHl4WBHHEej0kJpTrOLmnioMcy7C87avmhhiMt4Zqa13pkV3d6epKltq9kQGtLNTmCAA9SUOeopIKtyOihXnpZBegrsHvvI28yzU6gkru8JD+zY 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(83380400001)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ucV+D3VuzXfS/Ud6oIAmmmyq9j/blPPvzKjE0XSRXGH9YuIV4uCTSgVZMCUG?= =?us-ascii?Q?zUWMk7ICwCZcl+hZpg/TTvVrerqY4SwMaaYIh62DGj2ueyOeY/Ow0Ef3J+Ml?= =?us-ascii?Q?O/fgrLJ7/Gj+J8otDiwZ/B76x6uzMUWRigoKzV2fjWDE0jQFfWvkjPrRCQe5?= =?us-ascii?Q?hFinXgtd16QL5DZ6nOG/ppdDlpO461rOCmltotAuI3ZZam50k3YvZ+CVfVFQ?= =?us-ascii?Q?lYXHknCWaCUOYChIBlj0bQVxRj3FzBmIamuHOi9w9BhRXtWSoaRxS0ukzyb6?= =?us-ascii?Q?dazaeIlaWQz+/yyIC8/IR0H1AhaC5V8qv6Rw3zv45WsULs0Syr6Yq0oquJvb?= =?us-ascii?Q?JYbXbZIavM4IFsp4P/6foq1PA1YSB2JGiQ65osSy1iX/3svzwZ3m/m0loug+?= =?us-ascii?Q?umFhYGgj2tAddWmHFoqq5kcKZkP0LQHG5ISvT+zuFizxEjEKH5Oqsmuf+QeD?= =?us-ascii?Q?KXHvF/UUX5mKWRB6d1DhjGD4IGBqILLoNr3EFDlQXF44AfIZJ3H5aNJqRf7g?= =?us-ascii?Q?SOoIGRquEVa7+m6qRRU0g7FCItoHvwo1IlN6cAXR40D0q00C5+gnZENPrfe1?= =?us-ascii?Q?Vpj2CPnWAW9wDHjN4oQBF302MOG650FH4UdpKUuvIJlAE5yGvcYPqOAsxRkc?= =?us-ascii?Q?M1d5bNx3/gswpEDqVeSG9C5vfBjZACuBqZwv60nvnNNyrD8vFVmWwbdUdORm?= =?us-ascii?Q?GZxnXMLH944OSMnMjduXJ1RUlvMhZgEsY54jKxRs+q889JRfgyAU/HQjLd4p?= =?us-ascii?Q?OqJmuiSbwrROo3JqAs8+vFbsPj7PNDevGQMtgniAn/DK5A2Y1z1vY/PHeNK9?= =?us-ascii?Q?mwajyqRqsOhKdDBPOsk3f/lIpTDEF/EtuZOu/jeO/veQ5aYJpg2m1/nI1Yx1?= =?us-ascii?Q?1C2asiauhVc1AaItGsZJ8DBHo8ePMK4ZkTBc5+X5V3kUmZ/1PlTmzVAWae23?= =?us-ascii?Q?ActitOF24K+RWcmCgTTyUgTaPrVwcF2EB9S/TM7d1tB3xYs3timZFGN6Xb/m?= =?us-ascii?Q?rcOARZ5ghJvjf8b8akx1lzR2vPIlZs5ZDHPxa7+kPpO1neA3Jepn5x+gH/bL?= =?us-ascii?Q?/C/zJfZvnBLkS1yI7DyjpJYWyNv9ugIHpe0gNNJOeshGfNt/4gjHWVuR2nmE?= =?us-ascii?Q?B74ZcNvQ/oryhXS8bInbq4rhJkxHXuvTeJStHzbAs9Zo0lukrnyo/r/BzjiT?= =?us-ascii?Q?ltsbI5ggEYpP11gI6S9wEuh7xQKXDP8uEC84c/8agQ2ei/PhNRFTVDJIAxI4?= =?us-ascii?Q?HOuWA2mnP824Ol4rPbPiG2X+vLvwBRZiJ3gJvWKdyKjpOSvBzVQLV5fj4mwx?= =?us-ascii?Q?rZfyHiIDr1peK6gf+2DbXypRiGNbshHLw8u13Jvq5+Fnzu1SB9SobQ6CVgE+?= =?us-ascii?Q?qhvSlXMHTt5Zkd2AJPM2iXJCMRl1Sa3qsTD/HTMnyozjyewOeX2ar+AemvNi?= =?us-ascii?Q?Z5XHL29Cyvj0zIRw/HzDEvCty/zNyA8lfHbhKa7TW5Fvu8Di4t4l/7AAHXsP?= =?us-ascii?Q?fuXXKb0hSJ21zR9SSIP14so7zMFPBB+yCQWJ+BTl3duuXt7oTa5sOUJYyjEv?= =?us-ascii?Q?NTmAxydHhe9ODn1Pma3ATODE0jXE8Q5nx6GsOwlkx3OmoTKbbs/plqCx3R24?= =?us-ascii?Q?BQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: u4NMXoa6wKyocETEhcApDYRZEytUXTHxcEUiPNYyFkpfdOJD3E3Cy7D5oGHvSN2P08ki8x4DVW5+ywAcM5jzo9dY0aYihnuCwYgE2T9CWsX7OLeLfxYt4NbWtNgDdoqrTcqoo6s0c73cd1SU+X0MrvlKUVAOHMz7ibJjfBLXSfgoEUiVAVv1B5RNSMWP9Z0EFNfr6QKbxQG7mtw3iknp21KhpnlezfrFzUUOte8yqZD9Xy5ZFo7dwVE2vMe7rKxNk6XzxRE0rpf3ODZyKRN8S8KU+31zXJN0dnE7He064IZqO3PoK8YTp7sBqTBw/01s0QVqcynXf3YK7AdHNWdosAs8+cgEdUigoBQWD7qTqtk1jYgesz4YgqHYeEbNjzR/LbMUGcvho/BSSmxammCWLy5evA5/EWUeO5mWvELkU7cJG2AtJJ94UhNW0Dw4i+duPQc7r9MPjryRdyrLxDIjH4Qfto2FpTJ5FwGd9McuSDFxmfKbWxV4klqMZvIhfDltsQOjv4JI67b2bNuELioh0lpHo49f9QCH8VzzZqsrJmXEsydVdb1SWw8NNE5J9jo976E3nelSup80I9hNcEdf3g9a/wAFb7AIWhM+10F34weSPI+epyuReAxYliZCwiJrj7sHmFC0j7zEK8Fwuu2nTBqPvoTVgBYJyfM+9/a+vgE2cyZFP21r3l6/8j5+SypM4H6eyEUuBWlju4ITcGxy1XMN6bFKcAEv/U1q0lNr7K8+nKQxtWQcx2cq3OeYGWxz9JQnrrkbWm1/k55tpoYODStLQTEfUWf4tobbqeNWIjzHPEoJRjhtwMp06r56IA5RJLBxn/jRfTbpjjcq2wQ3BhNPtMiM2enO4ZSnVYqKjf1XjT9TRWAzLFvc4hyle7S86dvWRbcXjvYQm4xpFS746Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09903fc9-71b8-4d4b-0dc2-08db4596fc69 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:38.6045 (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: GblnROLj/y93IeG59GyQCJeIFJv/Yg/6Z2Llsnxjp2Zcu7a37ZeyPubBcO7WMzZ6Jk6yIOQD/7yiucnVMNAErw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-ORIG-GUID: _JD2u7UsrKi3xpWhhpuNHo8WsrdfRgI_ X-Proofpoint-GUID: _JD2u7UsrKi3xpWhhpuNHo8WsrdfRgI_ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add the testing for the new functions to iterate per range. Signed-off-by: Liam R. Howlett --- lib/test_maple_tree.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 7b2d19ad5934d..adbf59542951b 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -3356,6 +3356,150 @@ static noinline void __init check_state_handling(st= ruct maple_tree *mt) mas_unlock(&mas); } =20 +static noinline void __init check_slot_iterators(struct maple_tree *mt) +{ + MA_STATE(mas, mt, 0, 0); + unsigned long i, index =3D 40; + unsigned char offset =3D 0; + void *test; + + mt_set_non_kernel(99999); + + mas_lock(&mas); + for (i =3D 0; i <=3D index; i++) { + unsigned long end =3D 5; + if (i > 20 && i < 35) + end =3D 9; + mas_set_range(&mas, i*10, i*10 + end); + mas_store_gfp(&mas, xa_mk_value(i), GFP_KERNEL); + } + + i =3D 21; + mas_set(&mas, i*10); + MAS_BUG_ON(&mas, mas_walk(&mas) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas_prev_range(&mas, 0) !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 206); + MAS_BUG_ON(&mas, mas.last !=3D 209); + + i--; + MAS_BUG_ON(&mas, mas_prev_range(&mas, 0) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.index !=3D 200); + MAS_BUG_ON(&mas, mas.last !=3D 205); + + i =3D 25; + mas_set(&mas, i*10); + MAS_BUG_ON(&mas, mas_walk(&mas) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.offset !=3D 0); + + /* Previous range is in another node */ + i--; + MAS_BUG_ON(&mas, mas_prev_range(&mas, 0) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.index !=3D 240); + MAS_BUG_ON(&mas, mas.last !=3D 249); + + /* Shift back with mas_next */ + i++; + MAS_BUG_ON(&mas, mas_next_range(&mas, ULONG_MAX) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.index !=3D 250); + MAS_BUG_ON(&mas, mas.last !=3D 259); + + i =3D 33; + mas_set(&mas, i*10); + MAS_BUG_ON(&mas, mas_walk(&mas) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.index !=3D 330); + MAS_BUG_ON(&mas, mas.last !=3D 339); + + /* Next range is in another node */ + i++; + MAS_BUG_ON(&mas, mas_next_range(&mas, ULONG_MAX) !=3D xa_mk_value(i)); + MAS_BUG_ON(&mas, mas.offset !=3D 0); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + + /* Next out of range */ + i++; + MAS_BUG_ON(&mas, mas_next_range(&mas, i*10 - 1) !=3D NULL); + /* maple state does not move */ + MAS_BUG_ON(&mas, mas.offset !=3D 0); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + + /* Prev out of range */ + i--; + MAS_BUG_ON(&mas, mas_prev_range(&mas, i*10 + 1) !=3D NULL); + /* maple state does not move */ + MAS_BUG_ON(&mas, mas.offset !=3D 0); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + + mas_set(&mas, 210); + for (i =3D 210; i<=3D 350; i +=3D 10) { + void *entry =3D mas_find_range(&mas, ULONG_MAX); + + MAS_BUG_ON(&mas, entry !=3D xa_mk_value(i/10)); + } + + mas_set(&mas, 0); + mas_contiguous(&mas, test, ULONG_MAX) { + MAS_BUG_ON(&mas, test !=3D xa_mk_value(0)); + MAS_BUG_ON(&mas, mas.index !=3D 0); + MAS_BUG_ON(&mas, mas.last !=3D 5); + } + MAS_BUG_ON(&mas, test !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 6); + MAS_BUG_ON(&mas, mas.last !=3D 9); + + mas_set(&mas, 6); + mas_contiguous(&mas, test, ULONG_MAX) { + MAS_BUG_ON(&mas, test !=3D xa_mk_value(1)); + MAS_BUG_ON(&mas, mas.index !=3D 10); + MAS_BUG_ON(&mas, mas.last !=3D 15); + } + MAS_BUG_ON(&mas, test !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 16); + MAS_BUG_ON(&mas, mas.last !=3D 19); + + i =3D 210; + mas_set(&mas, i); + mas_contiguous(&mas, test, 340) { + MAS_BUG_ON(&mas, test !=3D xa_mk_value(i/10)); + MAS_BUG_ON(&mas, mas.index !=3D i); + MAS_BUG_ON(&mas, mas.last !=3D i+9); + i+=3D10; + offset =3D mas.offset; + } + /* Hit the limit, iterator is at the limit. */ + MAS_BUG_ON(&mas, offset !=3D mas.offset); + MAS_BUG_ON(&mas, test !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + test =3D mas_find_range(&mas, ULONG_MAX); + MAS_BUG_ON(&mas, test !=3D xa_mk_value(35)); + MAS_BUG_ON(&mas, mas.index !=3D 350); + MAS_BUG_ON(&mas, mas.last !=3D 355); + + + test =3D mas_find_range_rev(&mas, 0); + MAS_BUG_ON(&mas, test !=3D xa_mk_value(34)); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + mas_set(&mas, 345); + test =3D mas_find_range_rev(&mas, 0); + MAS_BUG_ON(&mas, test !=3D xa_mk_value(34)); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + + offset =3D mas.offset; + test =3D mas_find_range_rev(&mas, 340); + MAS_BUG_ON(&mas, offset !=3D mas.offset); + MAS_BUG_ON(&mas, test !=3D NULL); + MAS_BUG_ON(&mas, mas.index !=3D 340); + MAS_BUG_ON(&mas, mas.last !=3D 349); + + mas_unlock(&mas); + mt_set_non_kernel(0); +} + static DEFINE_MTREE(tree); static int __init maple_tree_seed(void) { @@ -3621,6 +3765,10 @@ static int __init maple_tree_seed(void) check_state_handling(&tree); mtree_destroy(&tree); =20 + mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); + check_slot_iterators(&tree); + mtree_destroy(&tree); + #if defined(BENCH) skip: #endif --=20 2.39.2 From nobody Thu Feb 12 07:40:31 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 11342C77B73 for ; Tue, 25 Apr 2023 16:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234800AbjDYQ4E (ORCPT ); Tue, 25 Apr 2023 12:56:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234799AbjDYQ4C (ORCPT ); Tue, 25 Apr 2023 12:56:02 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCDB813C2B for ; Tue, 25 Apr 2023 09:56:01 -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 33PDi8r9024340; Tue, 25 Apr 2023 14:11: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=lSws5H0p2AZUKlOXUrhiWvpa5Tl3YjQZDc5LQJ31yD0=; b=r+Wxk7lQ8mwaGsBaq6aPKOVsENveRG37/EF82nesqvTo8E4/CvOl7HaomJUI8Wu8LeYl Vc6AyYZUR+PbsXPw8k6nINz1fQTKqCezF2BOadnKDJCUeZFrNugEk5H4KP6JH73eXWim sGHVv8N3WWLMpT/vwq+F4Z+Olu+PpobmLi+C3m1afirEgPtOgE6r8fB1Kys/Vj6L1fn7 +V8GEFHmrbuNRNRMwdseDAnj9QUWuGQhd07IMZLepYPt9kZMcVmnao/XuMbjTjVhYDLJ fCqfYbRGYZN1OwtkYQDuzxAORMCuGl6dEx8sVcoUP9IMreKE8JFo5yHs0a6Ijm2Xf3T4 0A== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3q46c45fy8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:44 +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 33PCgvYc008521; Tue, 25 Apr 2023 14:11:44 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2172.outbound.protection.outlook.com [104.47.57.172]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3q4616qq7c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Apr 2023 14:11:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nE6mJEd/dWoCLUZJdkdyUcVRwRKWadeR61W7g/NnnCt3TV1Mu3pPMbQ5mZyFuwBEjGjZlA3nn6yhZ8STLn7EVigVodmECxcqZGbDkxKfLYXrOQ8q3TUUMyvMjyuB0Vu2OQppk5P20nlhRkoifaY5M2i3arG3b3nQ5sb1LmIo+C7Z4BFb273Y1KLS1GOrI3KlBGcJQZ66fiHnVSptlW8kw8KKEfKa7I9srQewHZon3yfCCUskEzdv4CW86MgkPfc4qmeZFItIuawdk194mSi01y5hPWJw6v3KttDKWhjZXnPB+DQ5vlUbzVg0dlfblt5C3j6zaq137cKiKLB6h2M9ow== 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=lSws5H0p2AZUKlOXUrhiWvpa5Tl3YjQZDc5LQJ31yD0=; b=SZ3SrxuVnPX75vMpQsHyTfeaez02kKuAO3ulMS8NVM9nmuGJ7uMSqQPnYVDiMxR/1VK+oQJZtVIVV1DHmPyyYJ9RQtFCXQ3kZqv9edu8WH6IM6iNIMFJEahhMsE5ekHljLoHfNWiyMdJod3qyAoxZ9IF4WBpEYeI6rLOpoNPBGG4Y+Eyyqo8riTVqRFhJoYeAGO/w3httv0mIFxVXJ2P1QqE9U6gFMBRDKm0pBUoOXfEBRKF2Y3juee8MCJlVUjnl31Ff+4EDy34xjaKIZ2tJbJptIS42iid/oq5H7oTEuOSS8FTlrKIc0jbeKZ5rgnj12v14Y5CYJ0JBnlSzZi0nw== 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=lSws5H0p2AZUKlOXUrhiWvpa5Tl3YjQZDc5LQJ31yD0=; b=paszQA8SBL+/3L/fJsRNixl38Hw0jheviZvlO7lM+NsfiWadSA7RZdlLZe0UUQta0k5NAznoRnvxyWR5Ca4Z3Sg8IEZjqztkso0hpjHf+BsdCd1lyhxIeIU/81D1hw2+kjtD8lCzssScBUD98mO1JAJ14AjHrBS9SKKJNnQj410= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DS0PR10MB7125.namprd10.prod.outlook.com (2603:10b6:8:f0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20; Tue, 25 Apr 2023 14:11:41 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8bb9:2bb7:3930:b5da%7]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 14:11:41 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, "Liam R. Howlett" Subject: [PATCH 34/34] mm: Add vma_iter_{next,prev}_range() to vma iterator Date: Tue, 25 Apr 2023 10:09:55 -0400 Message-Id: <20230425140955.3834476-35-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com> References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1P288CA0003.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01::16) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|DS0PR10MB7125:EE_ X-MS-Office365-Filtering-Correlation-Id: df72d563-e618-4988-173f-08db4596fe41 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jowgrgvykKtpQpwBw+Wwle0gK5E1Dm3n81jcpVaeqxYEZTmR1PiIXipgNlZHdwMFtGQgNSem29rDpSjEE4g3vhGXJdckpXdfuTTHAWKLhtgD8aMMfQIzyyFmC5KkppC7cPqTA4ceus1EdEkKWqn6+JPfh3SmWsjlMKxfVND+wShe0CEgzKVkLjR24whwG2LsIj7aS6piJSjRzprJJnpIJ8SHf9vcXEjXVQKOt5z61qCcLi9dGUROIOdsHsrvzAlONCGvdC8vA8epUQcArxozyx0ErT+raZKgSLvML/VdybiTIDG1GtVscosjRsGASxfAlBWm+bmcgpWhCJ564nxCu31e7mQ7u5n6Y9o4ez07DptUx5sYxll5Lp6BcSaf4Cvw5JHaDK0ftAA8FZsSXSk+wLuZJh536etaFGwN/TuC3cKBfj2viTL6BD/PvYuX6rDxHU0N6rbYe2/6vehB8AorvRoIIAAZiddwcuHol0c1jUvrwnPQdqqmslNcz+uy/UpShsfVpyjajouGKilQAp9ONiKL5Sq0uw/J91K+xWEyXJP+M8Xtu2RP8d6Vku+KffeK 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)(376002)(396003)(39860400002)(346002)(451199021)(316002)(6916009)(4326008)(38100700002)(41300700001)(5660300002)(8936002)(8676002)(36756003)(86362001)(2906002)(4744005)(66476007)(66556008)(6486002)(6666004)(6512007)(6506007)(1076003)(26005)(107886003)(478600001)(2616005)(186003)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ybGlKIst+zhEPMJkzW4jwkML7RO7eN6M3gaHU4LyOqloWYFKuUs9Jmo4VogR?= =?us-ascii?Q?mI7LlYfsfUi6Frtz6BoRjAPOiem45OALG5FDvAqh2/5Fmj2NclHmNME7zYIq?= =?us-ascii?Q?MxuOxR3vYtgH8zefVPbxbm//WsBpwfivsxaH2t06357e09opM4hQCMByYDZ9?= =?us-ascii?Q?BufBJPfG6IpFc9FeAbZbvgsGwZe5F4LpekJrzbHOTeRyspkMkYAkmDFVXPFO?= =?us-ascii?Q?j0pZx4P5bCwZ2FT0+Pt/3Q3TB9P3QbCNVzsJG70mRBGaIf+Bcp4uxey06w+a?= =?us-ascii?Q?hRits3IeP23Y1EriYWC+JNak+wM5x2CUx6Y/yMLnbq+uq80Tb5jTIMry2CWF?= =?us-ascii?Q?a6YDXjmVsqJS8uppFZCueCbcGlWim4mFcFY917lipCOmepL9bkL+Xaqd/G10?= =?us-ascii?Q?kiBmH3bHV+4ChyZlQsT9MVv4p4z2gb5Ol/CBrrIqxgKvuuqE/m0qg1zjSBIg?= =?us-ascii?Q?DxF+31thAOvsLaey2/kpmAtBuMn9IR1xa9WcFep3bew8IC/R6+eqcDRqxAof?= =?us-ascii?Q?eLfZNl0weVjdaBA4yz2L4ytTI54Oa8GUxDCVd4sat90DVRkMZwpLq3Cx/Gay?= =?us-ascii?Q?NELD8yIXQPASVmgf/5VaahAvY/QgvlsRFKjYE/ky6ONfoy0TpSqY3mYnwo2U?= =?us-ascii?Q?qvd/hntcS1KwIsitkLzA9y0OsrZg3SbkHSLcwnaWFGVF4GIXin5GhxHmwnn6?= =?us-ascii?Q?fOYh0Yx0mo/s+HVGFHNJT+xCc+DzBMb98ysWzrWsm7qIoh8IgwB6PXUpUpbO?= =?us-ascii?Q?n7LwxBKGSXcWh1iuq2ytZa+ijn7DvW38dT28LGOI8E98Yrsxgd2ItzNOtree?= =?us-ascii?Q?PZ+yPAMACKoSByrzWftjCdvwGf/aZpDlTlfBM5axMpzLRFzmh6E0IM6L8wGZ?= =?us-ascii?Q?30nPPLrxydnsjQyt1Fh/fLdgXELE8Si7EdabpoVDzZEsNVULCgVXjkRWbYIa?= =?us-ascii?Q?V/JxkSapcDdgKPdzOHnrRa3UQGGUjBzd0jBFaAWWg6MQxL1f/VAvEyJBKoaf?= =?us-ascii?Q?rSCe6M3a6/NUNaCigkanH2qHs8VQbphkJfnu7WGuDFNdflchb4ACWFB0jEt5?= =?us-ascii?Q?iXAACx0KOkKLcb3Ntdm5Z9GEIWV238JelyJ42ZVcbDlH7nM2RxA3pqtS+Ux9?= =?us-ascii?Q?EyR2BiZ6rtAtdO7vhsZJ5oQNq7XlOezZLopiF8+SRuTNlbgddBftnyUwd3uj?= =?us-ascii?Q?KSjiMsuMTHuUZpCCEM3ZeiN1zyfLm/qXiSk5T9ZrNR3ljxA3fG0Ysp7F3Ca7?= =?us-ascii?Q?EF5Ygxff3DcaniP2q2iN0buQrp5P+yPwtF2+VqThJ7VSPnBD3lF4/bVBFZCi?= =?us-ascii?Q?7Or9qN8moSKzjhfGO68AH/RO8p/Obs/JZQ/1iJ/sYHZohxD/48+ZWI9wqBgg?= =?us-ascii?Q?Bna5l7XdxiLBn+KMlYjPbFpQ+e2Imte14gYBoROOyvHIDP2F1kRAjoOgp8pE?= =?us-ascii?Q?pp4k/xW/QLJ0i9RE9JMDnRV8zpL86PI83MI3z6cQO2lmexD5VDuZkBnUw2wo?= =?us-ascii?Q?/nHShGSrk9yK0USYjEAr1wOvx4COy7KoIPzlzi5pa9Rkfu/fzFwHcPCM/FGm?= =?us-ascii?Q?vshJGGPk5+yjD1/5c8nBWfXWSpsltaKBEddk2tO+9/p/+fcg3/3SFr4PiYAQ?= =?us-ascii?Q?RA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MdMJcUCQ9RJpgZTTOyr+ZLZ9AUm+hNaY0tYJ9sEJyvojRgX7shZS9ZdeAWBMsD0eGKk8T3OyHCstgOkceTdca7u1yWFhraFqULS987HgzgblmwmTVCPeRwuzGISVCpUN/YL+G9nVDrh2b9SAQMsJL9xdW6dDoPMxKFG79w9t0vRvq2Q9TcAocOt2vOhKYhfnfEwUbWDYX3t0OtO4BQ75CbVTmBgHog4UHScSFKXw6jdUi8sLOAkt28GrNkuwEvhKWVlOtvG7G55ucZn4Otb+N2Krnzu+rT2svqkyOA4ALZApfIHCGpiPvP+nyLhrjFXSijOYOoRxTr4P5NwvAe5qsHgDQEtNn8cJE6wZpn2DEkxGlbK8frU6FBTmYYHTTdsT9CDImbfIrDz+/RRM5vPnhSc44aJTfShH/EdpPAzVC4EYLMJ2DCrrflbQOWWw+X8VePzP9ZEv0NyWh9gkCqIJRfOOrjEXRHctWAWrh1xIpNQssQyQ1my3Srr8CKEuq/qU5X37+KXbW3WKgW4V1OwkVlNNXH4k2gE+f0avRzpIdoMpUr7E/cIton8ERuMWqPFwWbu2HLFO5CW88FtbfLcKK7YltVMhuRNrfYNUE0VO+q1Vr3YP4o7aZF6MKWpHAljzMFIB0qNaB3+KU974lkFu/qVjCHZNRLELQ11svE7zR5L/F8AjoPFKb5GLMGe5halIqG6jHpwQZqmG2LJnMTsdoJ1RdLSso5mLbx7zb3l0zHYs/UfVrCoTf5X4K9ESAr0CcwwgO/GKay9WReuPi1iSD54/D/ak4Yc1U5w1jd0XIkktfy2VrMmkGrdt0YlSooLU8fkTtytmDZGMlKH5OFRhuo7Cxz/L33bAKb5CLQJ6rT5M23YNagKLkeu730ca4nOZHvpONrJ1RxuB7gAVjVXHyQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: df72d563-e618-4988-173f-08db4596fe41 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:41.7032 (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: 7bHkMxJD8QYkNCMJ7A+Fs2/o1eYY1joBhpJ90FSfT1aaYMiUoi/wKbECo/8xJA/1M+dvmHrXdTMwzlPqRwXt6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7125 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304250128 X-Proofpoint-GUID: Cc7Rt3lLs1G2Scz0CJcJO43D1KpoIz1x X-Proofpoint-ORIG-GUID: Cc7Rt3lLs1G2Scz0CJcJO43D1KpoIz1x Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 37554b08bb28f..2cb6e84ed6113 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -877,11 +877,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