From patchwork Tue Apr 25 11:05:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223207 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 7FCD9C77B61 for ; Tue, 25 Apr 2023 11:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 168306B0080; Tue, 25 Apr 2023 07:05:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F1D16B0081; Tue, 25 Apr 2023 07:05:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED4166B0082; Tue, 25 Apr 2023 07:05:50 -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 DE5896B0080 for ; Tue, 25 Apr 2023 07:05:50 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A1C6CACD04 for ; Tue, 25 Apr 2023 11:05:50 +0000 (UTC) X-FDA: 80719633260.14.0B34A25 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf28.hostedemail.com (Postfix) with ESMTP id C5FCDC0004 for ; Tue, 25 Apr 2023 11:05:48 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jipQmnHi; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682420748; 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:in-reply-to:references:references:dkim-signature; bh=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=6i85kzCL44gh+fgcx2LPXo6tUr82m2G5xf50MjHdsuUXw8IxlEYSHFWjggRFdvh1nAuYdJ mbP56tNsTa+MMjG6XSVpGSv30WsajsQ5lrq1MhcZRnwCvUjnzqIM0zCcelMcxcEHlhkeA5 LrtaABgXDqQwmlAmFXT3fsn40OjB+H4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jipQmnHi; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682420748; a=rsa-sha256; cv=none; b=ayw1oCBBQT4Q2kC3z+5YjGCvifdTPO7FE/iZLB1cQIoWE/EiRGs78F00/VZDwWULd2ZEGV QnuN8Iq3By/ULvO+a36uFT59BkQiIlJw94Oj1Vr6BpddWMqSAzeUL7YANB6xKG6beGtnIq 4NI1Iez+2OSHdhNlJQnXkvLMJJDHlS4= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-63b5c4c76aaso4109417b3a.2 for ; Tue, 25 Apr 2023 04:05:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420748; x=1685012748; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=jipQmnHiGZqHhFj+pjse8A990ppkL1/uxO9HRdscpit7rhuWxH1VtL8WteZPa//UVl d+QYWMUc3Pd0xNIJ5KCnsF9R2zsXUbxhe79MilPyoF5EbgQWgrgD5Yx/Z643QyvsML8e Y/jlWVM3tUMLV/IXawWDmC1VAS3dP/bzZfDjJDUx7QS7NhTg5FRO+N5DpeKFva0YH+ux jJWMrmPke8pBOQm1JHvFPXk9am07Mtp+Z4X0pBvH9tYeY/Ky6BThaNUVjVEk3qJFoxRR s2JD+th6vAVyzSwwRovJ2WxkiFVq+PiDC67vi7LzP0ZtSLmtotp3zsqbzMeCtXArnENH cbUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420748; x=1685012748; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=OumedGtqkANakJIq7/GsoCNOdCrXShligFFeengagYcp/jU/UuLuEt/W6BzEwIq5M9 BAH353mc2+SaCeEwgCLB7eZaNPl5sA4/s72eqWv+JXPe0S6IgG0j0Nv2O0CGOP2kuldj E6pslhvDAttq9XOEjbcEkjAij/Qh5H+cegJMJUkPHfMRtEwkJyFf64Cft2pq2Dw+uCYD w95idQvvj3mmsmLVcTReZJ90D8ELMH5wNchcZNL4jTHlrGnj4Iqe9Eubow1Xj3TnZyBj L1oQcdB8/oJZE533FsUsIPWoaoycf99ojfmyi6eoI2djJEgoL528vmSBesNYvXl4t19n NuIg== X-Gm-Message-State: AAQBX9fndFv7hDLoYyYFgvIDeEqPa/ckYHXGf/neV9I+n0VAY2A/m6aL XEXeSVfttqO3MezCBvb8kiZLeg== X-Google-Smtp-Source: AKy350al2UoM9RccPs0Hhp+BNacNU4gYAWUgaT33yzGBelCRbw3DAB4I5OBYUs9vNRoOZdmxnTocxQ== X-Received: by 2002:a05:6a00:1887:b0:624:7c9a:c832 with SMTP id x7-20020a056a00188700b006247c9ac832mr22104593pfh.8.1682420747660; Tue, 25 Apr 2023 04:05:47 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:47 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH 7/9] maple_tree: Delete redundant code in mas_next_node() Date: Tue, 25 Apr 2023 19:05:09 +0800 Message-Id: <20230425110511.11680-8-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C5FCDC0004 X-Stat-Signature: u13edgwuo74fcah4iaoqn4mpmqo1wzuo X-HE-Tag: 1682420748-639506 X-HE-Meta: U2FsdGVkX1/TBRd+speNtxxvHh9hSpCzVuSVXWmN9sYn59MyZH8vKe59Qk+ouQnv8t3EpwXZLkk0WknPi5wDvjCv1uk7VPzd1hD08pfAqovhCBJn3v2qgzy0vDdL6LkogycjHgslqwpDN5UmnfwUqKt8D4/L/f80M2jI83qMgzjV57mmATC4VRTlwA2fHgQmTPqCfasCwcq/WxWiygUSy5cRmu+GvQfg7p71o9OLGlv1eqxQ7rcQI68f0bt0rJkden/3PNGU/dBs+7iSy+SbMNMrs1d5fGMjpIktLdOGMM8WxNtKuweq23SMXqRnZKv6UhUn3ioEGdretJxbo92RmKx6PztiY0emdVo16jPj9itXYwTyKZLrYrX+rUezYaY/xJoHT/yEz2jKNuq6FMhiFWYHnKPbbaFt424kqybKKTJUCu+kaSSCIeFv65FVM8sHhDBNXpuXfExyc7HbLbqc8Pj5i+9nB9TXNpPyI/74OZGNyh0mH7LSMkXzrnYn4w9l8Mrrlj95GyvbDu7R7p4oQvOlzBiKcOecJSovY7F9VR1GHj7zRP/iHPJNCcGmfHgFW78flImjPByOqdSozRDCGpj7zM0fipgclnhuqVnqyxMGMJPHfhOLzIb5SaVZN2sT+1SHkfJJJgDY8qIA7Jwv53woUpdxEjhsJMsnFP7U1MXqGpq+OCxXdXP6/xCLj0//zmTnNf3YqjiE9qAvGfSfgEsUXKsheRMi33JrLU0tBItW/TbqvZQlnDIE625IuKK4+SFpOIcPrJtYPVdbyD2QaNEgqoXgFLALUMRyrDBQB8WpY4LphYgSzrLDgTEq5zbul+YHm8ohuexTFOU1o01AlSfvFYNRYZWqbiSmiHQKXigXAQS2BH2y2silM7mrt/y4W+Lp0SYAatbyS+ChnqIGNQE510rEpF2x2fujxEPPvGIgSjrSPNt0vk9cGKZT18gQXNrCv5j6veZF3hBD8bh I5LSMoPu 5TF2eLcNzvgp10G80qHabE/mSOYsAFcfsJyS24s2QNNoZhkwc098L1bA+YCfhf19EXHC9kcpibhZAkfBMqY5vWTGlLc4UwXHkZg5v5uZTYmNI+aIJqEo2nWB7xfkbJ1Q5SD6gNJNfqt4lEjEdvN+CPoaniuRtY5+ND3+Gfhoe61+l27iMDvzeu0TWilX9C0Nd8gzDuKE2p2ARA6yfLy3J45yVHAZTsrXbgbHe4xrHFcfi0TmKbsniH+ao3Gqf3lcVZKLXGo/piZfuo9H//w1CUIzSC3voE/LCw5qf4k5Z83+N6is3DF0HUJ475CR1fPoN+Q/U5TQQaobiuo4jj/MKYIgOQygJnpkcujZa3QTbJHK+yex4nD5rd/5C3ApVsDFtM6C3jnqjCCDyf7XcyMoVQg4XcjORFXYyu8ocA1lKrXGMmiI9V2jNL4AWDr+Gs7U8DHmmOo2J1aole4g= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When offset == node_end is satisfied, go to the parent node, mas->max will not change. So there is no need to update min on the move. Signed-off-by: Peng Zhang --- 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 83441ef2e1f57..8bfa837b7b752 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4616,7 +4616,8 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node, enum maple_type mt; void __rcu **slots; - if (mas->max >= max) + min = mas->max + 1; + if (min > max) goto no_entry; level = 0; @@ -4624,10 +4625,6 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node, if (ma_is_root(node)) goto no_entry; - min = mas->max + 1; - if (min > max) - goto no_entry; - if (unlikely(mas_ascend(mas))) return 1;