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 5/8] maple_tree: make mas_validate_limits() check root node and node limit
Date: Tue, 11 Jul 2023 21:24:41 -0400 [thread overview]
Message-ID: <20230712012441.bx7f32qctqc47my4@revolver> (raw)
In-Reply-To: <20230711035444.526-6-zhangpeng.00@bytedance.com>
* Peng Zhang <zhangpeng.00@bytedance.com> [230710 23:55]:
> 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().
>
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> ---
> lib/maple_tree.c | 30 ++++++++++++++----------------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index f750ebef595f..072532fa18ee 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -7146,7 +7146,9 @@ static void mas_validate_child_slot(struct ma_state *mas)
> }
>
> /*
> - * Validate all pivots are within mas->min and mas->max.
> + * Validate all pivots are within mas->min and mas->max, check metadata ends
> + * where the maximum ends and ensure there is no slots or pivots set outside of
> + * the end of the data.
> */
> static void mas_validate_limits(struct ma_state *mas)
> {
> @@ -7156,26 +7158,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) {
> @@ -7198,6 +7189,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
>
>
next prev parent reply other threads:[~2023-07-12 1:25 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 [this message]
2023-07-11 3:54 ` [PATCH v2 6/8] maple_tree: update mt_validate() Peng Zhang
2023-07-12 1:22 ` Liam R. Howlett
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=20230712012441.bx7f32qctqc47my4@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