net/nfp: remove duplicated check when setting MAC address
PATCH 1/2 net/nfp: remove duplicated check when setting MAC address
reported by code analysis tool C++test (version 10.4):
Quoted 2 lines
/build/dpdk-20.11/drivers/net/nfp/nfp_net.c
546 Conditions "(hw->ctrl&NFP_NET_CFG_CTRL_ENABLE) &&
!! (hw->cap &NFP_NET_CFG_C" is always evaluated to false
Quoted 1 line
547 Condition "! (
hw->cap&NFP_NET_CFG_C" is always evaluated to false
The previous "if" checks exactly the same condition. Removal of duplicate code.
--- drivers/net/nfp/nfp_common.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/nfp/nfp_common.c +0 -4
@@ -280,10 +280,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)return -EBUSY ; } -if ((hw->ctrl &NFP_NET_CFG_CTRL_ENABLE ) && - !(hw->cap &NFP_NET_CFG_CTRL_LIVE_ADDR )) -return -EBUSY ; -/* Writing new MAC to the specific port BAR address */ nfp_net_write_mac (hw, (uint8_t *)mac_addr);
Signature · 1 line
2.30.2
PATCH 2/2 net/nfp: remove useless range checks
reported by code analysis tool C++test (version 10.4):
Quoted 4 lines
/build/dpdk-20.11/drivers/net/nfp/nfpcore/nfp_target.h
375 Condition "island < 1" is always evaluated to false 415 Condition "island < 1" is always evaluated to false 547 Condition "target < 0" is always evaluated to false
All of these conditions have the same error. They call NFP_CPP_ID_ISLAND_of or NFP_CPP_ID_TARGET_of which return a uint8_t and put the result in "island" or "target" which are integers. These variables can only contain values between 0 and 255.
--- drivers/net/nfp/nfpcore/nfp_target.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/net/nfp/nfpcore/nfp_target.h +13 -13
@@ -37,7 +37,7 @@ pushpull_width(int pp)static inline int target_rw (uint32_t cpp_id,int pp,int start,int len) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island < start || island > (start + len)))return NFP_ERRNO (EINVAL );
@@ -117,7 +117,7 @@ nfp6000_nbi_ppc(uint32_t cpp_id)static inline int nfp6000_nbi (uint32_t cpp_id,uint64_t address) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);uint64_t rel_addr = address &0x3fFFFF ;if (island && (island <8 || island >9 ))
@@ -281,7 +281,7 @@ static inline int nfp6000_mu(uint32_t cpp_id, uint64_t address) { int pp; -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island ==0 ) {if (address <0x2000000000ULL )
@@ -316,7 +316,7 @@ nfp6000_mu(uint32_t cpp_id, uint64_t address)static inline int nfp6000_ila (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <48 || island >51 ))return NFP_ERRNO (EINVAL );
@@ -336,7 +336,7 @@ nfp6000_ila(uint32_t cpp_id)static inline int nfp6000_pci (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <4 || island >7 ))return NFP_ERRNO (EINVAL );
@@ -354,7 +354,7 @@ nfp6000_pci(uint32_t cpp_id)static inline int nfp6000_crypto (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <12 || island >15 ))return NFP_ERRNO (EINVAL );
@@ -370,9 +370,9 @@ nfp6000_crypto(uint32_t cpp_id)static inline int nfp6000_cap_xpb (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id); -if (island && (island <1 || island >63 )) +if (island >63 )return NFP_ERRNO (EINVAL );switch (cpp_id &NFP_CPP_ID (0 , ~0 , ~0 )) {
@@ -410,9 +410,9 @@ nfp6000_cap_xpb(uint32_t cpp_id)static inline int nfp6000_cls (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id); -if (island && (island <1 || island >63 )) +if (island >63 )return NFP_ERRNO (EINVAL );switch (cpp_id &NFP_CPP_ID (0 , ~0 , ~0 )) {
@@ -540,11 +540,11 @@ nfp_target_cpp(uint32_t cpp_island_id, uint64_t cpp_island_address, const uint32_t *imb_table) {int err; -int island =NFP_CPP_ID_ISLAND_of (cpp_island_id); -int target =NFP_CPP_ID_TARGET_of (cpp_island_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_island_id); +uint8_t target =NFP_CPP_ID_TARGET_of (cpp_island_id);uint32_t imb; -if (target <0 || target >=16 ) +if (target >=16 )return NFP_ERRNO (EINVAL );if (island ==0 ) {
Signature · 1 line
2.30.2
Re: [PATCH 2/2] net/nfp: remove useless range checks
Quoted 7 lines · Maxime Gouin
reported by code analysis tool C++test (version 10.4):
Quoted 4 lines
/build/dpdk-20.11/drivers/net/nfp/nfpcore/nfp_target.h
375 Condition "island < 1" is always evaluated to false 415 Condition "island < 1" is always evaluated to false 547 Condition "target < 0" is always evaluated to false
Quoted 7 lines
All of these conditions have the same error. They call
NFP_CPP_ID_ISLAND_oforNFP_CPP_ID_TARGET_ofwhich return auint8_tand put the result in "island" or "target" which are integers. These variables can only contain values between 0 and 255.Fixes c7e9729da6b5 ("net/nfp: support CPP")
Quoted 3 lines
Signed-off-by Maxime Gouin <[email protected]>Reviewed-by Olivier Matz <[email protected]>---
Quoted 101 lines
drivers/net/nfp/nfpcore/nfp_target.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)drivers/net/nfp/nfpcore/nfp_target.h +13
-13@@ -37,7 +37,7 @@ pushpull_width(int pp)static inline int target_rw (uint32_t cpp_id,int pp,int start,int len) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island < start || island > (start + len)))return NFP_ERRNO (EINVAL );@@ -117,7 +117,7 @@ nfp6000_nbi_ppc(uint32_t cpp_id)static inline int nfp6000_nbi (uint32_t cpp_id,uint64_t address) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);uint64_t rel_addr = address &0x3fFFFF ;if (island && (island <8 || island >9 ))@@ -281,7 +281,7 @@ static inline int nfp6000_mu(uint32_t cpp_id, uint64_t address) { int pp; -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island ==0 ) {if (address <0x2000000000ULL )@@ -316,7 +316,7 @@ nfp6000_mu(uint32_t cpp_id, uint64_t address)static inline int nfp6000_ila (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <48 || island >51 ))return NFP_ERRNO (EINVAL );@@ -336,7 +336,7 @@ nfp6000_ila(uint32_t cpp_id)static inline int nfp6000_pci (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <4 || island >7 ))return NFP_ERRNO (EINVAL );@@ -354,7 +354,7 @@ nfp6000_pci(uint32_t cpp_id)static inline int nfp6000_crypto (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id);if (island && (island <12 || island >15 ))return NFP_ERRNO (EINVAL );@@ -370,9 +370,9 @@ nfp6000_crypto(uint32_t cpp_id)static inline int nfp6000_cap_xpb (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id); -if (island && (island <1 || island >63 )) +if (island >63 )return NFP_ERRNO (EINVAL );switch (cpp_id &NFP_CPP_ID (0 , ~0 , ~0 )) {@@ -410,9 +410,9 @@ nfp6000_cap_xpb(uint32_t cpp_id)static inline int nfp6000_cls (uint32_t cpp_id) { -int island =NFP_CPP_ID_ISLAND_of (cpp_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_id); -if (island && (island <1 || island >63 )) +if (island >63 )return NFP_ERRNO (EINVAL );switch (cpp_id &NFP_CPP_ID (0 , ~0 , ~0 )) {@@ -540,11 +540,11 @@ nfp_target_cpp(uint32_t cpp_island_id, uint64_t cpp_island_address, const uint32_t *imb_table) {int err; -int island =NFP_CPP_ID_ISLAND_of (cpp_island_id); -int target =NFP_CPP_ID_TARGET_of (cpp_island_id); +uint8_t island =NFP_CPP_ID_ISLAND_of (cpp_island_id); +uint8_t target =NFP_CPP_ID_TARGET_of (cpp_island_id);uint32_t imb; -if (target <0 || target >=16 ) +if (target >=16 )return NFP_ERRNO (EINVAL );if (island ==0 ) {
Ferruh Yigit
Reviewed-byRe: [PATCH 2/2] net/nfp: remove useless range checks
Quoted 3 lines · Kevin Traynor
Quoted 2 lines · Maxime Gouin
reported by code analysis tool C++test (version 10.4):
Hi Maxime,
Can you please give some information on this tool?
Thanks,
ferruh
Quoted 13 lines
Quoted 5 lines
Quoted 4 lines
/build/dpdk-20.11/drivers/net/nfp/nfpcore/nfp_target.h 375 Condition "island < 1" is always evaluated to false 415 Condition "island < 1" is always evaluated to false 547 Condition "target < 0" is always evaluated to false
Quoted 7 lines
All of these conditions have the same error. They call
NFP_CPP_ID_ISLAND_oforNFP_CPP_ID_TARGET_ofwhich return auint8_tand put the result in "island" or "target" which are integers. These variables can only contain values between 0 and 255.Fixes c7e9729da6b5 ("net/nfp: support CPP")
Quoted 8 lines
Quoted 3 lines
Signed-off-by Maxime Gouin <[email protected]>Reviewed-by Olivier Matz <[email protected]>---
Acked-by Kevin Traynor <[email protected]>
For series,
Series applied to dpdk-next-net/main, thanks.
Quoted 4 lines · Maxime Gouin
reported by code analysis tool C++test (version 10.4):
Quoted 2 lines
/build/dpdk-20.11/drivers/net/nfp/nfp_net.c
546 Conditions "(hw->ctrl&NFP_NET_CFG_CTRL_ENABLE) &&
Quoted 8 lines
!! (hw->cap &NFP_NET_CFG_C" is always evaluated to falseQuoted 1 line
547 Condition "! (
hw->cap&NFP_NET_CFG_C" is always evaluated to falseThe previous "if" checks exactly the same condition. Removal of duplicate code.
Fixes 2fe669f4bcd2 ("net/nfp: support MAC address change")
Quoted 2 lines
Signed-off-by Maxime Gouin <[email protected]>Reviewed-by Olivier Matz <[email protected]>
Quoted 20 lines
--- drivers/net/nfp/nfp_common.c | 4 ---- 1 file changed, 4 deletions(-)drivers/net/nfp/nfp_common.c +0
-4@@ -280,10 +280,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)return -EBUSY ; } -if ((hw->ctrl &NFP_NET_CFG_CTRL_ENABLE ) && - !(hw->cap &NFP_NET_CFG_CTRL_LIVE_ADDR )) -return -EBUSY ; -/* Writing new MAC to the specific port BAR address */ nfp_net_write_mac (hw, (uint8_t *)mac_addr);