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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC4A1C001DC for ; Wed, 26 Jul 2023 08:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231769AbjGZIWx (ORCPT ); Wed, 26 Jul 2023 04:22:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232952AbjGZIWL (ORCPT ); Wed, 26 Jul 2023 04:22:11 -0400 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E38F14C11 for ; Wed, 26 Jul 2023 01:10:01 -0700 (PDT) Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6bb2ce4f9f8so2518772a34.3 for ; Wed, 26 Jul 2023 01:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690359001; x=1690963801; 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=CBWhUMSjOCubXY+PC9p9DMz2fuhl5l7G2DCnpXKXi44=; b=RXB/luIXuwGwXY6rqH5frdTWpd6w9LTeUKn410+nFpUsNaJ23LLavNegSawCjRQMgP olOEFVPrbE0jXarH32neIg973IiVObAB37RV1Je7V6W6onAegs08yBYLMxWW4j27U03B hRTru99Vp9e2P5P7I1yZCu3hCHl6eDVSN3p1/mQN5OYlpRyyeZZmDVUBbwGJZaY20H4v +Q7yDQfwWSqQdd6nsa9TBmh2ADavZejwsPqQ3zGHYBIy3WOGxQ8Wc0Mt+U6dEDUIIa22 6tz1eEu1O31YEPOltcFul+d3p84JJlOgzZQar6fOQqG8Qibwy5TwOeiRi3r4Mzrf/Aam nPTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690359001; x=1690963801; 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=CBWhUMSjOCubXY+PC9p9DMz2fuhl5l7G2DCnpXKXi44=; b=cQDAtBP0Ps6qvDI5c/znE2gZotFGNIUXMwW/nouecnBkGKn2PV8+d7869wtioeZK1w 41HNW46YR03EI76EFS/YkHhpplbV/QHttswXuQo8dj+Iz0fMVmitDunFOjqNpJLYArnz DcWgnidYhhDlUjaiHg1tX8qTpuylPpsSTM5+4TZlDpLKHv6Kc8Qy/0p2B7kqVLd/HG1d jG8+RWCuAw9nG2JgrT/xwTG/bUyyYdrlEVizd0LHWdLPLXISD/FDyl/tSlZ2U9TQLM1J BQOLLlchPFkgYLqMvT3Caw9R5KSgPGCVeMOEKMLSP57DoK4fpx2vd854Z8/F8xs+08WN /Jmw== X-Gm-Message-State: ABy/qLaY4NEVvBhD+9xtvwl0y/acBy+nqv/TZChtXfl/BTu2DRnTQA4K uWAhMbf9HIpepxt5uzU4wZ+CpA== X-Google-Smtp-Source: APBJJlHPh1Z40rOPA8hPV6aBOaHB64sfPxEqqnj6neuzGgAVDkJcfp/eL+6OtW5OBvbdU9FuJRRJcQ== X-Received: by 2002:a05:6830:1e39:b0:6b9:ae94:c664 with SMTP id t25-20020a0568301e3900b006b9ae94c664mr1651229otr.13.1690359001292; Wed, 26 Jul 2023 01:10:01 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id gc17-20020a17090b311100b002680b2d2ab6sm756540pjb.19.2023.07.26.01.09.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Jul 2023 01:10:00 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com, corbet@lwn.net, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, surenb@google.com, michael.christie@oracle.com, peterz@infradead.org, mathieu.desnoyers@efficios.com, npiggin@gmail.com, avagin@gmail.com Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Peng Zhang Subject: [PATCH 02/11] maple_tree: Validate MAPLE_ENODE and ma_nonleaf_data_end() Date: Wed, 26 Jul 2023 16:09:07 +0800 Message-Id: <20230726080916.17454-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230726080916.17454-1-zhangpeng.00@bytedance.com> References: <20230726080916.17454-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Updated mt_validate() to validate MAPLE_ENODE and ma_nonleaf_data_end(). Signed-off-by: Peng Zhang --- lib/maple_tree.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 98e4fdf6f4b9..e0e9a87bdb43 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7130,6 +7130,11 @@ static void mas_validate_child_slot(struct ma_state *mas) MT_BUG_ON(mas->tree, 1); } + if (!slot_is_mte((unsigned long)child)) { + pr_err("Slot is not mte %p[%u]\n", mas_mn(mas), i); + MT_BUG_ON(mas->tree, 1); + } + if (mte_parent_slot(child) != i) { pr_err("Slot error at %p[%u]: child %p has pslot %u\n", mas_mn(mas), i, mte_to_node(child), @@ -7200,6 +7205,13 @@ static void mas_validate_limits(struct ma_state *mas) MT_BUG_ON(mas->tree, 1); } + if (!mte_is_leaf(mas->node) && + mas_data_end(mas) != mte_nonleaf_data_end(mas->tree, mas->node)) { + pr_err("node:%p mas_data_end() != mte_nonleaf_data_end()\n", + mas_mn(mas)); + MT_BUG_ON(mas->tree, 1); + } + for (i += 1; i < mt_slots[type]; i++) { void *entry = mas_slot(mas, slots, i); -- 2.20.1