From patchwork Thu Jun 15 13:08: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: 13281266 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 5D370EB64DB for ; Thu, 15 Jun 2023 13:10:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A89B06B0078; Thu, 15 Jun 2023 09:10:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A12688E0005; Thu, 15 Jun 2023 09:10:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8655F8E0003; Thu, 15 Jun 2023 09:10:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 729246B0078 for ; Thu, 15 Jun 2023 09:10:40 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4882D1607F5 for ; Thu, 15 Jun 2023 13:10:40 +0000 (UTC) X-FDA: 80905016640.25.201614B Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf22.hostedemail.com (Postfix) with ESMTP id 6BBF2C0002 for ; Thu, 15 Jun 2023 13:10:38 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=JBdX1l1x; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 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=1686834638; 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=MG8wEkfZhYGC5aupLXEONPEpLbQPJyBuYKNQETRNYXQ=; b=GF+pVeRWfxIWL1jbBA9Y49XZ1eWx0KnnUfqIn1fcttft7feDdeCAGli6MCnWd2U1RXagNL dXvp2MtcReznynWsBDSIkTloVvK2lB5g41lo2subS2cZ6J1JRVJO8rr1mUxYH83lj+/mi2 vmcclE/rhOPCZebHX0kSA3DdDY/WvSQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686834638; a=rsa-sha256; cv=none; b=BTAJ7x5/hpZPr/G2SeNmj0+bGanVxL/lhJUkTPV4R8lq0gnpsLLDVkTDrgVl0kvD7T8tlW WWE8UJHaS8Z1zmNZdxCTO/59JxFZWe4osWHwVX1m8cObtzIpTELGC2OqZGMi21XGXKzxqf 1v0g8F4IBm+tEkXy/rz7TsfioREZE3s= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=JBdX1l1x; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b50e309602so10889145ad.0 for ; Thu, 15 Jun 2023 06:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1686834637; x=1689426637; 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=MG8wEkfZhYGC5aupLXEONPEpLbQPJyBuYKNQETRNYXQ=; b=JBdX1l1x+iSg2CpjvKE+gC3fQ5LWgXkFJ7O3qRqfSLsduXgNEEnfZyRZYD+aaDtn7N uSkoiI3TK2NJb/opjoa/il1l5jtgGuKT70/3p9YVeEph/4m8CwB62pWy40V19y6b3aBt T+3f4gBTnPVMNomBZwR+rHzM3IPEpaFZKEVHjpr3cDYsT085CBjG839Y0kDt0RG7zprr cs36S3Z9fzu8SZxcfDKFdL14UvqkXTGVFkmjRRMVFjUSG++ubc5+L0lc0JrsYkImHvD1 qPTGQOAli/Oa9AWBv0XxRDill+ZhjXzuiBCDJbggf+iwNECB11Vh4LZldV3czFsyeBDD w8IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686834637; x=1689426637; 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=MG8wEkfZhYGC5aupLXEONPEpLbQPJyBuYKNQETRNYXQ=; b=dxmgAswPwuBzubmmdwcs97NoCHy1R85PsJEKsbSuwD9AGnWx+TB6u2nqVGVdWx5CM7 6oWkA8mhZGp2rkrxFMsnOgwYX+pOOKcFuCMsiDu+EDLLIfhT54yw1Eg7pF3yZZxisVXC 7oCCMfKJqof7e3nkMLbB8lm7ZG4hwppRyTXZteQ5akvksXo/fzSeSBMtF+pWd8aJmICv zLOXq3lzEFByyOUOv68oxFCLThkWFPR+nsrUq2h4wsjk7IfXIJzZSmbwHbGCY8ScyV2G ulTSi/L9uyAjy/KTy56eC2pW5RXXkzWjm8yXsHPE1i8pIdth5oBxbCDYPbXQ2aFcMXZr ZRSg== X-Gm-Message-State: AC+VfDwP3AKWOw/UyDktmjHwbV/8SkST5njt8ugw/gBSv1gPdi7AcLTQ gRFLhDpyYN5eC6OQ7UbD18TjreCYducSJR97WVk= X-Google-Smtp-Source: ACHHUZ7WKJVUJ+SDKFA9ptbKZMIDGFAgwrtvXxZ4yz/AJGuNYEZLYBZtCRPVCyj7PJ8FHVY00ecTSg== X-Received: by 2002:a17:903:1390:b0:1b2:28ca:d16 with SMTP id jx16-20020a170903139000b001b228ca0d16mr13196115plb.44.1686834637281; Thu, 15 Jun 2023 06:10:37 -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.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Jun 2023 06:10:36 -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 3/8] maple_tree: make mas_validate_gaps() to check metadata Date: Thu, 15 Jun 2023 21:08:54 +0800 Message-Id: <20230615130859.21858-4-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-Rspamd-Queue-Id: 6BBF2C0002 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: k4zdbyyd4gpajj855imx983fuxpd9qsj X-HE-Tag: 1686834638-591114 X-HE-Meta: U2FsdGVkX19YkRUZ6RAyI0pIK3FLWoa7g7utGYCRMojxJRAC6VcHv+hm8X71StfrJff31mCnUwSyTJHYZmoPJSYTkv13JUp448G9a5ugDoCaYOiHezXOUSeQmgndtXRLtSCAOXcAc6zscj4NNEFR+PlFra2J6RqE7VdAkXx12Ejd6AjslFHZq6MlehjCpqZa24ZRw2cSy99DXa3mhsx3r/1bYGQiEWfV85EXbJ6ub6Enx8kN2TvnT/XahUzamckv/s48WaXW8XOUqpNT4HqnZlKJDdoghZ+sFVdpSVa1y6LDOJ65VWArsA1cS9PghD0pFywav+2Yf2wkdOHLVE5R+1wLG5KRTPGWCBxjWE0I6PL+k/U1SVUpZupYBSVXtFpio7L10zZs42cEEbWrkiQO4W24nzuPxsbQjl/oVWt/YlNRZ7Zec1ZgMF4BGjN3OLDnmGzN3wWJTipoBQNp7AHCe2Ai8Jw9tUjfyimYuM+qn+EbtVw3YnOYJPp7IbDZIgwplLMlQhtuqWdQLU7eVw5Rlc6Osoh09f5AZN+ZpnvFD1jagRCbYmdLZMEM1cr/WZXWfyP5vyaNx5z0e6D+LSaR+N+Zucg0g/uWB7SfRzPkqddIqnBsCGbCgPqfb2cZ3/5aeCqiA0g2kueupyGfyYp07BkYeZASPqOqHCtZZoOmCP4Xrz0YeyhrCiVP9h09YbPh1sG3zxroD4dfhZZFIq7p0AQ8UWyxjZKzQyf1zV4ESoTGHO5jLcpOHSRx+wx06AuEbYmM7HwMtiiAt0DbIWVnqsKPlftALByai+1M4/dfc8Y1imwh3ot9QXeA30Iy31A4Ekb/LnnOqglJc2uKjwC6LMPt/YkTF50+A4SkDG7X1eP+YZGcuNpmms/cCC/hM2zuxMdOOEwMC95vCN/YYCg4s43TOIEZny6BnbOOpfLnua+SPhGJ6tjOyYqBSYGnIrdfcyZU0VGrLDzjvhUIEA9 jH39oCyv PtxVyxs/P1Qbf/qHgvdCVBCTWStiPnj38P/Dg0R+su97W2qpMNvnh7RSviwFQji34AivMKJudNi1VgATasC+FSq3PWL3rvUhmJgkjGr04hY7IXRiDBYjLbjj4lQ5xewqIcLsPmFDJIcYvNF9LynusXcoXPulFrK56OgPDpl0GZtNfolN20xGKYyUSCPOpY3G6NCsMttP+gLjdc3oxVTTXS+f5MaPWQIk/U0cD6TAbacvL7LRj6zWO/UQgEXkQMr7oWYl9uYICoabaYS5xeNEaTyrLYbRJ187YOkziM6ezN8KTc01PGU1XeVBq3dBdJD34l1B4QX5/DeQz9Cbmp3R/GwLwdnwv8pndvFyVanxOsKyivIo6Yo5+f3rUo/JfvJojSjva+rxyu3kQQUwIIY1yY5F8IYx7//SXWrwcmOE4194Oxeovlhn3zJQq/YuN7l2Yn+1f11h3AgL+s2E= 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: Make mas_validate_gaps() check whether the offset in the metadata points to the largest gap. By the way, simplify this function. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 68 +++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 8aba9e419e08..799afd590cf3 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6979,15 +6979,16 @@ EXPORT_SYMBOL_GPL(mt_dump); static void mas_validate_gaps(struct ma_state *mas) { struct maple_enode *mte = mas->node; - struct maple_node *p_mn; + struct maple_node *p_mn, *node = mte_to_node(mte); + enum maple_type mt = mte_node_type(mas->node); unsigned long gap = 0, max_gap = 0; unsigned long p_end, p_start = mas->min; - unsigned char p_slot; + unsigned char p_slot, offset; unsigned long *gaps = NULL; - unsigned long *pivots = ma_pivots(mte_to_node(mte), mte_node_type(mte)); + unsigned long *pivots = ma_pivots(node, mt); int i; - if (ma_is_dense(mte_node_type(mte))) { + if (ma_is_dense(mt)) { for (i = 0; i < mt_slot_count(mte); i++) { if (mas_get_slot(mas, i)) { if (gap > max_gap) @@ -7000,52 +7001,51 @@ static void mas_validate_gaps(struct ma_state *mas) goto counted; } - gaps = ma_gaps(mte_to_node(mte), mte_node_type(mte)); + gaps = ma_gaps(node, mt); for (i = 0; i < mt_slot_count(mte); i++) { - p_end = mas_logical_pivot(mas, pivots, i, mte_node_type(mte)); + p_end = mas_logical_pivot(mas, pivots, i, mt); if (!gaps) { - if (mas_get_slot(mas, i)) { - gap = 0; - goto not_empty; - } - - gap += p_end - p_start + 1; + if (!mas_get_slot(mas, i)) + gap = p_end - p_start + 1; } else { void *entry = mas_get_slot(mas, i); gap = gaps[i]; - if (!entry) { - if (gap != p_end - p_start + 1) { - pr_err("%p[%u] -> %p %lu != %lu - %lu + 1\n", - mas_mn(mas), i, - mas_get_slot(mas, i), gap, - p_end, p_start); - mt_dump(mas->tree, mt_dump_hex); - - MT_BUG_ON(mas->tree, - gap != p_end - p_start + 1); - } - } else { - if (gap > p_end - p_start + 1) { - pr_err("%p[%u] %lu >= %lu - %lu + 1 (%lu)\n", - mas_mn(mas), i, gap, p_end, p_start, - p_end - p_start + 1); - MT_BUG_ON(mas->tree, - gap > p_end - p_start + 1); - } + MT_BUG_ON(mas->tree, !entry); + + if (gap > p_end - p_start + 1) { + pr_err("%p[%u] %lu >= %lu - %lu + 1 (%lu)\n", + mas_mn(mas), i, gap, p_end, p_start, + p_end - p_start + 1); + MT_BUG_ON(mas->tree, + gap > p_end - p_start + 1); } } if (gap > max_gap) max_gap = gap; -not_empty: + p_start = p_end + 1; if (p_end >= mas->max) break; } counted: + if (mt == maple_arange_64) { + offset = ma_meta_gap(node, mt); + if (offset > mt_slots[mt]) { + pr_err("gap offset %p[%u] is invalid\n", node, offset); + MT_BUG_ON(mas->tree, 1); + } + + if (gaps[offset] != max_gap) { + pr_err("gap %p[%u] is not the largest gap %lu\n", + node, offset, max_gap); + MT_BUG_ON(mas->tree, 1); + } + } + if (mte_is_root(mte)) return; @@ -7055,10 +7055,8 @@ static void mas_validate_gaps(struct ma_state *mas) if (ma_gaps(p_mn, mas_parent_type(mas, mte))[p_slot] != max_gap) { pr_err("gap %p[%u] != %lu\n", p_mn, p_slot, max_gap); mt_dump(mas->tree, mt_dump_hex); + MT_BUG_ON(mas->tree, 1); } - - MT_BUG_ON(mas->tree, - ma_gaps(p_mn, mas_parent_type(mas, mte))[p_slot] != max_gap); } static void mas_validate_parent_slot(struct ma_state *mas)