Coverity fixes and other cleanups
cover Coverity fixes and other cleanups
Patches 1-5 are Coverity fixes.
Patches 6-9 are removing commented out code.
Kevin Traynor (9):
net/pcap: fix argument checks
crypto/octeontx: fix possible NULL deference
net/bnxt: remove logically dead code
net/ipn3ke: fix incorrect commit check logic
net/ipn3ke: remove useless if statement
net/ipn3ke: remove commented out code
compress/octeontx: remove commented out code
event/opdl: remove commented out code
net/bnxt: remove commented out code
drivers/common/cpt/cpt_ucode.h | 3 +- drivers/compress/octeontx/include/zip_regs.h | 8 -- drivers/event/opdl/opdl_test.c | 3 - drivers/net/bnxt/bnxt_ethdev.c | 3 - drivers/net/bnxt/bnxt_hwrm.c | 118 +++++++++---------- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 -- drivers/net/ipn3ke/ipn3ke_tm.c | 7 -- drivers/net/pcap/rte_eth_pcap.c | 19 +-- 9 files changed, 70 insertions(+), 101 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/9 net/pcap: fix argument checks
Previously rx/tx_queues were passed into eth_from_pcaps_common() as ptrs and were checked for being NULL.
In commit da6ba28f0540 ("net/pcap: use a struct to pass user options") that changed to pass in a ptr to a pmd_devargs_all which contains the rx/tx_queues.
The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the pmd_devargs_all ptr and removing the NULL checks on rx/tx_queues.
1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointer tx_queues.
1234 const unsigned int nb_tx_queues = tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues == NULL && nb_rx_queues > 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking tx_queues suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues == NULL && nb_tx_queues > 0)
1241 return -1;
Coverity issue: 345029
Coverity issue: 345044
--- drivers/net/pcap/rte_eth_pcap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/net/pcap/rte_eth_pcap.c +11 -8
@@ -1229,16 +1229,19 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev, {struct pmd_process_private *pp; -struct pmd_devargs *rx_queues = &devargs_all->rx_queues; -struct pmd_devargs *tx_queues = &devargs_all->tx_queues; -const unsigned int nb_rx_queues = rx_queues->num_of_queue; -const unsigned int nb_tx_queues = tx_queues->num_of_queue; +struct pmd_devargs *rx_queues; +struct pmd_devargs *tx_queues; +unsigned int nb_rx_queues; +unsigned int nb_tx_queues;unsigned int i; -/* do some parameter checking */ -if (rx_queues ==NULL && nb_rx_queues >0 ) -return -1 ; -if (tx_queues ==NULL && nb_tx_queues >0 ) +if (devargs_all ==NULL )return -1 ; + rx_queues = &devargs_all->rx_queues; + tx_queues = &devargs_all->tx_queues; + + nb_rx_queues = rx_queues->num_of_queue; + nb_tx_queues = tx_queues->num_of_queue; +if (pmd_init_internals (vdev, nb_rx_queues, nb_tx_queues, internals, eth_dev) <0 )
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checks
Quoted 43 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday 1 October 2019 13:53
To: [email protected]
Cc: Kevin Traynor <[email protected]>; Ferriter, Cian <[email protected]>; [email protected]
Subject: [PATCH 1/9] net/pcap: fix argument checksPreviously rx/tx_queues were passed into
eth_from_pcaps_common()as ptrs and were checked for being NULL.In commit
da6ba28f0540("net/pcap: use a struct to pass user options") that changed to pass in a ptr to apmd_devargs_allwhich contains the rx/tx_queues.The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the
pmd_devargs_allptr and removing the NULL checks on rx/tx_queues.1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointertx_queues.
1234 const unsigned intnb_tx_queues=tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues== NULL &&nb_rx_queues> 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checkingtx_queuessuggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues== NULL &&nb_tx_queues> 0)
1241 return -1;
Quoted 7 lines
Coverity issue: 345029
Coverity issue: 345044Fixes da6ba28f0540 ("net/pcap: use a struct to pass user options")Signed-off-by Kevin Traynor <[email protected]>
Quoted 39 lines
--- drivers/net/pcap/rte_eth_pcap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/net/pcap/rte_eth_pcap.cindex5489010b6..7cf00306e100644drivers/net/pcap/rte_eth_pcap.c +11
-8@@ -1229,16 +1229,19 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev, {struct pmd_process_private *pp; -struct pmd_devargs *rx_queues = &devargs_all->rx_queues; -struct pmd_devargs *tx_queues = &devargs_all->tx_queues; -const unsigned int nb_rx_queues = rx_queues->num_of_queue; -const unsigned int nb_tx_queues = tx_queues->num_of_queue; +struct pmd_devargs *rx_queues; +struct pmd_devargs *tx_queues; +unsigned int nb_rx_queues; +unsigned int nb_tx_queues;unsigned int i; -/* do some parameter checking */ -if (rx_queues ==NULL && nb_rx_queues >0 ) -return -1 ; -if (tx_queues ==NULL && nb_tx_queues >0 ) +if (devargs_all ==NULL )return -1 ; + rx_queues = &devargs_all->rx_queues; + tx_queues = &devargs_all->tx_queues; + + nb_rx_queues = rx_queues->num_of_queue; + nb_tx_queues = tx_queues->num_of_queue; + if (pmd_init_internals(vdev, nb_rx_queues, nb_tx_queues, internals,
eth_dev) < 0)
--
2.21.0
Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checks
In reply to Kevin TraynorQuoted 34 lines · Kevin Traynor
Previously rx/tx_queues were passed into
eth_from_pcaps_common()as ptrs and were checked for being NULL.In commit
da6ba28f0540("net/pcap: use a struct to pass user options") that changed to pass in a ptr to apmd_devargs_allwhich contains the rx/tx_queues.The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the
pmd_devargs_allptr and removing the NULL checks on rx/tx_queues.1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointertx_queues.
1234 const unsigned intnb_tx_queues=tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues== NULL &&nb_rx_queues> 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checkingtx_queuessuggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues== NULL &&nb_tx_queues> 0)
1241 return -1;
Quoted 7 lines
Coverity issue: 345029
Coverity issue: 345044Fixes da6ba28f0540 ("net/pcap: use a struct to pass user options")Signed-off-by Kevin Traynor <[email protected]>
This patch hides the coverity warning.
But can't we just remove those checks?
Iiuc, the checks on NULL pointers are unnecessary since
https://git.dpdk.org/dpdk/commit/?id=a0fce1193ce13a50c00624cb36605ebef7a3e60b.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checks
Quoted 41 lines · David Marchand
Quoted 40 lines · Kevin Traynor
Previously rx/tx_queues were passed into
eth_from_pcaps_common()as ptrs and were checked for being NULL.In commit
da6ba28f0540("net/pcap: use a struct to pass user options") that changed to pass in a ptr to apmd_devargs_allwhich contains the rx/tx_queues.The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the
pmd_devargs_allptr and removing the NULL checks on rx/tx_queues.1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointertx_queues.
1234 const unsigned intnb_tx_queues=tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues== NULL &&nb_rx_queues> 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checkingtx_queuessuggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues== NULL &&nb_tx_queues> 0)
1241 return -1;Coverity issue: 345029
Coverity issue: 345044Fixes da6ba28f0540 ("net/pcap: use a struct to pass user options")
Quoted 9 lines
Quoted 1 line
Signed-off-by Kevin Traynor <[email protected]>This patch hides the coverity warning.
But can't we just remove those checks?Iiuc, the checks on NULL pointers are unnecessary since
https://git.dpdk.org/dpdk/commit/?id=a0fce1193ce13a50c00624cb36605ebef7a3e60b.
Aside from the Coverity complaint about rxq/txq NULL check after use, the checks didn't seem to make sense anymore as rxq/txq are part of devargs_all struct now, so they were removed.
I added the NULL check on devargs_all to avoid a NULL deference while getting them instead. The check isn't doing any harm, but looking at the current paths to this fn. can see devargs_all would not be NULL, so I'm ok to remove it too. Cian/Ferruh, wdyt?
Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checks
Quoted 65 lines
-----Original Message-----
From: Kevin Traynor <[email protected]>
Sent: Tuesday 5 November 2019 16:41
To: David Marchand <[email protected]>
Cc: dev <[email protected]>; Ferriter, Cian <[email protected]>; dpdk stable <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checksQuoted 1 line · David Marchand
On Tue, Oct 1, 2019 at 2:54 PM Kevin Traynor <[email protected]>
Quoted 40 lines · wrote:
Quoted 40 lines
Previously rx/tx_queues were passed into
eth_from_pcaps_common()as ptrs and were checked for being NULL.In commit
da6ba28f0540("net/pcap: use a struct to pass user options") that changed to pass in a ptr to apmd_devargs_allwhich contains the rx/tx_queues.The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the
pmd_devargs_allptr and removing the NULL checks on rx/tx_queues.1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointertx_queues.
1234 const unsigned intnb_tx_queues=tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues== NULL &&nb_rx_queues> 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checkingtx_queuessuggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues== NULL &&nb_tx_queues> 0)
1241 return -1;Coverity issue: 345029
Coverity issue: 345044Fixes da6ba28f0540 ("net/pcap: use a struct to pass user options")Quoted 7 lines
Quoted 1 line
Signed-off-by Kevin Traynor <[email protected]>This patch hides the coverity warning.
But can't we just remove those checks?Iiuc, the checks on NULL pointers are unnecessary since
https://git.dpdk.org/dpdk/commit/?id=a0fce1193ce13a50c00624cb36605ebe
f7a3e60b.Quoted 2 lines
Quoted 8 lines
Aside from the Coverity complaint about rxq/txq NULL check after use, the checks didn't seem to make sense anymore as rxq/txq are part of
devargs_allstruct now, so they were removed.I added the NULL check on
devargs_allto avoid a NULL deference while getting them instead. The check isn't doing any harm, but looking at the current paths to this fn. can seedevargs_allwould not be NULL, so I'm ok to remove it too. Cian/Ferruh, wdyt?
I'm OK to remove this. Looks like it's no longer necessary. Good find David!
Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checks
Quoted 69 lines · Cian
Quoted 69 lines
-----Original Message-----
From: Kevin Traynor <[email protected]>
Sent: Tuesday 5 November 2019 16:41
To: David Marchand <[email protected]>
Cc: dev <[email protected]>; Ferriter, Cian <[email protected]>; dpdk stable <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: Re: [dpdk-dev] [PATCH 1/9] net/pcap: fix argument checksQuoted 1 line · David Marchand
On Tue, Oct 1, 2019 at 2:54 PM Kevin Traynor <[email protected]>
Quoted 40 lines · wrote:
Quoted 40 lines
Previously rx/tx_queues were passed into
eth_from_pcaps_common()as ptrs and were checked for being NULL.In commit
da6ba28f0540("net/pcap: use a struct to pass user options") that changed to pass in a ptr to apmd_devargs_allwhich contains the rx/tx_queues.The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
Fix that by checking the
pmd_devargs_allptr and removing the NULL checks on rx/tx_queues.1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointertx_queues.
1234 const unsigned intnb_tx_queues=tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues== NULL &&nb_rx_queues> 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checkingtx_queuessuggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues== NULL &&nb_tx_queues> 0)
1241 return -1;Coverity issue: 345029
Coverity issue: 345044Fixes da6ba28f0540 ("net/pcap: use a struct to pass user options")Quoted 7 lines
Quoted 1 line
Signed-off-by Kevin Traynor <[email protected]>This patch hides the coverity warning.
But can't we just remove those checks?Iiuc, the checks on NULL pointers are unnecessary since
https://git.dpdk.org/dpdk/commit/?id=a0fce1193ce13a50c00624cb36605ebe
f7a3e60b.Quoted 2 lines
Aside from the Coverity complaint about rxq/txq NULL check after use, the checks didn't seem to make sense anymore as rxq/txq are part of
devargs_allstruct now, so they were removed.
Quoted 7 lines
Quoted 4 lines
I added the NULL check on
devargs_allto avoid a NULL deference while getting them instead. The check isn't doing any harm, but looking at the current paths to this fn. can seedevargs_allwould not be NULL, so I'm ok to remove it too. Cian/Ferruh, wdyt?I'm OK to remove this. Looks like it's no longer necessary. Good find David!
Thanks Cian, I kept your Ack for v2.
PATCH 2/9 crypto/octeontx: fix possible NULL deference
In reply to Kevin TraynorCoverity complains that ctrl_flags is set to NULL at the start of the function and it may not have been set before there is a jump to fc_success and it is dereferenced.
Check for NULL before dereference.
312fc_success:
CID 344983 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)7. var_deref_op: Dereferencing null pointer ctrl_flags.
313 *ctrl_flags = rte_cpu_to_be_64(*ctrl_flags);
Coverity issue: 344983
---
There may be further rework needed to set it to the correct value, but for now at least prevent the NULL dereference.
--- drivers/common/cpt/cpt_ucode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/common/cpt/cpt_ucode.h +2 -1
@@ -311,5 +311,6 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, fc_success: - *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); +if (ctrl_flags !=NULL ) + *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); success:
Signature · 1 line
2.21.0
PATCH 3/9 net/bnxt: remove logically dead code
If rc contains a non-zero return code from bnxt_hwrm_send_message(), HWRM_CHECK_RESULT_SILENT() will return.
Just after that code, there is an 'if (!rc) {...} else {...}'. Coverity is complaining that this if else statement is dead code as rc will always be 0 if that code is reached.
4309 rc = bnxt_hwrm_send_message(bp, &req, sizeof(req),
BNXT_USE_CHIMP_MB);
cond_const: Condition rc, taking false branch. Now the value of rc is equal to 0.
4310 HWRM_CHECK_RESULT_SILENT();
4311
const: At condition rc, the value of rc must be equal to 0.
dead_error_condition: The condition !rc must be true.
4312 if (!rc) {
[snip]
4373 } else {
CID 343450 (#1 of 1): Logically dead code
(DEADCODE)dead_error_line: Execution cannot
reach this statement: rc = 0;.
4374 rc = 0;
4375 }
Coverity issue: 343450
--- drivers/net/bnxt/bnxt_hwrm.c | 118 +++++++++++++++++------------------ 1 file changed, 56 insertions(+), 62 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +56 -62
@@ -4298,5 +4298,7 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)struct hwrm_func_backing_store_qcaps_output *resp = bp->hwrm_cmd_resp_addr; -int rc; +struct bnxt_ctx_pg_info *ctx_pg; +struct bnxt_ctx_mem_info *ctx; +int rc, total_alloc_len, i; if (!BNXT_CHIP_THOR(bp) ||
@@ -4310,68 +4312,60 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)HWRM_CHECK_RESULT_SILENT (); -if (!rc) { -struct bnxt_ctx_pg_info *ctx_pg; -struct bnxt_ctx_mem_info *ctx; -int total_alloc_len; -int i; + total_alloc_len =sizeof (*ctx); + ctx =rte_malloc ("bnxt_ctx_mem" , total_alloc_len, +RTE_CACHE_LINE_SIZE ); +if (!ctx) { + rc = -ENOMEM ; + goto ctx_err; + } +memset (ctx,0 , total_alloc_len); - total_alloc_len =sizeof (*ctx); - ctx =rte_malloc ("bnxt_ctx_mem" , total_alloc_len, -RTE_CACHE_LINE_SIZE ); -if (!ctx) { - rc = -ENOMEM ; - goto ctx_err; - } -memset (ctx,0 , total_alloc_len); + ctx_pg =rte_malloc ("bnxt_ctx_pg_mem" , +sizeof (*ctx_pg) *BNXT_MAX_Q , +RTE_CACHE_LINE_SIZE ); +if (!ctx_pg) { + rc = -ENOMEM ; + goto ctx_err; + } +for (i =0 ; i <BNXT_MAX_Q ; i++, ctx_pg++) + ctx->tqm_mem[i] = ctx_pg; - ctx_pg =rte_malloc ("bnxt_ctx_pg_mem" , -sizeof (*ctx_pg) *BNXT_MAX_Q , -RTE_CACHE_LINE_SIZE ); -if (!ctx_pg) { - rc = -ENOMEM ; - goto ctx_err; - } -for (i =0 ; i <BNXT_MAX_Q ; i++, ctx_pg++) - ctx->tqm_mem[i] = ctx_pg; + bp->ctx = ctx; + ctx->qp_max_entries =rte_le_to_cpu_32 (resp->qp_max_entries); + ctx->qp_min_qp1_entries = +rte_le_to_cpu_16 (resp->qp_min_qp1_entries); + ctx->qp_max_l2_entries = +rte_le_to_cpu_16 (resp->qp_max_l2_entries); + ctx->qp_entry_size =rte_le_to_cpu_16 (resp->qp_entry_size); + ctx->srq_max_l2_entries = +rte_le_to_cpu_16 (resp->srq_max_l2_entries); + ctx->srq_max_entries =rte_le_to_cpu_32 (resp->srq_max_entries); + ctx->srq_entry_size =rte_le_to_cpu_16 (resp->srq_entry_size); + ctx->cq_max_l2_entries = +rte_le_to_cpu_16 (resp->cq_max_l2_entries); + ctx->cq_max_entries =rte_le_to_cpu_32 (resp->cq_max_entries); + ctx->cq_entry_size =rte_le_to_cpu_16 (resp->cq_entry_size); + ctx->vnic_max_vnic_entries = +rte_le_to_cpu_16 (resp->vnic_max_vnic_entries); + ctx->vnic_max_ring_table_entries = +rte_le_to_cpu_16 (resp->vnic_max_ring_table_entries); + ctx->vnic_entry_size =rte_le_to_cpu_16 (resp->vnic_entry_size); + ctx->stat_max_entries = +rte_le_to_cpu_32 (resp->stat_max_entries); + ctx->stat_entry_size =rte_le_to_cpu_16 (resp->stat_entry_size); + ctx->tqm_entry_size =rte_le_to_cpu_16 (resp->tqm_entry_size); + ctx->tqm_min_entries_per_ring = +rte_le_to_cpu_32 (resp->tqm_min_entries_per_ring); + ctx->tqm_max_entries_per_ring = +rte_le_to_cpu_32 (resp->tqm_max_entries_per_ring); + ctx->tqm_entries_multiple = resp->tqm_entries_multiple; +if (!ctx->tqm_entries_multiple) + ctx->tqm_entries_multiple =1 ; + ctx->mrav_max_entries = +rte_le_to_cpu_32 (resp->mrav_max_entries); + ctx->mrav_entry_size =rte_le_to_cpu_16 (resp->mrav_entry_size); + ctx->tim_entry_size =rte_le_to_cpu_16 (resp->tim_entry_size); + ctx->tim_max_entries =rte_le_to_cpu_32 (resp->tim_max_entries); - bp->ctx = ctx; - ctx->qp_max_entries =rte_le_to_cpu_32 (resp->qp_max_entries); - ctx->qp_min_qp1_entries = -rte_le_to_cpu_16 (resp->qp_min_qp1_entries); - ctx->qp_max_l2_entries = -rte_le_to_cpu_16 (resp->qp_max_l2_entries); - ctx->qp_entry_size =rte_le_to_cpu_16 (resp->qp_entry_size); - ctx->srq_max_l2_entries = -rte_le_to_cpu_16 (resp->srq_max_l2_entries); - ctx->srq_max_entries =rte_le_to_cpu_32 (resp->srq_max_entries); - ctx->srq_entry_size =rte_le_to_cpu_16 (resp->srq_entry_size); - ctx->cq_max_l2_entries = -rte_le_to_cpu_16 (resp->cq_max_l2_entries); - ctx->cq_max_entries =rte_le_to_cpu_32 (resp->cq_max_entries); - ctx->cq_entry_size =rte_le_to_cpu_16 (resp->cq_entry_size); - ctx->vnic_max_vnic_entries = -rte_le_to_cpu_16 (resp->vnic_max_vnic_entries); - ctx->vnic_max_ring_table_entries = -rte_le_to_cpu_16 (resp->vnic_max_ring_table_entries); - ctx->vnic_entry_size =rte_le_to_cpu_16 (resp->vnic_entry_size); - ctx->stat_max_entries = -rte_le_to_cpu_32 (resp->stat_max_entries); - ctx->stat_entry_size =rte_le_to_cpu_16 (resp->stat_entry_size); - ctx->tqm_entry_size =rte_le_to_cpu_16 (resp->tqm_entry_size); - ctx->tqm_min_entries_per_ring = -rte_le_to_cpu_32 (resp->tqm_min_entries_per_ring); - ctx->tqm_max_entries_per_ring = -rte_le_to_cpu_32 (resp->tqm_max_entries_per_ring); - ctx->tqm_entries_multiple = resp->tqm_entries_multiple; -if (!ctx->tqm_entries_multiple) - ctx->tqm_entries_multiple =1 ; - ctx->mrav_max_entries = -rte_le_to_cpu_32 (resp->mrav_max_entries); - ctx->mrav_entry_size =rte_le_to_cpu_16 (resp->mrav_entry_size); - ctx->tim_entry_size =rte_le_to_cpu_16 (resp->tim_entry_size); - ctx->tim_max_entries =rte_le_to_cpu_32 (resp->tim_max_entries); - }else { - rc =0 ; - } ctx_err:HWRM_UNLOCK ();
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 3/9] net/bnxt: remove logically dead code
Quoted 26 lines · Kevin Traynor
If rc contains a non-zero return code from
bnxt_hwrm_send_message(),HWRM_CHECK_RESULT_SILENT()will return.Just after that code, there is an 'if (!rc) {...} else {...}'. Coverity is complaining that this if else statement is dead code as rc will always be 0 if that code is reached.
4309 rc = bnxt_hwrm_send_message(bp, &req, sizeof(req),
BNXT_USE_CHIMP_MB);
cond_const: Condition rc, taking false branch. Now the value of rc is equal to 0.
4310HWRM_CHECK_RESULT_SILENT();
4311
const: At condition rc, the value of rc must be equal to 0.
dead_error_condition: The condition !rc must be true.
4312 if (!rc) {[snip]
4373 } else {
CID 343450 (#1 of 1): Logically dead code
(DEADCODE)dead_error_line: Execution cannot
reach this statement: rc = 0;.
4374 rc = 0;
4375 }
Quoted 7 lines
Coverity issue: 343450
Signed-off-by Kevin Traynor <[email protected]>
Quoted 156 lines
--- drivers/net/bnxt/bnxt_hwrm.c | 118 +++++++++++++++++------------------ 1 file changed, 56 insertions(+), 62 deletions(-)drivers/net/bnxt/bnxt_hwrm.c +3
-1@@ -4298,5 +4298,7 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)struct hwrm_func_backing_store_qcaps_output *resp = bp->hwrm_cmd_resp_addr; -int rc; +struct bnxt_ctx_pg_info *ctx_pg; +struct bnxt_ctx_mem_info *ctx; +int rc, total_alloc_len, i;if (!BNXT_CHIP_THOR(bp) ||drivers/net/bnxt/bnxt_hwrm.c +53
-32@@ -4310,68 +4312,60 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)HWRM_CHECK_RESULT_SILENT (); -if (!rc) { -struct bnxt_ctx_pg_info *ctx_pg; -struct bnxt_ctx_mem_info *ctx; -int total_alloc_len; -int i; + total_alloc_len =sizeof (*ctx); + ctx =rte_malloc ("bnxt_ctx_mem" , total_alloc_len, +RTE_CACHE_LINE_SIZE ); +if (!ctx) { + rc = -ENOMEM ; + goto ctx_err; + } +memset (ctx,0 , total_alloc_len); - total_alloc_len =sizeof (*ctx); - ctx =rte_malloc ("bnxt_ctx_mem" , total_alloc_len, -RTE_CACHE_LINE_SIZE ); -if (!ctx) { - rc = -ENOMEM ; - goto ctx_err; - } -memset (ctx,0 , total_alloc_len); + ctx_pg =rte_malloc ("bnxt_ctx_pg_mem" , +sizeof (*ctx_pg) *BNXT_MAX_Q , +RTE_CACHE_LINE_SIZE ); +if (!ctx_pg) { + rc = -ENOMEM ; + goto ctx_err; + } +for (i =0 ; i <BNXT_MAX_Q ; i++, ctx_pg++) + ctx->tqm_mem[i] = ctx_pg; - ctx_pg =rte_malloc ("bnxt_ctx_pg_mem" , -sizeof (*ctx_pg) *BNXT_MAX_Q , -RTE_CACHE_LINE_SIZE ); -if (!ctx_pg) { - rc = -ENOMEM ; - goto ctx_err; - } -for (i =0 ; i <BNXT_MAX_Q ; i++, ctx_pg++) - ctx->tqm_mem[i] = ctx_pg; + bp->ctx = ctx; + ctx->qp_max_entries =rte_le_to_cpu_32 (resp->qp_max_entries); + ctx->qp_min_qp1_entries = +rte_le_to_cpu_16 (resp->qp_min_qp1_entries); + ctx->qp_max_l2_entries = +rte_le_to_cpu_16 (resp->qp_max_l2_entries); + ctx->qp_entry_size =rte_le_to_cpu_16 (resp->qp_entry_size); + ctx->srq_max_l2_entries = +rte_le_to_cpu_16 (resp->srq_max_l2_entries); + ctx->srq_max_entries =rte_le_to_cpu_32 (resp->srq_max_entries); + ctx->srq_entry_size =rte_le_to_cpu_16 (resp->srq_entry_size); + ctx->cq_max_l2_entries = +rte_le_to_cpu_16 (resp->cq_max_l2_entries); + ctx->cq_max_entries =rte_le_to_cpu_32 (resp->cq_max_entries); + ctx->cq_entry_size =rte_le_to_cpu_16 (resp->cq_entry_size); + ctx->vnic_max_vnic_entries = +rte_le_to_cpu_16 (resp->vnic_max_vnic_entries); + ctx->vnic_max_ring_table_entries = +rte_le_to_cpu_16 (resp->vnic_max_ring_table_entries); + ctx->vnic_entry_size =rte_le_to_cpu_16 (resp->vnic_entry_size); + ctx->stat_max_entries = +rte_le_to_cpu_32 (resp->stat_max_entries); + ctx->stat_entry_size =rte_le_to_cpu_16 (resp->stat_entry_size); + ctx->tqm_entry_size =rte_le_to_cpu_16 (resp->tqm_entry_size); + ctx->tqm_min_entries_per_ring = +rte_le_to_cpu_32 (resp->tqm_min_entries_per_ring); + ctx->tqm_max_entries_per_ring = +rte_le_to_cpu_32 (resp->tqm_max_entries_per_ring); + ctx->tqm_entries_multiple = resp->tqm_entries_multiple; +if (!ctx->tqm_entries_multiple) + ctx->tqm_entries_multiple =1 ; + ctx->mrav_max_entries = +rte_le_to_cpu_32 (resp->mrav_max_entries); + ctx->mrav_entry_size =rte_le_to_cpu_16 (resp->mrav_entry_size); + ctx->tim_entry_size =rte_le_to_cpu_16 (resp->tim_entry_size); + ctx->tim_max_entries =rte_le_to_cpu_32 (resp->tim_max_entries); - bp->ctx = ctx; - ctx->qp_max_entries =rte_le_to_cpu_32 (resp->qp_max_entries); - ctx->qp_min_qp1_entries = -rte_le_to_cpu_16 (resp->qp_min_qp1_entries); - ctx->qp_max_l2_entries = -rte_le_to_cpu_16 (resp->qp_max_l2_entries); - ctx->qp_entry_size =rte_le_to_cpu_16 (resp->qp_entry_size); - ctx->srq_max_l2_entries = -rte_le_to_cpu_16 (resp->srq_max_l2_entries); - ctx->srq_max_entries =
rte_le_to_cpu_32(resp->srq_max_entries);
-ctx->srq_entry_size=rte_le_to_cpu_16(resp->srq_entry_size);drivers/net/bnxt/bnxt_hwrm.c +0
-3- ctx->cq_max_l2_entries = -rte_le_to_cpu_16 (resp->cq_max_l2_entries); - ctx->cq_max_entries =
rte_le_to_cpu_32(resp->cq_max_entries);drivers/net/bnxt/bnxt_hwrm.c +0
-6- ctx->cq_entry_size =rte_le_to_cpu_16 (resp->cq_entry_size); - ctx->vnic_max_vnic_entries = -rte_le_to_cpu_16 (resp->vnic_max_vnic_entries); - ctx->vnic_max_ring_table_entries = -rte_le_to_cpu_16 (resp->vnic_max_ring_table_entries); - ctx->vnic_entry_size =
rte_le_to_cpu_16(resp->vnic_entry_size);drivers/net/bnxt/bnxt_hwrm.c +0
-3- ctx->stat_max_entries = -rte_le_to_cpu_32 (resp->stat_max_entries); - ctx->stat_entry_size =
rte_le_to_cpu_16(resp->stat_entry_size);
-ctx->tqm_entry_size=rte_le_to_cpu_16(resp->tqm_entry_size);drivers/net/bnxt/bnxt_hwrm.c +0
-10- ctx->tqm_min_entries_per_ring = -rte_le_to_cpu_32 (resp->tqm_min_entries_per_ring); - ctx->tqm_max_entries_per_ring = -rte_le_to_cpu_32 (resp->tqm_max_entries_per_ring); - ctx->tqm_entries_multiple = resp->tqm_entries_multiple; -if (!ctx->tqm_entries_multiple) - ctx->tqm_entries_multiple =1 ; - ctx->mrav_max_entries = -rte_le_to_cpu_32 (resp->mrav_max_entries); - ctx->mrav_entry_size =
rte_le_to_cpu_16(resp->mrav_entry_size);
-ctx->tim_entry_size=rte_le_to_cpu_16(resp->tim_entry_size);
-ctx->tim_max_entries=rte_le_to_cpu_32(resp->tim_max_entries);drivers/net/bnxt/bnxt_hwrm.c +0
-4- }else { - rc =0 ; - } ctx_err:HWRM_UNLOCK (); --2.21.0
Re: [dpdk-dev] [PATCH 3/9] net/bnxt: remove logically dead code
Hello Ajit, Kevin,
Quoted 29 lines · Ajit Khaparde
Quoted 26 lines · Kevin Traynor
If rc contains a non-zero return code from
bnxt_hwrm_send_message(),HWRM_CHECK_RESULT_SILENT()will return.Just after that code, there is an 'if (!rc) {...} else {...}'. Coverity is complaining that this if else statement is dead code as rc will always be 0 if that code is reached.
4309 rc = bnxt_hwrm_send_message(bp, &req, sizeof(req),
BNXT_USE_CHIMP_MB);
cond_const: Condition rc, taking false branch. Now the value of rc is equal to 0.
4310HWRM_CHECK_RESULT_SILENT();
4311
const: At condition rc, the value of rc must be equal to 0.
dead_error_condition: The condition !rc must be true.
4312 if (!rc) {[snip]
4373 } else {
CID 343450 (#1 of 1): Logically dead code
(DEADCODE)dead_error_line: Execution cannot
reach this statement: rc = 0;.
4374 rc = 0;
4375 }
Quoted 8 lines
Quoted 7 lines
Coverity issue: 343450
Signed-off-by Kevin Traynor <[email protected]>Acked-by Ajit Khaparde <[email protected]>
I can see a *really* close patch has been submitted the day after.
http://patchwork.dpdk.org/patch/58352/
And merged after a v3:
https://git.dpdk.org/dpdk/commit/?id=b4f74051165560aa81814433dea7e6eb0bdb32b9
So I suppose this patch can be dropped.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH 3/9] net/bnxt: remove logically dead code
Quoted 46 lines · David Marchand
Hello Ajit, Kevin,
Quoted 2 lines · Ajit Khaparde
On Tue, Oct 1, 2019 at 6:04 AM Kevin Traynor <[email protected]>
Quoted 27 lines · wrote:
Quoted 27 lines
If rc contains a non-zero return code from
bnxt_hwrm_send_message(),HWRM_CHECK_RESULT_SILENT()will return.Just after that code, there is an 'if (!rc) {...} else {...}'. Coverity is complaining that this if else statement is dead code as rc will always be 0 if that code is reached.
4309 rc = bnxt_hwrm_send_message(bp, &req, sizeof(req),
BNXT_USE_CHIMP_MB);
cond_const: Condition rc, taking false branch. Now the value of rc is equal to 0.
4310HWRM_CHECK_RESULT_SILENT();
4311
const: At condition rc, the value of rc must be equal to 0.
dead_error_condition: The condition !rc must be true.
4312 if (!rc) {[snip]
4373 } else {
CID 343450 (#1 of 1): Logically dead code
(DEADCODE)dead_error_line: Execution cannot
reach this statement: rc = 0;.
4374 rc = 0;
4375 }Quoted 8 lines
Quoted 7 lines
Coverity issue: 343450
Signed-off-by Kevin Traynor <[email protected]>Acked-by Ajit Khaparde <[email protected]>I can see a *really* close patch has been submitted the day after.
http://patchwork.dpdk.org/patch/58352/
Quoted 7 lines
And merged after a v3:
https://git.dpdk.org/dpdk/commit/?id=b4f74051165560aa81814433dea7e6eb0bdb32b9
So I suppose this patch can be dropped.
Yes. That makes sense.
Thanks for checking.
Thanks
Ajit
Quoted 4 lines
--
David Marchand
Re: [dpdk-dev] [PATCH 3/9] net/bnxt: remove logically dead code
Quoted 53 lines · Ajit Khaparde
Quoted 50 lines · David Marchand
Hello Ajit, Kevin,
Quoted 2 lines · Ajit Khaparde
On Tue, Oct 1, 2019 at 6:04 AM Kevin Traynor <[email protected]>
Quoted 27 lines · wrote:
Quoted 27 lines
If rc contains a non-zero return code from
bnxt_hwrm_send_message(),HWRM_CHECK_RESULT_SILENT()will return.Just after that code, there is an 'if (!rc) {...} else {...}'. Coverity is complaining that this if else statement is dead code as rc will always be 0 if that code is reached.
4309 rc = bnxt_hwrm_send_message(bp, &req, sizeof(req),
BNXT_USE_CHIMP_MB);
cond_const: Condition rc, taking false branch. Now the value of rc is equal to 0.
4310HWRM_CHECK_RESULT_SILENT();
4311
const: At condition rc, the value of rc must be equal to 0.
dead_error_condition: The condition !rc must be true.
4312 if (!rc) {[snip]
4373 } else {
CID 343450 (#1 of 1): Logically dead code
(DEADCODE)dead_error_line: Execution cannot
reach this statement: rc = 0;.
4374 rc = 0;
4375 }Quoted 8 lines
Quoted 7 lines
Coverity issue: 343450
Signed-off-by Kevin Traynor <[email protected]>Acked-by Ajit Khaparde <[email protected]>I can see a *really* close patch has been submitted the day after.
http://patchwork.dpdk.org/patch/58352/And merged after a v3:
https://git.dpdk.org/dpdk/commit/?id=b4f74051165560aa81814433dea7e6eb0bdb32b9
Quoted 8 lines
Quoted 3 lines
So I suppose this patch can be dropped.
Yes. That makes sense.
Thanks for checking.
Thanks
Ajit
Thanks for catching it David.
Quoted 5 lines
Quoted 4 lines
--
David Marchand
PATCH 4/9 net/ipn3ke: fix incorrect commit check logic
In reply to Kevin TraynorCoverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether n->level != IPN3KE_TM_NODE_LEVEL_COS || n->n_children != 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level != IPN3KE_TM_NODE_LEVEL_COS ||
1507 n->n_children != 0) {
1508 return -rte_tm_error_set(error,
1509 EINVAL,
1510 RTE_TM_ERROR_TYPE_UNSPECIFIED,
1511 NULL,
1512 rte_strerror(EINVAL));
else_branch: The else branch, identical to the then branch.
1513 } else {
1514 return -rte_tm_error_set(error,
1515 EINVAL,
1516 RTE_TM_ERROR_TYPE_UNSPECIFIED,
1517 NULL,
1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ipn3ke/ipn3ke_tm.c +0 -6
@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } }
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
Hello Rosen,
Review please.
Quoted 55 lines · Kevin Traynor
Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)drivers/net/ipn3ke/ipn3ke_tm.c +0
-7@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } } --2.21.0
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
Quoted 4 lines · David Marchand
Hello Rosen,
Review please.
Ping Rosen.
Quoted 57 lines · Kevin Traynor
Quoted 55 lines
Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)drivers/net/ipn3ke/ipn3ke_tm.c +0
-7@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } } --2.21.0
Xu, Rosen
Reviewed-byRe: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
Hi Kevin,
Too many things in these days, sorry for late reply.
Quoted 13 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday, November 05, 2019 23:42
To: David Marchand <[email protected]>; Xu, Rosen <[email protected]>
Cc: dev <[email protected]>; dpdk stable <[email protected]>; Ye, Xiaolong <[email protected]>
Subject: Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logicQuoted 2 lines · David Marchand
Hello Rosen,
Quoted 18 lines
Quoted 2 lines
Review please.
Ping Rosen.
Quoted 1 line
On Tue, Oct 1, 2019 at 3:04 PM Kevin Traynor <[email protected]>
Quoted 11 lines · wrote:
Quoted 11 lines
Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
Yes, you are right.
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
1506 if (
n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)
Quoted 20 lines
Quoted 5 lines
drivers/net/ipn3ke/ipn3ke_tm.c ipn3ke_tm_hierarchy_commit_check(struct
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexadf02c157..a93145d59100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-0@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct
rte_eth_dev*dev,Quoted 14 lines
Quoted 13 lines
drivers/net/ipn3ke/ipn3ke_tm.c +0
-7NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } } --2.21.0
Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
Quoted 4 lines · Rosen
Hi Kevin,
Too many things in these days, sorry for late reply.
Hi Rosen, no problem, thanks for the Ack.
Kevin.
Quoted 83 lines
Quoted 13 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday, November 05, 2019 23:42
To: David Marchand <[email protected]>; Xu, Rosen <[email protected]>
Cc: dev <[email protected]>; dpdk stable <[email protected]>; Ye, Xiaolong <[email protected]>
Subject: Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logicQuoted 2 lines · David Marchand
Hello Rosen,
Quoted 18 lines
Quoted 2 lines
Review please.
Ping Rosen.
Quoted 1 line
On Tue, Oct 1, 2019 at 3:04 PM Kevin Traynor <[email protected]>
Quoted 11 lines · wrote:
Quoted 11 lines
Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?Yes, you are right.
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
1506 if (
n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)Quoted 20 lines
Quoted 5 lines
drivers/net/ipn3ke/ipn3ke_tm.c ipn3ke_tm_hierarchy_commit_check(struct
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexadf02c157..a93145d59100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-0@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct
rte_eth_dev*dev,Quoted 14 lines
Quoted 13 lines
drivers/net/ipn3ke/ipn3ke_tm.c +0
-7NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } } --2.21.0
Reviewed-by Rosen Xu <[email protected]>
Xu, Rosen
Reviewed-byRe: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
In reply to David MarchandHi David,
Too many things in these days. I have reviewed it. Thanks a lot.
Quoted 71 lines
-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Wednesday, October 30, 2019 16:00
To: Xu, Rosen <[email protected]>
Cc: dev <[email protected]>; Kevin Traynor <[email protected]>; dpdk stable <[email protected]>; Ye, Xiaolong <[email protected]>
Subject: Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logicHello Rosen,
Review please.
drivers/net/ipn3ke/ipn3ke_tm.c ipn3ke_tm_hierarchy_commit_check(struct
Quoted 42 lines · Kevin Traynor
Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexadf02c157..a93145d59100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-0@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct
rte_eth_dev*dev,Quoted 11 lines
drivers/net/ipn3ke/ipn3ke_tm.c +0
-7NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } } --Quoted 2 lines
2.21.0
Quoted 2 lines
--
David Marchand
Re: [dpdk-dev] [PATCH 4/9] net/ipn3ke: fix incorrect commit check logic
In reply to Kevin TraynorHi,
Quoted 12 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday, October 01, 2019 21:04
To: [email protected]
Cc: Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [PATCH 4/9] net/ipn3ke: fix incorrect commit check logicCoverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
Quoted 6 lines
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
Okay
Quoted 44 lines
1506 if (
n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexadf02c157..a93145d59100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-6@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(structrte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , - RTE_TM_ERROR_TYPE_UNSPECIFIED, -NULL , -rte_strerror (EINVAL ));drivers/net/ipn3ke/ipn3ke_tm.c +0
-1} } --
Quoted 1 line
2.21.0
PATCH 5/9 net/ipn3ke: remove useless if statement
In reply to Kevin TraynorCoverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret = ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:
Coverity issue: 337930
--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ipn3ke/ipn3ke_ethdev.c +1 -2
@@ -652,6 +652,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist)
Signature · 1 line
2.21.0
Re: [dpdk-dev] [dpdk-stable] [PATCH 5/9] net/ipn3ke: remove useless if statement
Quoted 39 lines · Kevin Traynor
Coverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret =
ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:Coverity issue: 337930
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.c +1
-3@@ -652,6 +652,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist) --
Quoted 2 lines
2.21.0
Signature · 1 line
David Marchand
Xu, Rosen
Reviewed-byRe: [dpdk-dev] [dpdk-stable] [PATCH 5/9] net/ipn3ke: remove useless if statement
Quoted 57 lines
-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Wednesday, October 30, 2019 16:01
To: Kevin Traynor <[email protected]>
Cc: dev <[email protected]>; Xu, Rosen <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [dpdk-stable] [PATCH 5/9] net/ipn3ke: remove useless if statementQuoted 40 lines · Kevin Traynor
Coverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret =
ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:Coverity issue: 337930
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.c +1
-3@@ -652,6 +652,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist) --Quoted 2 lines
2.21.0
Reviewed-by David Marchand <[email protected]>
Quoted 2 lines
--
David Marchand
Re: [dpdk-dev] [PATCH 5/9] net/ipn3ke: remove useless if statement
In reply to Kevin TraynorHi,
Quoted 47 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday, October 01, 2019 21:04
To: [email protected]
Cc: Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [PATCH 5/9] net/ipn3ke: remove useless if statementCoverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret =
ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:Coverity issue: 337930
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.c +1
-3@@ -652,6 +652,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist) --
Quoted 1 line
2.21.0
PATCH 6/9 net/ipn3ke: remove commented out code
In reply to Kevin TraynorThese struct members and variable were commented out. Remove them.
--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)
drivers/net/ipn3ke/ipn3ke_ethdev.h +0 -7
@@ -97,18 +97,11 @@ struct ipn3ke_tm_node {struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };
drivers/net/ipn3ke/ipn3ke_tm.c +0 -1
@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/ uint32_t node_index;uint32_t parent_index;
Signature · 1 line
2.21.0
Re: [dpdk-dev] [dpdk-stable] [PATCH 6/9] net/ipn3ke: remove commented out code
Quoted 48 lines · Kevin Traynor
These struct members and variable were commented out. Remove them.
Fixes c01c748e4ae6 ("net/ipn3ke: add new driver")Fixes c820468ac99c ("net/ipn3ke: support TM")Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.h +0
-7@@ -97,18 +97,11 @@ struct ipn3ke_tm_node {struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };drivers/net/ipn3ke/ipn3ke_tm.c +0
-2@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/ uint32_t node_index;uint32_t parent_index; --
Quoted 2 lines
2.21.0
Signature · 1 line
David Marchand
Xu, Rosen
Reviewed-byRe: [dpdk-dev] [dpdk-stable] [PATCH 6/9] net/ipn3ke: remove commented out code
Hi,
Too busy these days, sorry for late reply.
Quoted 64 lines
-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Wednesday, October 30, 2019 16:04
To: Kevin Traynor <[email protected]>
Cc: dev <[email protected]>; Xu, Rosen <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [dpdk-stable] [PATCH 6/9] net/ipn3ke: remove commented out codedrivers/net/ipn3ke/ipn3ke_tm.c ipn3ke_tm_node_add_check_mount(uint32_t
Quoted 43 lines · Kevin Traynor
These struct members and variable were commented out. Remove them.
Fixes c01c748e4ae6 ("net/ipn3ke: add new driver")Fixes c820468ac99c ("net/ipn3ke: support TM")Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.h +0
-7@@ -97,18 +97,11 @@ struct ipn3ke_tm_node { struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexa93145d59..5a16c5f96100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-0@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t
tm_id,drivers/net/ipn3ke/ipn3ke_tm.c ipn3ke_tm_node_add_check_mount(uint32_t tm_id,
Quoted 3 lines
drivers/net/ipn3ke/ipn3ke_tm.c +0
-1struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/
Quoted 5 lines
drivers/net/ipn3ke/ipn3ke_tm.c +0
-1uint32_t node_index;uint32_t parent_index; --2.21.0
Quoted 5 lines
Reviewed-by David Marchand <[email protected]>--
David Marchand
Re: [dpdk-dev] [PATCH 6/9] net/ipn3ke: remove commented out code
In reply to Kevin TraynorHi,
Quoted 58 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Tuesday, October 01, 2019 21:04
To: [email protected]
Cc: Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [PATCH 6/9] net/ipn3ke: remove commented out codeThese struct members and variable were commented out. Remove them.
Fixes c01c748e4ae6 ("net/ipn3ke: add new driver")Fixes c820468ac99c ("net/ipn3ke: support TM")Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.h +0
-7@@ -97,18 +97,11 @@ struct ipn3ke_tm_node { struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexa93145d59..5a16c5f96100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-1@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/
drivers/net/ipn3ke/ipn3ke_tm.c +0
-1uint32_t node_index;uint32_t parent_index; --
Quoted 1 line
2.21.0
PATCH 7/9 compress/octeontx: remove commented out code
In reply to Kevin TraynorThis code is commented out. Remove it.
--- drivers/compress/octeontx/include/zip_regs.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/compress/octeontx/include/zip_regs.h +0 -8
@@ -37,5 +37,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_ena_s cn; */ } zip_vqx_ena_t;
@@ -65,5 +64,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_sbuf_addr_s cn; */ } zip_vqx_sbuf_addr_t;
@@ -85,5 +83,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_quex_doorbell_s cn; */ } zip_quex_doorbell_t;
@@ -105,5 +102,4 @@ union zip_nptr_s {#endif /* Word 0 - End */ } s; -/* struct zip_nptr_s_s cn83xx; */ };
@@ -198,5 +194,4 @@ union zip_inst_s {/** Beginning of file */ uint64_t bf : 1; -// uint64_t reserved_3_4 : 2; /** Comp/decomp operation */ uint64_t op : 2;
@@ -211,5 +206,4 @@ union zip_inst_s { uint64_t dg : 1; uint64_t ds : 1; -//uint64_t reserved_3_4 : 2; uint64_t op : 2; uint64_t bf : 1;
@@ -616,6 +610,4 @@ union zip_zres_s {#endif /* Word 7 - End */ }/** ZIP Result Structure */ s; - -/* struct zip_zres_s_s cn83xx; */ };
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 7/9] compress/octeontx: remove commented out code
Quoted 60 lines · Kevin Traynor
This code is commented out. Remove it.
Fixes 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD")Signed-off-by Kevin Traynor <[email protected]>--- drivers/compress/octeontx/include/zip_regs.h | 8 -------- 1 file changed, 8 deletions(-)drivers/compress/octeontx/include/zip_regs.h +0
-9@@ -37,5 +37,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_ena_s cn; */ } zip_vqx_ena_t;@@ -65,5 +64,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_sbuf_addr_s cn; */ } zip_vqx_sbuf_addr_t;@@ -85,5 +83,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_quex_doorbell_s cn; */ } zip_quex_doorbell_t;@@ -105,5 +102,4 @@ union zip_nptr_s {#endif /* Word 0 - End */ } s; -/* struct zip_nptr_s_s cn83xx; */ };@@ -198,5 +194,4 @@ union zip_inst_s {/** Beginning of file */ uint64_t bf : 1; -// uint64_t reserved_3_4 : 2; /** Comp/decomp operation */ uint64_t op : 2;@@ -211,5 +206,4 @@ union zip_inst_s { uint64_t dg : 1; uint64_t ds : 1; -//uint64_t reserved_3_4 : 2; uint64_t op : 2; uint64_t bf : 1;@@ -616,6 +610,4 @@ union zip_zres_s {#endif /* Word 7 - End */ }/** ZIP Result Structure */ s; - -/* struct zip_zres_s_s cn83xx; */ }; --
Quoted 2 lines
2.21.0
Signature · 1 line
David Marchand
PATCH 8/9 event/opdl: remove commented out code
In reply to Kevin TraynorSome variables are commented out. Remove them.
--- drivers/event/opdl/opdl_test.c | 3 --- 1 file changed, 3 deletions(-)
drivers/event/opdl/opdl_test.c +0 -3
@@ -696,7 +696,4 @@ static int single_link(struct test *t) { -/* const uint8_t rx_port = 0; */ -/* const uint8_t w1_port = 1; */ -/* const uint8_t w3_port = 3; */ const uint8_t tx_port =2 ;int err;
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 8/9] event/opdl: remove commented out code
Quoted 26 lines · Kevin Traynor
Some variables are commented out. Remove them.
Signed-off-by Kevin Traynor <[email protected]>--- drivers/event/opdl/opdl_test.c | 3 --- 1 file changed, 3 deletions(-)drivers/event/opdl/opdl_test.c +0
-3@@ -696,7 +696,4 @@ static int single_link(struct test *t) { -/* const uint8_t rx_port = 0; */ -/* const uint8_t w1_port = 1; */ -/* const uint8_t w3_port = 3; */ const uint8_t tx_port =2 ;int err;Signature · 1 line
2.21.0
PATCH 9/9 net/bnxt: remove commented out code
In reply to Kevin TraynorThis commented out todo and code is old. Remove it.
--- drivers/net/bnxt/bnxt_ethdev.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +0 -3
@@ -2239,7 +2239,4 @@ parse_ntuple_filter(struct bnxt *bp, } -//TODO Priority -//nfilter->priority = (uint8_t)filter->priority; - bfilter->enables = en;return 0 ;
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 9/9] net/bnxt: remove commented out code
Quoted 8 lines · Kevin Traynor
This commented out todo and code is old. Remove it.
Fixes b7435d660a8c ("net/bnxt: add ntuple filtering support")Signed-off-by Kevin Traynor <[email protected]>
---
Quoted 20 lines
drivers/net/bnxt/bnxt_ethdev.c | 3 --- 1 file changed, 3 deletions(-)drivers/net/bnxt/bnxt_ethdev.c +0
-4@@ -2239,7 +2239,4 @@ parse_ntuple_filter(struct bnxt *bp, } -//TODO Priority -//nfilter->priority = (uint8_t)filter->priority; - bfilter->enables = en;return 0 ; --2.21.0
Re: [dpdk-dev] [dpdk-stable] [PATCH 2/9] crypto/octeontx: fix possible NULL deference
In reply to Kevin TraynorQuoted 12 lines · Kevin Traynor
Coverity complains that
ctrl_flagsis set to NULL at the start of the function and it may not have been set before there is a jump tofc_successand it is dereferenced.Check for NULL before dereference.
312fc_success:
CID 344983 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)7.var_deref_op: Dereferencing null pointerctrl_flags.
313*ctrl_flags=rte_cpu_to_be_64(*ctrl_flags);
Quoted 4 lines
Coverity issue: 344983
Fixes 6cc54096520d ("crypto/octeontx: add supported sessions")
Quoted 24 lines
Signed-off-by Kevin Traynor <[email protected]>---
There may be further rework needed to set it to the correct value, but for now at least prevent the NULL dereference.
--- drivers/common/cpt/cpt_ucode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/common/cpt/cpt_ucode.h +2
-2@@ -311,5 +311,6 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, fc_success: - *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); +if (ctrl_flags !=NULL ) + *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); success: --
Quoted 2 lines
2.21.0
Signature · 1 line
David Marchand
v2 cover Coverity fixes and other cleanups
In reply to Kevin TraynorPatches 1-4 are Coverity fixes.
Patches 5-8 are removing commented out code.
v2:
- 1/8: removed added NULL check for devargs_all
- 2/8: fixed headline to common/cpt
- v1 3/9 'net/bnxt: remove logically dead code'
removed as duplicate patch already applied
Kevin Traynor (8):
net/pcap: fix argument checks
common/cpt: fix possible NULL deference
net/ipn3ke: fix incorrect commit check logic
net/ipn3ke: remove useless if statement
net/ipn3ke: remove commented out code
compress/octeontx: remove commented out code
event/opdl: remove commented out code
net/bnxt: remove commented out code
drivers/common/cpt/cpt_ucode.h | 3 ++- drivers/compress/octeontx/include/zip_regs.h | 8 -------- drivers/event/opdl/opdl_test.c | 3 --- drivers/net/bnxt/bnxt_ethdev.c | 3 --- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 7 ------- drivers/net/pcap/rte_eth_pcap.c | 6 ------ 8 files changed, 3 insertions(+), 37 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/8 net/pcap: fix argument checks
Previously rx/tx_queues were passed into eth_from_pcaps_common() as ptrs and were checked for being NULL.
In commit da6ba28f0540 ("net/pcap: use a struct to pass user options") that changed to pass in a ptr to a pmd_devargs_all which contains the rx/tx_queues.
The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced.
In fact as they are a members of the devargs_all struct, they will not be NULL so remove those checks.
1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue;
deref_ptr: Directly dereferencing pointer tx_queues.
1234 const unsigned int nb_tx_queues = tx_queues->num_of_queue;
1235 unsigned int i;
1236
1237 /* do some parameter checking */
CID 345004: Dereference before null check (REVERSE_INULL) [select issue]
1238 if (rx_queues == NULL && nb_rx_queues > 0)
1239 return -1;
CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking tx_queues suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
1240 if (tx_queues == NULL && nb_tx_queues > 0)
1241 return -1;
Coverity issue: 345029
Coverity issue: 345044
--- drivers/net/pcap/rte_eth_pcap.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/pcap/rte_eth_pcap.c +0 -6
@@ -1241,10 +1241,4 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev,unsigned int i; -/* do some parameter checking */ -if (rx_queues ==NULL && nb_rx_queues >0 ) -return -1 ; -if (tx_queues ==NULL && nb_tx_queues >0 ) -return -1 ; -if (pmd_init_internals (vdev, nb_rx_queues, nb_tx_queues, internals, eth_dev) <0 )
Signature · 1 line
2.21.0
PATCH v2 2/8 common/cpt: fix possible NULL deference
In reply to Kevin TraynorCoverity complains that ctrl_flags is set to NULL at the start of the function and it may not have been set before there is a jump to fc_success and it is dereferenced.
Check for NULL before dereference.
312fc_success:
CID 344983 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)7. var_deref_op: Dereferencing null pointer ctrl_flags.
313 *ctrl_flags = rte_cpu_to_be_64(*ctrl_flags);
Coverity issue: 344983
---
There may be further rework needed to set it to the correct value, but for now at least prevent the NULL dereference.
--- drivers/common/cpt/cpt_ucode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/common/cpt/cpt_ucode.h +2 -1
@@ -311,5 +311,6 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, fc_success: - *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); +if (ctrl_flags !=NULL ) + *ctrl_flags =rte_cpu_to_be_64 (*ctrl_flags); success:
Signature · 1 line
2.21.0
PATCH v2 3/8 net/ipn3ke: fix incorrect commit check logic
In reply to Kevin TraynorCoverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether n->level != IPN3KE_TM_NODE_LEVEL_COS || n->n_children != 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level != IPN3KE_TM_NODE_LEVEL_COS ||
1507 n->n_children != 0) {
1508 return -rte_tm_error_set(error,
1509 EINVAL,
1510 RTE_TM_ERROR_TYPE_UNSPECIFIED,
1511 NULL,
1512 rte_strerror(EINVAL));
else_branch: The else branch, identical to the then branch.
1513 } else {
1514 return -rte_tm_error_set(error,
1515 EINVAL,
1516 RTE_TM_ERROR_TYPE_UNSPECIFIED,
1517 NULL,
1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ipn3ke/ipn3ke_tm.c +0 -6
@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , -RTE_TM_ERROR_TYPE_UNSPECIFIED , -NULL , -rte_strerror (EINVAL )); } }
Signature · 1 line
2.21.0
Re: [dpdk-dev] [v2 PATCH 3/8] net/ipn3ke: fix incorrect commit check logic
Hi,
Quoted 62 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Thursday, November 07, 2019 3:02
To: [email protected]
Cc: [email protected]; Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [v2 PATCH 3/8] net/ipn3ke: fix incorrect commit check logicCoverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch.
CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether
n->level!=IPN3KE_TM_NODE_LEVEL_COS||n->n_children!= 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced?
1506 if (n->level!=IPN3KE_TM_NODE_LEVEL_COS||
1507n->n_children!= 0) {
1508 return -rte_tm_error_set(error,1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL));1519 }
Coverity issue: 337928
Signed-off-by Kevin Traynor <[email protected]>--- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-)(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexadf02c157..a93145d59100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-6@@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(structrte_eth_dev *dev,NULL , rte_strerror(EINVAL)); - }else { -return -rte_tm_error_set (error, -EINVAL , - RTE_TM_ERROR_TYPE_UNSPECIFIED, -NULL , -rte_strerror (EINVAL ));drivers/net/ipn3ke/ipn3ke_tm.c +0
-1} } --
Quoted 1 line
2.21.0
PATCH v2 4/8 net/ipn3ke: remove useless if statement
In reply to Kevin TraynorCoverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret = ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:
Coverity issue: 337930
--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ipn3ke/ipn3ke_ethdev.c +1 -2
@@ -738,6 +738,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist)
Signature · 1 line
2.21.0
Re: [dpdk-dev] [v2 PATCH 4/8] net/ipn3ke: remove useless if statement
Hi,
Quoted 48 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Thursday, November 07, 2019 3:02
To: [email protected]
Cc: [email protected]; Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [v2 PATCH 4/8] net/ipn3ke: remove useless if statementCoverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement.
653 ret =
ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);
CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed?
654 if (ret)
655 goto end;
implicit_else: The code from the above if-then branch is identical to the code after the if statement.
656end:Coverity issue: 337930
Signed-off-by Kevin Traynor <[email protected]>Reviewed-by David Marchand <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.c +1
-3@@ -738,6 +738,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret =ipn3ke_cfg_parse_i40e_pf_ethdev (afu_name, pf_name); -if (ret) - goto end; + end:if (kvlist) --
Quoted 1 line
2.21.0
PATCH v2 5/8 net/ipn3ke: remove commented out code
In reply to Kevin TraynorThese struct members and variable were commented out. Remove them.
--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)
drivers/net/ipn3ke/ipn3ke_ethdev.h +0 -7
@@ -97,18 +97,11 @@ struct ipn3ke_tm_node {struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };
drivers/net/ipn3ke/ipn3ke_tm.c +0 -1
@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/ uint32_t node_index;uint32_t parent_index;
Signature · 1 line
2.21.0
Re: [dpdk-dev] [v2 PATCH 5/8] net/ipn3ke: remove commented out code
Hi,
Quoted 35 lines
-----Original Message-----
From: Kevin Traynor [mailto:[email protected]]
Sent: Thursday, November 07, 2019 3:02
To: [email protected]
Cc: [email protected]; Kevin Traynor <[email protected]>; Xu, Rosen <[email protected]>; [email protected]
Subject: [v2 PATCH 5/8] net/ipn3ke: remove commented out codeThese struct members and variable were commented out. Remove them.
Fixes c01c748e4ae6 ("net/ipn3ke: add new driver")Fixes c820468ac99c ("net/ipn3ke: support TM")Signed-off-by Kevin Traynor <[email protected]>Reviewed-by David Marchand <[email protected]>--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-)drivers/net/ipn3ke/ipn3ke_ethdev.h +0
-4@@ -97,18 +97,11 @@ struct ipn3ke_tm_node { struct ipn3ke_tm_hierarchy {struct ipn3ke_tm_node *port_node; -/*struct ipn3ke_tm_node_list vt_node_list;*/ -/*struct ipn3ke_tm_node_list cos_node_list;*/ -uint32_t n_shaper_profiles; -/*uint32_t n_shared_shapers;*/
drivers/net/ipn3ke/ipn3ke_ethdev.h struct ipn3ke_tm_node { struct ipn3ke_tm_hierarchy · line 106
Quoted 10 lines
drivers/net/ipn3ke/ipn3ke_ethdev.h +0
-3uint32_t n_tdrop_profiles;uint32_t n_vt_nodes;uint32_t n_cos_nodes; -struct ipn3ke_tm_node *port_commit_node;struct ipn3ke_tm_node_list vt_commit_node_list;struct ipn3ke_tm_node_list cos_commit_node_list; - -/*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ };
No problem.
Quoted 13 lines
(quoted diff) +0
-0
b/drivers/net/ipn3ke/ipn3ke_tm.cindexa93145d59..5a16c5f96100644drivers/net/ipn3ke/ipn3ke_tm.c +0
-1@@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { -/*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/
drivers/net/ipn3ke/ipn3ke_tm.c +0
-1uint32_t node_index;uint32_t parent_index; --
Quoted 1 line
2.21.0
PATCH v2 6/8 compress/octeontx: remove commented out code
In reply to Kevin TraynorThis code is commented out. Remove it.
--- drivers/compress/octeontx/include/zip_regs.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/compress/octeontx/include/zip_regs.h +0 -8
@@ -37,5 +37,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_ena_s cn; */ } zip_vqx_ena_t;
@@ -65,5 +64,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_vqx_sbuf_addr_s cn; */ } zip_vqx_sbuf_addr_t;
@@ -85,5 +83,4 @@ typedef union {#endif /* Word 0 - End */ } s; -/* struct zip_quex_doorbell_s cn; */ } zip_quex_doorbell_t;
@@ -105,5 +102,4 @@ union zip_nptr_s {#endif /* Word 0 - End */ } s; -/* struct zip_nptr_s_s cn83xx; */ };
@@ -198,5 +194,4 @@ union zip_inst_s {/** Beginning of file */ uint64_t bf : 1; -// uint64_t reserved_3_4 : 2; /** Comp/decomp operation */ uint64_t op : 2;
@@ -211,5 +206,4 @@ union zip_inst_s { uint64_t dg : 1; uint64_t ds : 1; -//uint64_t reserved_3_4 : 2; uint64_t op : 2; uint64_t bf : 1;
@@ -616,6 +610,4 @@ union zip_zres_s {#endif /* Word 7 - End */ }/** ZIP Result Structure */ s; - -/* struct zip_zres_s_s cn83xx; */ };
Signature · 1 line
2.21.0
PATCH v2 7/8 event/opdl: remove commented out code
In reply to Kevin TraynorSome variables are commented out. Remove them.
--- drivers/event/opdl/opdl_test.c | 3 --- 1 file changed, 3 deletions(-)
drivers/event/opdl/opdl_test.c +0 -3
@@ -696,7 +696,4 @@ static int single_link(struct test *t) { -/* const uint8_t rx_port = 0; */ -/* const uint8_t w1_port = 1; */ -/* const uint8_t w3_port = 3; */ const uint8_t tx_port =2 ;int err;
Signature · 1 line
2.21.0
PATCH v2 8/8 net/bnxt: remove commented out code
In reply to Kevin TraynorThis commented out todo and code is old. Remove it.
--- drivers/net/bnxt/bnxt_ethdev.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +0 -3
@@ -2617,7 +2617,4 @@ parse_ntuple_filter(struct bnxt *bp, } -//TODO Priority -//nfilter->priority = (uint8_t)filter->priority; - bfilter->enables = en;return 0 ;
Signature · 1 line
2.21.0
David Marchand
AppliedQuoted 10 lines · Kevin Traynor
Patches 1-4 are Coverity fixes.
Patches 5-8 are removing commented out code.v2:
- 1/8: removed added NULL check fordevargs_all
- 2/8: fixed headline to common/cpt
- v1 3/9 'net/bnxt: remove logically dead code'
removed as duplicate patch already applied
Quoted 9 lines
Kevin Traynor (8):
net/pcap: fix argument checks
common/cpt: fix possible NULL deference
net/ipn3ke: fix incorrect commit check logic
net/ipn3ke: remove useless if statement
net/ipn3ke: remove commented out code
compress/octeontx: remove commented out code
event/opdl: remove commented out code
net/bnxt: remove commented out code
Dropped patch 3 since I did not see a review on it, and I was not feeling comfortable with it.
Applied, thanks.
--
David Marchand
Hi David,
Too busy today, sorry for late reply.
Quoted 38 lines
-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Friday, November 08, 2019 22:08
To: Kevin Traynor <[email protected]>
Cc: dev <[email protected]>; Xu, Rosen <[email protected]>; Ye, Xiaolong <[email protected]>
Subject: Re: [v2 PATCH 0/8] Coverity fixes and other cleanupsQuoted 10 lines · Kevin Traynor
Patches 1-4 are Coverity fixes.
Patches 5-8 are removing commented out code.v2:
- 1/8: removed added NULL check fordevargs_all
- 2/8: fixed headline to common/cpt
- v1 3/9 'net/bnxt: remove logically dead code'
removed as duplicate patch already appliedQuoted 9 lines
Kevin Traynor (8):
net/pcap: fix argument checks
common/cpt: fix possible NULL deference
net/ipn3ke: fix incorrect commit check logic
net/ipn3ke: remove useless if statement
net/ipn3ke: remove commented out code
compress/octeontx: remove commented out code
event/opdl: remove commented out code
net/bnxt: remove commented out codeDropped patch 3 since I did not see a review on it, and I was not feeling comfortable with it.
Applied, thanks.
--
David Marchand
Quoted 4 lines · Rosen
Hi David,
Too busy today, sorry for late reply.
Ok, no problem, I had not pushed yet.
So I put the patch 3 back in my tree with your Review tokens added where applicable, and pushed the full series.
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Kevin Traynor (8):
net/pcap: fix argument checks
common/cpt: fix possible NULL deference
net/ipn3ke: fix incorrect commit check logic
net/ipn3ke: remove useless if statement
net/ipn3ke: remove commented out code
compress/octeontx: remove commented out code
event/opdl: remove commented out code
net/bnxt: remove commented out code
Quoted 4 lines
Quoted 4 lines
Dropped patch 3 since I did not see a review on it, and I was not feeling comfortable with it.
Applied, thanks.
--
David Marchand