From patchwork Wed Jul 26 08:09:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13327565 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 478ACC001DE for ; Wed, 26 Jul 2023 08:10:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE4E26B0075; Wed, 26 Jul 2023 04:10:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D6D8B6B0078; Wed, 26 Jul 2023 04:10:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE7806B007B; Wed, 26 Jul 2023 04:10:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AE59F6B0075 for ; Wed, 26 Jul 2023 04:10:04 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 75FC412019C for ; Wed, 26 Jul 2023 08:10:04 +0000 (UTC) X-FDA: 81053039928.10.F0B12BB Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by imf09.hostedemail.com (Postfix) with ESMTP id 63120140015 for ; Wed, 26 Jul 2023 08:10:02 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="RXB/luIX"; spf=pass (imf09.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.49 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=1690359002; a=rsa-sha256; cv=none; b=PuKwzPZYi1NrYHD0OxwY2KtB914x+FHvnLPADq8X2TEx/hNVj/zo3pxhVrC0c5/VIVIB0p /LVIwcZcULX8jB79BhtJ9g8XfM2cQgd+rPFN15maIy7BT2bdEbRfKKApRGX92W200Kt+a0 K5FolUnexjtliMNU1fxUFasVc+ahAog= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="RXB/luIX"; spf=pass (imf09.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.49 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=1690359002; 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=CBWhUMSjOCubXY+PC9p9DMz2fuhl5l7G2DCnpXKXi44=; b=IH1lNnLiQZ7HhkTSxmSYFjpsMXYHuVkKzOBmt0CJuF6gWCF6bPFF3kBqZ6664B2yrTdfpB hwvnuwuwv3eBVxPQ+X3YqBM7FIG3v7sM7CZKK5hIkIsjBkinb9aTHKRwmH8f7qsC/B8daJ oawLQZzSU66qQe4xDoX1He4AmhtlJAw= Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6bb2ce4f9f8so2518774a34.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=KXjZZV86/cnOSYpk6EWxzrIaulckieWmZpOjwWnvLdXoy3L+LXLHyPAlXTMlF3d3tT nRxaI2kvuYcV2hgBmVfFYNmaCz8pA8ic8CMDOSc759FStz6w28o81uNGIGlNbitkEfUG v6yrG07soAoiiXMslxJAhpguqCoSUm6G+stD2lmdkGPPUWSKNy8921V7MXS8ilFTMFuv WXV4K0U7zoNU49aW9ZQn8Ddjjivke0Spht8OsnFWY6fAkOky9syMv8umM022spOn7rn3 RNwXLuf8K2/eqSzqKsyTPw6RlbTGhERDUnn4TK+kFmyueHKSympPnYR5ahyjRKmwOM0w JTpw== X-Gm-Message-State: ABy/qLbt6vBfiv9W6lHgeTzMFlp+pWmfbqxED9v6IIFhzokXXQiyLOuE yfkpSvK2wupPOpvOcju2hUG9Zw== 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 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 63120140015 X-Stat-Signature: p8heikypyiab1uxcn4gwjqd94nj6wyrk X-Rspam-User: X-HE-Tag: 1690359002-26883 X-HE-Meta: U2FsdGVkX19ZlZ5Cj4XdWiF3r4tJBOTdjPzwmyx4B4AzPmQaiJT2WCTJ5DwSA9IjYiKj/kNTp6QzWtpYHoj9xdNaalM1PAYkNyf9H044MDp8ySHaOheGoNdlIeZfvmCB+1egf41KO+SkvCc86SzIlNmB1gRx8RyGaOoUUpGoS32Q4I0eVyVI9kV+cmk1pcjmkwQArT2TLbsq1FMxUs3HIjyVkGU9AUo5nPkbyo87E4HOfNOBWa5pSYeIsZdlo0WX/nhHyeRa+oUVseRWi37WHxNhbnX3+RHc6blxRTH3M3tdb3KA15wkj01bGQZoUu3LLpb17g7hTdT6q/wLKsQFSLEdsmta6oJCFYq51BwPHDKu096RS5zMJUSKm9/AYS7dMCanHlaghqIdfHU3BXx5iFxgOEj94fH24JkDYJk/7fgbey/7mAHFcG81mVTJEd7n4MSI+53g2yZndySjm5d4r1gnoTj2YkIFJx1pepFTcfKUcIZzKl6NrJ4pmSTvTHTJ/MWTfxqIQ6K9l/MlZA+R9EQyIifjScjpyBge/PtejTDt6EbCOAaP7rzZhbp0CJ8pvdt3Qk1oPw+vxR3gOUdxJ74Eyn2XvfIlbnktNJM+xfXOVfv3ObUd+SaQ4eUD9tWBq7u0eCB8fp3xeQR/B/MRx5POhadkDTGAqqCvIvDvgbfG8QprusabcaWIFoRUqXkOByB8bD28DBUbaJq39N0I+ecQG6I0vKJRUxZZxWbdHNcUWG5fvbT8isOiF/MiaukB9gsaAlRmmNoaZwgiHgav6X3X/WsdfLj+Qe+/STeJhAIKz8XHT5NsV7IPE31/5Vkn6TOckTWM9TEp4/f8t76Gv9/MvNv0ZPCAycAU3atnbCrRa5fOv+tkcR2dXdWOGgP8vRXB1J4XtnoY/6DH8HMMYm1fI3dsMCrVT57pTC+v27qXUpZQ3dV90kT7O3DqdK6S+WY9m1IdtCPjvoovY00 sgEE6NU8 zA/+5dN+BF/BPz9NYYo3Fd79J3q3PZOHLWv+D7KGAXavEQ7lcY0fgMGPRTivyhiUk0DPTMK+GxHEo+TFJ9bY79IdElewGYqiCLZqa3OcosqrjfB3Pbyj+sRpD7XA6u4aNo9tzY44yXHzPjK9p0cIVPNr1TKtGdoIU9YIsBESFBGlIk752ZehO9xTyJOOKUqjm66q1uF5iqXySppF2HD+guAekSFaKSMOhrY3RDzwoiWRLFYcs6VUxZNJdCCzMh9pBsPJMcpaM7gxXcHu6XForFZQIZFChT0djrw242p8Jrr9F6scSehMLXFVzn8rH0zDry6Dnwr2DbU7kTpuvnoVXHTyLANaor9WqxI0DitLOwKOD3CU56NjoyzMFojLZBSE/CkzOfgEU0k9iS6lIqy5NSz/vlcgnQsyBh6igsCqosvXdQMIBdh5kETuwZwIIe3E5C7npzE9GA1Q9RdgLuwy1gGhZGg== 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: 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);