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 1FD82EB64DD for ; Tue, 11 Jul 2023 03:55:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5DED8E0007; Mon, 10 Jul 2023 23:55:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0DBD8E0002; Mon, 10 Jul 2023 23:55:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D5558E0007; Mon, 10 Jul 2023 23:55:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 824A88E0002 for ; Mon, 10 Jul 2023 23:55:17 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5A019802D7 for ; Tue, 11 Jul 2023 03:55:17 +0000 (UTC) X-FDA: 80997965874.07.5707476 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by imf18.hostedemail.com (Postfix) with ESMTP id 888C31C0005 for ; Tue, 11 Jul 2023 03:55:14 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CmxeKRs4; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.51 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=1689047714; 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=IIlxgDREFu6LlOiulF242HoL+hhnsQmd+OCvzSb0WTY=; b=i7rMCqL4sX97LAcoCX+2L+zgY2zwYA33opA6SWQ1xnvI4+O5wRoXnoW+OmtASV+Z1NmoXG FrEk9LoBCQvC6ggV+eoHbDNtDGA361lozfkq5KPFx/1j/tIoHmGWejPnmLWpgU0+E+FHoA OvrDZ3hc6ZxsbVjHAhj/vu4BQ0famDw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CmxeKRs4; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.51 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689047714; a=rsa-sha256; cv=none; b=cQaF2ROEt3kG1J6RgglmzRbUmOtq9LehgBg/Ez//E1cmf28QiaYcp057HFxMtq29OBqTHk GfnmHW6DpYAoeHyMSS3p6Ls7gMJPL/UTXen42Ixlp9696wr+CiyNmVRBHE0mja/X18KlZh g8OvHquXgZGQebqlWu05Pby2c7AO8b8= Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6b5ef64bca6so4623900a34.3 for ; Mon, 10 Jul 2023 20:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689047713; x=1691639713; 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=IIlxgDREFu6LlOiulF242HoL+hhnsQmd+OCvzSb0WTY=; b=CmxeKRs4gLnyTQYT+priT1hS2JdubJC5Dw/d7haZ/eUhfQ5DQq8hVuNMfRYn0YrKfY Ere1opP+H09ay1uUCmD9kh4UFVcpIbi2SR7/v45hmGGedCsFMQP3NOr8I/oahWOEG28L FHyHWHEStwZS08cCmBqv+KoceYbwE0k6jnZbqJUp6YvpwzUaFpP3wuoCSAXRC90ZVPbe k/DY6/mOEVsGugOyMCCTxcwo56s6Afhsnl9I6hbNxTGvNYu938n6abLjmyi171Pg75zw ytktelZVA+im/0Vpnwlp4JUajcIfcJ3I6n3qCfLCrBjvPngSvJou6nOA9Hu6O7kxYWyl bFsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689047713; x=1691639713; 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=IIlxgDREFu6LlOiulF242HoL+hhnsQmd+OCvzSb0WTY=; b=VjGUrxdYLSDsn4ssd9viNsu6eYZv4X4wnhodJMTHV0MDXcNAf+Jj9O90jNzv0oa47x hU0e95McaZVgcrpe0lN0YITQNIChzOoN383T/vL2AnnvcaiZelRTKPYc97yOfkExFBh8 Z9jf9RuSNirfG30ghI9JeM8D7PggOZGgQouY5ZJ9OLaXHoJs8ouS6AAbMZeQ7pS280wO NS/ltNEOQq83iXEJlYjwX20cQyUFhlJM/Wb+jD/i6cQY5C1LiYSNnrv2FAQ+QW8yHByZ /H7RDypyc0yv1WuUbIzyD6mb32O4rX2/NxnsYS8YJXfGq92+gudAPVKk8L73mcBeYZie wPTw== X-Gm-Message-State: ABy/qLZ/dCWnI+GKvpGYOzU9NWarrbdWa/86c51v15kxYmQrZUWAD3nh zAuTG52O1Siwoe+8eKTX5nXE1/mEnS67yfyMk7I= X-Google-Smtp-Source: APBJJlFAdlFH4yOpWh33A5jHeiNI5op1t/pJadGZ9w0dOd23WdGLfmf+wGdZ+cMymmOd7GxyhBWwlg== X-Received: by 2002:a05:6358:9929:b0:134:c984:ab87 with SMTP id w41-20020a056358992900b00134c984ab87mr13040684rwa.4.1689047713510; Mon, 10 Jul 2023 20:55:13 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id b15-20020a170903228f00b001b872c17535sm688329plh.13.2023.07.10.20.55.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Jul 2023 20:55:13 -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 v2 5/8] maple_tree: make mas_validate_limits() check root node and node limit Date: Tue, 11 Jul 2023 11:54:41 +0800 Message-Id: <20230711035444.526-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230711035444.526-1-zhangpeng.00@bytedance.com> References: <20230711035444.526-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 888C31C0005 X-Stat-Signature: kwxra8s1syj68146d9gsgi85rcaufzux X-HE-Tag: 1689047714-678823 X-HE-Meta: U2FsdGVkX1+ctYyO/7k2fFyKk3EMIBkiH0vLK/zI+TMEoXWJxzvC9aU9tyzw8pvo9IAjMXV5si1dVKIIIc6Qy2YpEob2OONNTKzidnexs8BLWdLXu8bXvhv+Si5uxLsr3eEQAPPR/s8N2HA/q4+TE3y/tvWurTW09v9zT9LfQc1mI+YMZM6GN4gRxVox1Easnrs4sMncFyWK9DV+3ho7LQgywL1NRA6fJldEwAYEfpf+VRVOo0DUiPYKoa5/7HZzXQLXVF9AuGzgurTVuxRJZu8HVIDxhAWFr8Mupir+rEZ98O/zx+H0RniU5eTXxRIU/oG5yMeUNXvwHpqJMjWSWaui8otYoJahmcsK+JPJXqcuyfrATpPjAcYiS2yXv2lvjuO+smBTkudvSx7VYkG4so1LYLgiljVvOVTpqcEZ9M1CfOjvXWFNaEAej2hqbLRDt+HOA5akTTQ06RaEr19OUGCiapCLSUfilKb/8JKCZv4F1E3J20+4OvfNuAoWQDSNLCCt+pzL0DxEnb+aqi1zy8u9xiqI5OLr5pLo14cQSfnl1xaLMh0UzsJdi0SALkvkhdppuZMxpXJ/OP4GPSlOf75KSC2+SIBgFnkjjqB170wC+L5tWucgNwI1Nbtp0VGqBhDs5W9/n87oTi68PsDrEeOot+ZJTxI8/HQB2l/WFYktmji7/JokWXwbuGF9boxXX8EAU9/xlHR4jM6LxcwKW6zrWBUMWukSj2bbBn2Y0DLQh+77a8IrTy7f4JhMMeOWTXPtDzHWCzV13cujacRsJn4xsC7UpNByIcHBr7gD2P7Gka6EmbI/SMfHuljQjx+YK/4VKmMuR0DmHM59NDkwxCwr8eTF7/VUJrKwITBVxIlwI9x48brOSmF/+YsjqaeHt0R4SnDPYSb4vvnNgxBYXrrak4hwWSrg1dQeNXWdsuzZC3BO363r1UJaaez1XpGJ+39uZH8K33JOsGRDYWo EYWjUm37 NbPUKPK9TlUxX4IqebP4E06fDqy1LDaa8p2CaQSWX7z5f5TVqkkErY1WfGL1GGlHAVsF8FULxgb6rA4lNVYIOBXsnCGp51Qd7nmUP07Scx5iQz1K141i4yqkhSpn/EyaDyC8F9LedUqt101OTYx9XeRkLwd+QhJSE1N4Ym+uGpe2prdRsNVw/hK45JzPxECc7xGwcqJIbNMlGrXFchXFhR34E3EKRQQfU67MjGb7yHkKtU52l/GSzAlcz8xpEzaTNP22cL9xCBIdIsP+YPPZFXYnm+/zXocdozfzhJZjgdzh2qMGKu/MG/ue2710bNO3Le6ZyICTclt1gkswIzWRE6mw26BU7rlCY9gJ5y1XtSLdCnKsAfsdA9GyoUOPjAH1LShp0mVXSl6yIETYtlVdxQ+a3Yrj72Rc8t7At2xBLhogKBG0z2qn06ZwRBruKrdVBzSdiOMaL4QV2a/Y= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000057, 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 | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f750ebef595f..072532fa18ee 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7146,7 +7146,9 @@ static void mas_validate_child_slot(struct ma_state *mas) } /* - * Validate all pivots are within mas->min and mas->max. + * Validate all pivots are within mas->min and mas->max, check metadata ends + * where the maximum ends and ensure there is no slots or pivots set outside of + * the end of the data. */ static void mas_validate_limits(struct ma_state *mas) { @@ -7156,26 +7158,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) { @@ -7198,6 +7189,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); -- 2.20.1