From: "Liam R. Howlett" <Liam.Howlett@oracle.com>
To: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Matthew Wilcox <willy@infradead.org>,
Vlastimil Babka <vbabka@suse.cz>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Sidhartha Kumar <sidhartha.kumar@oracle.com>,
Bert Karwatzki <spasswolf@web.de>,
Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>,
maple-tree@lists.infradead.org
Subject: Re: [PATCH hotfix 6.12 v3 2/2] maple_tree: add regression test for spanning store bug
Date: Mon, 7 Oct 2024 16:39:20 -0400 [thread overview]
Message-ID: <y6vps6mz24sccrbszehz4i3abcdv73yj6jxflbjoz3gcatbbaf@24btpbtw65dr> (raw)
In-Reply-To: <30cdc101a700d16e03ba2f9aa5d83f2efa894168.1728314403.git.lorenzo.stoakes@oracle.com>
* Lorenzo Stoakes <lorenzo.stoakes@oracle.com> [241007 11:28]:
> Add a regression test to assert that, when performing a spanning store
> which consumes the entirety of the rightmost right leaf node does not
> result in maple tree corruption when doing so.
>
> This achieves this by building a test tree of 3 levels and establishing a
> store which ultimately results in a spanned store of this nature.
>
> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
> ---
> tools/testing/radix-tree/maple.c | 84 ++++++++++++++++++++++++++++++++
> 1 file changed, 84 insertions(+)
>
> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> index 1873ddbe16cc..5fde09999be4 100644
> --- a/tools/testing/radix-tree/maple.c
> +++ b/tools/testing/radix-tree/maple.c
> @@ -36406,9 +36406,93 @@ void farmer_tests(void)
> check_nomem(&tree);
> }
>
> +static unsigned long get_last_index(struct ma_state *mas)
> +{
> + struct maple_node *node = mas_mn(mas);
> + enum maple_type mt = mte_node_type(mas->node);
> + unsigned long *pivots = ma_pivots(node, mt);
> + unsigned long last_index = mas_data_end(mas);
> +
> + BUG_ON(last_index == 0);
> +
> + return pivots[last_index - 1] + 1;
> +}
> +
> +/*
> + * Assert that we handle spanning stores that consume the entirety of the right
> + * leaf node correctly.
> + */
> +static void test_spanning_store_regression(void)
> +{
> + unsigned long from = 0, to = 0;
> + DEFINE_MTREE(tree);
> + MA_STATE(mas, &tree, 0, 0);
> +
> + /*
> + * Build a 3-level tree. We require a parent node below the root node
> + * and 2 leaf nodes under it, so we can span the entirety of the right
> + * hand node.
> + */
> + build_full_tree(&tree, 0, 3);
> +
> + /* Descend into position at depth 2. */
> + mas_reset(&mas);
> + mas_start(&mas);
> + mas_descend(&mas);
> + mas_descend(&mas);
> +
> + /*
> + * We need to establish a tree like the below.
> + *
> + * Then we can try a store in [from, to] which results in a spanned
> + * store across nodes B and C, with the maple state at the time of the
> + * write being such that only the subtree at A and below is considered.
> + *
> + * Height
> + * 0 Root Node
> + * / \
> + * pivot = to / \ pivot = ULONG_MAX
> + * / \
> + * 1 A [-----] ...
> + * / \
> + * pivot = from / \ pivot = to
> + * / \
> + * 2 (LEAVES) B [-----] [-----] C
> + * ^--- Last pivot to.
> + */
> + while (true) {
> + unsigned long tmp = get_last_index(&mas);
> +
> + if (mas_next_sibling(&mas)) {
> + from = tmp;
> + to = mas.max;
> + } else {
> + break;
> + }
> + }
> +
> + BUG_ON(from == 0 && to == 0);
> +
> + /* Perform the store. */
> + mas_set_range(&mas, from, to);
> + mas_store_gfp(&mas, xa_mk_value(0xdead), GFP_KERNEL);
> +
> + /* If the regression occurs, the validation will fail. */
> + mt_validate(&tree);
> +
> + /* Cleanup. */
> + __mt_destroy(&tree);
> +}
> +
> +static void regression_tests(void)
> +{
> + test_spanning_store_regression();
> +}
> +
> void maple_tree_tests(void)
> {
> #if !defined(BENCH)
> + regression_tests();
> farmer_tests();
> #endif
> maple_tree_seed();
> --
> 2.46.2
next prev parent reply other threads:[~2024-10-07 20:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 15:28 [PATCH hotfix 6.12 v3 0/2] maple_tree: correct tree corruption on spanning store Lorenzo Stoakes
2024-10-07 15:28 ` [PATCH hotfix 6.12 v3 1/2] " Lorenzo Stoakes
2024-10-07 20:39 ` Liam R. Howlett
2024-10-11 5:37 ` Mikhail Gavrilov
2024-10-11 8:39 ` Wei Yang
2024-10-07 15:28 ` [PATCH hotfix 6.12 v3 2/2] maple_tree: add regression test for spanning store bug Lorenzo Stoakes
2024-10-07 20:39 ` Liam R. Howlett [this message]
2024-10-11 8:40 ` Wei Yang
2024-10-17 7:17 ` [PATCH hotfix 6.12 v3 0/2] maple_tree: correct tree corruption on spanning store Andrew Morton
2024-10-17 7:38 ` Lorenzo Stoakes
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=y6vps6mz24sccrbszehz4i3abcdv73yj6jxflbjoz3gcatbbaf@24btpbtw65dr \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=maple-tree@lists.infradead.org \
--cc=mikhail.v.gavrilov@gmail.com \
--cc=sidhartha.kumar@oracle.com \
--cc=spasswolf@web.de \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/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