From patchwork Fri May 5 14:58:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13232722 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 A4C81C77B7F for ; Fri, 5 May 2023 14:59:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E53316B0072; Fri, 5 May 2023 10:59:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFF376B0075; Fri, 5 May 2023 10:59:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEE4C6B007B; Fri, 5 May 2023 10:59:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by kanga.kvack.org (Postfix) with ESMTP id A60BF6B0072 for ; Fri, 5 May 2023 10:59:50 -0400 (EDT) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-64115eef620so20215720b3a.1 for ; Fri, 05 May 2023 07:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1683298789; x=1685890789; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bMT3CTvNOAP4fCjxDVg1BNstksZl3tnW2Myn+79x8Cw=; b=QwEB81Ilrk88iqDgvmlnlkgY1xH/viUbnGvJIFCcTSa1/z5yxz10LKsGBVYzgcsZuX Y8VncuvEQdxKiuu7XU6cI7UiCWnAo9hy/57xcgqHl8Uh9DQL6odiJWFInMmVUsIpPNOd 6ReuzFiIJXtbdqvB2l+niWIPjPMXMNEPYa9kCThz6rmWzhRfqTEQzE5n+4wTiZ6M5Hrl DtpC2hpUpDLpRKS9Z+8qut8FG0ln+rashaBjgrXavbCRk2Xc6tRHV56kiXRYZXQlI4iK PtLyGq62Icg65t0xI0NHnRbh483/MfTaI0Jlg/KH7u9uiHE7bJU8MhB9Ag5bUHb/QDSg byGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683298789; x=1685890789; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bMT3CTvNOAP4fCjxDVg1BNstksZl3tnW2Myn+79x8Cw=; b=RNkZ1jMaF9dWzQx4cZ84kC+L3Z9IlhC/y/EYB3DZiT7R0flB5Auar/ihqCs1iiDgY1 hGnRTdEYpZf5Uq/6blJzMkuW7up6r/lg0/dJ/FAYLgZg65AydD1z8IuN++1/pSxNO7t7 BqBa2h66e/tBKqaPgYksYUu7kxHqvHl5S1w9VXm9DTZNL+md+H5j75mE0eMxeOk/RMTp RZVDgHp8eZ69lNLR0TZEr5p+LkMki1tC6e5cbqnvyskvpqdggSEzRZr7LkQDRv4cc16K OHXFfRJrxjika0z+DNKCBP0qwNWcI05hHHyNADIfQ9HCCb/B7pSefh24Q7Zd6FXmIcfj PdXQ== X-Gm-Message-State: AC+VfDz6HZB0W6qLgEX6hotu4l4BOSBWYVvR/hityqNq0WrOTdIADch4 m9vOJz9A446M72JSTAWgvTpdmQ== X-Google-Smtp-Source: ACHHUZ6FuVUAXC00F96fqcdHC1SI4rCfWrNHMf4zPD4ZuMK39P5kvxpDXzGvNw0oL9QZNMtop4ou7w== X-Received: by 2002:a17:90b:350d:b0:246:9517:30b6 with SMTP id ls13-20020a17090b350d00b00246951730b6mr7007998pjb.4.1683298789614; Fri, 05 May 2023 07:59:49 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id jx12-20020a17090b46cc00b0024e0141353dsm5193761pjb.28.2023.05.05.07.59.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 May 2023 07:59:49 -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 , "Edgecombe, Rick P" , Tad , Michael Keyes , Stable@vger.kernel.org Subject: [PATCH v2] maple_tree: Make maple state reusable after mas_empty_area() Date: Fri, 5 May 2023 22:58:29 +0800 Message-Id: <20230505145829.74574-1-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 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: 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. Users would get unexpected results from other operations on the maple state after calling the affected function. Reported-by: "Edgecombe, Rick P" Reported-by: Tad Reported-by: Michael Keyes Link: https://lore.kernel.org/linux-mm/32f156ba80010fd97dbaf0a0cdfc84366608624d.camel@intel.com/ Link: https://lore.kernel.org/linux-mm/e6108286ac025c268964a7ead3aab9899f9bc6e9.camel@spotco.us/ Fixes: 54a611b60590 ("Maple Tree: add new data structure") Cc: Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 110a36479dced..8ebc43d4cc8c5 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5317,15 +5317,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min, mt = mte_node_type(mas->node); pivots = ma_pivots(mas_mn(mas), mt); - if (offset) - mas->min = pivots[offset - 1] + 1; - - if (offset < mt_pivots[mt]) - mas->max = pivots[offset]; - - if (mas->index < mas->min) - mas->index = mas->min; - + min = mas_safe_min(mas, pivots, offset); + if (mas->index < min) + mas->index = min; mas->last = mas->index + size - 1; return 0; }