From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EC4FC7EE31 for ; Thu, 26 Jun 2025 17:19:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D6E86B00A3; Thu, 26 Jun 2025 13:19:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 960A86B00A4; Thu, 26 Jun 2025 13:19:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8501A6B00A5; Thu, 26 Jun 2025 13:19:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6C97C6B00A3 for ; Thu, 26 Jun 2025 13:19:31 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DB99A121699 for ; Thu, 26 Jun 2025 17:19:30 +0000 (UTC) X-FDA: 83598213300.05.A78D005 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf05.hostedemail.com (Postfix) with ESMTP id 29ECD100013 for ; Thu, 26 Jun 2025 17:19:28 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750958369; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=1Ep6izEw4dCRXA1HPWc7OnChSE//4ciLCYe54ZpLXW8=; b=5i4K8n8uEBv4PBCU82KXfoqSr4t1DzYzE0i940KZo8raSD5fQxkSxuYxN53QPnUoOlHFcR iwQJK3zL1t3UbadHwV57CzNXKwSPgk4wEOfNxF1lNAjrrDeVp+e0e+S1u2kszFOWv44WZC Mm+2ZxsDrpDnJ1NpPc/wU1WxA2q7QJs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750958369; a=rsa-sha256; cv=none; b=TlMftdZ0hYOVl1MuuKrXOcfI8XPfsWkyUXLpcsQzra4WbT6TzlWZE5sGiBsejzTvPGl0bx CrcM3jVCgZJeXK+ggduPzSYRNK07AvJqPLtVaT644HBg5Lgh0pQzqTS7wGj30xWOJ0AkUw FSU0pCCqaV8/tfdbZRPQGDR8Ekf3Q0I= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5328D1758; Thu, 26 Jun 2025 10:19:10 -0700 (PDT) Received: from localhost.localdomain (unknown [10.163.88.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2D5063F762; Thu, 26 Jun 2025 10:19:24 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org, Liam.Howlett@oracle.com Cc: richard.weiyang@gmail.com, maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH 1/2] maple tree: Clean up mtree_range_walk() Date: Thu, 26 Jun 2025 22:49:17 +0530 Message-Id: <20250626171918.17261-1-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 29ECD100013 X-Stat-Signature: zfb4ngqjwipiprin4b613mqo7zkud4id X-Rspam-User: X-HE-Tag: 1750958368-630825 X-HE-Meta: U2FsdGVkX18ewI9SwCj7PnKUZGlpFURuUnngcvip0n5zIPEEDuRK+VeHcBrogqfOiN3nTpT3kEybok7q9kY/qg6dkjeKx1/yElrT4TsWU3S9bYmQdDdU62NiAQhgiHhCpwbs3ztWFUKIyGVEpcDn9JtGHhq6bnHmtlwwqnbGpvI6fS2aGZpSKkl16BBTAHMtGf03jPSVaiuxkDWVrBd6335FK1iFz1/OYwqjlh6tOiAOG/NgRaeIni97P8AquhkWu+JNmEukrbpYx59oF+6JbqTPVD3m+lCz1dN189MfCiDOE+g2VnIsXqA4ta9C0SQcsODANVz1u1oWaORFDyZAbu6X5diL32rhi0BUXbwhEnDoZ1jUh3mr2+iCtx4rSHqynxpz4pNqY2WkCnqyTqNwvt6LvOEEeAb0iAYI8sncM3qK2J6YzXPl2BZNYhAn1oQn2Pczgra/WRpBZ3OAd45NmW9JgpcZYRHDVSCqAod2Zir5lVrci2N5PdcR6xlUegjxWDQdhLRPJmrtAmsDs0hlRwLH6AtT/L4t/18YInyeXEfPyKEBIYi80biHanJH2xeZWaey3nuj7aB4UmNhixZhDQIpSm8sR0Nef1QcKtlZzs8j5t28RRrTBVVgq3FyLnQhTmEsw9+GwA6X+bp/wyL6n+ASmdVO3B4OaYvusID7HBcGZ6bUkRQ+8F12drlsRp1u0HxozUk2VyxAn7fbmSKYODPm7FgawnGxWNxbFN+0NTQ4HNv0ZeojBxnP3x5alHEdUzyMMZSIXJ2qzee25QnXuOAQii8cJ2dTpeGEqv9QDtz8NmSYtCOf/wjodwrf0gwdcBvCmcDE98IDWovNb3LrbUWw3DUv4y1myQOx3PtezYEffhHroJZ7WCNU9zxsvV/sYg5UFka79bWSwx24rqX6rvOGjm7QjvI9Trx/9Pi18T9W9fnnCvsf0ij24Y024vG6yEBOIgnJXC+EVvsTt3m NrzwVVcS IK/b7oSkafdCJ2wkp/J35RBuiuHGE3JhecZpaILXH7tjwzXorfU3ODzi0LQMQBoiDpAywsuTV6pvUYPO4n4QdF0c9SSsr9nCF7nDKp/JjfB5JOisDH0hvqW0kzBHTzWDIg3sJUzwNuXtAiX9RjfoSfX8pL2TBZkvifdLsM6O5Hk+BLTI+Bf3CwWQa+J1mUNDi8Me84b/oVLVxzy7nrWYf19mmhRS8eK2FKmJlfOryd2OKtFoQHka3dprDm3FqtPP8Jj4qmH90SnqpjMY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The special casing for offset == 0 is being done because min will stay mas->min in this case. So refactor the code to use the while loop for setting the max and getting the corresponding offset, and only set the min for offset > 0. Signed-off-by: Dev Jain --- lib/maple_tree.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 0e85e92c5375..6c89e6790fb5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -2770,13 +2770,8 @@ static inline void *mtree_range_walk(struct ma_state *mas) end = ma_data_end(node, type, pivots, max); prev_min = min; prev_max = max; - if (pivots[0] >= mas->index) { - offset = 0; - max = pivots[0]; - goto next; - } - offset = 1; + offset = 0; while (offset < end) { if (pivots[offset] >= mas->index) { max = pivots[offset]; @@ -2784,9 +2779,9 @@ static inline void *mtree_range_walk(struct ma_state *mas) } offset++; } + if (likely(offset)) + min = pivots[offset - 1] + 1; - min = pivots[offset - 1] + 1; -next: slots = ma_slots(node, type); next = mt_slot(mas->tree, slots, offset); if (unlikely(ma_dead_node(node))) -- 2.30.2