Re: [PATCH 2/2] net/nfp: remove useless range checks

[Kevin Traynor]

On 05/01/2022 10:32, Maxime Gouin wrote:

reported by code analysis tool C++test (version 10.4):

/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.

Fixes: c7e9729da6b5 ("net/nfp: support CPP")

Cc: sta...@dpdk.org

Signed-off-by: Maxime Gouin <maxime.go...@6wind.com>
Reviewed-by: Olivier Matz <olivier.m...@6wind.com>
---

Acked-by: Kevin Traynor <ktray...@redhat.com>

  drivers/net/nfp/nfpcore/nfp_target.h | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/nfp/nfpcore/nfp_target.h 
b/drivers/net/nfp/nfpcore/nfp_target.h
index 2884a0034f44..e8dcc9ad1eda 100644
--- a/drivers/net/nfp/nfpcore/nfp_target.h
+++ b/drivers/net/nfp/nfpcore/nfp_target.h
@@ -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) {