Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH v4 21/35] maple_tree: mas_start() reset depth on dead node
Date:   Thu, 18 May 2023 10:55:30 -0400
Message-Id: <20230518145544.1722059-22-Liam.Howlett@oracle.com>
In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
References: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ie0Um6gvSo8/SARPKGN5YzBIWkExd5ajggppePzd92Jo3bErlhOnm+9b68LU?=
 =?us-ascii?Q?STa8lzZezBcaxwwXtN6O7m10yw8mf9PYr/91mCklb6h2QvvcoJmDqhpxun4H?=
 =?us-ascii?Q?ufC1l4s9RdAMfviIgCnqwD5l4ya9Ghyv2jTa1Zm2BBMWSjgLFewviWKA4jOl?=
 =?us-ascii?Q?uwHpvMU/Ipgw6/ZISg5O1+tOn1Kc2C1941dq2MoSEmWZCuNGnBSqhtUvLAa5?=
 =?us-ascii?Q?Moo48qzhmQtaaTI3+F0QJU3A5busDRQAMQDakvTBcCRiAc0bWK6XjnoHcpKv?=
 =?us-ascii?Q?rCRhYPbCC5xzqZBhewwiuGQACgVt4MM7ikyHI1g09G0re25TJCYo4yNjqk1i?=
 =?us-ascii?Q?J2Mm+/tFlvvzxzQ637aTgTqRSnQ0Sa/jUU8BOm3dSTVaKuTvLPE5gync4wti?=
 =?us-ascii?Q?N5DFmmPTJOPiSvSnTjDnIxW0qSRDMrEjJhQhB7Upbamk86+fkrarBArj0wHy?=
 =?us-ascii?Q?1Brgwgj5YQcJmky/X1OYdOqkQFSp1o1LfCtqoQiUbjcsxBN7DFtJM+Hrzthw?=
 =?us-ascii?Q?YrqLpEOGIVZWnlt9UCrzEFfQPPAkGO1LA0GwSkO+Bueao03L6wAKeSCfmLaB?=
 =?us-ascii?Q?/ZmOSh59kWR1AI5EWgihj3sROMwDknwT4JJRVHsiW/Assjo0Hvsof6e6hKZ9?=
 =?us-ascii?Q?cfUAdT+fu6VKEzGX1z7jhOplDU0haHBtqdx4Ee8l/Jrwpq5wNBE/qFz8FN2u?=
 =?us-ascii?Q?OA6RRsu3mdGdG7FVGz2Y/FYh2DkAzXPRRXYWKAdmevZU2YbQ9z1rqP4DaqfF?=
 =?us-ascii?Q?jVCf3Ts7Bo9Vi+ptEgAujDeHz0z1AwK6xzuP7NuQtdUfos1jZHATM7MZ8hRq?=
 =?us-ascii?Q?xnXVlCEN+vUwnEJ0F0BqCFewcovJzYmMMlxTf1ti7spA6nc0r5d5BviA60wg?=
 =?us-ascii?Q?gFBRq36Gs5ua6qAopoZ8EuctW+tFC3smJSFnrYVmdtwiR2GQBV3SjDw7p3DJ?=
 =?us-ascii?Q?716CdWxhYcZWZqGadbBikiO7ryQn8FmHRScD2HWqjFClf1wGtF1yZpLtrDik?=
 =?us-ascii?Q?Q1hxHaVht/IBlhOdRZU8XrAVY/jsttBllsWt5UG7BkKb6tsbvLUopQImbdeW?=
 =?us-ascii?Q?AaTQd+lDEFKb3skHUN0GOQKZR1dlXnjPphtF/d3hYCmYaAxpduIj/XeeEFCf?=
 =?us-ascii?Q?aBRiFzAWQQkZa8ilYKkA4+IPFZhIQnLeZbZtxbZ8ehzIQvTFpJQrQQ0iJiaZ?=
 =?us-ascii?Q?5L5x4napfXImM8ArOCT+B8i3z0S08jBo9nRizl+PXZRRj/GD7TH9KDJaAFpP?=
 =?us-ascii?Q?5Jy+NmQ1zHAkWtL+ey3XKr6J0CsSkEcUhIDA4ghM8EBe2Av418Wz7AkOolki?=
 =?us-ascii?Q?EnsdTy2pf3B4GnovbsdWWbk4W+5iOhgdlvUnAn2XzTlFk0GHBWem8z9PXD9H?=
 =?us-ascii?Q?uaNu2gUYEGqlrxlD4yyybEstys0sv3Kaw243H/WOdRLJvOSyuGRlVdVg3Sna?=
 =?us-ascii?Q?t2aqOjh8u+PQhjD7nI2dxIEUqzKiayvt1ObOX1YtBIqquaCtoJ//NhE1eKYJ?=
 =?us-ascii?Q?Kn9goUN00FLavkA6iIvKWyTsXyRXkarNe1n68V5546mw4PuPUklZrguZQAni?=
 =?us-ascii?Q?lfXQoEgJTKF8ZQTyOcDlNqGsN8opYT+vauV+8IGV2vFJeXzduOClyY/zgjnb?=
 =?us-ascii?Q?oA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?15b07NxpTF7KDRLvHGzKXeP8bcIIXNkWfQ5JcxJyKM7wJVLN+7iAp+BFjNGX?=
 =?us-ascii?Q?r0IkD5F84qfxguEROlpB5ScaSl0/RQ3I3OX9g2VvJqNUBbBz28L1cJhN5kgn?=
 =?us-ascii?Q?cdfQEzmsAL8gjAqMc1zE4oXDIy1s+aByYfdpcqc8AqNuxFFRj3olTZA6rcH0?=
 =?us-ascii?Q?R1T0xjwBj02jIrSFw3Mrq9+pNOrK+L45hoa8TKOSzISj20zEYqiBekJgy1GO?=
 =?us-ascii?Q?DBPhbmtFA9ALf6PqNq8A8K9eTYL02C7EVRwrNy8/10dcqkVEbKVLXuXQBZ+R?=
 =?us-ascii?Q?kiPby8tY+d4KylMB+XwVKzSpBC2RF0CfUjKO5I/XIierDOKMpmtPIRyzcTgP?=
 =?us-ascii?Q?iKx/6txRrGEURBLPfVmlZcDa9kj8gKh0tr5nAjiFCEwW0oblJGzfIAPGBoWp?=
 =?us-ascii?Q?tvVOI+tFoASdqtK8cez6VynUGleU+Fuy5oJPIM1ee970UGO3ENREit1vYy8b?=
 =?us-ascii?Q?ypwPcyUMq/JqEd1JegVzrKnMo0z1R1U+a39bFdtvJqg7XR5Mp4W/n+7s4ck0?=
 =?us-ascii?Q?HSFBUSRk66C9LuzUWTZ0Zpc4AimKNqo1SK1naWdxVXQTS23OmehLgBVk3TYB?=
 =?us-ascii?Q?SSf2g1Yc9lzCXAA+f+Stm+35BZdbAmQfUxLmirWury8fHjrmqMLwwDGDTVZI?=
 =?us-ascii?Q?fMbpkT4IJojuZnlzql+45qZplqnsi6mDlzKea9GpJze3VhwRhXrMiEad8F2k?=
 =?us-ascii?Q?kA01OuGk9GrI0JEn2DQZJYRX5+zGyo6rP0u12bVgNvSGDI3/7oHnQihz/nKK?=
 =?us-ascii?Q?Wzvv1jihTfWWwGqIzSKMtc2U5y9f1stAvfOsb+l0nTdx015CPRbFgvxqkF48?=
 =?us-ascii?Q?Fl3rpzHCXpqc7A2w/0r4GXa6VlcSkhe0IGw/+mowK1OdgoTQ5TBgo1/hehSN?=
 =?us-ascii?Q?RE1hWVYsTFYr8VlcvOet+JrlnPnu02hQmkANa7L8ustQcRyUayVGWklgnt7K?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecdcf175-ff33-4eae-cf4c-08db57b0166d
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:56:40.6450
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: l1QRjIvdwV5wrrRu+eop6kYsZQeWmkQRpd8QsrUECTeUSxhT+l31Y1m79hoIL+x2QKY2Tt+05pnkUyS6F+7lzg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0
 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305180120
X-Proofpoint-ORIG-GUID: JAAlHjXfQgd_QeHHVr3E46svQe0rlBK7
X-Proofpoint-GUID: JAAlHjXfQgd_QeHHVr3E46svQe0rlBK7
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <Liam.Howlett@oracle.com>
Reviewed-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index b3e5ae43ff8f..e233f41ed4da 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1396,9 +1396,9 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
 
 		mas->min = 0;
 		mas->max = ULONG_MAX;
-		mas->depth = 0;
 
 retry:
+		mas->depth = 0;
 		root = mas_root(mas);
 		/* Tree with nodes */
 		if (likely(xa_is_node(root))) {
-- 
2.39.2