net/mlx5: remove unnecessary NULL check
diff mbox series

Message ID 1585650269-11556-1-git-send-email-wangyunjian@huawei.com
State Deferred
Delegated to: Raslan Darawsheh
Headers show
Series
  • net/mlx5: remove unnecessary NULL check
Related show

Checks

Context Check Description
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

wangyunjian March 31, 2020, 10:24 a.m. UTC
From: Yunjian Wang <wangyunjian@huawei.com>

This NULL check is unnecessary, container_of is never NULL.

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/mlx5/mlx5.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Matan Azrad March 31, 2020, 10:53 a.m. UTC | #1
From: wangyunjian
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> This NULL check is unnecessary, container_of is never NULL.
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  drivers/net/mlx5/mlx5.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> 94aaa6057..2e4edb123 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -747,7 +747,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>  	if (pos) {
>  		tbl_data = container_of(pos, struct
> mlx5_flow_tbl_data_entry,
>  					entry);
> -		MLX5_ASSERT(tbl_data);

So, maybe the assert should be on entry?

>  		mlx5_hlist_remove(sh->flow_tbls, pos);
>  		rte_free(tbl_data);
>  	}
> @@ -756,7 +755,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>  	if (pos) {
>  		tbl_data = container_of(pos, struct
> mlx5_flow_tbl_data_entry,
>  					entry);
> -		MLX5_ASSERT(tbl_data);
>  		mlx5_hlist_remove(sh->flow_tbls, pos);
>  		rte_free(tbl_data);
>  	}
> @@ -766,7 +764,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>  	if (pos) {
>  		tbl_data = container_of(pos, struct
> mlx5_flow_tbl_data_entry,
>  					entry);
> -		MLX5_ASSERT(tbl_data);
>  		mlx5_hlist_remove(sh->flow_tbls, pos);
>  		rte_free(tbl_data);
>  	}
> --
> 2.19.1
>
wangyunjian April 1, 2020, 11:13 a.m. UTC | #2
> -----Original Message-----
> From: Matan Azrad [mailto:matan@mellanox.com]
> Sent: Tuesday, March 31, 2020 6:54 PM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: Shahaf Shuler <shahafs@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; Lilijun (Jerry) <jerry.lilijun@huawei.com>;
> xudingke <xudingke@huawei.com>
> Subject: RE: [dpdk-dev] [PATCH] net/mlx5: remove unnecessary NULL check
> 
> 
> 
> From: wangyunjian
> > From: Yunjian Wang <wangyunjian@huawei.com>
> >
> > This NULL check is unnecessary, container_of is never NULL.
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >  drivers/net/mlx5/mlx5.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> > 94aaa6057..2e4edb123 100644
> > --- a/drivers/net/mlx5/mlx5.c
> > +++ b/drivers/net/mlx5/mlx5.c
> > @@ -747,7 +747,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >  	if (pos) {
> >  		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >  					entry);
> > -		MLX5_ASSERT(tbl_data);
> 
> So, maybe the assert should be on entry?

Now the 'pos' is being NULL checked.

Thanks
Yunjian
> 
> >  		mlx5_hlist_remove(sh->flow_tbls, pos);
> >  		rte_free(tbl_data);
> >  	}
> > @@ -756,7 +755,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >  	if (pos) {
> >  		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >  					entry);
> > -		MLX5_ASSERT(tbl_data);
> >  		mlx5_hlist_remove(sh->flow_tbls, pos);
> >  		rte_free(tbl_data);
> >  	}
> > @@ -766,7 +764,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >  	if (pos) {
> >  		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >  					entry);
> > -		MLX5_ASSERT(tbl_data);
> >  		mlx5_hlist_remove(sh->flow_tbls, pos);
> >  		rte_free(tbl_data);
> >  	}
> > --
> > 2.19.1
> >
Suanming Mou Nov. 18, 2020, 2:15 a.m. UTC | #3
Hi Yunjian,

As the code changed, I think this patch is not needed anymore.

Thanks,
SuanmingMou

On 3/31/2020 6:24 PM, wangyunjian wrote:
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> This NULL check is unnecessary, container_of is never NULL.
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>   drivers/net/mlx5/mlx5.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 94aaa6057..2e4edb123 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -747,7 +747,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>   	if (pos) {
>   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
>   					entry);
> -		MLX5_ASSERT(tbl_data);
>   		mlx5_hlist_remove(sh->flow_tbls, pos);
>   		rte_free(tbl_data);
>   	}
> @@ -756,7 +755,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>   	if (pos) {
>   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
>   					entry);
> -		MLX5_ASSERT(tbl_data);
>   		mlx5_hlist_remove(sh->flow_tbls, pos);
>   		rte_free(tbl_data);
>   	}
> @@ -766,7 +764,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
>   	if (pos) {
>   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
>   					entry);
> -		MLX5_ASSERT(tbl_data);
>   		mlx5_hlist_remove(sh->flow_tbls, pos);
>   		rte_free(tbl_data);
>   	}
wangyunjian Nov. 18, 2020, 2:41 a.m. UTC | #4
OK, please reject this patch.

Thanks,
Yunjian

> -----Original Message-----
> From: Suanming Mou [mailto:suanmingm@nvidia.com]
> Sent: Wednesday, November 18, 2020 10:16 AM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: matan@mellanox.com; shahafs@mellanox.com;
> viacheslavo@mellanox.com; Lilijun (Jerry) <jerry.lilijun@huawei.com>; xudingke
> <xudingke@huawei.com>
> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: remove unnecessary NULL check
> 
> Hi Yunjian,
> 
> As the code changed, I think this patch is not needed anymore.
> 
> Thanks,
> SuanmingMou
> 
> On 3/31/2020 6:24 PM, wangyunjian wrote:
> > From: Yunjian Wang <wangyunjian@huawei.com>
> >
> > This NULL check is unnecessary, container_of is never NULL.
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >   drivers/net/mlx5/mlx5.c | 3 ---
> >   1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> > 94aaa6057..2e4edb123 100644
> > --- a/drivers/net/mlx5/mlx5.c
> > +++ b/drivers/net/mlx5/mlx5.c
> > @@ -747,7 +747,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >   	if (pos) {
> >   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >   					entry);
> > -		MLX5_ASSERT(tbl_data);
> >   		mlx5_hlist_remove(sh->flow_tbls, pos);
> >   		rte_free(tbl_data);
> >   	}
> > @@ -756,7 +755,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >   	if (pos) {
> >   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >   					entry);
> > -		MLX5_ASSERT(tbl_data);
> >   		mlx5_hlist_remove(sh->flow_tbls, pos);
> >   		rte_free(tbl_data);
> >   	}
> > @@ -766,7 +764,6 @@ mlx5_free_table_hash_list(struct mlx5_priv *priv)
> >   	if (pos) {
> >   		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
> >   					entry);
> > -		MLX5_ASSERT(tbl_data);
> >   		mlx5_hlist_remove(sh->flow_tbls, pos);
> >   		rte_free(tbl_data);
> >   	}
>

Patch
diff mbox series

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 94aaa6057..2e4edb123 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -747,7 +747,6 @@  mlx5_free_table_hash_list(struct mlx5_priv *priv)
 	if (pos) {
 		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
 					entry);
-		MLX5_ASSERT(tbl_data);
 		mlx5_hlist_remove(sh->flow_tbls, pos);
 		rte_free(tbl_data);
 	}
@@ -756,7 +755,6 @@  mlx5_free_table_hash_list(struct mlx5_priv *priv)
 	if (pos) {
 		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
 					entry);
-		MLX5_ASSERT(tbl_data);
 		mlx5_hlist_remove(sh->flow_tbls, pos);
 		rte_free(tbl_data);
 	}
@@ -766,7 +764,6 @@  mlx5_free_table_hash_list(struct mlx5_priv *priv)
 	if (pos) {
 		tbl_data = container_of(pos, struct mlx5_flow_tbl_data_entry,
 					entry);
-		MLX5_ASSERT(tbl_data);
 		mlx5_hlist_remove(sh->flow_tbls, pos);
 		rte_free(tbl_data);
 	}