unnecessary null checks
cover unnecessary null checks
Several drivers have unnecessary checks found by Coccinelle script
Stephen Hemminger (3):
net/sxe2: remove unnecessary checks
net/gve: remove unnecessary check for NULL
ml/cnxk: remove unnecessary NULL check
drivers/ml/cnxk/tvmrt_ml_model.c | 6 ++---- drivers/net/gve/gve_rx.c | 3 ++- drivers/net/sxe2/sxe2_cmd_chnl.c | 6 ++---- drivers/net/sxe2/sxe2_ethdev.c | 3 +-- drivers/net/sxe2/sxe2_ethdev_repr.c | 3 +-- drivers/net/sxe2/sxe2_mp.c | 3 +-- drivers/net/sxe2/sxe2_rss.c | 3 +-- drivers/net/sxe2/sxe2_txrx_poll.c | 3 +-- 8 files changed, 11 insertions(+), 19 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/3 net/sxe2: remove unnecessary checks
The DPDK rte_free API already handles NULL pointer. Found by cocci/nullfree.cocci script.
--- drivers/net/sxe2/sxe2_cmd_chnl.c | 6 ++---- drivers/net/sxe2/sxe2_ethdev.c | 3 +-- drivers/net/sxe2/sxe2_ethdev_repr.c | 3 +-- drivers/net/sxe2/sxe2_mp.c | 3 +-- drivers/net/sxe2/sxe2_rss.c | 3 +-- drivers/net/sxe2/sxe2_txrx_poll.c | 3 +-- 6 files changed, 7 insertions(+), 14 deletions(-)
drivers/net/sxe2/sxe2_cmd_chnl.c +2 -4
@@ -263,8 +263,7 @@ int32_t sxe2_drv_rxq_ctxt_cfg(struct sxe2_adapter *adapter,PMD_DEV_LOG_ERR (adapter,DRV ,"rxq cfg failed, ret=%d" , ret); l_end: -if (req) -rte_free (req); +rte_free (req);return ret; }
@@ -320,8 +319,7 @@ int32_t sxe2_drv_txq_ctxt_cfg(struct sxe2_adapter *adapter,PMD_DEV_LOG_ERR (adapter,DRV ,"txq cfg failed, ret=%d" , ret); l_end: -if (req) -rte_free (req); +rte_free (req);return ret; }
drivers/net/sxe2/sxe2_ethdev.c +1 -2
@@ -2063,8 +2063,7 @@ static int32_t sxe2_dev_uninit(struct rte_eth_dev *dev) ret = rep_dev->dev_ops->dev_close (rep_dev);if (ret) goto l_end; -if (rep_dev->intr_handle) -rte_intr_instance_free (rep_dev->intr_handle); +rte_intr_instance_free (rep_dev->intr_handle); ret =rte_eth_dev_release_port (rep_dev);if (ret) goto l_end;
drivers/net/sxe2/sxe2_ethdev_repr.c +1 -2
@@ -594,8 +594,7 @@ int32_t sxe2_switchdev_repr_devs_init(struct sxe2_adapter *adapter,struct rte_eth_dev *rep_dev = adapter->repr_ctxt.vf_rep_eth_dev[tmp_repr_idx];if (rep_dev) {sxe2_repr_dev_uinit (rep_dev); -if (rep_dev->intr_handle) -rte_intr_instance_free (rep_dev->intr_handle); +rte_intr_instance_free (rep_dev->intr_handle);rte_eth_dev_release_port (rep_dev); adapter->repr_ctxt.vf_rep_eth_dev[tmp_repr_idx] =NULL ; }
drivers/net/sxe2/sxe2_mp.c +1 -2
@@ -282,8 +282,7 @@ int32_t sxe2_mp_request_simple(struct rte_eth_dev *dev, *result_out = ((struct sxe2_mp_param *)reply.msgs[0 ].param)->result; out: -if (reply.msgs !=NULL ) -free (reply.msgs); +free (reply.msgs);return ret; }
drivers/net/sxe2/sxe2_rss.c +1 -2
@@ -439,8 +439,7 @@ int32_t sxe2_dev_rss_reta_update(struct rte_eth_dev *dev,rte_memcpy (rss_ctxt->rss_lut, lut_tmp, reta_size); l_end: -if (lut_tmp) -rte_free (lut_tmp); +rte_free (lut_tmp);return ret; }
drivers/net/sxe2/sxe2_txrx_poll.c +1 -2
@@ -1121,8 +1121,7 @@ uint16_t sxe2_rx_pkts_scattered_split(void *rx_queue, struct rte_mbuf **rx_pkts, new_mbuf_pay =rte_mbuf_raw_alloc (rxq->rx_seg[1 ].mp);if (unlikely (new_mbuf_pay ==NULL )) { rxq->vsi->adapter->dev_info.dev_data->rx_mbuf_alloc_failed++; -if (new_mbuf !=NULL ) -rte_pktmbuf_free (new_mbuf); +rte_pktmbuf_free (new_mbuf); new_mbuf =NULL ;break ; }
Signature · 1 line
2.53.0
PATCH 2/3 net/gve: remove unnecessary check for NULL
In reply to Stephen HemmingerChecking for NULL before calling rte_free is unnecessary. Found by cocci/nullfree.cocci script.
--- drivers/net/gve/gve_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/gve/gve_rx.c +2 -1
@@ -205,8 +205,9 @@ gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (gve_rx (rxq, rxd, rx_id)) {if (!ctx->drop_pkt) rx_pkts[nb_rx++] = ctx->mbuf_head; -else if (ctx->mbuf_head !=NULL ) +else {rte_pktmbuf_free (ctx->mbuf_head); + } rxq->nb_avail += ctx->total_frags;gve_rx_ctx_clear (ctx); }
Signature · 1 line
2.53.0
Re: [PATCH 2/3] net/gve: remove unnecessary check for NULL
Quoted 5 lines · Stephen Hemminger
Checking for NULL before calling
rte_freeis unnecessary. Found bycocci/nullfree.cocciscript.Signed-off-by Stephen Hemminger <[email protected]>
Quoted 22 lines
--- drivers/net/gve/gve_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/gve/gve_rx.c +2
-2@@ -205,8 +205,9 @@ gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (gve_rx (rxq, rxd, rx_id)) {if (!ctx->drop_pkt) rx_pkts[nb_rx++] = ctx->mbuf_head; -else if (ctx->mbuf_head !=NULL ) +else {rte_pktmbuf_free (ctx->mbuf_head); + } rxq->nb_avail += ctx->total_frags;gve_rx_ctx_clear (ctx); } --2.53.0
PATCH 3/3 ml/cnxk: remove unnecessary NULL check
In reply to Stephen HemmingerNo need to check for NULL before calling rte_free. Found by cocci/nullfree.cocci script.
--- drivers/ml/cnxk/tvmrt_ml_model.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/ml/cnxk/tvmrt_ml_model.c +2 -4
@@ -133,10 +133,8 @@ tvmrt_ml_model_blob_parse(struct rte_ml_model_params *params, struct tvmrt_ml_mo goto cleanup; error: -for (i =0 ; i <ML_TVMRT_MODEL_OBJECT_MAX ; i++) { -if (object[i].buffer !=NULL ) -rte_free (object[i].buffer); - } +for (i =0 ; i <ML_TVMRT_MODEL_OBJECT_MAX ; i++) +rte_free (object[i].buffer); cleanup:archive_read_close (a);
Signature · 1 line
2.53.0