From patchwork Tue Mar 7 16:03:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13164083 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 1A398C678D5 for ; Tue, 7 Mar 2023 16:03:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BF826B0071; Tue, 7 Mar 2023 11:03:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 16FBA6B0073; Tue, 7 Mar 2023 11:03:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0382D280001; Tue, 7 Mar 2023 11:03:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E40336B0071 for ; Tue, 7 Mar 2023 11:03:56 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C3ED080D7A for ; Tue, 7 Mar 2023 16:03:56 +0000 (UTC) X-FDA: 80542573272.06.E06E31D Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf17.hostedemail.com (Postfix) with ESMTP id C46434000F for ; Tue, 7 Mar 2023 16:03:51 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=HhlJAwr8; spf=pass (imf17.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678205032; 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:dkim-signature; bh=G7hLcya3bsLv//yf0JprtSrDFewhrMQT5YQLYtI/Y+8=; b=YrYPsVlx9t/AnDvSR5aJWF1/bGmvuEWsflFxruIWu0fvOGDUAamJHgLzE4CcZrr4ovelMQ oj/b0jRBGncLayvzV4w/N9DzzBKhTy3djnpDDy0fbfT3sPaGQ9+r/6kS1XeE8UV80iVqiv EujoIo5spE6RwwN5VT3TijQHgOvDVtk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=HhlJAwr8; spf=pass (imf17.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678205032; a=rsa-sha256; cv=none; b=Pyig+xvapgfJ8h/+wlEY2nBbtnhdGqK6VXRRwtzub8X1J5dfFJOnP3dM3kXJciFkZxsmKo ES+WbaxVq0tu+BdAXRBE3E4EXlQ5lpqOg2UafYe8JrL5dw5334XcDEGsZSlpqXS9EASqEl uW182dgM8U8lG6LoSBz0lzFoksSwdmo= Received: by mail-pl1-f171.google.com with SMTP id v11so14599187plz.8 for ; Tue, 07 Mar 2023 08:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1678205030; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=G7hLcya3bsLv//yf0JprtSrDFewhrMQT5YQLYtI/Y+8=; b=HhlJAwr8DqmGWUQSQKG77Mn/Gh6yYYR1j2fGKcMErDoLU/2WO4w78tvQGmo8qzz+Bd z+vLe76wWlESF6KvD5zv8SeC+NAvZI2OhNtVa9jLuWq4nDxOG0mZ08GuWIQ40j0ve47d wCNyjXMH15KF/Lpl90NsfZWOhDLQT55jBjeZV/k5txBnAGDsY8KeEu55sl6W4ZjYnJzp PJilrxuNUwsZ1en+/W/K3Dx1Nuza0C8iW4/1LFjiIRH4BesAKN2JMUmORh0abKLxfa8O 9FUU+5gIIQldomfJ4kYWMctWkgmHx1rBLoa3jLT643ykt0S5GIx5oKwqmS3Exzn5j4tf xmag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678205030; 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=G7hLcya3bsLv//yf0JprtSrDFewhrMQT5YQLYtI/Y+8=; b=lpVVXRd0u0g26ymGD7DyjLjlxF7Bch+quDi7gs7C2SLgzUoSIN/m/grPaGMNWS3geI c031I8BnCB9ePYz4ut/BXsi5ccPdQq8SgZ603piH25D1CG2CuCbSzROpkxIyx4eLsMr5 zCA94ZqKpBwKO3681bQbG2kTjKlMKCu76gQ1/bG/DI4AAyD+CEizI2Eoxsd6zqQpqqcL ECJFuZoffy7TGozSjq0VZRIN41woIF9AcG/XDGRmTkoux72IZcGjHQnkqndQdW6SCe6l RBos++ojE1yaxtkdXEGLFzzrTYp+G8Oc9/poYgwHjGz+oCwFDvMo+++CPz8rCHjif9YX SMAg== X-Gm-Message-State: AO0yUKW2zVOrxQ/lP3I/7x+Y7aQblN8We5BfKA3GIke4U0OvJrjGjdVj ITowyEoOjHKo6Js58VxprMunmbXjIdAsFNc/1zU= X-Google-Smtp-Source: AK7set8Q11G93VM5gWqdl9WiAdklDxZlW9kQBcrDhnVNMiGKZchmSzF3+ndLqHk5ffFXVnShE9uXAA== X-Received: by 2002:a05:6a20:8e0a:b0:c7:af88:3c8f with SMTP id y10-20020a056a208e0a00b000c7af883c8fmr19601953pzj.25.1678205030119; Tue, 07 Mar 2023 08:03:50 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id m3-20020a635803000000b00502fdc69b97sm7900009pgb.67.2023.03.07.08.03.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Mar 2023 08:03:49 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, snild@sony.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Stable@vger.kernel.org, Peng Zhang Subject: [PATCH] maple_tree: Fix the error of mas->min/max in mas_skip_node() Date: Wed, 8 Mar 2023 00:03:40 +0800 Message-Id: <20230307160340.57074-1-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C46434000F X-Rspam-User: X-Stat-Signature: oi5wcrtjt5isfpc9y8kxjhnoy8k4ruyk X-HE-Tag: 1678205031-321536 X-HE-Meta: U2FsdGVkX19MFr6Ayp82PSmKj1xKNSC8D/vhOjsyYfMpnA537J0btH7OfxsC2mwGpjbRCS630s4W69LT80D+Z5VUdI/dUXPqN3otVv5lDsk0x5ua9sKqTKlL1I85PSrAQI2JXeA2DoFoT9MmiwEqLHS9KAyzrUFBjB/mM0L8oUDigRdicOEQd8J6QvoupKnqhiVJuIVlYeim4mZwWH2NSM3ArVpum9dUqXEGgxweyx2Zjp+9QnTD0MZBITuZStkPgQAoTNKCZOnz1DOM3p9mKwS63SVxcwwgOUf2xbdOsvJJcZghLbL3DCP+jlBMhuRw8zQGUuiWuOglrQes3zGJqILodmEAzhD0LawapAvPDUaYAL5pA3g758SpLM2RXYfffuFvKwrNIaXoo/qWhOBMhk4X/G/N2oVKNddSW7OftogKwLr23PlYrnyZ+1u4Mwh7xhQHYcsh8XtUj7kKMew8yOdF/W9WsgvnBEVaX/lvru9tc09aWhC6eHR8uyLIqdqwIFGkJDIPHPznTj6RU364WXfN4KTR+Irj0eEtrjT/OQajRyKhDl8f7J9e8O8sYbNxDlIgMZn4DYIg8c6sOmbr+nsQ/6SbxvD6icJOH7Cjd52cTmUmYf+kAS1HiR2I5+cZxcDXWnsyRuis21rfeYc89rOykiWMtBNIGroKialcHXbE+CHs+A3pYVKfgXnvWodw9e/p6w+pj6GUGGD7Ym9QHGnKRQCA3zLZ/53cidQqphjR+Sx84nclsUwZ0gVQlDFpplSRWjU5HbkLCIy07UmNRor6MNoWUo8zpQDgG9DOvuyw/u9qYgrtzx1AXJYubdAWSmCZOSM0KJG1yvvvi89o0WJKbWtMPcj1szB/rNwVONQMVTwcomJuE2BGeuZWUs00eVTZqW6i6mRi1l8W8wf+m3lW7PKz2QlG9eofWIOiZpo4r5/OfQjMz9aNW0BKOdOi7YqYcn5Vh8nKRM54VSU aYjhqu8k fs+pnn8xYtdQXZl9/ue1CgV9CFNWK/CX/kvCFEFsr9JbzGsHBrUpsW/XddKPI4FyHWotCd5C1n1ptUKgykhY9H9XFcwNkeBgfAYY5E8hUk3p7j5ILpE9GkWDZbMRHwjltMbxp6WlcVTNClyZ5WKRh6qA7q2VgUUSGLA68ZrgqEDsScs1DmK1sL+fzUFrMjHWeXXdfnSIcpmXCVwuOIE/Gy8rXUDUFgVA4d+SzfNGggZmqSART1uYvNv0Lwjtg8TwokEFS593OCGxAVUH3E5dY/3b00oq0KHvwg2NH8PobITUHriuaXdMlhaGHoupFWNoQ7ufWXMdWFPc/IQMRlb7/hcgZNbDyStBZmGRT+MA9+bgoJNwBpPZUm9ZBE+whJTSKCXVV8+x//EwjcR8vVhDff91xpwxXj20HQ8r0mILr+o2BtPhHnMskJYN81D5KQkRjpEuujLdfigx82bTNF5ulBjNPLA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.049320, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The assignment of mas->min and mas->max is wrong. mas->min and mas->max should represent the range of the current node. After mas_ascend() returns, mas-min and mas->max already represent the range of the current node, so we should delete these assignments of mas->min and mas->max. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f5bee48de569..d4ddf7f8adc7 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5157,9 +5157,6 @@ static inline bool mas_rewind_node(struct ma_state *mas) */ static inline bool mas_skip_node(struct ma_state *mas) { - unsigned long *pivots; - enum maple_type mt; - if (mas_is_err(mas)) return false; @@ -5173,14 +5170,7 @@ static inline bool mas_skip_node(struct ma_state *mas) mas_ascend(mas); } } while (mas->offset >= mas_data_end(mas)); - - mt = mte_node_type(mas->node); - pivots = ma_pivots(mas_mn(mas), mt); - mas->min = pivots[mas->offset] + 1; mas->offset++; - if (mas->offset < mt_slots[mt]) - mas->max = pivots[mas->offset]; - return true; }