remove unnecessary null checks
cover remove unnecessary null checks
This patch set is from running the null_free coccinelle script on the current main branch.
Stephen Hemminger (4):
gve: remove unnecessary null checks
mlx5: remove unnecessary null checks
idpf: remove unnecessary null checks
examples: remove unnecessary null checks
drivers/net/gve/gve_ethdev.c | 6 ++---- drivers/net/idpf/idpf_rxtx.c | 3 +-- drivers/net/mlx5/hws/mlx5dr_pool.c | 3 +-- drivers/net/mlx5/mlx5_flow_hw.c | 6 ++---- examples/distributor/main.c | 3 +-- examples/fips_validation/main.c | 15 +++++---------- 6 files changed, 12 insertions(+), 24 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/4 gve: remove unnecessary null checks
The function rte_free() already handles NULL argument; therefore the checks in this code are unnecessary.
--- drivers/net/gve/gve_ethdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/gve/gve_ethdev.c +2 -4
@@ -81,12 +81,10 @@ gve_free_qpls(struct gve_priv *priv)for (i =0 ; i < nb_txqs + nb_rxqs; i++) {if (priv->qpl[i].mz !=NULL )rte_memzone_free (priv->qpl[i].mz); -if (priv->qpl[i].page_buses !=NULL ) -rte_free (priv->qpl[i].page_buses); +rte_free (priv->qpl[i].page_buses); } -if (priv->qpl !=NULL ) -rte_free (priv->qpl); +rte_free (priv->qpl); } static int
Signature · 1 line
2.35.1
PATCH 2/4 mlx5: remove unnecessary null checks
In reply to Stephen HemmingerThe function rte_free() already handles NULL argument; therefore the checks in this code are unnecessary.
--- drivers/net/mlx5/hws/mlx5dr_pool.c | 3 +-- drivers/net/mlx5/mlx5_flow_hw.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/net/mlx5/hws/mlx5dr_pool.c +1 -2
@@ -537,8 +537,7 @@ static void mlx5dr_onesize_element_db_uninit(struct mlx5dr_pool *pool)for (i =0 ; i <MLX5DR_POOL_RESOURCE_ARR_SZ ; i++) { elem = pool->db.element_manager->elements[i];if (elem) { -if (elem->bitmap) -rte_free (elem->bitmap); +rte_free (elem->bitmap);simple_free (elem); pool->db.element_manager->elements[i] =NULL ; }
drivers/net/mlx5/mlx5_flow_hw.c +2 -4
@@ -7063,10 +7063,8 @@ flow_hw_configure(struct rte_eth_dev *dev,if (dr_ctx)claim_zero (mlx5dr_context_close (dr_ctx));for (i =0 ; i < nb_q_updated; i++) { -if (priv->hw_q[i].indir_iq) -rte_ring_free (priv->hw_q[i].indir_iq); -if (priv->hw_q[i].indir_cq) -rte_ring_free (priv->hw_q[i].indir_cq); +rte_ring_free (priv->hw_q[i].indir_iq); +rte_ring_free (priv->hw_q[i].indir_cq); }mlx5_free (priv->hw_q); priv->hw_q =NULL ;
Signature · 1 line
2.35.1
PATCH 3/4 idpf: remvoee unnecessary null checks
In reply to Stephen HemmingerThe function rte_free() already handles NULL argument; therefore the checks in this code are unnecessary.
--- drivers/net/idpf/idpf_rxtx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/idpf/idpf_rxtx.c +1 -2
@@ -251,8 +251,7 @@ reset_single_rx_queue(struct idpf_rx_queue *rxq) rxq->rx_tail =0 ; rxq->nb_rx_hold =0 ; -if (rxq->pkt_first_seg !=NULL ) -rte_pktmbuf_free (rxq->pkt_first_seg); +rte_pktmbuf_free (rxq->pkt_first_seg); rxq->pkt_first_seg =NULL ; rxq->pkt_last_seg =NULL ;
Signature · 1 line
2.35.1
PATCH 4/4 examples: remove unnecessary null checks
In reply to Stephen HemmingerThe function rte_free() already handles NULL argument; therefore the checks in this code are unnecessary.
--- examples/distributor/main.c | 3 +-- examples/fips_validation/main.c | 15 +++++---------- 2 files changed, 6 insertions(+), 12 deletions(-)
examples/distributor/main.c +1 -2
@@ -1017,8 +1017,7 @@ main(int argc, char *argv[])print_stats (); -if (pd) -rte_free (pd); +rte_free (pd);rte_free (pr);/* clean up the EAL */
examples/fips_validation/main.c +5 -10
@@ -962,8 +962,7 @@ prepare_rsa_op(void) asym->rsa.message.data = msg.val; asym->rsa.message.length = msg.len; -if (vec.rsa.signature.val) -rte_free (vec.rsa.signature.val); +rte_free (vec.rsa.signature.val); vec.rsa.signature.val =rte_zmalloc (NULL , vec.rsa.n.len,0 ); vec.rsa.signature.len = vec.rsa.n.len;
@@ -1011,11 +1010,9 @@ prepare_ecdsa_op(void) asym->ecdsa.k.data = vec.ecdsa.k.val; asym->ecdsa.k.length = vec.ecdsa.k.len; -if (vec.ecdsa.r.val) -rte_free (vec.ecdsa.r.val); +rte_free (vec.ecdsa.r.val); -if (vec.ecdsa.s.val) -rte_free (vec.ecdsa.s.val); +rte_free (vec.ecdsa.s.val); vec.ecdsa.r.len = info.interim_info.ecdsa_data.curve_len; vec.ecdsa.r.val =rte_zmalloc (NULL , vec.ecdsa.r.len,0 );
@@ -1060,11 +1057,9 @@ prepare_ecfpm_op(void) asym->ecpm.scalar.data = vec.ecdsa.pkey.val; asym->ecpm.scalar.length = vec.ecdsa.pkey.len; -if (vec.ecdsa.qx.val) -rte_free (vec.ecdsa.qx.val); +rte_free (vec.ecdsa.qx.val); -if (vec.ecdsa.qy.val) -rte_free (vec.ecdsa.qy.val); +rte_free (vec.ecdsa.qy.val); vec.ecdsa.qx.len = info.interim_info.ecdsa_data.curve_len; vec.ecdsa.qx.val =rte_zmalloc (NULL , vec.ecdsa.qx.len,0 );
Signature · 1 line
2.35.1
RE: [PATCH 4/4] examples: remove unnecessary null checks
Hi Stephen,
Looks good for fips validation.
Quoted 75 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, November 9, 2022 11:47 PM
To: [email protected]
Cc: Stephen Hemminger <[email protected]>; Hunt, David <[email protected]>; Dooley, Brian <[email protected]>
Subject: [PATCH 4/4] examples: remove unnecessary null checksThe function
rte_free()already handles NULL argument; therefore the checks in this code are unnecessary.Signed-off-by Stephen Hemminger <[email protected]>--- examples/distributor/main.c | 3 +-- examples/fips_validation/main.c | 15 +++++---------- 2 files changed, 6 insertions(+), 12 deletions(-)examples/distributor/main.c index renamed from examples/distributor/main.c +0
-0
e767973ed8de..21304d661873100644examples/distributor/main.c +1
-2@@ -1017,8 +1017,7 @@ main(int argc, char *argv[])print_stats (); -if (pd) -rte_free (pd); +rte_free (pd);rte_free (pr);/* clean up the EAL */ (quoted diff) +0
-0
b/examples/fips_validation/main.cindex40a5b70e073b..73caaffb7e7a100644examples/fips_validation/main.c +1
-2@@ -962,8 +962,7 @@ prepare_rsa_op(void) asym->rsa.message.data = msg.val; asym->rsa.message.length = msg.len; -if (vec.rsa.signature.val) -rte_free (vec.rsa.signature.val); +rte_free (vec.rsa.signature.val); vec.rsa.signature.val =rte_zmalloc (NULL , vec.rsa.n.len,0 ); vec.rsa.signature.len = vec.rsa.n.len; @@ -1011,11 +1010,9@@
prepare_ecdsa_op(void)examples/fips_validation/main.c +2
-4asym->ecdsa.k.data = vec.ecdsa.k.val; asym->ecdsa.k.length = vec.ecdsa.k.len; -if (vec.ecdsa.r.val) -rte_free (vec.ecdsa.r.val); +rte_free (vec.ecdsa.r.val); -if (vec.ecdsa.s.val) -rte_free (vec.ecdsa.s.val); +rte_free (vec.ecdsa.s.val); vec.ecdsa.r.len = info.interim_info.ecdsa_data.curve_len; vec.ecdsa.r.val = rte_zmalloc(NULL, vec.ecdsa.r.len, 0); @@ -1060,11 +1057,9 @@
prepare_ecfpm_op(void)examples/fips_validation/main.c +2
-5asym->ecpm.scalar.data = vec.ecdsa.pkey.val; asym->ecpm.scalar.length = vec.ecdsa.pkey.len; -if (vec.ecdsa.qx.val) -rte_free (vec.ecdsa.qx.val); +rte_free (vec.ecdsa.qx.val); -if (vec.ecdsa.qy.val) -rte_free (vec.ecdsa.qy.val); +rte_free (vec.ecdsa.qy.val); vec.ecdsa.qx.len = info.interim_info.ecdsa_data.curve_len; vec.ecdsa.qx.val =rte_zmalloc (NULL , vec.ecdsa.qx.len,0 ); --
Quoted 1 line
2.35.1
10/11/2022 00:46, Stephen Hemminger:
Quoted 8 lines
This patch set is from running the
null_freecoccinelle script on the current main branch.Stephen Hemminger (4):
gve: remove unnecessary null checks
mlx5: remove unnecessary null checks
idpf: remove unnecessary null checks
examples: remove unnecessary null checks
Squashed drivers together and applied, thanks.
Quoted 11 lines · On Tue, 15 Nov 2022 15:03:14 +0100 Thomas Monjalon <[email protected]> wrote:
10/11/2022 00:46, Stephen Hemminger:
Quoted 8 lines
This patch set is from running the
null_freecoccinelle script on the current main branch.Stephen Hemminger (4):
gve: remove unnecessary null checks
mlx5: remove unnecessary null checks
idpf: remove unnecessary null checks
examples: remove unnecessary null checksSquashed drivers together and applied, thanks.
Thanks, I tend to split driver patches so each maintainer only has to see their own code.
15/11/2022 17:46, Stephen Hemminger:
Quoted 13 lines
Quoted 10 lines · On Tue, 15 Nov 2022 15:03:14 +0100 Thomas Monjalon <[email protected]> wrote:
10/11/2022 00:46, Stephen Hemminger:
Quoted 8 lines
This patch set is from running the
null_freecoccinelle script on the current main branch.Stephen Hemminger (4):
gve: remove unnecessary null checks
mlx5: remove unnecessary null checks
idpf: remove unnecessary null checks
examples: remove unnecessary null checks
Quoted 4 lines
Quoted 1 line
Squashed drivers together and applied, thanks.
Thanks, I tend to split driver patches so each maintainer only has to see their own code.
Yes I know the intent, no problem.