From patchwork Fri Jul 7 10:10:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13304703 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 01F16EB64D9 for ; Fri, 7 Jul 2023 10:11:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 919198D0008; Fri, 7 Jul 2023 06:11:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C9E18D0001; Fri, 7 Jul 2023 06:11:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 769C28D0008; Fri, 7 Jul 2023 06:11:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 690948D0001 for ; Fri, 7 Jul 2023 06:11:30 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 259971C90E4 for ; Fri, 7 Jul 2023 10:11:30 +0000 (UTC) X-FDA: 80984398740.18.E7B7B47 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf05.hostedemail.com (Postfix) with ESMTP id 17B88100019 for ; Fri, 7 Jul 2023 10:11:27 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=XtBGxnqT; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.176 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=1688724688; 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=RsMt13COde274ttCMoaZF2YE95cjQIf4f286siNaW/E=; b=UNDZbDUAAinOH7cQ11cdtopv5OV0mba6PScQ5iVoHDQC3T9BqEp9BsXHiI0N553R2Fnzif jnekh/OObUBuRGwsx6w448BA+DcDAENxYBVfMRKbfbdkz8bf8f85Zt6oYertTJ/APsAiPG N+m9LhVZVpZ1JoV35R2lenGUsbAzgzc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688724688; a=rsa-sha256; cv=none; b=SKAQYDXSbYUzJ2mvGjzpaiDQDELxEM2OJ+K/qGc8+SVgbO0GF6Vy3heF5ApKwQEI0981rr wqefKMAJvA2n/PkoEtduoutEaoGt2W67ZfqPxP0cV2B9P5PEFRtEPz0/mL1Zx7FRXbLr+O YTg4JsZrDPldh11tBed32JCeqadTEKo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=XtBGxnqT; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-66767d628e2so1305762b3a.2 for ; Fri, 07 Jul 2023 03:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724687; x=1691316687; 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=RsMt13COde274ttCMoaZF2YE95cjQIf4f286siNaW/E=; b=XtBGxnqToLGpm+wz6UZHE9Z3Yyxmjqg7q/72evlzQgOrt67p/JLRMjJAMrFv64XiNW ZfNIFHx8T6s60FA+P6V7/qQ/4y1QQs0E/n5KE/7dmVz96wUjBNbODxKCxTfFaJ9jLt2H laFNuDh3JK1SqIMoLaYkBZW1pM75vCISZxsvdxkPotXveDzGUwaBGWVWnIyP7Z0I7RCR zgII0JY9Fk1buneVD/uJGvPj4QSx+CBBeH9ivoDSr3ms/fjZUANEfKwaROGQINSOs2Xk zQlMEdoB+G418aYhQibOq/MhMhBWs4Saqurzw5bMTc1VTdZiJ693s6MQD+BFBUaoxYYe 3QuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724687; x=1691316687; 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=RsMt13COde274ttCMoaZF2YE95cjQIf4f286siNaW/E=; b=VeQgiSajxSfWnHHzBG4/vMzmXnNEKKrs1ypCcMNcru3jhORyH9NPgOBF8NHCsy5SA6 SYnE8QGNlCcG2A+Li+ozB5MX/bz4xbz3wLLT/jENJP/LtyWj2NAmp35I6HPJWssfI5M9 qItnsdVXw9tIbnzH92rh/Rl7EX2I1m4st911SdLsDaXfcKBREOGthnlYwZsE+816Xc3f QpKChJh/lJEo1tCI1wpvOgpyU2ShQg0M6HV5XwMTjeLSwn/mNw0rGXhBCu6ohi55e048 L5V5Yk7+wPgY1/9Gaxh96cMc9+wgZbsdttURNaYy6bAIixIOxeY3F5OWGlqB0HzGNiM4 fBMg== X-Gm-Message-State: ABy/qLZjafttm2QGEkGR3/bub1sxNPOeWgGNWMjxQ8guvLIYrlIBC5Ns PrQEJwA+9SWId94BkcLPBNrE7w== X-Google-Smtp-Source: APBJJlF0ImEh0lWSBujHgiGl3Eem6V0jD/6IH2Qzj54mjY4tPYvtVOMeeD3PwEtW49AKgrd4d9B+5A== X-Received: by 2002:a05:6a00:c89:b0:668:711a:7d93 with SMTP id a9-20020a056a000c8900b00668711a7d93mr4048082pfv.19.1688724686695; Fri, 07 Jul 2023 03:11:26 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id x11-20020a056a00270b00b0068288aaf23esm2602549pfv.100.2023.07.07.03.11.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:26 -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: [RESEND PATCH 5/8] maple_tree: make mas_validate_limits() check root node and node limit Date: Fri, 7 Jul 2023 18:10:54 +0800 Message-Id: <20230707101057.29326-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230707101057.29326-1-zhangpeng.00@bytedance.com> References: <20230707101057.29326-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 17B88100019 X-Rspam-User: X-Stat-Signature: qt6ukea3r7bcsz9ptbwy3d4teyu1s6dp X-Rspamd-Server: rspam03 X-HE-Tag: 1688724687-50026 X-HE-Meta: U2FsdGVkX18jZq1h0LO7bog6DNdkAa0FUvyJpp5M+8vmsP8T21EBQjAIYMpe3ASdQi0+rNJR+MP+k1dy6EZP5loaw9bn9gcC9Snc84yF9fqfYgKB+9nekj2eBX6mdicWd2J6qJaumxz7VEslXsx6k+MnTgHCqLjbN1s0OBgwmS5QIYffRQyAnnl91lOSxVj273e+gLei3YnZy8Sx2FDfa49gPeVDYNTeFPZ3D76O599hwT6sxT/JKD+WNvzWFrs3JBdSs4gtbcWEU+Q8fu5dRDw1CrZ71+zcH5IlcbFiacMcUiFXNhz4B+TerKgDQVKaeayf5ZWBmWIiChsbLTv9XDeTo18aUu3sZvz/oNBG0Dqh+08zz4OhlMqGTc0m0fyS5o8TYXJqDFtvrMs2syrdl1Aj4THmaaUczA7ForFDdEmkUFII1a7rqG1I+k91ME3Q95RJWJK8hRSGEjmmxD8cXaOc7WiZn+GPkmgWq+Q5h1ZWRoRUyRCOKj3WfMMb6liSh1Y3CBCy0nKAFiY58a0yZ0jmGOAEufTbxAq/GifCsgiB2w+RYQG8aWxCawG7CE4CloNZJ5SDmW/SJKiC0T03Kd6JbMuCTCEXO3UlJsyjYmipTolH6K0ihRyuiMX6fmm0KQTOfIBL2x0Wh7iB35SyMGrqLvI+Tm5MfxPVVL/CsuNnG+fvIvcRBzAKEiH+FnLvUMZBZvO0R5N2z3uwzR+vxaMZmz4K3Du/QCPzTmiug7YyzbeaIrxJ6N3AIqOprNBqBAVK50BByqmRohjbQabyK071jjQ9KYIz4MZssryJBGLNvWojboh+JpOidiBp80JIwqDJijAM6Qky+DLE797x++uzVnDpOzAgsyRxUIBxjVGA2+BaXG4P1td0rO5xCvSQTc2gHo4VIdo3XDs3ncKK8OhmGEJYJ6G2FaeaOTbGlJZPZbEsWbJcxQB756g0Mv4y+jSN2dU67wuid2fuJYt de3KsiMo nQfTBzYS6X86hFQGmMmTBYXmkrsqYekz37nbnmrPlcEY1+e4X6LgINIHNUfAZskFNPsnGVhjQuDtF+8Ehk+EWRq2Ia1DUXrLHw3roq425WPOqrMT+HfLEqH6krpjqni48BdbtDungbKdyOpsLVWChzxI3fgcI/amrDtUmKYxZZk8g+jhon56rmZ4QV0SVcMKswhztNxKclKkCSDvXROr+49WL7ojpi2r5ghO50GLbTnlvTJB+E36fEF8THqYTIsGsSkTWoSkiazQTJTPDjSVsxRUue0GepDSjTdruFoQWHNAAtipALBCBVWBYYICR5cQccGNutM+2NQobi6M1MEyB1VvQL08bvrz/4TIuKGijljPyDYgGMIMmAf7gI2x3V8IWAFXeT2/R2PMnv6Lih/wiwo+rMmUcurfAaV4nuJyizTyPV9vHBnrJ6nz7DdxvRJ/zPLGGcvtQ5AACWkY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.002813, 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 88d6373f37b0..e84a042b6d84 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7148,26 +7148,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) { @@ -7190,6 +7179,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);