From patchwork Fri Jul 7 10:10:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13304701 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 6CB24EB64D9 for ; Fri, 7 Jul 2023 10:11:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B639B8D0006; Fri, 7 Jul 2023 06:11:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B12808D0001; Fri, 7 Jul 2023 06:11:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DB508D0006; Fri, 7 Jul 2023 06:11:24 -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 8ED528D0001 for ; Fri, 7 Jul 2023 06:11:24 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 55AC0140723 for ; Fri, 7 Jul 2023 10:11:24 +0000 (UTC) X-FDA: 80984398488.19.EA3604A Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf06.hostedemail.com (Postfix) with ESMTP id 5E116180011 for ; Fri, 7 Jul 2023 10:11:22 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hOQ+fMw+; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.179 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=1688724682; 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=HNMajAjya5LH1cr0h8UcY7AWKYluSf3DNGPBuMzeW+I=; b=phKUgwRqe06WQ2v5mClKNKgzvVy682BrDNofb2N54RwSY/VA9iGAYWn/5rr/6biKpz49jh gSQ54mepR84ZPjNG9nyPqEmLAVO5AXEXBtp7Ffc0FvcDIxApzfuoqQo5Of5XeCT7DLH6PY vQWxv+GtOzI2KqrN21caQ6Goj2T+U1g= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hOQ+fMw+; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.179 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=1688724682; a=rsa-sha256; cv=none; b=yyNykIffDaFUEvmqRL1euILj1/8ghXlBqYVcJtGqwfGk8iaQJDA+/nL/mTDymBafg373e0 R7bNvD0HJ7ZHSAA5O5JgP4vPPRq/+/1+mzSAG4y5yLZIlOSm4Mt1l/SfcLenqBlDJExXP0 afX/5ZTcwuQhHI5euqBBTEuY22TPd+g= Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-54290603887so990852a12.1 for ; Fri, 07 Jul 2023 03:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724681; x=1691316681; 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=HNMajAjya5LH1cr0h8UcY7AWKYluSf3DNGPBuMzeW+I=; b=hOQ+fMw+BoiKkHf4LQFjJnXVHwgx2GGmC/dU+wccE2ou+6cHm99YqltRcJg7kqi77w zjJuucAdKRHBItZe1kbAqEj3SOEHXVqcT+vtsgJH9vPZ1sQHFHGQMUAd73UPZ+IuncE+ PxN6UdZ/JpdNDMEMv9hq8FfOUobjmEvmd0t1+SSb+rvuDL4J5mp6pm8ZeaTupFiAkyn/ 6NBrEumoORrpUSnZ6eOh0MaZQltxZBWELIm9f4h7m4hIOFxH6pHCn/DAtuZ0RgiNSFCL 6GX4aHss9kmIE3DU40cuEcPA98gWIB5scldrp5GwlCikrV/AtjDreQKvRxCIPaVcO+Zd Ssqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724681; x=1691316681; 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=HNMajAjya5LH1cr0h8UcY7AWKYluSf3DNGPBuMzeW+I=; b=AyTKeEYfaIc40GKUx7xKYP2IMERj+TkftRzLlczsNmlzsLrBlHrcJLq6iZWHeTqJ3s Ai6APbRqKPIy6KX7XGzU8Hfbuc3M3ep/YxSwbtmitZPEkpYwC7ZcfxLNduMiJcrVHsQF Ywro/gJardyM6WaiVnkUO4PvKbdB9gZ8A4ZjJ8+JqgR9123z4qTKyiIApr4/Yw0nVMGv 9P2V3kgXPdIpw+YIXumAk3hrbcxYcBF38vXBiEPa2XCLpkRg5fywijvkivX/SWzy+hBJ NB8MzDWAslIcd+2aveT40fiO8UlUtYnnj7a+zD013ySDUae1YdN30MdGcK73jCKXkseZ Xqgg== X-Gm-Message-State: ABy/qLZhrnrWTVt+xzEmQQcNWIJY0VWArJyMV3AjGQjdM1ErQMW9iTZo 705GQqmMOjPx2KhJK+CktddssQwzpVySf9qfxHo= X-Google-Smtp-Source: APBJJlFF6iwtClAEjjI0g2PkdpD1KpvblVyCvkJamsMfzMjqpTWoEpTSQSc6Wdy/cPKbmJxSQP1qIA== X-Received: by 2002:a05:6a20:d7:b0:12d:2abd:73f4 with SMTP id 23-20020a056a2000d700b0012d2abd73f4mr3051324pzh.26.1688724681045; Fri, 07 Jul 2023 03:11:21 -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.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:20 -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 3/8] maple_tree: make mas_validate_gaps() to check metadata Date: Fri, 7 Jul 2023 18:10:52 +0800 Message-Id: <20230707101057.29326-4-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: 5E116180011 X-Rspam-User: X-Stat-Signature: oqry661pbi3zpygk7u8fi4ibeyb6eq4d X-Rspamd-Server: rspam01 X-HE-Tag: 1688724682-291142 X-HE-Meta: U2FsdGVkX1+yMA3W32sjGaP/Bjc6I7Y3xLyoc+InVkhhk4lCVyov+6a0QwGrnhZySKEigF5/jvrR5Xp2JbAX6kfA/s3d2AvR7UKigLrxkDU1FPjpGxfrdgDE4qH5fCznHH4IZpJRDJbxrNx8luxNKeSc0Cwrxbe8UG9nrmy1gCtW99DiUdq3filxCn/qPSvQw+zg1rYygghslNwCNtBs2/5XUQkssbfb1QlQFxrLLLtnRnmCnIFlBE7IbrA6ZFxImXHoew0+0mOJe/sQRZfdMJe4kCSUNWmD22jpJYHcrBg14TKdm509sM2FcMAD/l5Ix4uKf3g9IY7b8hrVotumlbkrzqoMZjArZHzl4Yf4QVdg37HjVzu+0ZEGN54U3zasM7imq9ecZ6fzJfFtHTp1lswDXRgABkdCjUNrRvvwMA/2HSBHu3XdpVSzxQKLLdF6M+93oEeDdZORg+hEIuC0t3bnM8vfD0bdtzeb5oVgHz3nQKGozquV1L4kYwhzt1T3E9QZiq/e81W5qOy+kuVwsaO68bGm11NBn8vSJR9NyffMiK4gKDumWvdxUkK6HrBvIgXfglSFNpdFRf3sOowQXtlmRiCD6yuyh3q5f/M98KRgHYFKdqOpU1b0IB7iONiZUozbjhRNDD5wy/p7FLnfqHq0IYxQmrfDc4/B42Pu9QiCboKWm8qyFW1hARaZLK9Zg/nIkvS1YkJFhR65lOGLxT4J/+gITlDNJtPUxRLjGMzf+5pW7ReiovZ+yCZep3VYETWi4CD8DWn1A3YA2b9wkHm0C6VXfNJjQVz5qHAbO5nyjJ/+3gYgq+vKv1LMcAyaRKyvKHekZnlqQ5y3psLW7GRNEmZ3OlTTgm8Zk5TcMD+je5Iftf1eGQXhUoOhbbSki4NNR6LGIR7DebriZXkuTTFKhROeoCs+Ad06vxRQ5sqxOQsMO3aDJSeftN7LsJK1LErgXBTN9nrPKf5CW3N ndP/Uaib nIn7UdhUJM95OeNbhTT6zfqpA1PnBi9O8hlyIm5b5a+cyTX9WkpKrVKsKCXu+LTzrnTTVCgI1SF09b4poY4LgrpwyQC59LjRwVZJHCoVhD4E/A//X4d25oECrUhus2iWaOedzYKgDXhIaQeGKdh/V4wfjPyUpOQFPJ8ofl32LYc46legtIh+gx94IR3Sm5Funpb2eYhewrWYYoALzWRURm+s+Lq8PuRtTKU6SpECSriomwIW7Gkg9YldD4xfjtjeTXxQsUp5pQpjk3tfuu789m8J6FCVmL8FrhJKqcEha2OIzt//RuOZK0JheS5S6hIFnm97Of/eB3ll2URTeg14LLztxfb4PmAkLiLq5h+2JZcEQipnwmGUWy2bJOcb0XKdgP+gI1cZmmtFiimGpdtudgby6G3x6p42+d8C03RLOsXcBQitZsGOYBn+/cry64bOP/UVyXVqzCJbofxo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000005, 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 6a8982146338..1fe8b6a787dd 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6983,15 +6983,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) @@ -7004,52 +7005,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; @@ -7059,10 +7059,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)