Message ID | 20230711035444.526-5-zhangpeng.00@bytedance.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 82BD8EB64DC for <linux-mm@archiver.kernel.org>; Tue, 11 Jul 2023 03:55:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ECB2C8E0006; Mon, 10 Jul 2023 23:55:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E7B408E0002; Mon, 10 Jul 2023 23:55:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D435F8E0006; Mon, 10 Jul 2023 23:55:13 -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 C5F8F8E0002 for <linux-mm@kvack.org>; Mon, 10 Jul 2023 23:55:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8582CAFE3F for <linux-mm@kvack.org>; Tue, 11 Jul 2023 03:55:13 +0000 (UTC) X-FDA: 80997965706.24.D5F47B3 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf18.hostedemail.com (Postfix) with ESMTP id AE0911C0005 for <linux-mm@kvack.org>; Tue, 11 Jul 2023 03:55:11 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RBwCD953; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.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=1689047711; 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=trWG5ZcTEhQeGdiIh695WKCYOeE3HbrZ9Lquw5Sy0DA=; b=7A11U3TKJ/o2ycgwoDBzB0wE9bi0AFd5mNDrrDQsrhxxtAgwud86v2DnY7D5wsDeqmJZFl lXMptgd6GsaHpudarObEQviAbhfUA+4AprPScGFtmaoGqXLTs7BgLjImexTmGE9SQ425Nt OCDX1s+bcgyIaGWymv8BOF3z0E4elIA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689047711; a=rsa-sha256; cv=none; b=rWW/TQ+h5ymVAB/22IGmbEH6c3RowJc+cBWvVhogdpqkJGfIewd4M1vZw0b12I2wLn1P1C hyAVe7VZCIl+gIwtk+P7eUoEuHENhWVSZ3phQ3KP9na7jDDuuLVTMuThCiGHYmWNNmogFx SX/+w6I1vDek7lD31sWwBljFMoxItOU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RBwCD953; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1b9c368f4b5so23801005ad.0 for <linux-mm@kvack.org>; Mon, 10 Jul 2023 20:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689047710; x=1691639710; 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=trWG5ZcTEhQeGdiIh695WKCYOeE3HbrZ9Lquw5Sy0DA=; b=RBwCD953n8uZsMTFBTHHBrqSeGPAwgTiNB4mn19QAWfXCNEYcpGV1kO3pwrVNg8yiO 4ChpEv1ST7jhjL5P3juHp3AxjrYpZOoUZVhD2YQEdnop9cODo0HrY8a0kzrHUNaUIvkj O1spSqlg3rieSeSLBfw8jVSeQ+y/GqBPmyB5Avs2d2g6U18ZtSVO+yG2hZ8l0KZkCgPf 9sjA0l8IF0bLaMPCEax3vXMEOqTK9Cbi/czByHRMN1o+xEe1N1f+PJx1K+l/9/PeL/cF /WpOb15CGoZm3QwOcSnNOf9bHQ47bs7GLBz7f6r8m2UpoVAIMjkZhz0huGnDN+G6zPf1 oDpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689047710; x=1691639710; 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=trWG5ZcTEhQeGdiIh695WKCYOeE3HbrZ9Lquw5Sy0DA=; b=lV3tYWP5MfaG5Gy/jzHCENwDzN4zPgI+OC17DOW0etVvoLVuqWnx9VvMkgZb8WgOD9 DHQ4fPQhi6LSDiRzXekmAEToWvtDVsGc2ePFjsLx9woO1fprmKm99vCuIidXuN7qF7Hd 5oCMcfkrRm85xrJXw0AyyHprZm7vjDYbQNQGzPHJ1SNosKdwZv68Xtrj6Au2BfnXM/ht eCuhyExvwf5mgqvwBNMOhSEVNMlMZUPAyuQ+9iJpNUWHjIPhIYo1BzQ7csxoV1YaL3H/ ccqnQKY3h57ZdGSBgmL0P2BuXeXIjr/Q/yUsu/zTEKoAE9Ry1YXcz8IaVRZD1D/9bA79 ViaQ== X-Gm-Message-State: ABy/qLZDtTnbrYXK9RbYtuizBfAiQ/WPpAbnA3T6BcSuuKWeeqVwdW3u GrxLoIiO+IkWagyqayBHiXmmAg== X-Google-Smtp-Source: APBJJlGAHImLe3JwZyPyDVH1VXMjy9vrBysT74mOvTPUwjlmymGLtnOZwnAIUkbTS+FLwMQi0gLuzg== X-Received: by 2002:a17:903:2441:b0:1b8:a39e:ff4b with SMTP id l1-20020a170903244100b001b8a39eff4bmr26118175pls.32.1689047710631; Mon, 10 Jul 2023 20:55:10 -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.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Jul 2023 20:55:10 -0700 (PDT) From: Peng Zhang <zhangpeng.00@bytedance.com> 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 <zhangpeng.00@bytedance.com> Subject: [PATCH v2 4/8] maple_tree: fix mas_validate_child_slot() to check last missed slot Date: Tue, 11 Jul 2023 11:54:40 +0800 Message-Id: <20230711035444.526-5-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-Rspamd-Queue-Id: AE0911C0005 X-Rspam-User: X-Stat-Signature: 96c1qzf9mwxhai3pi68g8a9rmq1nijb6 X-Rspamd-Server: rspam03 X-HE-Tag: 1689047711-918690 X-HE-Meta: U2FsdGVkX1/fTFAnbMnMzeBRc8iG+lALJM8H0yEDVWT9EbDqc10gbvOA94qNV12RnMpvd34GRD4UOr2zPPSQhN5wYtJAwlDg7uvOGY5QsFon8AtXqrJYbSR8Vy2Ce7Bx4L5xdn8KJAS8IrWnCtFb0qEWPGGP0nvRL6JaQWIZl1dmpDLiydWTRN3gvzTun9gorLpV9PH87vNTpVhAgLNrBA/Knno40i9NAh3xNKdtnxCEmRKsQL8xxM+5hjDIISfQkMzQWz1bsNBqkU03bnwm4caJm8wCUoSCKSe/5hHS7w96Aq7d/ZVR1/55jkG/vA8kse8owEP5yylKb0XFNYhV8wJw9NcRvjMClhPPkaEgo+JJivNmd/rUE9YnjwfGJ63uz/DPeGghdMcMdBfnThQWcAtiNLQpZAscXZ0ys2gA6rrcgAUY5THKhvnxv32Yxe9oU1A+jADUoSJlKAq2A01/f4E2zih1Y0FmP+6la8B07oogbLCmkPYcBAU36vW4g15F3IHmlWYWS23T9v7tJ5gNFnN+myIe8idU2cinIKL+gpXLYo37cxWc+vGDu03I+bSmqt+RA8FAggczL/M3gCO5Wtkg9prcj0XGZyq9ARbHqAp9mGDZw7BnJQ1fspxg2VxUNtl6GV2qn05Z5zATz+10t4l7pJrR6cvSYUDVfAZakOwov/ILlSHmLgciMuWJ9/vwNAafTxPJdOHp+f8dXpiVPp5mnnU8owbDxYxdjg629lVqcuU512G3/b0UXURarigDtZV6hvVbvzZfVsXoiO/ERFhIdtwDeceyTCvhLEk1PFEP+VlbiDlfzBSIvEFfv49GCoZm5mYGrBmdoeh8PxbS5B+1Zr3kcZaJcQIxTlrRZyIhqHjxRTMY30xccOfjZBB0npdn6Czbm/nzEm1/0fEHiFyDej4GB8U2va1CewwhPFnYeabn4n50xBcwDmYHr5ZfvDXFoElpDPCIxSGaA6P Cc7ptTl8 4kQSJ4U1soMx/0pZcjhE+4p4LFw0q1CYuFaiweBs4xqNN35Aiuv956rlUxQCW2kE2lqgB5UBu9MXmgJQEpqSxxTd0dPJMrhfWB57D3jeiRNUfPLme/sJ8pQxHANDTIw1J+t67VGYYWfUUhdoprSYgdKxZfDUaT8Ppv2VGV7wtxdvwPmEvqMjFkD97mROkibOb5rCIA0NlUSuv+q3rNoWb8IFQ+4crGYD3HT/10GJWFSxmVTGK8uvGZesVPZVdpRBdz3+vvSvK3RVRuJLh9XkeXyfw7z6r3KaOrYxmUR9x6L9jxtia6HcIeYc72SMANHWJOX0enrWdhPf8oeZpqyF+c5OGZb1ih9uv5viv7tdVzEA8VE4kjqZf75II/Z9XgtvCsHVbETXBgLYkHSvto4/FaC6g61SsDZvWtmPo+jsqarQZUlnlTp2kybheM6iTob8RzJklf81AEGL9f7dB1BTVUW4siy7LB+cBTUdS X-Bogosity: Ham, tests=bogofilter, spamicity=0.000036, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
Improve the validation for maple tree and some cleanup
|
expand
|
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index a5776fab1875..f750ebef595f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7119,11 +7119,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", @@ -7138,6 +7139,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; } }