From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To: Peng Zhang <zhangpeng.00@bytedance.com>
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Subject: Re: [PATCH v2 6/8] maple_tree: update mt_validate()
Date: Tue, 11 Jul 2023 21:22:44 -0400 [thread overview]
Message-ID: <20230712012244.5o2cxqowoe5dmw7k@revolver> (raw)
In-Reply-To: <20230711035444.526-7-zhangpeng.00@bytedance.com>
* Peng Zhang <zhangpeng.00@bytedance.com> [230710 23:55]:
> Instead of using mas_first_entry() to find the leftmost leaf, use a
> simple loop instead. Remove an unneeded check for root node. To make
> the error message more accurate, check pivots first and then slots,
> because checking slots depend on the node limit pivot to break the loop.
>
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> ---
> lib/maple_tree.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 072532fa18ee..1ad11799e197 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -7270,21 +7270,20 @@ void mt_validate(struct maple_tree *mt)
> if (!mas_searchable(&mas))
> goto done;
>
> - mas_first_entry(&mas, mas_mn(&mas), ULONG_MAX, mte_node_type(mas.node));
> + while (!mte_is_leaf(mas.node))
> + mas_descend(&mas);
> +
> while (!mas_is_none(&mas)) {
> MAS_WARN_ON(&mas, mte_dead_node(mas.node));
> - if (!mte_is_root(mas.node)) {
> - end = mas_data_end(&mas);
> - if (MAS_WARN_ON(&mas,
> - (end < mt_min_slot_count(mas.node)) &&
> - (mas.max != ULONG_MAX))) {
> - pr_err("Invalid size %u of %p\n", end,
> - mas_mn(&mas));
> - }
> + end = mas_data_end(&mas);
> + if (MAS_WARN_ON(&mas, (end < mt_min_slot_count(mas.node)) &&
> + (mas.max != ULONG_MAX))) {
> + pr_err("Invalid size %u of %p\n", end, mas_mn(&mas));
> }
> +
> mas_validate_parent_slot(&mas);
> - mas_validate_child_slot(&mas);
> mas_validate_limits(&mas);
> + mas_validate_child_slot(&mas);
> if (mt_is_alloc(mt))
> mas_validate_gaps(&mas);
> mas_dfs_postorder(&mas, ULONG_MAX);
> --
> 2.20.1
>
>
> --
> maple-tree mailing list
> maple-tree@lists.infradead.org
> https://lists.infradead.org/mailman/listinfo/maple-tree
next prev parent reply other threads:[~2023-07-12 1:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 3:54 [PATCH v2 0/8] Improve the validation for maple tree and some cleanup Peng Zhang
2023-07-11 3:54 ` [PATCH v2 1/8] maple_tree: set the node limit when creating a new root node Peng Zhang
2023-07-11 3:54 ` [PATCH v2 2/8] maple_tree: don't use MAPLE_ARANGE64_META_MAX to indicate no gap Peng Zhang
2023-07-11 3:54 ` [PATCH v2 3/8] maple_tree: make mas_validate_gaps() to check metadata Peng Zhang
2023-07-12 1:21 ` Liam R. Howlett
2023-07-11 3:54 ` [PATCH v2 4/8] maple_tree: fix mas_validate_child_slot() to check last missed slot Peng Zhang
2023-07-11 3:54 ` [PATCH v2 5/8] maple_tree: make mas_validate_limits() check root node and node limit Peng Zhang
2023-07-12 1:24 ` Liam R. Howlett
2023-07-11 3:54 ` [PATCH v2 6/8] maple_tree: update mt_validate() Peng Zhang
2023-07-12 1:22 ` Liam R. Howlett [this message]
2023-07-11 3:54 ` [PATCH v2 7/8] maple_tree: replace mas_logical_pivot() with mas_safe_pivot() Peng Zhang
2023-07-11 3:54 ` [PATCH v2 8/8] maple_tree: drop mas_first_entry() Peng Zhang
2023-07-11 10:10 ` [PATCH v2 0/8] Improve the validation for maple tree and some cleanup Geert Uytterhoeven
2023-07-12 1:27 ` Liam R. Howlett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230712012244.5o2cxqowoe5dmw7k@revolver \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
--cc=zhangpeng.00@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox