From patchwork Thu Jun 15 13:08:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13281268 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 36CD4EB64DB for ; Thu, 15 Jun 2023 13:10:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CABC38E0005; Thu, 15 Jun 2023 09:10:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C35156B007E; Thu, 15 Jun 2023 09:10:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD6718E0005; Thu, 15 Jun 2023 09:10:47 -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 9D3B06B007B for ; Thu, 15 Jun 2023 09:10:47 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6418FA0821 for ; Thu, 15 Jun 2023 13:10:47 +0000 (UTC) X-FDA: 80905016934.23.CD0EEDD Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf10.hostedemail.com (Postfix) with ESMTP id 5AB39C0013 for ; Thu, 15 Jun 2023 13:10:45 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=XHxv1DOD; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686834645; a=rsa-sha256; cv=none; b=KQHTrx+fYoByJlOAHDgAr2gYQKpigr9+Ke85iwzTczkQqYw9iglysSDSRXt93hhKc8nBBO +lbZZYY2zDHG//xhXMN5m3tZAuckLftnqzyYU0/Patzqf2B9MA83WA1YqvhuikzNF+Qp+Z eNCiKNlfVIKLXODWHS4UwP3FltSGOec= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=XHxv1DOD; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686834645; 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=Bi6s0yfXuBjDVA++TIrUvyqPyk4i8//b9rD0tFMY+rQ=; b=4dQnWEEqvcUG5hzIxYxJkpYyPSmkm43InVSJRGen2uy13U5lnTiFQBq2HNPDPka+TVckGf ksEtfqqb4qDAqrfROfefvrBIdtqbzNk9O1xWIY1yMfOXkJSPZn3WfrXFKu1OQ5kRSP6vP1 immvFQOYDAjNM3aniJviA9ssRZ6R+h8= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b3db8f3d94so25488845ad.1 for ; Thu, 15 Jun 2023 06:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1686834644; x=1689426644; 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=Bi6s0yfXuBjDVA++TIrUvyqPyk4i8//b9rD0tFMY+rQ=; b=XHxv1DODKYeQKwjzJy2jt+aDwBfZOEIQt0yctlrkqvR3AsFSf1ORSYqAly/zx/7VwZ WE5pC8UGcgZNqDWgJwiEsDt408rwNq/NyGormCqefHQz7iV/7MM+SPvUXcgj8DIwhdjM pdca/N3EZmE6EUlzP8ejwoyLpAGzBriRcJ0sZ40piq4tT04sS0ciN2/ZenkJeOM+P7Ig G51gduTFS2c7/RsbPS1J745FnYsdE+Lck2dn1qUXKvwp0gv2Tm588fL14wsSgM//puEw TH6gPvmuoROUn2NJ4SgKKQZxGmklUQUJUdHsGkpDt0dog3/OQShcgpNHl+zGO18WjK26 ebrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686834644; x=1689426644; 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=Bi6s0yfXuBjDVA++TIrUvyqPyk4i8//b9rD0tFMY+rQ=; b=E3Bok0qXTgc0EQLvtzji9FPgwCSpJGNJrL2MkWeJ5kUeLrpqfVHf3IUZo7PDXO94rO J9ccNMM4TOSBqOAg4gZ2YFbt5bB71Ja7wDzC6/ICLNbJlyAwh6LwbML29XcBZAHm/HqX qNdQ9lBfaxQsULVWxsyTz9VFZ4Hgvdz+mMWL432h84FkDw7GlMJ+5zeaGsZySZBjAtZ4 D/UVq+v0hw10MsuLvfga6udYma0A9Gj4Ts42Zqp1I9SlDL9rgwCtwpATpTTIKLYWmcwd a2wEoJrtiSttH9+dThQOpKtyJE/DhoKw47AcxQl0FEvTt/1UO/LlX2XWBZuyad0ZElip geSg== X-Gm-Message-State: AC+VfDxpkvB3LY7qLARO7HkMnfFRWQ6jzLIhbWX4MrB3skCi0zzcx+jg 7vMpuqM8gO5oLhIqXNpppQ/dJw== X-Google-Smtp-Source: ACHHUZ52MGd9EC/zQoRkcmWexYmu12qqZKGDLmgxc8TYFK9fADOrTtHJMU75US+EdruywsgRdY2x2A== X-Received: by 2002:a17:902:ab1b:b0:1b5:26d4:517d with SMTP id ik27-20020a170902ab1b00b001b526d4517dmr140399plb.29.1686834644205; Thu, 15 Jun 2023 06:10:44 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id x1-20020a170902b40100b001a804b16e38sm14036019plr.150.2023.06.15.06.10.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Jun 2023 06:10:43 -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 5/8] maple_tree: make mas_validate_limits() check root node and node limit Date: Thu, 15 Jun 2023 21:08:56 +0800 Message-Id: <20230615130859.21858-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230615130859.21858-1-zhangpeng.00@bytedance.com> References: <20230615130859.21858-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5AB39C0013 X-Stat-Signature: ktsmioqdfwqpeyg3mfj6q15qkdsim873 X-HE-Tag: 1686834645-817568 X-HE-Meta: U2FsdGVkX192Tdj160uxLT77v2Dnf0ByahMUCMoknDQl9h8lqO5o3pwiwvTTZavCCVCB/hONVpuHw4FsdC5bhcg8mMsettd6AAXVJ0DlyMYou+hwGLMK05BVoxPB+nSxvd7WBODo74r/QP2U1E3pwrepM8nzdXuG2XJlwZH7d0iuxBQOEYzw2qWR+up4aBDGe68lKNeb0RDpszXj/X2h9iBCizE+1a8d5LLFqfOXPAp+GtpQQBwjX1Z1u6QwG+UBDAfPvnoPF0Y+PSGD7ZOl5BpYTswxxVSOLFRDzoPw4bVkPFKZWVYfbP1LQuQkF4rkVqkXLj8KjkNJ7BXmv4REFfmOVIsgq00t1ORCQLMLDT/DdfanJ0ztyAykNOWK9ylZ4ckepWjqU22ARjRWteuDharmyt03kW+HAzY2OYrcsawLnn3G6PQv28XQ2jT2+vzwGB1e2wS7TmWuzj9z3iDkOEULexEUDPwoEgT+RiZ9GKkeSU3AT/8Fp1UuN0KOQtT5NvpauOWU2mvU8+e5qg5Gj55MuOyJsArQBDFF3/YYq4nyDuBGu3bxez8YETpvWZm1fW82FKEdTXMAMVjk4/MdBmJKZAohGalIfrDWkb29V+jnrCCGsIq1u/REyJxT5L6zmKX7DJuos6Xpa+oYac9ItJIC4I1SLLPBoSRlG9sdct2yt0XAZTYXbZbpS7dMdO/WoxtvMg9a8HEsf59YGNzJa0g/APJRXKemjWeijDy4j/ajmSTWjgwPa4FGwIk0wF0fMYlDAmVUJYbtj6hgAP/Wme0uY4tcWS68GqcZHj5IaqOhL2IKJ5HES94e6tmmFwpVEyqg84NbYU9ehcnFabC+3WetbzNyX0IZTdMCFrr8+OskySnLvECx/Du4J6eiwTHV8yZcbJOtXK0L3sijhhjzz0xzRZKsBmDwekHJSYE1cROqOhXzDdJFlRFbFxT3bjH5Va8Ajk4ovb7XwxzeHqa bF3/rX8E YpZCn+13HWsNI3cYJEXQjbiw9KHn9cK9+O8I512x5/YsQW+6mCOOQvKS/2ezElk3C+u8Nl2COjjGkBHpJ709qrpHsrz15D9kpM52Iuh/SiinNy6v8ZRzG13Xexeuz0FFhAPmjeBfZjWh3JdeA0CE+rmg7mpS2yBz97Wc4iBDytN5+PhbCTy+3MHggTQPiJNv06ug+qE28O3nVauen04E7UHu/N2DkZZKwIReRcMmulIFdrO1vdyVAad2QE+7NhSUpdchR8MlEHK77gLzgSn7twB9tUhMtExeyOC+3pG4v3NPft5/yd4QzlbugNxJYPslX9gbaWeezxJXBeprLZEbjUwK8JXbPgV+2rOFu3WX4M7cEYUvbh7YQ+5gkaYmyEmdYRf+Htjnx/IEAh6WqTyNFa3klNo68YVND+TggTQB9Cap3jlc1SSh7ljZDC0FuOfSDmBMOx3eIOFVLmZQ= 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: Update mas_validate_limits() to check root node, check node limit pivot if there is enough room for it to exist and check data_end. Remove the check for child existence as it is done in mas_validate_child_slot(). Signed-off-by: Peng Zhang --- lib/maple_tree.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d91e66ea223f..6c9b62e41605 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7144,26 +7144,15 @@ static void mas_validate_limits(struct ma_state *mas) void __rcu **slots = ma_slots(mte_to_node(mas->node), type); unsigned long *pivots = ma_pivots(mas_mn(mas), type); - /* all limits are fine here. */ - if (mte_is_root(mas->node)) - return; - for (i = 0; i < mt_slots[type]; i++) { unsigned long piv; piv = mas_safe_pivot(mas, pivots, i, type); - if (!piv && (i != 0)) - break; - - if (!mte_is_leaf(mas->node)) { - void *entry = mas_slot(mas, slots, i); - - if (!entry) - pr_err("%p[%u] cannot be null\n", - mas_mn(mas), i); - - MT_BUG_ON(mas->tree, !entry); + if (!piv && (i != 0)) { + pr_err("Missing node limit pivot at %p[%u]", + mas_mn(mas), i); + MAS_WARN_ON(mas, 1); } if (prev_piv > piv) { @@ -7186,6 +7175,13 @@ static void mas_validate_limits(struct ma_state *mas) if (piv == mas->max) break; } + + if (mas_data_end(mas) != i) { + pr_err("node%p: data_end %u != the last slot offset %u\n", + mas_mn(mas), mas_data_end(mas), i); + MT_BUG_ON(mas->tree, 1); + } + for (i += 1; i < mt_slots[type]; i++) { void *entry = mas_slot(mas, slots, i);