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 B3C8AEB64D9 for ; Mon, 10 Jul 2023 09:12:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AEAB6B0072; Mon, 10 Jul 2023 05:12:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45E606B0074; Mon, 10 Jul 2023 05:12:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3256F6B0075; Mon, 10 Jul 2023 05:12:01 -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 251DC6B0072 for ; Mon, 10 Jul 2023 05:12:01 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E0BA180283 for ; Mon, 10 Jul 2023 09:12:00 +0000 (UTC) X-FDA: 80995135200.03.BAC7809 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf25.hostedemail.com (Postfix) with ESMTP id 2D6C5A0009 for ; Mon, 10 Jul 2023 09:11:57 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YR387A5t; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 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=1688980319; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cktsf3e/9yrSZkfRHzFPts0N9sSQ7eFco0OYncndQDY=; b=Xmb6P14nZWeoaqzHmDtrFOkU/sjxOfsYNihaIQkSHhQQKMvooK610XtCWHksfi7w3iLZUK bfNPiYg3Qd0mUDDo7ObUFtfscVCgWAYqOUnbopGbQU9VHDarVC9ZhkkidjnIDXhL8OE6Ly sKde/0H4cOiRG8JIxy8UFoaRrhQ9IE4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YR387A5t; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 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=1688980319; a=rsa-sha256; cv=none; b=8Z7v5C1F9qHfikq6lORe89z+lilWwjdoY1ETfKQdAfREG12hMHuT1R581NSFAP1nMMqqMb GQ9C9hFPzCyJBUlHdiv0wXCvSeFbiH221BCWZ2mikyz+P5Z1dEGc+HEBjz5GyOUpWpyZFa AaNr4Azc8qjIdWOFFg42Oe9Yo1IY7IQ= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1b89e10d356so21055225ad.3 for ; Mon, 10 Jul 2023 02:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688980316; x=1691572316; h=content-transfer-encoding:in-reply-to:cc:from:references:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=cktsf3e/9yrSZkfRHzFPts0N9sSQ7eFco0OYncndQDY=; b=YR387A5tUMzUm+Mxwyf5r6vu7cQFgPPUwlT6mz9aHYmDBxyfn44CoLCyKZWBLhAmxL kdhZguk3KvwosZL30Ucg40KWVhJK06BnoL+sDRpFaH8cZLKJ9pcrm9SPEYOk/Ns2NyWu vuYatnpz9VFy/rAwXOD65aUIAONbfT/dYALCUo6c1LDbRo6F1Qhd4weHvY58np6E5/EX HfXNGD2Eq0KnVUrDZEs11Ppk5jRBseLdoOGI2RyAH3g3nzDmOpB8Rd27rnAvUdJ/R8Oh pesUmKyYVxnmlYtOmxpRz+vUgQiJQFoy+RLxK4qQ6jD7qZP3JbUkNpG27tKvNoBmD1+2 TwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688980316; x=1691572316; h=content-transfer-encoding:in-reply-to:cc:from:references:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cktsf3e/9yrSZkfRHzFPts0N9sSQ7eFco0OYncndQDY=; b=jkRkmwfRafxoalNzf7WQH+KEdkcSD1cT7Va0K2uC0B8BGWqRdVWZ5G/KY8rXdXxmTf WuZScKNCgbraZgxs9gTEc8lC1+6KhkWfSWCO5eDhtPNZW2zVilD33UF7ptSHF/8rYWdT VvaW/iKadOheS+CmGWFnyjLguKLs5L/WYkL3276oxi8cH7zqRJWTQLyQqo1Z0OgpkA1O OU0Tx/tj7aIURbEPg3Mphdu+NQP0pkcoyS59cdgMDO3Z/ndncaCEQ1unuSyEkZbH86BC /htCJVl8k8kL4qAZJqX4A5+SXk+M4dZoeaLhJNlRS4sZ/V4g2pRQoEBYIgz/62Q41qJr I1Pw== X-Gm-Message-State: ABy/qLb673j7o9oz0iftN7XUVkBMB6ycSxn5OYkKPoPXKAwz5ZpjpMmn NDa7YSzvteVxv9ziM3KSzPTmaA== X-Google-Smtp-Source: APBJJlE5gPvetUd9sDdLRZi5Rr3hp14Pbn5crLRM0qEo1N9NogPXfMmgJXzFkUcEJMmk9VmwIduJVA== X-Received: by 2002:a17:902:ef95:b0:1b1:9218:6bf3 with SMTP id iz21-20020a170902ef9500b001b192186bf3mr9521475plb.37.1688980316660; Mon, 10 Jul 2023 02:11:56 -0700 (PDT) Received: from ?IPV6:fdbd:ff1:ce00:1c2a:1cd4:8b91:108f:bf15? ([2408:8000:b001:1:1f:58ff:f102:103]) by smtp.gmail.com with ESMTPSA id i6-20020a170902c94600b001b80760fd04sm7733208pla.112.2023.07.10.02.11.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jul 2023 02:11:56 -0700 (PDT) Message-ID: <42945254-beb8-8a04-8689-1419595b0b85@bytedance.com> Date: Mon, 10 Jul 2023 17:11:47 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [RESEND PATCH 5/8] maple_tree: make mas_validate_limits() check root node and node limit To: "Liam R. Howlett" References: <20230707101057.29326-1-zhangpeng.00@bytedance.com> <20230707101057.29326-6-zhangpeng.00@bytedance.com> <20230707145848.yninylf4uccfsnaa@revolver> From: Peng Zhang Cc: Peng Zhang , akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org In-Reply-To: <20230707145848.yninylf4uccfsnaa@revolver> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2D6C5A0009 X-Rspam-User: X-Stat-Signature: m1o91bab1xnufmpyfbj591xn5rmid79q X-Rspamd-Server: rspam01 X-HE-Tag: 1688980317-694114 X-HE-Meta: U2FsdGVkX19W4mONNEI27PYBIEh+a8QafAlnl7g9/OlhNVTJBMnF0xtC+wXY1SFb/ZekRcSmDxhha7UBCNvdk4h6jb2D/Sqb+kFOoj9XwYTKL+i0s5r2PqxuQsx0v27s5ZVTaJH5RAWdJi8NXX4u/jgTAFQRStWfezrFYlvQ31a9s3QlelYnfqKiF4o0J3bvhuUd+eqfJ4O5xv9nk/pBdvg6sfoqpEvUH89Y05b2qXxTDVV47W091bhQp3qCfAJnJQi9EgNkYPR5HB424txxyL+1Xu0zlbZJy2iy0J6E9hDvvnnKVvIaNFlOItNkwQKTSp4H8l7cObJjpLVCqPRMXOxbk/NR7EOnQvSaOYsQJs2oW5bL5KhdmyOk/qkDtyj1fO7n0lIcYbyTg2Pu4NNWGDlD2G9jKNIssgXi6QD0RGWzcQTKLmLb16suRf/7zeDt6zbFgZASp6aEaUXnaLhkO2diH1nieXKWC/LFLWH2hT6vTVfbMUWEraPFmgX0VZ9/LS1cnZKIRxqA5Kce1eusgWNA9kzauDirMgbuEAYs4qpmSKskBaPrr5EoTmztLJzdFWRSDI6ub+sc3+1fYyX687NRe+1qe/1dyOryEPU4MIIhyNtEWsHhlIhOr6qBB+18YoXIkfxNcTpstOVAJ8/jNb27mPV4s9qZfj12VNS+BaTJ6NIjSDekb3vcqtm9LMVHx99enARGX0SsFfAZPTo7ZR+9h065ESMy2caQSZV93TvtVJjnxnUV4N14Z1s6ISik2sr2ajDBuFqnECdSrGKDAxKLa91Niusk03/0ith0uSkquydXk0tpdxaNVlPse8J78gGDyQ94907XX/n9TSlVyoKRh+byMfGesjQdkeAbXQEvJKGaFzP7qyc4rOIBLFmCZZ6c1rgH0SWBoGjNZQjLLmD8du5ji1nt66MiBVlQLswqlaLiZvsLwvN8qiL9uvZemlWpghgivVMpPgu4xyD 9z/CQKLl VLpmOpyfJxpRGu4pG4ZKsujXIiGzgYJhYMJjI/99pxgjfoCe7xJmN1NJJhwlljzQhoY6+xoNnPciEJifHb1s1kcXsERqorlKDR10T0YIdqwcL33aaTLM/zoltLCOH9bE2Cxd/+9gpxMg5xTKpwSWWjCD8QJwnWGJ59EgBvPUrokrhqmnuonzCwcTh7jcR8AJGJRxDTDfel1kkGdURnITmJdQDeTy+C6A1urVqcPEK8yfdCxSt5xs9bBN/KX96YGzzFate3OnKyJRA6GNsrKiJeYfonjCCqBlXVh2adEWC+4IlOGxSmrJNel0vpiLr4JHr6hyZPPG0ht2a39x9PHm7hbYTul8/7zTpPzJdjmGHE1TMsJNYiLxXe4ANjs1Nmm7AfGgSj5er9qTYnitqByiCiAmvuykYJNlimBUv6AkJrc4zlvjmGwVe3lAvdpEjlGKdLT8+aNoctQKGfLJiUzzhI28NFlt0esRdq+NWAcSYIPWFE/ZOwsFtcpyV+ocxFDg7QQOdHzN1dvTD0qCV7U17i+dQjrCMaXjOCWGJ 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: 在 2023/7/7 22:58, Liam R. Howlett 写道: > * Peng Zhang [230707 06:11]: >> 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(). >> > > The comments for this function say: > * Validate all pivots are within mas->min and mas->max. > > This needs adjusting since we are doing a whole lot more now.. Thanks, I will update it in v2. > > Validate limits is now checking metadata ends where the maximum ends, > checks the pivots are within the limits of the node, and ensures > there is no slots or pivots set outside of the end of the data. > > Did I miss anything? You're right, that's exactly all the checks it does. > >> Signed-off-by: Peng Zhang >> --- >> lib/maple_tree.c | 26 +++++++++++--------------- >> 1 file changed, 11 insertions(+), 15 deletions(-) >> >> diff --git a/lib/maple_tree.c b/lib/maple_tree.c >> index 88d6373f37b0..e84a042b6d84 100644 >> --- a/lib/maple_tree.c >> +++ b/lib/maple_tree.c >> @@ -7148,26 +7148,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) { >> @@ -7190,6 +7179,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 >> >> >> -- >> maple-tree mailing list >> maple-tree@lists.infradead.org >> https://lists.infradead.org/mailman/listinfo/maple-tree