net/ice/base: add profile validation on switch filter

Profile type was determined without validation when getting
switch field vector bitmap. It caused error when associating
profile id with given recipe if no lookup elements were given.
Add profile validation to check if the profile is existing
before getting bitmap.

Fixes: 55744222e6e2 ("net/ice/base: associate recipes by profile type")
Cc: stable@dpdk.org
Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 395787806baa0b47ff21ede45d8aea89aa0118f2..f6a29f87c5e3e791eb06bf1d6b913909a995142a 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -1785,8 +1785,12 @@ static enum ice_prof_type
 ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
 {
        u16 i;
+       bool valid_prof = false;
 
        for (i = 0; i < hw->blk[ICE_BLK_SW].es.fvw; i++) {
+               if (fv->ew[i].off != ICE_NAN_OFFSET)
+                       valid_prof = true;
+
                /* UDP tunnel will have UDP_OF protocol ID and VNI offset */
                if (fv->ew[i].prot_id == (u8)ICE_PROT_UDP_OF &&
                    fv->ew[i].off == ICE_VNI_OFFSET)
@@ -1801,7 +1805,7 @@ ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
                        return ICE_PROF_TUN_PPPOE;
        }
 
-       return ICE_PROF_NON_TUN;
+       return valid_prof ? ICE_PROF_NON_TUN : ICE_PROF_INVALID;
 }
 
 /**
@@ -1818,11 +1822,6 @@ ice_get_sw_fv_bitmap(struct ice_hw *hw, enum ice_prof_type req_profs,
        struct ice_seg *ice_seg;
        struct ice_fv *fv;
 
-       if (req_profs == ICE_PROF_ALL) {
-               ice_bitmap_set(bm, 0, ICE_MAX_NUM_PROFILES);
-               return;
-       }
-
        ice_memset(&state, 0, sizeof(state), ICE_NONDMA_MEM);
        ice_zero_bitmap(bm, ICE_MAX_NUM_PROFILES);
        ice_seg = hw->seg;

diff --git a/drivers/net/ice/base/ice_flex_type.h b/drivers/net/ice/base/ice_flex_type.h
index 59eeca0a3077cae8427668c3a0da46718827f427..09a02fe9ac94334832774e3f061f9be2782e8c57 100644 (file)
--- a/drivers/net/ice/base/ice_flex_type.h
+++ b/drivers/net/ice/base/ice_flex_type.h
@@ -1003,6 +1003,7 @@ struct ice_chs_chg {
 #define ICE_FLOW_PTYPE_MAX             ICE_XLT1_CNT
 
 enum ice_prof_type {
+       ICE_PROF_INVALID = 0x0,
        ICE_PROF_NON_TUN = 0x1,
        ICE_PROF_TUN_UDP = 0x2,
        ICE_PROF_TUN_GRE = 0x4,

diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index cef8354f77afacd4cdd656cb96b12e9ed39e5107..0e6e5990beba4aea4b0885a6c711b91af89893d3 100644 (file)
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -191,6 +191,7 @@ enum ice_prot_id {
 
 #define ICE_VNI_OFFSET         12 /* offset of VNI from ICE_PROT_UDP_OF */
 
+#define ICE_NAN_OFFSET         511
 #define ICE_MAC_OFOS_HW                1
 #define ICE_MAC_IL_HW          4
 #define ICE_ETYPE_OL_HW                9

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 1fee790c25b70e8ee795cb6f6921be03259f4d29..d4cc664ad7a87ecf508f1711654baeefc662c20f 100644 (file)
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -7779,6 +7779,7 @@ ice_get_compat_fv_bitmap(struct ice_hw *hw, struct ice_adv_rule_info *rinfo,
 bool ice_is_prof_rule(enum ice_sw_tunnel_type type)
 {
        switch (type) {
+       case ICE_SW_TUN_AND_NON_TUN:
        case ICE_SW_TUN_PROFID_IPV6_ESP:
        case ICE_SW_TUN_PROFID_IPV6_AH:
        case ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3: