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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2812C001B0 for ; Fri, 7 Jul 2023 10:11:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 548798D0007; Fri, 7 Jul 2023 06:11:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F7F68D0001; Fri, 7 Jul 2023 06:11:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C0478D0007; Fri, 7 Jul 2023 06:11:27 -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 2D8D38D0001 for ; Fri, 7 Jul 2023 06:11:27 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EAA9F80D22 for ; Fri, 7 Jul 2023 10:11:26 +0000 (UTC) X-FDA: 80984398572.22.3F00655 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf11.hostedemail.com (Postfix) with ESMTP id 0AA1D4000E for ; Fri, 7 Jul 2023 10:11:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QfdtXzib; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.182 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=1688724685; 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=VE13/bSU+7HEsPPuu+3SI81hgRU4W8DBIsnfpeEf3iw=; b=R0zhUrUw7cz3N/auA3Xy+wDA/7zxI6PZfLtFgj5zIaLLu5SVTDY09m308t0QimBo/DPv3W /fnO54QLLnNBWuNGDRT7e+g6t5G78tUTE1YkXF7FKTbuJPU8WPUTAUHSUvGVwHFiGYZ39n TppiE6cag8mMjAVMEVeeJD9hpwxpiX8= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QfdtXzib; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.182 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=1688724685; a=rsa-sha256; cv=none; b=3c9D+q6hR5Q5tiGQ2OCHByzzhqeAGiDhObdnSqPoqw87CjZ1EPzQpgYDf0IRCKoCk+y6Jm k4W7uFgmZU3gcdSrDnYyDHzr6xjd5iBQy3lys9nmVHU94XIG1OqCgNPAa0MM1tAeVvxeDh boNxqx4UgCOq5zdLf97ARBEZuObSRM4= Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-55767141512so985517a12.3 for ; Fri, 07 Jul 2023 03:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724684; x=1691316684; 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=VE13/bSU+7HEsPPuu+3SI81hgRU4W8DBIsnfpeEf3iw=; b=QfdtXzibF52G1Tv3CudmdGlATyS59CcgsOu6Yx2koGrpC74+8yd+xWT7sFR6R2XDrO gLuqLE0iQGKZdOWHpMCvXK6wF3hpQJ2EHnzTEB5S7e3pI8W8gv7WPZ8DUDfaaqwZCOuH F4h98U2DmLpnD0IvL2M9FbjL0G77/y888wjKbLXS79WcMX/Ga6KUkSkLCB+PHy7ZStcX bK+SrmMCjPox6KOZsAiGtXVXBFtJq1xqS4MTotYtaou3nIWhmDuwlDa0Aphz8y+ii/Rn dJ+t5kSMAr2Ep6yUvfN2iaHaXG3bEUMxRZPcbMo8BDViD3Yv/fGmVaamFhCuCeZcJ1Tm CXxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724684; x=1691316684; 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=VE13/bSU+7HEsPPuu+3SI81hgRU4W8DBIsnfpeEf3iw=; b=feSAlPtE5648PO2UoZatf8VMs2+OQWdnjL9C9vl6jwN6RUGbXReHMGj8XKjl/1cgWd GI49xZSg6XvDj70GN/BW8fIAfvqFI6WqZdHFGZAMoAxYU8E/dHAEHPCY/yopsQrRvDxK mJm4MqNrjwMwJdFzDfcLFMfDAx3svruSIFMR6vLL3zYlzgqSBqY5PL/z5uCbjD+e94TK R3FODkt4ATjwNFO9ovn1SDGUHBITNFhashtM8YQewlpcGIKMJ0A8PZVhjii/vDoazbPU PAymDJCjRrVqVvs7fUDC18fMTjrVUeikM2aHTmGn0ZXV0EQ7+FiFJXSimRMRrL5iNghX D37w== X-Gm-Message-State: ABy/qLbqU0KS2sNaQdhdi8NZ69Bu/9JuQbLGT+DsnnymH8MEBlp2QIGq m++PWBc6gzEcJZtZh+1KJp96HA== X-Google-Smtp-Source: APBJJlHLtVaSHtwyC+RDJwQld7xxpdLz2jT4V8stnsV2QVLZYFcHbHnSXhSnU0cJ6Mez8qp0sxmKeA== X-Received: by 2002:a05:6a20:3d8b:b0:12f:952:11fb with SMTP id s11-20020a056a203d8b00b0012f095211fbmr4370514pzi.52.1688724683859; Fri, 07 Jul 2023 03:11:23 -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.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:23 -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 4/8] maple_tree: fix mas_validate_child_slot() to check last missed slot Date: Fri, 7 Jul 2023 18:10:53 +0800 Message-Id: <20230707101057.29326-5-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0AA1D4000E X-Rspam-User: X-Stat-Signature: h657bxawx69o144663ez6x4pz5xghu6a X-Rspamd-Server: rspam01 X-HE-Tag: 1688724684-816180 X-HE-Meta: U2FsdGVkX1/mi1J0Q3N+Vpmh5pfngfBQ3lCazL+TpZBcKfx+JLxkpJcq2mnwf0XuUDD0n5F7Zljxxgbfdja8UK13i7OIgGOLnC3NQgs+50DQyeC4T2uOieU0sFa+n7lydqhnBOy5u9NO36KqeCtAQOey9zAuN8S03Vyg2oqan9MxQGI74YURyXbJbXT68xOSa483R94AbUBs+KF+Q6/8cNwqE+RlW7M7mHCSVjrz1loPNUKaJUX1L0a6iBLhHeu24rzx+4TS7jzHts6FK3HPIIa6WCXKXU5lJt8o6Hzf0/4ryw05T/cGAWKp8ymbGcnx/nRpQgkV2U+xIzsaYqGWgCfGNSrJdthB+80tF8JmjBba315wH0aL1Oy3z1SAXGeAG41L9p4rmlgQJPjkyaPOT/l4/yP9ZxxSiZWw/wlYJdY6DvTwxsUH3+Iz5uBthrs2BoKkBNq2e1AQEIj3pPY2LkvAk5xyE//UIMnXi9jDbO/lq86K+51vm1KIe2QadXe6rLBh5zoxF6M4DknnrYW/2pj/wQ3oQjV9qaWEgkwlJFEnvbT3YEmcrwBAIGjH6eNY0soSYK+9lIY+HIt4nsdECEzD+rJ35Xs4jcYGublzsRsEaobYt/zNvg9bJmgMw45fDX84qxcnRQiZvORc93qkq2kMuQFQhbFavWyhszeH735/JvYiXLMDzEFj2Tw3OdOjrQb2hz+JI6N2Ult/zKDj75fiYzqJjcuXLamwJHiKoqiDZKblZnw/x5jScrcfgIgU25RW5QgIqL7PDK8bQDSxhIBfSqg1bS81gmwV2f/bidfbN0vqraHtK5jb75fqYtSXv+H9U5bczf2mKIYKdeHBRyshIdIUSgm/GmHEZfBidjEY8ok1idgp11H8/GDD3qWO6Xnz9SjsuyWqvae+cgtrg7KdiEZ0hTclojm0ooruovRGlHx/3IBw5dhzZ156EUFaFyB56PD7RC0Y7nPv3Ga +0PRqDL+ DNtrAKeV4b4j3ZyOmuFy6znKhOVCeIjpWPxA4C9/BOomku4MrA3DAbJcVq+Zs+vOnBbnfsX3r6n9D2YbnxhuoGOonxnydjFchTSi1ZL9RhNPeygailZg7UmnmzauYGCy1ewh68vmVJAitlkwIXdqNvUjPAZePTfy/91naX/QAx3LemhPND65Iw7+Kzjh8mqQZ4VFYUTP/A36gQknOQjGBlv2zG5RdPa1UGHWOSmw5d0Fd96GBYIT0x7RrtRQruHi0ByKpQ8kps7i8cIeM5PKJYfZ6H2DS88R6HSkK1Jrdq4onwp3lC1z2YpCP0FkSaLb/SBNcacuA0ZLibj6Prd0vPXzcoOVAfHsVSv3D6L/isOdVgAqTEyGY1JhwuVx1JqnnM7cjEDcnGXX8I3Auf/pH9Isbf40TTHaBkXVu2tV3jpXTf+8RXQtnJGhzGEFS3Tjn5qBQbuyCoDZy3kDiUigWkN5EFGQyB6Zs2qbFWV26knwgfpa+Wq6akrrP1g== 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: Don't break the loop before checking the last slot. Also here check if non-leaf nodes are missing children. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 1fe8b6a787dd..88d6373f37b0 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7111,11 +7111,12 @@ static void mas_validate_child_slot(struct ma_state *mas) for (i = 0; i < mt_slots[type]; i++) { child = mas_slot(mas, slots, i); - if (!pivots[i] || pivots[i] == mas->max) - break; - if (!child) - break; + if (!child) { + pr_err("Non-leaf node lacks child at %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", @@ -7130,6 +7131,9 @@ static void mas_validate_child_slot(struct ma_state *mas) mte_to_node(mas->node)); MT_BUG_ON(mas->tree, 1); } + + if (i < mt_pivots[type] && pivots[i] == mas->max) + break; } } -- 2.20.1