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 v3 21/35] maple_tree: mas_start() reset depth on dead node
Date:   Fri, 12 May 2023 14:20:22 -0400
Message-Id: <20230512182036.359030-22-Liam.Howlett@oracle.com>
In-Reply-To: <20230512182036.359030-1-Liam.Howlett@oracle.com>
References: <20230512182036.359030-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?Rg5c9Lx2JLioAi4uhrhuD2MKQtW/Sog5in41CEITrHaA0B8SsD1YSiyINY7+?=
 =?us-ascii?Q?qp1n30muPafFwjuh5RX8ZqHGxKWKeXKKm6qK+zPiB8Rcg8US5YdNPV+E1MkW?=
 =?us-ascii?Q?LWCFkAG1YtRfeNhuDYGX47kjlZG42MMlKenemJcECeRMgdv8Ez0BKlzGm3IT?=
 =?us-ascii?Q?TPAjmmc7tuQo2yR+byc2yWl67yNbZU5d+hYTRGUfAF0x6TnGTdIhjw/BOXFS?=
 =?us-ascii?Q?cerwkzOJyO9ZkhsiG4XOgzs4oUrHkzYa08rSFVwJzZ8clTrge5S2N5aL/Mk8?=
 =?us-ascii?Q?24ChJqH/MYqsyUgVQzXBG23k9O2d47QBu7filHi0v47ebRnz6qFeK0tplFTZ?=
 =?us-ascii?Q?83GzObuvG/l5jSpRhXSeRdRygorsguHITqfl0JKxKJ6ATJ9HNY/KeLIs1hgT?=
 =?us-ascii?Q?Y89yRVwMjVC8hcn2ysobw+VVRsWI/LTwv5E3hZOWJAWmEDUkN0p6X3sYVti4?=
 =?us-ascii?Q?Qt8RrebM8aeD1iQOBASgUmeY0ndy6RfQc7g0rupHdbjH1IpuiNplQHkT56mP?=
 =?us-ascii?Q?H6hxglkKmcG5v6jXSz9eWoQeJAgNVLsE6xpN2eDakyySderPycs1P/fHLk94?=
 =?us-ascii?Q?r+kvLjnG4EPZTuMbSR9AmOtlvulxvwJ5hRhECelvKgE97X7ZW67FrWgpoz3H?=
 =?us-ascii?Q?lnwgrgzmOxj/h8oQ2YBk5T5HF4Pk3TrzG2f4vJCcj9zV3n0XdIJ6ou6BGlUH?=
 =?us-ascii?Q?DuQTCZD57dWVVHfexEEZ4uZoggwvjSOzNppiDk8HI8zqSwhVvbDn6joGQcAZ?=
 =?us-ascii?Q?MS38+V47nFLm/SPxHb7NrIm3PQs/keU9dZPbcbiAWB/sAaTtlqnt7lIwN4Ws?=
 =?us-ascii?Q?KLZ0XitovgMHMK2auvLN2xF27Bhk3kcqFgGVARw5p5uwDZt2eLQlBuMa/ife?=
 =?us-ascii?Q?uac7GgiUyXpSfhBp0agvZBMGQQokpCAMf8K24Ky8QhqJ4EP1NE2yEGOks5Zn?=
 =?us-ascii?Q?ioe0eBDivVwOB4T62iCLUTAfIjWxiRqRbrLXAj2PxThDW4lyC+mGQJN1azAN?=
 =?us-ascii?Q?pexe8u2EihTrt3Rgb4P/pw/bI2CGPkvmdePU4E812ED1ycM7mqAYZWMZbgnk?=
 =?us-ascii?Q?1u05AURYOqgh4AuHbA+0Z8c6pRl6CqgxvWZ8/+XQ483vW4wR5Oz/1c1HqS6n?=
 =?us-ascii?Q?lGNvjjCN5C4K+xqygNjd5ynYkQ0NNDFaSp9qz66kwWzPWeOW2XLcsHrW8ZbQ?=
 =?us-ascii?Q?cyVGH4LoZ68+7lH8WEicj5FcChgFSjlLn8XiN70KhHAAQnAIZ+cvk+5ZseIT?=
 =?us-ascii?Q?rxc/d/npgXjluAllKhJnLm2FQWosVRozKoBPaSUI2PnuMREKYA0xgJLphJeg?=
 =?us-ascii?Q?ouq70uOY/i2bwmBLY/ul51q8gyImTiRqRVYXU6HKTcd0N8LpXqddBAyYYgLL?=
 =?us-ascii?Q?EWdngQlP6d22pqaHgH7u+P75HQiiQiqQqNVH8UPNbvyS2pCowB/JyiazMcHk?=
 =?us-ascii?Q?099tsXCdPg3k2dQOztavb/uOCV9q9apbCbiT0meKZ0MLjdSWw4DYFETJxDvd?=
 =?us-ascii?Q?6RREFD+0cpGspWm2aGoQrDbkLNv9uRRi7jkean2OfztWQCKzalI70FHVqkbL?=
 =?us-ascii?Q?x410msFhD26w/WXwk4pqhS/doRl4In9eJw/312VPDetz4bZnb65fk0t4fq0q?=
 =?us-ascii?Q?Vg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?dmVE13x5kYy1gCXNuw3Id93sem6Rwg9M3nKTYkjey+3BWf0jWVEVM+qWLQfz?=
 =?us-ascii?Q?tiMDkhk5p8jOhLJEK8XfOrw+xRUsQMrZMjPNqldl5rjXhcf94ePt75ujH6U+?=
 =?us-ascii?Q?vUn9c7+YzpzxR3K0wGPhXqVllWL8AhjaxCxNRn/jVkmvTeAResp1MZd8Nv5B?=
 =?us-ascii?Q?ATVUHmcdeKngeQ+GMUyeeYF6JPyvYOc8MjceIc74OepqeS7rphA+fl8v+tei?=
 =?us-ascii?Q?TesU3bj3a4kfAUk805UlaHvMRJIgPknloqXekstguCNquIiHBC1mGQJwnOQ2?=
 =?us-ascii?Q?OFor8WMWaCv6/xHG6wo3vg7hqtz/pCPelDguE1deqCUSKjCIVBHsjSrGAhuv?=
 =?us-ascii?Q?8bO804fnfXGP+J+uj9iRRaDRiO1187OxIs+ouCLnXoYQLHtiEqlonXNqyxOa?=
 =?us-ascii?Q?t2A/sOURl2E4rSSUZODG7ZxTz62BYXux5nbmgGQ4/FBmy/zuqT+MvqG+5dVl?=
 =?us-ascii?Q?iRhAz8X1sCTKbn0gGUDb6CwSjomoTnqOekuC8lZeaDkMxCx1jgQ9rLg5diQ/?=
 =?us-ascii?Q?n+d75NyomMUqQICEzqDKcYn5kHS2l+azn5GGXedKFHsUrxUwQBoPWUGCrvpr?=
 =?us-ascii?Q?L/grdW6JK08I6HBdyuL2TyCVXx+7qNaAONjkadswWiPiu1qBmIXT03NsIrjI?=
 =?us-ascii?Q?rSmfb6+vBXx9bMTyP7zjr1On2GSRZ+QKln6ux3LJSUGJ98aL4h/H5UdCRQ1I?=
 =?us-ascii?Q?TZlw9ZYaoz3VRkM02GEoETCPv4yVsk5q8qo23kN33D1x7mf2kYQdIlARDfA6?=
 =?us-ascii?Q?zNz79jAihHSJxzHeokEhrMbQzgCHyBosabIniho+8SaBTAALgIIURGBkfTC6?=
 =?us-ascii?Q?6T6VKUpIz7JLWGLWBenKHymMeaE9MtEUQ08jiNkz4AIExx7Ulgmtf8hPUoQi?=
 =?us-ascii?Q?cmc6Sgt3lDtt1QfgAwj4IAH16tYjCwyd6/i+ll+7KugIdb/06d88DtEQGjoC?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1758a05b-93ef-45a3-2a98-08db5315bd86
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 18:21:44.3045
 (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: xa/j8Qt1rkUwsFGTGx0SMCj3HHs0N08PEpC5RjWHNahPxkGCX1NC3o/DdeidkrFC3PNx4nclLVvniNBeML5yoQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5211
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-05-12_11,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-ORIG-GUID: 2Sa43_sfqGh5WLDUEQkRmckLBqrttquT
X-Proofpoint-GUID: 2Sa43_sfqGh5WLDUEQkRmckLBqrttquT
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,
        RCVD_IN_MSPIKE_H2,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 b3e5ae43ff8ff..e233f41ed4da2 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