From nobody Thu Feb 12 10:34:32 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 8009BC6FD18 for ; Tue, 25 Apr 2023 11:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233779AbjDYLFg (ORCPT ); Tue, 25 Apr 2023 07:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbjDYLFd (ORCPT ); Tue, 25 Apr 2023 07:05:33 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C4E05FDD for ; Tue, 25 Apr 2023 04:05:32 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-63d2ba63dddso4532384b3a.2 for ; Tue, 25 Apr 2023 04:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420732; x=1685012732; 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=k3gtz2twduYMn314aWKPdPXlwzAEr/ThikDxq/EAqMc=; b=QmK+bpu3OrfPdSwq5btASAzKm3wgRczj/+suiuqNcMy2NwVbP4ROvdfevWx4rQNazE z51Uz+aGBN2J44RqQUvlScXgks+MkypgIVZPjhcPt8g1vNU6HSKACdUnLJH86h3Trf5x 29A4FD1yH8yNeYxbdMGM1UejkWDX+SNrdDJtE8vfWm8swblZ77+lqF7zKpuickVwqdC4 oAnQBvIRl6pV+0feNB+9re2SLlggZIRIT1Z67T0xC9ipIzv87BVHDvgkdSQ1gdFZnefA DXoZ2TKFJCZFzR8vjJJb5NhBPKZIus1BetzLfmTTHhYzAZW9qSZtdi+W+BOt1gqG8q5m iEtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420732; x=1685012732; 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=k3gtz2twduYMn314aWKPdPXlwzAEr/ThikDxq/EAqMc=; b=V/0cHUk/NP1HzrTZzlK4rLuKt+/ddwWS3W+/A6HwDSbtzycw0rqZMc/yqydoZwTBnO IVbAkk2MaYTwK68PPrg8EljtZYGIAtJKCir5zJTkKcRNcIhxLB38bWAQ/7cOQLORyIeV 56oV8Gsh9DpZgLcw29snB4ulS7GJfIcBPH4sCexM/iVMf5KB0qoNyo6JymSQP4pDeV3z P7KuriAGRE9XnApXAcRtX4yyJJmMsNQHm98LcoTQluuvCiXnJ2eEq3DuNxbsp5euIcsB eviLVMTCsx2uXH1oM4tYLFiIVfqU/YQAVPamwJ5mtXO1tN591aVmRpSWruqRMdhx4E3K afPA== X-Gm-Message-State: AAQBX9fJ9EfzbdC2Fw/tc31QX6+NkaIFHzRrHwLkUzSHGlmDQQ/TpWn5 oMVzefIEn9S94TjvoZqebwuykw== X-Google-Smtp-Source: AKy350a6riQre9kg4t0NqG+0JOJCUjRgULCxd3ko2U+yTXTnw2AYPmRvhUw2mqlYxBxuXlVpDaZ1AQ== X-Received: by 2002:aa7:8884:0:b0:63d:2c2f:e3a2 with SMTP id z4-20020aa78884000000b0063d2c2fe3a2mr23868065pfe.18.1682420731840; Tue, 25 Apr 2023 04:05:31 -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.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:31 -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 2/9] maple_tree: Make maple state reusable after mas_empty_area() Date: Tue, 25 Apr 2023 19:05:04 +0800 Message-Id: <20230425110511.11680-3-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Make mas->min and mas->max point to a node range instead of a leaf entry range. This allows mas to still be usable after mas_empty_area() returns. This currently has no user impact because no one use mas after mas_empty_area() now. Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang --- lib/maple_tree.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 72099b4b32169..aa55c914818a0 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5320,14 +5320,7 @@ int mas_empty_area(struct ma_state *mas, unsigned lo= ng min, =20 mt =3D mte_node_type(mas->node); pivots =3D ma_pivots(mas_mn(mas), mt); - if (offset) - mas->min =3D pivots[offset - 1] + 1; - - if (offset < mt_pivots[mt]) - mas->max =3D pivots[offset]; - - if (mas->index < mas->min) - mas->index =3D mas->min; + mas->index =3D max(mas->index, mas_safe_min(mas, pivots, offset)); =20 mas->last =3D mas->index + size - 1; return 0; --=20 2.20.1