diff mbox series

[1/2] maple_tree: Add a test case to check maple_alloc

Message ID	20230407040718.99064-1-zhangpeng.00@bytedance.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Peng Zhang <zhangpeng.00@bytedance.com> 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 <zhangpeng.00@bytedance.com> Subject: [PATCH 1/2] maple_tree: Add a test case to check maple_alloc Date: Fri, 7 Apr 2023 12:07:17 +0800 Message-Id: <20230407040718.99064-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[1/2] maple_tree: Add a test case to check maple_alloc \| [1/2] maple_tree: Add a test case to check maple_alloc [2/2] maple_tree: Fix a potential memory leak, OOB access, or other unpredictable bug

Commit Message

Peng Zhang April 7, 2023, 4:07 a.m. UTC

  Add a test case to check whether the number of maple_alloc structures is
actually equal to mas->alloc->total.

Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Comments

Liam R. Howlett April 8, 2023, 3:16 a.m. UTC | #1

* Peng Zhang <zhangpeng.00@bytedance.com> [230407 00:09]:
> Add a test case to check whether the number of maple_alloc structures is
> actually equal to mas->alloc->total.

Please have a look at check_new_node() as there are tests there already
and see if it covers what you are trying to test.

> 
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> ---
>  tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> index 958ee9bdb316..26389e0dcfff 100644
> --- a/tools/testing/radix-tree/maple.c
> +++ b/tools/testing/radix-tree/maple.c
> @@ -55,6 +55,28 @@ struct rcu_reader_struct {
>  	struct rcu_test_struct2 *test;
>  };
>  
> +static int get_alloc_node_count(struct ma_state *mas)
> +{
> +	int count = 1;
> +	struct maple_alloc *node = mas->alloc;
> +
> +	if (!node || ((unsigned long)node & 0x1))
> +		return 0;
> +	while (node->node_count) {
> +		count += node->node_count;
> +		node = node->slot[0];
> +	}
> +	return count;
> +}
> +
> +static void check_mas_alloc_node_count(struct ma_state *mas)
> +{
> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);
> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);
> +	MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total);
> +	mas_destroy(mas);
> +}
> +
>  /*
>   * check_new_node() - Check the creation of new nodes and error path
>   * verification.
> @@ -69,6 +91,8 @@ static noinline void check_new_node(struct maple_tree *mt)
>  
>  	MA_STATE(mas, mt, 0, 0);
>  
> +	check_mas_alloc_node_count(&mas);
> +
>  	/* Try allocating 3 nodes */
>  	mtree_lock(mt);
>  	mt_set_non_kernel(0);
> -- 
> 2.20.1
>

Liam R. Howlett April 8, 2023, 3:22 a.m. UTC | #2

* Liam R. Howlett <Liam.Howlett@Oracle.com> [230407 23:17]:
> * Peng Zhang <zhangpeng.00@bytedance.com> [230407 00:09]:
> > Add a test case to check whether the number of maple_alloc structures is
> > actually equal to mas->alloc->total.
> 
> Please have a look at check_new_node() as there are tests there already
> and see if it covers what you are trying to test.

Sorry, sent this too fast.  I'll have a look after the holiday here.

> 
> > 
> > Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> > ---
> >  tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++
> >  1 file changed, 24 insertions(+)
> > 
> > diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> > index 958ee9bdb316..26389e0dcfff 100644
> > --- a/tools/testing/radix-tree/maple.c
> > +++ b/tools/testing/radix-tree/maple.c
> > @@ -55,6 +55,28 @@ struct rcu_reader_struct {
> >  	struct rcu_test_struct2 *test;
> >  };
> >  
> > +static int get_alloc_node_count(struct ma_state *mas)
> > +{
> > +	int count = 1;
> > +	struct maple_alloc *node = mas->alloc;
> > +
> > +	if (!node || ((unsigned long)node & 0x1))
> > +		return 0;
> > +	while (node->node_count) {
> > +		count += node->node_count;
> > +		node = node->slot[0];
> > +	}
> > +	return count;
> > +}
> > +
> > +static void check_mas_alloc_node_count(struct ma_state *mas)
> > +{
> > +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);
> > +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);
> > +	MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total);
> > +	mas_destroy(mas);
> > +}
> > +
> >  /*
> >   * check_new_node() - Check the creation of new nodes and error path
> >   * verification.
> > @@ -69,6 +91,8 @@ static noinline void check_new_node(struct maple_tree *mt)
> >  
> >  	MA_STATE(mas, mt, 0, 0);
> >  
> > +	check_mas_alloc_node_count(&mas);
> > +
> >  	/* Try allocating 3 nodes */
> >  	mtree_lock(mt);
> >  	mt_set_non_kernel(0);
> > -- 
> > 2.20.1
> >

Liam R. Howlett April 10, 2023, 12:41 p.m. UTC | #3

* Peng Zhang <zhangpeng.00@bytedance.com> [230407 00:09]:
> Add a test case to check whether the number of maple_alloc structures is
> actually equal to mas->alloc->total.

Thanks for the test case.  Can you please send the code to fix the issue
first in the future?  This way the verification code can be used to
bisect any issues.

> 
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> ---
>  tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> index 958ee9bdb316..26389e0dcfff 100644
> --- a/tools/testing/radix-tree/maple.c
> +++ b/tools/testing/radix-tree/maple.c
> @@ -55,6 +55,28 @@ struct rcu_reader_struct {
>  	struct rcu_test_struct2 *test;
>  };
>  
> +static int get_alloc_node_count(struct ma_state *mas)
> +{
> +	int count = 1;
> +	struct maple_alloc *node = mas->alloc;
> +
> +	if (!node || ((unsigned long)node & 0x1))
> +		return 0;
> +	while (node->node_count) {
> +		count += node->node_count;
> +		node = node->slot[0];
> +	}
> +	return count;
> +}
> +
> +static void check_mas_alloc_node_count(struct ma_state *mas)
> +{
> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);
> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);
> +	MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total);
> +	mas_destroy(mas);
> +}
> +
>  /*
>   * check_new_node() - Check the creation of new nodes and error path
>   * verification.
> @@ -69,6 +91,8 @@ static noinline void check_new_node(struct maple_tree *mt)
>  
>  	MA_STATE(mas, mt, 0, 0);
>  
> +	check_mas_alloc_node_count(&mas);
> +
>  	/* Try allocating 3 nodes */
>  	mtree_lock(mt);
>  	mt_set_non_kernel(0);
> -- 
> 2.20.1
>

Peng Zhang April 10, 2023, 1:02 p.m. UTC | #4

在 2023/4/10 20:41, Liam R. Howlett 写道:
> * Peng Zhang <zhangpeng.00@bytedance.com> [230407 00:09]:
>> Add a test case to check whether the number of maple_alloc structures is
>> actually equal to mas->alloc->total.
> Thanks for the test case.  Can you please send the code to fix the issue
> first in the future?  This way the verification code can be used to
> bisect any issues.
Ok, I will exchange the order of the two patches in the next version.
>
>> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
>> ---
>>   tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++
>>   1 file changed, 24 insertions(+)
>>
>> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
>> index 958ee9bdb316..26389e0dcfff 100644
>> --- a/tools/testing/radix-tree/maple.c
>> +++ b/tools/testing/radix-tree/maple.c
>> @@ -55,6 +55,28 @@ struct rcu_reader_struct {
>>   	struct rcu_test_struct2 *test;
>>   };
>>   
>> +static int get_alloc_node_count(struct ma_state *mas)
>> +{
>> +	int count = 1;
>> +	struct maple_alloc *node = mas->alloc;
>> +
>> +	if (!node || ((unsigned long)node & 0x1))
>> +		return 0;
>> +	while (node->node_count) {
>> +		count += node->node_count;
>> +		node = node->slot[0];
>> +	}
>> +	return count;
>> +}
>> +
>> +static void check_mas_alloc_node_count(struct ma_state *mas)
>> +{
>> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);
>> +	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);
>> +	MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total);
>> +	mas_destroy(mas);
>> +}
>> +
>>   /*
>>    * check_new_node() - Check the creation of new nodes and error path
>>    * verification.
>> @@ -69,6 +91,8 @@ static noinline void check_new_node(struct maple_tree *mt)
>>   
>>   	MA_STATE(mas, mt, 0, 0);
>>   
>> +	check_mas_alloc_node_count(&mas);
>> +
>>   	/* Try allocating 3 nodes */
>>   	mtree_lock(mt);
>>   	mt_set_non_kernel(0);
>> -- 
>> 2.20.1
>>

diff mbox series

Patch

diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 958ee9bdb316..26389e0dcfff 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -55,6 +55,28 @@  struct rcu_reader_struct {
 	struct rcu_test_struct2 *test;
 };
 
+static int get_alloc_node_count(struct ma_state *mas)
+{
+	int count = 1;
+	struct maple_alloc *node = mas->alloc;
+
+	if (!node || ((unsigned long)node & 0x1))
+		return 0;
+	while (node->node_count) {
+		count += node->node_count;
+		node = node->slot[0];
+	}
+	return count;
+}
+
+static void check_mas_alloc_node_count(struct ma_state *mas)
+{
+	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);
+	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);
+	MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total);
+	mas_destroy(mas);
+}
+
 /*
  * check_new_node() - Check the creation of new nodes and error path
  * verification.
@@ -69,6 +91,8 @@  static noinline void check_new_node(struct maple_tree *mt)
 
 	MA_STATE(mas, mt, 0, 0);
 
+	check_mas_alloc_node_count(&mas);
+
 	/* Try allocating 3 nodes */
 	mtree_lock(mt);
 	mt_set_non_kernel(0);