* [PATCH] XArray: Fix xa_to_node by adding xa_is_node
@ 2021-10-12 8:42 Jiasheng Jiang
2021-10-18 20:06 ` Matthew Wilcox
0 siblings, 1 reply; 2+ messages in thread
From: Jiasheng Jiang @ 2021-10-12 8:42 UTC (permalink / raw)
To: willy, akpm; +Cc: linux-kernel, Jiasheng Jiang
Directly using xa_to_node may lead to the compulsory type
conversion of unknown type,which is unsafe.
So it might be better that adding xa_is_node before.
Fixes: 58d6ea3 ("xarray: Add XArray unconditional store operations")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
lib/test_xarray.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/test_xarray.c b/lib/test_xarray.c
index 8b1c318..7ad3d51 100644
--- a/lib/test_xarray.c
+++ b/lib/test_xarray.c
@@ -606,8 +606,10 @@ static noinline void check_multi_store(struct xarray *xa)
XA_BUG_ON(xa, xa_load(xa, 1) != xa_mk_value(0));
XA_BUG_ON(xa, xa_load(xa, 2) != NULL);
rcu_read_lock();
- XA_BUG_ON(xa, xa_to_node(xa_head(xa))->count != 2);
- XA_BUG_ON(xa, xa_to_node(xa_head(xa))->nr_values != 2);
+ if (xa_is_node(xa_head(xa))) {
+ XA_BUG_ON(xa, xa_to_node(xa_head(xa))->count != 2);
+ XA_BUG_ON(xa, xa_to_node(xa_head(xa))->nr_values != 2);
+ }
rcu_read_unlock();
/* Storing adjacent to the value does not alter the value */
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] XArray: Fix xa_to_node by adding xa_is_node
2021-10-12 8:42 [PATCH] XArray: Fix xa_to_node by adding xa_is_node Jiasheng Jiang
@ 2021-10-18 20:06 ` Matthew Wilcox
0 siblings, 0 replies; 2+ messages in thread
From: Matthew Wilcox @ 2021-10-18 20:06 UTC (permalink / raw)
To: Jiasheng Jiang; +Cc: akpm, linux-kernel
On Tue, Oct 12, 2021 at 08:42:50AM +0000, Jiasheng Jiang wrote:
> Directly using xa_to_node may lead to the compulsory type
> conversion of unknown type,which is unsafe.
> So it might be better that adding xa_is_node before.
No. This is test code, and it knows what it's doing.
I suppose we could add an XA_BUG_ON(xa, !xa_is_node(xa_head(xa)));
but that seems pointless. This patch is definitely wrong.
> Fixes: 58d6ea3 ("xarray: Add XArray unconditional store operations")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> lib/test_xarray.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/test_xarray.c b/lib/test_xarray.c
> index 8b1c318..7ad3d51 100644
> --- a/lib/test_xarray.c
> +++ b/lib/test_xarray.c
> @@ -606,8 +606,10 @@ static noinline void check_multi_store(struct xarray *xa)
> XA_BUG_ON(xa, xa_load(xa, 1) != xa_mk_value(0));
> XA_BUG_ON(xa, xa_load(xa, 2) != NULL);
> rcu_read_lock();
> - XA_BUG_ON(xa, xa_to_node(xa_head(xa))->count != 2);
> - XA_BUG_ON(xa, xa_to_node(xa_head(xa))->nr_values != 2);
> + if (xa_is_node(xa_head(xa))) {
> + XA_BUG_ON(xa, xa_to_node(xa_head(xa))->count != 2);
> + XA_BUG_ON(xa, xa_to_node(xa_head(xa))->nr_values != 2);
> + }
> rcu_read_unlock();
>
> /* Storing adjacent to the value does not alter the value */
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-18 20:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 8:42 [PATCH] XArray: Fix xa_to_node by adding xa_is_node Jiasheng Jiang
2021-10-18 20:06 ` Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).