d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unnecessary null checks

Browse Source 
Functions like free, rte_free, and rte_mempool_free
already handle NULL pointer so the checks here are not necessary.

Remove redundant NULL pointer checks before free functions
found by nullfree.cocci

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2022-02-09 11:17:15 -08:00 committed by Thomas Monjalon
parent 27b360f1b5
commit 06c047b680
130 changed files with 273 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/pdump/main.c
View File

@ -502,14 +502,11 @@ cleanup_rings(void)
for (i = 0; i < num_tuples; i++) {
pt = &pdump_t[i];
if (pt->device_id)
free(pt->device_id);
free(pt->device_id);
/* free the rings */
if (pt->rx_ring)
rte_ring_free(pt->rx_ring);
if (pt->tx_ring)
rte_ring_free(pt->tx_ring);
rte_ring_free(pt->rx_ring);
rte_ring_free(pt->tx_ring);
}
}

3
app/test-crypto-perf/cperf_test_latency.c
View File

@ -49,8 +49,7 @@ cperf_latency_test_free(struct cperf_latency_ctx *ctx)
rte_cryptodev_sym_session_free(ctx->sess);
}
if (ctx->pool)
rte_mempool_free(ctx->pool);
rte_mempool_free(ctx->pool);
rte_free(ctx->res);
rte_free(ctx);

9
app/test-crypto-perf/cperf_test_pmd_cyclecount.c
View File

@ -79,14 +79,11 @@ cperf_pmd_cyclecount_test_free(struct cperf_pmd_cyclecount_ctx *ctx)
}
}
if (ctx->pool)
rte_mempool_free(ctx->pool);
rte_mempool_free(ctx->pool);
if (ctx->ops)
rte_free(ctx->ops);
rte_free(ctx->ops);
if (ctx->ops_processed)
rte_free(ctx->ops_processed);
rte_free(ctx->ops_processed);
rte_free(ctx);
}

3
app/test-crypto-perf/cperf_test_throughput.c
View File

@ -57,8 +57,7 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
rte_cryptodev_sym_session_free(ctx->sess);
}
}
if (ctx->pool)
rte_mempool_free(ctx->pool);
rte_mempool_free(ctx->pool);
rte_free(ctx);
}

6
app/test-crypto-perf/cperf_test_vector_parsing.c
View File

@ -551,10 +551,8 @@ parse_file(struct cperf_test_vector *vector, struct cperf_options *opts)
err:
if (fp)
fclose(fp);
if (line)
free(line);
if (entry)
rte_free(entry);
free(line);
rte_free(entry);
return -1;
}

3
app/test-crypto-perf/cperf_test_verify.c
View File

@ -42,8 +42,7 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx)
rte_cryptodev_sym_session_free(ctx->sess);
}
if (ctx->pool)
rte_mempool_free(ctx->pool);
rte_mempool_free(ctx->pool);
rte_free(ctx);
}

3
app/test-pmd/cmd_flex_item.c
View File

@ -364,8 +364,7 @@ flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename)
flow_error.message ? flow_error.message : "");
}
out:
if (fp)
free(fp);
free(fp);
}
#else /* RTE_HAS_JANSSON */

3
app/test-pmd/cmdline.c
View File

@ -14830,8 +14830,7 @@ cmd_ddp_info_parsed(
ret = 0;
no_print_return:
if (proto)
free(proto);
free(proto);
#endif
if (ret == -ENOTSUP)
fprintf(stderr, "Function not supported in PMD\n");

3
app/test-pmd/testpmd.c
View File

@ -908,8 +908,7 @@ create_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, struct extmem_param *param,
return 0;
fail:
if (iovas)
free(iovas);
free(iovas);
if (addr)
munmap(addr, mem_sz);

12
app/test-regex/main.c
View File

@ -210,8 +210,7 @@ read_file(char *file, char **buf)
printf("Error, can't open file %s\n, err = %d", file, res);
if (fp)
fclose(fp);
if (*buf)
rte_free(*buf);
rte_free(*buf);
return -res;
}
@ -299,8 +298,7 @@ init_port(uint16_t *nb_max_payload, char *rules_file, uint8_t *nb_max_matches,
rte_free(rules);
return 0;
error:
if (rules)
rte_free(rules);
rte_free(rules);
return res;
}
@ -367,8 +365,7 @@ regex_create_segmented_mbuf(struct rte_mempool *mbuf_pool, int pkt_len,
return mbuf;
fail:
if (mbuf)
rte_pktmbuf_free(mbuf);
rte_pktmbuf_free(mbuf);
return NULL;
}
@ -612,8 +609,7 @@ run_regex(void *args)
rte_free(qp->buf);
qp->buf = NULL;
}
if (mbuf_mp)
rte_mempool_free(mbuf_mp);
rte_mempool_free(mbuf_mp);
rte_free(qps);
return res;
}

3
app/test/test_cksum.c
View File

@ -218,8 +218,7 @@ test_l4_cksum(struct rte_mempool *pktmbuf_pool, const char *pktdata, size_t len)
return 0;
fail:
if (m)
rte_pktmbuf_free(m);
rte_pktmbuf_free(m);
return -1;
}

3
app/test/test_compressdev.c
View File

@ -2144,8 +2144,7 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
if (stream != NULL)
rte_compressdev_stream_free(0, stream);
if (all_decomp_data != NULL)
rte_free(all_decomp_data);
rte_free(all_decomp_data);
/* Free compress private xforms */
for (i = 0; i < test_priv_data.num_priv_xforms; i++) {

3
app/test/test_cryptodev.h
View File

@ -230,8 +230,7 @@ create_segmented_mbuf(struct rte_mempool *mbuf_pool, int pkt_len,
return mbuf;
fail:
if (mbuf)
rte_pktmbuf_free(mbuf);
rte_pktmbuf_free(mbuf);
return NULL;
}

3
app/test/test_cryptodev_asym.c
View File

@ -520,8 +520,7 @@ test_cryptodev_asym_op(struct crypto_testsuite_params_asym *ts_params,
if (op != NULL)
rte_crypto_op_free(op);
if (result != NULL)
rte_free(result);
rte_free(result);
return status;
}

12
app/test/test_cryptodev_blockcipher.c
View File

@ -807,20 +807,16 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
rte_cryptodev_sym_session_clear(dev_id, sess);
rte_cryptodev_sym_session_free(sess);
}
if (cipher_xform)
rte_free(cipher_xform);
if (auth_xform)
rte_free(auth_xform);
rte_free(cipher_xform);
rte_free(auth_xform);
}
if (op)
rte_crypto_op_free(op);
if (obuf)
rte_pktmbuf_free(obuf);
rte_pktmbuf_free(obuf);
if (ibuf)
rte_pktmbuf_free(ibuf);
rte_pktmbuf_free(ibuf);
return status;
}

15
app/test/test_func_reentrancy.c
View File

@ -89,15 +89,13 @@ ring_clean(unsigned int lcore_id)
int i;
rp = rte_ring_lookup("fr_test_once");
if (rp != NULL)
rte_ring_free(rp);
rte_ring_free(rp);
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(ring_name, sizeof(ring_name),
"fr_test_%d_%d", lcore_id, i);
rp = rte_ring_lookup(ring_name);
if (rp != NULL)
rte_ring_free(rp);
rte_ring_free(rp);
}
}
@ -152,15 +150,13 @@ mempool_clean(unsigned int lcore_id)
int i;
mp = rte_mempool_lookup("fr_test_once");
if (mp != NULL)
rte_mempool_free(mp);
rte_mempool_free(mp);
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d",
lcore_id, i);
mp = rte_mempool_lookup(mempool_name);
if (mp != NULL)
rte_mempool_free(mp);
rte_mempool_free(mp);
}
}
@ -215,8 +211,7 @@ hash_clean(unsigned lcore_id)
int i;
handle = rte_hash_find_existing("fr_test_once");
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_id, i);

15
app/test/test_hash.c
View File

@ -1654,8 +1654,7 @@ test_hash_add_delete_jhash2(void)
ret = 0;
fail_jhash2:
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
return ret;
}
@ -1689,8 +1688,7 @@ test_hash_add_delete_2_jhash2(void)
ret = 0;
fail_2_jhash2:
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
return ret;
}
@ -1754,8 +1752,7 @@ test_hash_add_delete_jhash_1word(void)
ret = 0;
fail_jhash_1word:
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
return ret;
}
@ -1789,8 +1786,7 @@ test_hash_add_delete_jhash_2word(void)
ret = 0;
fail_jhash_2word:
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
return ret;
}
@ -1824,8 +1820,7 @@ test_hash_add_delete_jhash_3word(void)
ret = 0;
fail_jhash_3word:
if (handle != NULL)
rte_hash_free(handle);
rte_hash_free(handle);
return ret;
}

7
app/test/test_hash_perf.c
View File

@ -106,12 +106,7 @@ create_table(unsigned int with_data, unsigned int table_index,
ut_params.key_len = hashtest_key_lens[table_index];
ut_params.socket_id = rte_socket_id();
h[table_index] = rte_hash_find_existing(name);
if (h[table_index] != NULL)
/*
* If table was already created, free it to create it again,
* so we force it is empty
*/
rte_hash_free(h[table_index]);
rte_hash_free(h[table_index]);
h[table_index] = rte_hash_create(&ut_params);
if (h[table_index] == NULL) {
printf("Error creating table\n");

9
app/test/test_link_bonding.c
View File

@ -1639,8 +1639,7 @@ test_roundrobin_rx_burst_on_single_slave(void)
/* free mbufs */
for (i = 0; i < MAX_PKT_BURST; i++) {
if (rx_pkt_burst[i] != NULL)
rte_pktmbuf_free(rx_pkt_burst[i]);
rte_pktmbuf_free(rx_pkt_burst[i]);
}
@ -1722,8 +1721,7 @@ test_roundrobin_rx_burst_on_multiple_slaves(void)
/* free mbufs */
for (i = 0; i < MAX_PKT_BURST; i++) {
if (rx_pkt_burst[i] != NULL)
rte_pktmbuf_free(rx_pkt_burst[i]);
rte_pktmbuf_free(rx_pkt_burst[i]);
}
/* Clean up and remove slaves from bonded device */
@ -2010,8 +2008,7 @@ test_roundrobin_verify_slave_link_status_change_behaviour(void)
/* free mbufs */
for (i = 0; i < MAX_PKT_BURST; i++) {
if (rx_pkt_burst[i] != NULL)
rte_pktmbuf_free(rx_pkt_burst[i]);
rte_pktmbuf_free(rx_pkt_burst[i]);
}
/* Clean up and remove slaves from bonded device */

3
app/test/test_link_bonding_mode4.c
View File

@ -194,8 +194,7 @@ free_pkts(struct rte_mbuf **pkts, uint16_t count)
uint16_t i;
for (i = 0; i < count; i++) {
if (pkts[i] != NULL)
rte_pktmbuf_free(pkts[i]);
rte_pktmbuf_free(pkts[i]);
}
}

5
app/test/test_malloc.c
View File

@ -823,7 +823,7 @@ test_zero_aligned_alloc(void)
err_return:
/*clean up */
if (p1) rte_free(p1);
rte_free(p1);
return -1;
}
@ -876,8 +876,7 @@ test_malloc_bad_params(void)
err_return:
/* clean up pointer */
if (bad_ptr)
rte_free(bad_ptr);
rte_free(bad_ptr);
return -1;
}

45
app/test/test_mbuf.c
View File

@ -304,8 +304,7 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)
return 0;
fail:
if (m)
rte_pktmbuf_free(m);
rte_pktmbuf_free(m);
return -1;
}
@ -416,12 +415,9 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool,
return 0;
fail:
if (m)
rte_pktmbuf_free(m);
if (clone)
rte_pktmbuf_free(clone);
if (clone2)
rte_pktmbuf_free(clone2);
rte_pktmbuf_free(m);
rte_pktmbuf_free(clone);
rte_pktmbuf_free(clone2);
return -1;
}
@ -572,12 +568,9 @@ test_pktmbuf_copy(struct rte_mempool *pktmbuf_pool,
return 0;
fail:
if (m)
rte_pktmbuf_free(m);
if (copy)
rte_pktmbuf_free(copy);
if (copy2)
rte_pktmbuf_free(copy2);
rte_pktmbuf_free(m);
rte_pktmbuf_free(copy);
rte_pktmbuf_free(copy2);
return -1;
}
@ -679,12 +672,9 @@ test_attach_from_different_pool(struct rte_mempool *pktmbuf_pool,
return 0;
fail:
if (m)
rte_pktmbuf_free(m);
if (clone)
rte_pktmbuf_free(clone);
if (clone2)
rte_pktmbuf_free(clone2);
rte_pktmbuf_free(m);
rte_pktmbuf_free(clone);
rte_pktmbuf_free(clone2);
return -1;
}
@ -722,8 +712,7 @@ test_pktmbuf_pool(struct rte_mempool *pktmbuf_pool)
}
/* free them */
for (i=0; i<NB_MBUF; i++) {
if (m[i] != NULL)
rte_pktmbuf_free(m[i]);
rte_pktmbuf_free(m[i]);
}
return ret;
@ -924,8 +913,7 @@ test_pktmbuf_pool_ptr(struct rte_mempool *pktmbuf_pool)
/* free them */
for (i=0; i<NB_MBUF; i++) {
if (m[i] != NULL)
rte_pktmbuf_free(m[i]);
rte_pktmbuf_free(m[i]);
}
for (i=0; i<NB_MBUF; i++)
@ -947,8 +935,7 @@ test_pktmbuf_pool_ptr(struct rte_mempool *pktmbuf_pool)
/* free them */
for (i=0; i<NB_MBUF; i++) {
if (m[i] != NULL)
rte_pktmbuf_free(m[i]);
rte_pktmbuf_free(m[i]);
}
return ret;
@ -1366,8 +1353,7 @@ test_mbuf_linearize(struct rte_mempool *pktmbuf_pool, int pkt_len,
return 0;
fail:
if (mbuf)
rte_pktmbuf_free(mbuf);
rte_pktmbuf_free(mbuf);
return -1;
}
@ -2779,8 +2765,7 @@ test_nb_segs_and_next_reset(void)
return 0;
fail:
if (pool != NULL)
rte_mempool_free(pool);
rte_mempool_free(pool);
return -1;
}

3
app/test/test_pcapng.c
View File

@ -240,8 +240,7 @@ test_validate(void)
static void
test_cleanup(void)
{
if (mp)
rte_mempool_free(mp);
rte_mempool_free(mp);
if (pcapng)
rte_pcapng_close(pcapng);

15
app/test/test_reorder.c
View File

@ -218,8 +218,7 @@ test_reorder_insert(void)
exit:
rte_reorder_free(b);
for (i = 0; i < num_bufs; i++) {
if (bufs[i] != NULL)
rte_pktmbuf_free(bufs[i]);
rte_pktmbuf_free(bufs[i]);
}
return ret;
}
@ -278,8 +277,7 @@ test_reorder_drain(void)
ret = -1;
goto exit;
}
if (robufs[0] != NULL)
rte_pktmbuf_free(robufs[0]);
rte_pktmbuf_free(robufs[0]);
/* Insert more packets
* RB[] = {NULL, NULL, NULL, NULL}
@ -313,8 +311,7 @@ test_reorder_drain(void)
goto exit;
}
for (i = 0; i < 3; i++) {
if (robufs[i] != NULL)
rte_pktmbuf_free(robufs[i]);
rte_pktmbuf_free(robufs[i]);
}
/*
@ -332,10 +329,8 @@ test_reorder_drain(void)
exit:
rte_reorder_free(b);
for (i = 0; i < num_bufs; i++) {
if (bufs[i] != NULL)
rte_pktmbuf_free(bufs[i]);
if (robufs[i] != NULL)
rte_pktmbuf_free(robufs[i]);
rte_pktmbuf_free(bufs[i]);
rte_pktmbuf_free(robufs[i]);
}
return ret;
}

3
app/test/virtual_pmd.c
View File

@ -397,8 +397,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
/* free packets in burst */
for (i = 0; i < successfully_txd; i++) {
/* free packets in burst */
if (bufs[i] != NULL)
rte_pktmbuf_free(bufs[i]);
rte_pktmbuf_free(bufs[i]);
bufs[i] = NULL;
}

3
drivers/baseband/acc100/rte_acc100_pmd.c
View File

@ -4402,8 +4402,7 @@ poweron_cleanup(struct rte_bbdev *bbdev, struct acc100_device *d,
}
printf("Number of 5GUL engines %d\n", numEngines);
if (d->sw_rings_base != NULL)
rte_free(d->sw_rings_base);
rte_free(d->sw_rings_base);
usleep(ACC100_LONG_WAIT);
}

3
drivers/baseband/la12xx/bbdev_la12xx.c
View File

@ -975,8 +975,7 @@ parse_bbdev_la12xx_params(struct bbdev_la12xx_params *params,
}
exit:
if (kvlist)
rte_kvargs_free(kvlist);
rte_kvargs_free(kvlist);
return ret;
}

3
drivers/baseband/null/bbdev_null.c
View File

@ -251,8 +251,7 @@ parse_bbdev_null_params(struct bbdev_null_params *params,
}
exit:
if (kvlist)
rte_kvargs_free(kvlist);
rte_kvargs_free(kvlist);
return ret;
}

3
drivers/baseband/turbo_sw/bbdev_turbo_software.c
View File

@ -1918,8 +1918,7 @@ parse_turbo_sw_params(struct turbo_sw_params *params, const char *input_args)
}
exit:
if (kvlist)
rte_kvargs_free(kvlist);
rte_kvargs_free(kvlist);
return ret;
}

6
drivers/bus/fslmc/fslmc_bus.c
View File

@ -221,13 +221,11 @@ scan_one_fslmc_device(char *dev_name)
insert_in_device_list(dev);
/* Don't need the duplicated device filesystem entry anymore */
if (dup_dev_name)
free(dup_dev_name);
free(dup_dev_name);
return 0;
cleanup:
if (dup_dev_name)
free(dup_dev_name);
free(dup_dev_name);
if (dev) {
rte_intr_instance_free(dev->intr_handle);
free(dev);

6
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
View File

@ -149,8 +149,7 @@ dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)
if (!token) {
DPAA2_BUS_WARN("Failed to get interrupt id for dpio.%d",
dpio_id);
if (temp)
free(temp);
free(temp);
fclose(file);
return;
}
@ -574,8 +573,7 @@ dpaa2_free_dq_storage(struct queue_storage_info_t *q_storage)
int i = 0;
for (i = 0; i < NUM_DQS_PER_QUEUE; i++) {
if (q_storage->dq_storage[i])
rte_free(q_storage->dq_storage[i]);
rte_free(q_storage->dq_storage[i]);
}
}

12
drivers/bus/ifpga/ifpga_bus.c
View File

@ -191,10 +191,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
return afu_dev;
end:
if (kvlist)
rte_kvargs_free(kvlist);
if (path)
free(path);
rte_kvargs_free(kvlist);
free(path);
if (afu_dev) {
rte_intr_instance_free(afu_dev->intr_handle);
free(afu_dev);
@ -254,10 +252,8 @@ ifpga_scan(void)
}
end:
if (kvlist)
rte_kvargs_free(kvlist);
if (name)
free(name);
rte_kvargs_free(kvlist);
free(name);
return 0;
}

3
drivers/bus/pci/pci_params.c
View File

@ -117,8 +117,7 @@ rte_pci_devargs_parse(struct rte_devargs *da)
rte_pci_device_name(&addr, da->name, sizeof(da->name));
out:
if (kvargs != NULL)
rte_kvargs_free(kvargs);
rte_kvargs_free(kvargs);
if (ret != 0)
rte_errno = -ret;
return ret;

3
drivers/bus/pci/windows/pci.c
View File

@ -418,8 +418,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data)
return 0;
end:
if (dev)
free(dev);
free(dev);
return ret;
}

3
drivers/bus/pci/windows/pci_netuio.c
View File

@ -180,8 +180,7 @@ get_netuio_device_info(HDEVINFO dev_info, PSP_DEVINFO_DATA dev_info_data,
CloseHandle(netuio);
}
if (dev_ifx_detail)
free(dev_ifx_detail);
free(dev_ifx_detail);
if (di_set != INVALID_HANDLE_VALUE)
SetupDiDestroyDeviceInfoList(di_set);

6
drivers/common/cpt/cpt_ucode_asym.h
View File

@ -192,13 +192,11 @@ cpt_free_asym_session_parameters(struct cpt_asym_sess_misc *sess)
switch (sess->xfrm_type) {
case RTE_CRYPTO_ASYM_XFORM_RSA:
rsa = &sess->rsa_ctx;
if (rsa->n.data)
rte_free(rsa->n.data);
rte_free(rsa->n.data);
break;
case RTE_CRYPTO_ASYM_XFORM_MODEX:
mod = &sess->mod_ctx;
if (mod->modulus.data)
rte_free(mod->modulus.data);
rte_free(mod->modulus.data);
break;
case RTE_CRYPTO_ASYM_XFORM_ECDSA:
/* Fall through */

11
drivers/common/dpaax/compat.h
View File

@ -339,16 +339,9 @@ static inline void copy_bytes(void *dest, const void *src, size_t sz)
/* Allocator stuff */
#define kmalloc(sz, t) rte_malloc(NULL, sz, 0)
#define kzalloc(sz, t) rte_zmalloc(NULL, sz, 0)
#define vmalloc(sz) rte_malloc(NULL, sz, 0)
#define kfree(p) { if (p) rte_free(p); }
static inline void *kzalloc(size_t sz, gfp_t __foo __rte_unused)
{
void *ptr = rte_malloc(NULL, sz, 0);
if (ptr)
memset(ptr, 0, sz);
return ptr;
}
#define kfree(p) rte_free(p)
static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)
{

3
drivers/common/mlx5/mlx5_common_mr.c
View File

@ -516,8 +516,7 @@ mlx5_mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb)
return;
DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr);
dereg_mr_cb(&mr->pmd_mr);
if (mr->ms_bmp != NULL)
rte_bitmap_free(mr->ms_bmp);
rte_bitmap_free(mr->ms_bmp);
mlx5_free(mr);
}

3
drivers/common/mlx5/mlx5_common_pci.c
View File

@ -97,8 +97,7 @@ pci_ids_table_update(const struct rte_pci_id *driver_id_table)
updated_table[i].vendor_id = 0;
mlx5_common_pci_driver.id_table = updated_table;
mlx5_pci_id_table = updated_table;
if (old_table)
free(old_table);
free(old_table);
return 0;
}

9
drivers/common/qat/qat_qp.c
View File

@ -175,11 +175,9 @@ qat_qp_setup(struct qat_pci_device *qat_dev,
create_err:
if (qp) {
if (qp->op_cookie_pool)
rte_mempool_free(qp->op_cookie_pool);
rte_mempool_free(qp->op_cookie_pool);
if (qp->op_cookies)
rte_free(qp->op_cookies);
rte_free(qp->op_cookies);
rte_free(qp);
}
@ -329,8 +327,7 @@ qat_qp_release(enum qat_device_gen qat_dev_gen, struct qat_qp **qp_addr)
for (i = 0; i < qp->nb_descriptors; i++)
rte_mempool_put(qp->op_cookie_pool, qp->op_cookies[i]);
if (qp->op_cookie_pool)
rte_mempool_free(qp->op_cookie_pool);
rte_mempool_free(qp->op_cookie_pool);
rte_free(qp->op_cookies);
rte_free(qp);

3
drivers/compress/mlx5/mlx5_compress.c
View File

@ -146,8 +146,7 @@ mlx5_compress_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
void *opaq = qp->opaque_mr.addr;
mlx5_common_verbs_dereg_mr(&qp->opaque_mr);
if (opaq != NULL)
rte_free(opaq);
rte_free(opaq);
}
mlx5_mr_btree_free(&qp->mr_ctrl.cache_bh);
rte_free(qp);

9
drivers/compress/octeontx/otx_zip_pmd.c
View File

@ -337,8 +337,7 @@ zip_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
if (qp != NULL) {
zipvf_q_term(qp);
if (qp->processed_pkts)
rte_ring_free(qp->processed_pkts);
rte_ring_free(qp->processed_pkts);
rte_free(qp);
dev->data->queue_pairs[qp_id] = NULL;
@ -423,10 +422,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
return 0;
qp_setup_cleanup:
if (qp->processed_pkts)
rte_ring_free(qp->processed_pkts);
if (qp)
rte_free(qp);
rte_ring_free(qp->processed_pkts);
rte_free(qp);
return -1;
}

3
drivers/crypto/armv8/rte_armv8_pmd_ops.c
View File

@ -251,8 +251,7 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
return 0;
qp_setup_cleanup:
if (qp)
rte_free(qp);
rte_free(qp);
return -1;
}

3
drivers/crypto/ccp/ccp_dev.c
View File

@ -673,8 +673,7 @@ ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev)
CCP_LOG_ERR("CCP Device probe failed");
if (uio_fd >= 0)
close(uio_fd);
if (ccp_dev)
rte_free(ccp_dev);
rte_free(ccp_dev);
return -1;
}

3
drivers/crypto/ccp/ccp_pmd_ops.c
View File

@ -744,8 +744,7 @@ ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp_setup_cleanup:
dev->data->queue_pairs[qp_id] = NULL;
if (qp)
rte_free(qp);
rte_free(qp);
return -1;
}

6
drivers/crypto/cnxk/cnxk_ae.h
View File

@ -196,13 +196,11 @@ cnxk_ae_free_session_parameters(struct cnxk_ae_sess *sess)
switch (sess->xfrm_type) {
case RTE_CRYPTO_ASYM_XFORM_RSA:
rsa = &sess->rsa_ctx;
if (rsa->n.data)
rte_free(rsa->n.data);
rte_free(rsa->n.data);
break;
case RTE_CRYPTO_ASYM_XFORM_MODEX:
mod = &sess->mod_ctx;
if (mod->modulus.data)
rte_free(mod->modulus.data);
rte_free(mod->modulus.data);
break;
case RTE_CRYPTO_ASYM_XFORM_ECDSA:
/* Fall through */

3
drivers/crypto/ipsec_mb/ipsec_mb_ops.c
View File

@ -102,8 +102,7 @@ ipsec_mb_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
if (qp != NULL && rte_eal_process_type() == RTE_PROC_PRIMARY) {
r = rte_ring_lookup(qp->name);
if (r)
rte_ring_free(r);
rte_ring_free(r);
#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM
if (qp->mb_mgr)

6
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
View File

@ -774,10 +774,8 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,
}
/* free the keys memory allocated for session creation */
if (mrvl_sess->sam_sess_params.cipher_key != NULL)
free(mrvl_sess->sam_sess_params.cipher_key);
if (mrvl_sess->sam_sess_params.auth_key != NULL)
free(mrvl_sess->sam_sess_params.auth_key);
free(mrvl_sess->sam_sess_params.cipher_key);
free(mrvl_sess->sam_sess_params.auth_key);
return 0;
}

6
drivers/crypto/null/null_crypto_pmd_ops.c
View File

@ -135,8 +135,7 @@ null_crypto_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
if (dev->data->queue_pairs[qp_id] != NULL) {
struct null_crypto_qp *qp = dev->data->queue_pairs[qp_id];
if (qp->processed_pkts)
rte_ring_free(qp->processed_pkts);
rte_ring_free(qp->processed_pkts);
rte_free(dev->data->queue_pairs[qp_id]);
dev->data->queue_pairs[qp_id] = NULL;
@ -241,8 +240,7 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
return 0;
qp_setup_cleanup:
if (qp)
rte_free(qp);
rte_free(qp);
return -1;
}

3
drivers/crypto/octeontx/otx_cryptodev_ops.c
View File

@ -335,8 +335,7 @@ sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess)
misc = priv;
ctx = SESS_PRIV(misc);
if (ctx->auth_key != NULL)
rte_free(ctx->auth_key);
rte_free(ctx->auth_key);
memset(priv, 0, cpt_get_session_size());

6
drivers/crypto/openssl/rte_openssl_pmd_ops.c
View File

@ -659,8 +659,7 @@ openssl_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
if (dev->data->queue_pairs[qp_id] != NULL) {
struct openssl_qp *qp = dev->data->queue_pairs[qp_id];
if (qp->processed_ops)
rte_ring_free(qp->processed_ops);
rte_ring_free(qp->processed_ops);
rte_free(dev->data->queue_pairs[qp_id]);
dev->data->queue_pairs[qp_id] = NULL;
@ -748,8 +747,7 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
return 0;
qp_setup_cleanup:
if (qp)
rte_free(qp);
rte_free(qp);
return -1;
}

6
drivers/crypto/scheduler/scheduler_pmd_ops.c
View File

@ -371,10 +371,8 @@ scheduler_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
if (!qp_ctx)
return 0;
if (qp_ctx->order_ring)
rte_ring_free(qp_ctx->order_ring);
if (qp_ctx->private_qp_ctx)
rte_free(qp_ctx->private_qp_ctx);
rte_ring_free(qp_ctx->order_ring);
rte_free(qp_ctx->private_qp_ctx);
rte_free(qp_ctx);
dev->data->queue_pairs[qp_id] = NULL;

6
drivers/crypto/virtio/virtqueue.c
View File

@ -32,10 +32,8 @@ virtqueue_detatch_unused(struct virtqueue *vq)
for (idx = 0; idx < vq->vq_nentries; idx++) {
cop = vq->vq_descx[idx].crypto_op;
if (cop) {
if (cop->sym->m_src)
rte_pktmbuf_free(cop->sym->m_src);
if (cop->sym->m_dst)
rte_pktmbuf_free(cop->sym->m_dst);
rte_pktmbuf_free(cop->sym->m_src);
rte_pktmbuf_free(cop->sym->m_dst);
rte_crypto_op_free(cop);
vq->vq_descx[idx].crypto_op = NULL;
}

3
drivers/event/sw/sw_evdev.c
View File

@ -526,8 +526,7 @@ sw_dev_configure(const struct rte_eventdev *dev)
* IQ chunk references were cleaned out of the QIDs in sw_stop(), and
* will be reinitialized in sw_start().
*/
if (sw->chunks)
rte_free(sw->chunks);
rte_free(sw->chunks);
sw->chunks = rte_malloc_socket(NULL,
sizeof(struct sw_queue_chunk) *

6
drivers/net/axgbe/axgbe_rxtx.c
View File

@ -22,8 +22,7 @@ axgbe_rx_queue_release(struct axgbe_rx_queue *rx_queue)
sw_ring = rx_queue->sw_ring;
if (sw_ring) {
for (i = 0; i < rx_queue->nb_desc; i++) {
if (sw_ring[i])
rte_pktmbuf_free(sw_ring[i]);
rte_pktmbuf_free(sw_ring[i]);
}
rte_free(sw_ring);
}
@ -507,8 +506,7 @@ static void axgbe_tx_queue_release(struct axgbe_tx_queue *tx_queue)
sw_ring = tx_queue->sw_ring;
if (sw_ring) {
for (i = 0; i < tx_queue->nb_desc; i++) {
if (sw_ring[i])
rte_pktmbuf_free(sw_ring[i]);
rte_pktmbuf_free(sw_ring[i]);
}
rte_free(sw_ring);
}

6
drivers/net/bnx2x/bnx2x_rxtx.c
View File

@ -27,8 +27,7 @@ bnx2x_rx_queue_release(struct bnx2x_rx_queue *rx_queue)
sw_ring = rx_queue->sw_ring;
if (NULL != sw_ring) {
for (i = 0; i < rx_queue->nb_rx_desc; i++) {
if (NULL != sw_ring[i])
rte_pktmbuf_free(sw_ring[i]);
rte_pktmbuf_free(sw_ring[i]);
}
rte_free(sw_ring);
}
@ -172,8 +171,7 @@ bnx2x_tx_queue_release(struct bnx2x_tx_queue *tx_queue)
sw_ring = tx_queue->sw_ring;
if (NULL != sw_ring) {
for (i = 0; i < tx_queue->nb_tx_desc; i++) {
if (NULL != sw_ring[i])
rte_pktmbuf_free(sw_ring[i]);
rte_pktmbuf_free(sw_ring[i]);
}
rte_free(sw_ring);
}

3
drivers/net/bnxt/bnxt_ethdev.c
View File

@ -5887,8 +5887,7 @@ static void bnxt_free_ctx_mem_buf(struct bnxt_ctx_mem_buf_info *ctx)
if (!ctx)
return;
if (ctx->va)
rte_free(ctx->va);
rte_free(ctx->va);
ctx->va = NULL;
ctx->dma = RTE_BAD_IOVA;

3
drivers/net/bonding/rte_eth_bond_pmd.c
View File

@ -2155,8 +2155,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
*/
rte_mempool_free(internals->mode6.mempool);
if (internals->kvlist != NULL)
rte_kvargs_free(internals->kvlist);
rte_kvargs_free(internals->kvlist);
return 0;
}

6
drivers/net/cnxk/cnxk_ethdev.c
View File

@ -934,10 +934,8 @@ nix_restore_queue_cfg(struct rte_eth_dev *eth_dev)
for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
dev_ops->tx_queue_release(eth_dev, i);
fail:
if (tx_qconf)
free(tx_qconf);
if (rx_qconf)
free(rx_qconf);
free(tx_qconf);
free(rx_qconf);
return rc;
}

3
drivers/net/cxgbe/cxgbe_main.c
View File

@ -463,8 +463,7 @@ void cxgbe_insert_tid(struct tid_info *t, void *data, unsigned int tid,
static void tid_free(struct tid_info *t)
{
if (t->tid_tab) {
if (t->ftid_bmap)
rte_bitmap_free(t->ftid_bmap);
rte_bitmap_free(t->ftid_bmap);
if (t->ftid_bmap_array)
t4_os_free(t->ftid_bmap_array);

3
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -474,8 +474,7 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev)
}
/* release configuration memory */
if (dpaa_intf->fc_conf)
rte_free(dpaa_intf->fc_conf);
rte_free(dpaa_intf->fc_conf);
/* Release RX congestion Groups */
if (dpaa_intf->cgr_rx) {

3
drivers/net/dpaa/fmlib/fm_lib.c
View File

@ -408,8 +408,7 @@ fm_port_close(t_handle h_fm_port)
_fml_dbg("Calling...\n");
close(p_dev->fd);
if (p_dev->h_user_priv)
free(p_dev->h_user_priv);
free(p_dev->h_user_priv);
free(p_dev);
_fml_dbg("Finishing.\n");

3
drivers/net/dpaa2/dpaa2_ethdev.c
View File

@ -510,8 +510,7 @@ dpaa2_free_rx_tx_queues(struct rte_eth_dev *dev)
/* cleaning up queue storage */
for (i = 0; i < priv->nb_rx_queues; i++) {
dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i];
if (dpaa2_q->q_storage)
rte_free(dpaa2_q->q_storage);
rte_free(dpaa2_q->q_storage);
}
/* cleanup tx queue cscn */
for (i = 0; i < priv->nb_tx_queues; i++) {

3
drivers/net/dpaa2/dpaa2_mux.c
View File

@ -353,8 +353,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
return 0;
init_err:
if (dpdmux_dev)
rte_free(dpdmux_dev);
rte_free(dpdmux_dev);
return -1;
}

3
drivers/net/dpaa2/dpaa2_ptp.c
View File

@ -170,8 +170,7 @@ dpaa2_create_dprtc_device(int vdev_fd __rte_unused,
return 0;
init_err:
if (dprtc_dev)
rte_free(dprtc_dev);
rte_free(dprtc_dev);
return -1;
}

18
drivers/net/ena/ena_ethdev.c
View File

@ -567,16 +567,13 @@ static void ena_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
struct ena_ring *ring = dev->data->rx_queues[qid];
/* Free ring resources */
if (ring->rx_buffer_info)
rte_free(ring->rx_buffer_info);
rte_free(ring->rx_buffer_info);
ring->rx_buffer_info = NULL;
if (ring->rx_refill_buffer)
rte_free(ring->rx_refill_buffer);
rte_free(ring->rx_refill_buffer);
ring->rx_refill_buffer = NULL;
if (ring->empty_rx_reqs)
rte_free(ring->empty_rx_reqs);
rte_free(ring->empty_rx_reqs);
ring->empty_rx_reqs = NULL;
ring->configured = 0;
@ -590,14 +587,11 @@ static void ena_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
struct ena_ring *ring = dev->data->tx_queues[qid];
/* Free ring resources */
if (ring->push_buf_intermediate_buf)
rte_free(ring->push_buf_intermediate_buf);
rte_free(ring->push_buf_intermediate_buf);
if (ring->tx_buffer_info)
rte_free(ring->tx_buffer_info);
rte_free(ring->tx_buffer_info);
if (ring->empty_tx_reqs)
rte_free(ring->empty_tx_reqs);
rte_free(ring->empty_tx_reqs);
ring->empty_tx_reqs = NULL;
ring->tx_buffer_info = NULL;

3
drivers/net/hinic/hinic_pmd_ethdev.c
View File

@ -2662,8 +2662,7 @@ static int hinic_copy_mempool_init(struct hinic_nic_dev *nic_dev)
static void hinic_copy_mempool_uninit(struct hinic_nic_dev *nic_dev)
{
if (nic_dev->cpy_mpool != NULL)
rte_mempool_free(nic_dev->cpy_mpool);
rte_mempool_free(nic_dev->cpy_mpool);
}
static int hinic_init_sw_rxtxqs(struct hinic_nic_dev *nic_dev)

9
drivers/net/hns3/hns3_rxtx.c
View File

@ -86,8 +86,7 @@ hns3_rx_queue_release(void *queue)
hns3_rx_queue_release_mbufs(rxq);
if (rxq->mz)
rte_memzone_free(rxq->mz);
if (rxq->sw_ring)
rte_free(rxq->sw_ring);
rte_free(rxq->sw_ring);
rte_free(rxq);
}
}
@ -100,10 +99,8 @@ hns3_tx_queue_release(void *queue)
hns3_tx_queue_release_mbufs(txq);
if (txq->mz)
rte_memzone_free(txq->mz);
if (txq->sw_ring)
rte_free(txq->sw_ring);
if (txq->free)
rte_free(txq->free);
rte_free(txq->sw_ring);
rte_free(txq->free);
rte_free(txq);
}
}

27
drivers/net/i40e/i40e_ethdev.c
View File

@ -1781,10 +1781,8 @@ i40e_rm_ethtype_filter_list(struct i40e_pf *pf)
ethertype_rule = &pf->ethertype;
/* Remove all ethertype filter rules and hash */
if (ethertype_rule->hash_map)
rte_free(ethertype_rule->hash_map);
if (ethertype_rule->hash_table)
rte_hash_free(ethertype_rule->hash_table);
rte_free(ethertype_rule->hash_map);
rte_hash_free(ethertype_rule->hash_table);
while ((p_ethertype = TAILQ_FIRST(&ethertype_rule->ethertype_list))) {
TAILQ_REMOVE(&ethertype_rule->ethertype_list,
@ -1801,10 +1799,8 @@ i40e_rm_tunnel_filter_list(struct i40e_pf *pf)
tunnel_rule = &pf->tunnel;
/* Remove all tunnel director rules and hash */
if (tunnel_rule->hash_map)
rte_free(tunnel_rule->hash_map);
if (tunnel_rule->hash_table)
rte_hash_free(tunnel_rule->hash_table);
rte_free(tunnel_rule->hash_map);
rte_hash_free(tunnel_rule->hash_table);
while ((p_tunnel = TAILQ_FIRST(&tunnel_rule->tunnel_list))) {
TAILQ_REMOVE(&tunnel_rule->tunnel_list, p_tunnel, rules);
@ -1833,16 +1829,11 @@ i40e_fdir_memory_cleanup(struct i40e_pf *pf)
fdir_info = &pf->fdir;
/* flow director memory cleanup */
if (fdir_info->hash_map)
rte_free(fdir_info->hash_map);
if (fdir_info->hash_table)
rte_hash_free(fdir_info->hash_table);
if (fdir_info->fdir_flow_pool.bitmap)
rte_free(fdir_info->fdir_flow_pool.bitmap);
if (fdir_info->fdir_flow_pool.pool)
rte_free(fdir_info->fdir_flow_pool.pool);
if (fdir_info->fdir_filter_array)
rte_free(fdir_info->fdir_filter_array);
rte_free(fdir_info->hash_map);
rte_hash_free(fdir_info->hash_table);
rte_free(fdir_info->fdir_flow_pool.bitmap);
rte_free(fdir_info->fdir_flow_pool.pool);
rte_free(fdir_info->fdir_filter_array);
}
void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)

3
drivers/net/i40e/i40e_rxtx.c
View File

@ -2573,8 +2573,7 @@ i40e_reset_rx_queue(struct i40e_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;

3
drivers/net/iavf/iavf_rxtx.c
View File

@ -230,8 +230,7 @@ reset_rx_queue(struct iavf_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;

6
drivers/net/ice/ice_fdir_filter.c
View File

@ -421,10 +421,8 @@ ice_fdir_release_filter_list(struct ice_pf *pf)
{
struct ice_fdir_info *fdir_info = &pf->fdir;
if (fdir_info->hash_map)
rte_free(fdir_info->hash_map);
if (fdir_info->hash_table)
rte_hash_free(fdir_info->hash_table);
rte_free(fdir_info->hash_map);
rte_hash_free(fdir_info->hash_table);
fdir_info->hash_map = NULL;
fdir_info->hash_table = NULL;

5
drivers/net/igc/igc_flow.c
View File

@ -775,10 +775,7 @@ igc_flow_create(struct rte_eth_dev *dev,
}
if (ret) {
/* check and free the memory */
if (flow)
rte_free(flow);
rte_free(flow);
rte_flow_error_set(error, -ret,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
"Failed to create flow.");

12
drivers/net/ixgbe/ixgbe_ethdev.c
View File

@ -1336,10 +1336,8 @@ static int ixgbe_fdir_filter_uninit(struct rte_eth_dev *eth_dev)
IXGBE_DEV_PRIVATE_TO_FDIR_INFO(eth_dev->data->dev_private);
struct ixgbe_fdir_filter *fdir_filter;
if (fdir_info->hash_map)
rte_free(fdir_info->hash_map);
if (fdir_info->hash_handle)
rte_hash_free(fdir_info->hash_handle);
rte_free(fdir_info->hash_map);
rte_hash_free(fdir_info->hash_handle);
while ((fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list))) {
TAILQ_REMOVE(&fdir_info->fdir_list,
@ -1357,10 +1355,8 @@ static int ixgbe_l2_tn_filter_uninit(struct rte_eth_dev *eth_dev)
IXGBE_DEV_PRIVATE_TO_L2_TN_INFO(eth_dev->data->dev_private);
struct ixgbe_l2_tn_filter *l2_tn_filter;
if (l2_tn_info->hash_map)
rte_free(l2_tn_info->hash_map);
if (l2_tn_info->hash_handle)
rte_hash_free(l2_tn_info->hash_handle);
rte_free(l2_tn_info->hash_map);
rte_hash_free(l2_tn_info->hash_handle);
while ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {
TAILQ_REMOVE(&l2_tn_info->l2_tn_list,

3
drivers/net/ixgbe/ixgbe_rxtx.c
View File

@ -2983,8 +2983,7 @@ ixgbe_reset_rx_queue(struct ixgbe_adapter *adapter, struct ixgbe_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;

6
drivers/net/memif/rte_eth_memif.c
View File

@ -1709,8 +1709,7 @@ memif_check_socket_filename(const char *filename)
ret = -EINVAL;
}
if (dir != NULL)
rte_free(dir);
rte_free(dir);
return ret;
}
@ -1881,8 +1880,7 @@ rte_pmd_memif_probe(struct rte_vdev_device *vdev)
log2_ring_size, pkt_buffer_size, secret, ether_addr);
exit:
if (kvlist != NULL)
rte_kvargs_free(kvlist);
rte_kvargs_free(kvlist);
return ret;
}

3
drivers/net/mlx4/mlx4_mr.c
View File

@ -471,8 +471,7 @@ mr_free(struct mlx4_mr *mr)
DEBUG("freeing MR(%p):", (void *)mr);
if (mr->ibv_mr != NULL)
claim_zero(mlx4_glue->dereg_mr(mr->ibv_mr));
if (mr->ms_bmp != NULL)
rte_bitmap_free(mr->ms_bmp);
rte_bitmap_free(mr->ms_bmp);
rte_free(mr);
}

3
drivers/net/mlx5/mlx5_flow.c
View File

@ -7008,8 +7008,7 @@ flow_alloc_thread_workspace(void)
data->rssq_num = MLX5_RSSQ_DEFAULT_NUM;
return data;
err:
if (data->rss_desc.queue)
free(data->rss_desc.queue);
free(data->rss_desc.queue);
free(data);
return NULL;
}

3
drivers/net/mvpp2/mrvl_qos.c
View File

@ -945,8 +945,7 @@ setup_tc(struct pp2_ppio_tc_params *param, uint8_t inqs,
param->num_in_qs = inqs;
/* Release old config if necessary. */
if (param->inqs_params)
rte_free(param->inqs_params);
rte_free(param->inqs_params);
param->inqs_params = inq_params;

6
drivers/net/netvsc/hn_rxtx.c
View File

@ -315,8 +315,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
error:
if (txq->txdesc_pool)
rte_mempool_free(txq->txdesc_pool);
rte_mempool_free(txq->txdesc_pool);
rte_memzone_free(txq->tx_rndis_mz);
rte_free(txq);
return err;
@ -365,8 +364,7 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
if (!txq)
return;
if (txq->txdesc_pool)
rte_mempool_free(txq->txdesc_pool);
rte_mempool_free(txq->txdesc_pool);
rte_memzone_free(txq->tx_rndis_mz);
rte_free(txq);

3
drivers/net/null/rte_eth_null.c
View File

@ -717,8 +717,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
ret = eth_dev_null_create(dev, &args);
free_kvlist:
if (kvlist)
rte_kvargs_free(kvlist);
rte_kvargs_free(kvlist);
return ret;
}

3
drivers/net/octeontx/octeontx_ethdev.c
View File

@ -1037,8 +1037,7 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
return res;
err:
if (txq)
rte_free(txq);
rte_free(txq);
return res;
}

3
drivers/net/octeontx/octeontx_ethdev_ops.c
View File

@ -108,8 +108,7 @@ octeontx_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
if (rc != 0) {
octeontx_log_err("Fail to configure vlan filter entry "
"for port %d", nic->port_id);
if (entry)
rte_free(entry);
rte_free(entry);
goto done;
}

3
drivers/net/qede/qede_main.c
View File

@ -335,8 +335,7 @@ static int qed_slowpath_start(struct ecore_dev *edev,
err:
#ifdef CONFIG_ECORE_BINARY_FW
if (IS_PF(edev)) {
if (edev->firmware)
rte_free(edev->firmware);
rte_free(edev->firmware);
edev->firmware = NULL;
}
#endif

6
drivers/net/qede/qede_rxtx.c
View File

@ -706,12 +706,10 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
}
}
if (qdev->fp_array)
rte_free(qdev->fp_array);
rte_free(qdev->fp_array);
qdev->fp_array = NULL;
if (qdev->fp_array_cmt)
rte_free(qdev->fp_array_cmt);
rte_free(qdev->fp_array_cmt);
qdev->fp_array_cmt = NULL;
}

12
drivers/net/softnic/rte_eth_softnic_cli.c
View File

@ -4482,10 +4482,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
switch (xform[i]->type) {
case RTE_CRYPTO_SYM_XFORM_CIPHER:
if (p->cipher_auth.cipher_iv.val)
free(p->cipher_auth.cipher_iv.val);
if (p->cipher_auth.cipher_iv_update.val)
free(p->cipher_auth.cipher_iv_update.val);
free(p->cipher_auth.cipher_iv.val);
free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AUTH:
if (p->cipher_auth.auth_iv.val)
@ -4494,10 +4492,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AEAD:
if (p->aead.iv.val)
free(p->aead.iv.val);
if (p->aead.aad.val)
free(p->aead.aad.val);
free(p->aead.iv.val);
free(p->aead.aad.val);
break;
default:
continue;

6
drivers/net/softnic/rte_eth_softnic_cryptodev.c
View File

@ -159,10 +159,8 @@ softnic_cryptodev_create(struct pmd_internals *p,
return cryptodev;
error_exit:
if (cryptodev->mp_create)
rte_mempool_free(cryptodev->mp_create);
if (cryptodev->mp_init)
rte_mempool_free(cryptodev->mp_init);
rte_mempool_free(cryptodev->mp_create);
rte_mempool_free(cryptodev->mp_init);
free(cryptodev);

6
drivers/net/softnic/rte_eth_softnic_thread.c
View File

@ -29,11 +29,9 @@ softnic_thread_free(struct pmd_internals *softnic)
struct softnic_thread *t = &softnic->thread[i];
/* MSGQs */
if (t->msgq_req)
rte_ring_free(t->msgq_req);
rte_ring_free(t->msgq_req);
if (t->msgq_rsp)
rte_ring_free(t->msgq_rsp);
rte_ring_free(t->msgq_rsp);
}
}

9
drivers/net/tap/tap_flow.c
View File

@ -1465,8 +1465,7 @@ tap_flow_create(struct rte_eth_dev *dev,
}
return flow;
fail:
if (remote_flow)
rte_free(remote_flow);
rte_free(remote_flow);
if (flow)
tap_flow_free(pmd, flow);
return NULL;
@ -1541,8 +1540,7 @@ tap_flow_destroy_pmd(struct pmd_internals *pmd,
}
}
end:
if (remote_flow)
rte_free(remote_flow);
rte_free(remote_flow);
tap_flow_free(pmd, flow);
return ret;
}
@ -1764,8 +1762,7 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
success:
return 0;
fail:
if (remote_flow)
rte_free(remote_flow);
rte_free(remote_flow);
return -1;
}

12
drivers/net/txgbe/txgbe_ethdev.c
View File

@ -821,10 +821,8 @@ static int txgbe_fdir_filter_uninit(struct rte_eth_dev *eth_dev)
struct txgbe_hw_fdir_info *fdir_info = TXGBE_DEV_FDIR(eth_dev);
struct txgbe_fdir_filter *fdir_filter;
if (fdir_info->hash_map)
rte_free(fdir_info->hash_map);
if (fdir_info->hash_handle)
rte_hash_free(fdir_info->hash_handle);
rte_free(fdir_info->hash_map);
rte_hash_free(fdir_info->hash_handle);
while ((fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list))) {
TAILQ_REMOVE(&fdir_info->fdir_list,
@ -841,10 +839,8 @@ static int txgbe_l2_tn_filter_uninit(struct rte_eth_dev *eth_dev)
struct txgbe_l2_tn_info *l2_tn_info = TXGBE_DEV_L2_TN(eth_dev);
struct txgbe_l2_tn_filter *l2_tn_filter;
if (l2_tn_info->hash_map)
rte_free(l2_tn_info->hash_map);
if (l2_tn_info->hash_handle)
rte_hash_free(l2_tn_info->hash_handle);
rte_free(l2_tn_info->hash_map);
rte_hash_free(l2_tn_info->hash_handle);
while ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {
TAILQ_REMOVE(&l2_tn_info->l2_tn_list,

3
drivers/net/vdev_netvsc/vdev_netvsc.c
View File

@ -717,8 +717,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
error:
++vdev_netvsc_ctx_inst;
ignore:
if (kvargs)
rte_kvargs_free(kvargs);
rte_kvargs_free(kvargs);
/* Reset alarm if there are device context created */
if (vdev_netvsc_ctx_count) {
ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000,

12
drivers/net/virtio/virtio_user_ethdev.c
View File

@ -689,14 +689,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev)
ret = 0;
end:
if (kvlist)
rte_kvargs_free(kvlist);
if (path)
free(path);
if (mac_addr)
free(mac_addr);
if (ifname)
free(ifname);
rte_kvargs_free(kvlist);
free(path);
free(mac_addr);
free(ifname);
return ret;
}

3
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
View File

@ -233,8 +233,7 @@ cnxk_bphy_cgx_fini_queues(struct cnxk_bphy_cgx *cgx)
unsigned int i;
for (i = 0; i < cgx->num_queues; i++) {
if (cgx->queues[i].rsp)
rte_free(cgx->queues[i].rsp);
rte_free(cgx->queues[i].rsp);
}
cgx->num_queues = 0;

15
drivers/raw/dpaa2_qdma/dpaa2_qdma.c
View File

@ -1115,11 +1115,9 @@ dpaa2_qdma_reset(struct rte_rawdev *rawdev)
/* Reset and free virtual queues */
for (i = 0; i < qdma_dev->max_vqs; i++) {
if (qdma_dev->vqs[i].status_ring)
rte_ring_free(qdma_dev->vqs[i].status_ring);
rte_ring_free(qdma_dev->vqs[i].status_ring);
}
if (qdma_dev->vqs)
rte_free(qdma_dev->vqs);
rte_free(qdma_dev->vqs);
qdma_dev->vqs = NULL;
/* Reset per core info */
@ -1314,8 +1312,7 @@ dpaa2_qdma_queue_setup(struct rte_rawdev *rawdev,
if (qdma_dev->vqs[i].hw_queue == NULL) {
DPAA2_QDMA_ERR("No H/W queue available for VQ");
if (qdma_dev->vqs[i].status_ring)
rte_ring_free(qdma_dev->vqs[i].status_ring);
rte_ring_free(qdma_dev->vqs[i].status_ring);
qdma_dev->vqs[i].status_ring = NULL;
rte_spinlock_unlock(&qdma_dev->lock);
return -ENODEV;
@ -1516,14 +1513,12 @@ dpaa2_qdma_queue_release(struct rte_rawdev *rawdev,
if (qdma_vq->exclusive_hw_queue)
free_hw_queue(qdma_vq->hw_queue);
else {
if (qdma_vq->status_ring)
rte_ring_free(qdma_vq->status_ring);
rte_ring_free(qdma_vq->status_ring);
put_hw_queue(qdma_vq->hw_queue);
}
if (qdma_vq->fle_pool)
rte_mempool_free(qdma_vq->fle_pool);
rte_mempool_free(qdma_vq->fle_pool);
memset(qdma_vq, 0, sizeof(struct qdma_virt_queue));

9
drivers/raw/ifpga/ifpga_rawdev.c
View File

@ -836,8 +836,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
}
free_buffer:
if (buf_to_free)
rte_free(buf_to_free);
rte_free(buf_to_free);
close_fd:
close(file_fd);
file_fd = 0;
@ -1739,10 +1738,8 @@ ifpga_cfg_probe(struct rte_vdev_device *dev)
ret = rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME),
dev_name, devargs->args);
end:
if (kvlist)
rte_kvargs_free(kvlist);
if (name)
free(name);
rte_kvargs_free(kvlist);
free(name);
return ret;
}

6
drivers/raw/skeleton/skeleton_rawdev_test.c
View File

@ -395,13 +395,11 @@ test_rawdev_enqdeq(void)
RTE_TEST_ASSERT_EQUAL((unsigned int)ret, count,
"Unable to dequeue buffers");
if (deq_buffers)
free(deq_buffers);
free(deq_buffers);
return TEST_SUCCESS;
cleanup:
if (buffers[0].buf_addr)
free(buffers[0].buf_addr);
free(buffers[0].buf_addr);
return TEST_FAILED;
}

6
drivers/regex/cn9k/cn9k_regexdev.c
View File

@ -256,10 +256,8 @@ ree_dev_fini(struct rte_regexdev *dev)
cn9k_err("Could not detach queues");
/* TEMP : should be in lib */
if (data->queue_pairs)
rte_free(data->queue_pairs);
if (data->rules)
rte_free(data->rules);
rte_free(data->queue_pairs);
rte_free(data->rules);
roc_ree_dev_fini(vf);

3
drivers/regex/cn9k/cn9k_regexdev_compiler.c
View File

@ -214,8 +214,7 @@ cn9k_ree_rule_db_compile_prog(struct rte_regexdev *dev)
rxp_free_structs(NULL, NULL, NULL, NULL, NULL, &rof, NULL, &rofi, NULL,
1);
if (rule_db)
rte_free(rule_db);
rte_free(rule_db);
return ret;
}

3
drivers/regex/mlx5/mlx5_regex.c
View File

@ -127,8 +127,7 @@ mlx5_regex_dev_probe(struct mlx5_common_device *cdev)
if (priv->regexdev)
rte_regexdev_unregister(priv->regexdev);
dev_error:
if (priv)
rte_free(priv);
rte_free(priv);
return -rte_errno;
}

3
drivers/regex/mlx5/mlx5_rxp.c
View File

@ -166,7 +166,6 @@ mlx5_regex_configure(struct rte_regexdev *dev,
DRV_LOG(DEBUG, "Regex config without rules programming!");
return 0;
configure_error:
if (priv->qps)
rte_free(priv->qps);
rte_free(priv->qps);
return -rte_errno;
}

Some files were not shown because too many files have changed in this diff Show More