* [PATCH v1] net/ice/base: support source interface FLG of switch filter
@ 2022-05-11 9:02 Yuying Zhang
2022-05-12 7:42 ` [PATCH v2] net/ice/base: fix direction match of flow that matches any Yuying Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Yuying Zhang @ 2022-05-11 9:02 UTC (permalink / raw)
To: dev, qi.z.zhang, qiming.yang; +Cc: Yuying Zhang
The tx/rx packets are dropped when creating drop any rule
since the recipe doesn't contain direction flag matching.
This patch enables the packet flag which represents
the direction of source interface to slove the issue.
Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
---
drivers/net/ice/base/ice_protocol_type.h | 8 ++++++--
drivers/net/ice/base/ice_switch.c | 19 +++++++++++++++++--
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index 0e6e5990be..32273ec87b 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -54,6 +54,7 @@ enum ice_protocol_type {
ICE_GTP_NO_PAY,
ICE_VLAN_EX,
ICE_VLAN_IN,
+ ICE_FLG,
ICE_PROTOCOL_LAST
};
@@ -218,9 +219,12 @@ enum ice_prot_id {
#define ICE_META_DATA_ID_HW 255 /* this is used for tunnel type */
#define ICE_MDID_SIZE 2
-#define ICE_TUN_FLAG_MDID 21
-#define ICE_TUN_FLAG_MDID_OFF (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID)
+#define ICE_TUN_FLAG_MDID1 20
+#define ICE_TUN_FLAG_MDID2 21
+#define ICE_TUN_FLAG_MDID_OFF1 (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID1)
+#define ICE_TUN_FLAG_MDID_OFF2 (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID2)
#define ICE_TUN_FLAG_MASK 0xFF
+#define ICE_DIR_FLAG_MASK 0x10
#define ICE_TUN_FLAG_VLAN_MASK 0x01
#define ICE_TUN_FLAG_FV_IND 2
diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index d4cc664ad7..afd26eff7e 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -2303,7 +2303,7 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid,
lkup_exts->field_mask[fv_word_idx] =
rg_entry->fv_mask[i];
if (prot == ICE_META_DATA_ID_HW &&
- off == ICE_TUN_FLAG_MDID_OFF)
+ off == ICE_TUN_FLAG_MDID_OFF2)
vlan = true;
fv_word_idx++;
}
@@ -6770,6 +6770,7 @@ static struct ice_protocol_entry ice_prot_id_tbl[ICE_PROTOCOL_LAST] = {
{ ICE_GTP_NO_PAY, ICE_UDP_ILOS_HW },
{ ICE_VLAN_EX, ICE_VLAN_OF_HW },
{ ICE_VLAN_IN, ICE_VLAN_OL_HW },
+ { ICE_FLG, ICE_META_DATA_ID_HW},
};
/**
@@ -7508,6 +7509,10 @@ static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *mask)
*mask = ICE_TUN_FLAG_MASK;
return true;
+ case ICE_SW_TUN_AND_NON_TUN:
+ *mask = ICE_DIR_FLAG_MASK;
+ return true;
+
case ICE_SW_TUN_GENEVE_VLAN:
case ICE_SW_TUN_VXLAN_VLAN:
*mask = ICE_TUN_FLAG_MASK & ~ICE_TUN_FLAG_VLAN_MASK;
@@ -7538,7 +7543,10 @@ ice_add_special_words(struct ice_adv_rule_info *rinfo,
u8 word = lkup_exts->n_val_words++;
lkup_exts->fv_words[word].prot_id = ICE_META_DATA_ID_HW;
- lkup_exts->fv_words[word].off = ICE_TUN_FLAG_MDID_OFF;
+ if (rinfo->tun_type == ICE_SW_TUN_AND_NON_TUN)
+ lkup_exts->fv_words[word].off = ICE_TUN_FLAG_MDID_OFF1;
+ else
+ lkup_exts->fv_words[word].off = ICE_TUN_FLAG_MDID_OFF2;
lkup_exts->field_mask[word] = mask;
} else {
return ICE_ERR_MAX_LIMIT;
@@ -7864,6 +7872,11 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
*/
ice_get_compat_fv_bitmap(hw, rinfo, fv_bitmap);
+ if (rinfo->tun_type == ICE_SW_TUN_AND_NON_TUN) {
+ lkups[lkups_cnt].type = ICE_FLG;
+ lkups_cnt++;
+ }
+
status = ice_get_fv(hw, lkups, lkups_cnt, fv_bitmap, &rm->fv_list);
if (status)
goto err_unroll;
@@ -7888,6 +7901,7 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
/* Find offsets from the field vector. Pick the first one for all the
* recipes.
*/
+
status = ice_fill_fv_word_index(hw, &rm->fv_list, &rm->rg_list);
if (status)
goto err_unroll;
@@ -8987,6 +9001,7 @@ ice_add_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
NULL);
if (status)
goto err_ice_add_adv_rule;
+
adv_fltr = (struct ice_adv_fltr_mgmt_list_entry *)
ice_malloc(hw, sizeof(struct ice_adv_fltr_mgmt_list_entry));
if (!adv_fltr) {
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] net/ice/base: fix direction match of flow that matches any
2022-05-11 9:02 [PATCH v1] net/ice/base: support source interface FLG of switch filter Yuying Zhang
@ 2022-05-12 7:42 ` Yuying Zhang
2022-05-17 7:46 ` Zhang, Qi Z
0 siblings, 1 reply; 3+ messages in thread
From: Yuying Zhang @ 2022-05-12 7:42 UTC (permalink / raw)
To: dev, qi.z.zhang, qiming.yang; +Cc: Yuying Zhang, stable
The tx/rx packets were dropped when creating drop any rule
since the recipe didn't contain direction flag matching.
This patch adds the packet flag which represents
the direction of source interface to slove the issue.
Fixes: 92317961a731 ("net/ice: support drop any and steer all to queue")
Cc: stable@dpdk.org
Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
---
drivers/net/ice/base/ice_protocol_type.h | 6 +++--
drivers/net/ice/base/ice_switch.c | 31 ++++++++++++++++++++----
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index 83867418c6..8fb95a8a8d 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -54,6 +54,7 @@ enum ice_protocol_type {
ICE_GTP_NO_PAY,
ICE_VLAN_EX,
ICE_VLAN_IN,
+ ICE_FLG_DIR,
ICE_PROTOCOL_LAST
};
@@ -219,9 +220,10 @@ enum ice_prot_id {
#define ICE_META_DATA_ID_HW 255 /* this is used for tunnel type */
#define ICE_MDID_SIZE 2
-#define ICE_TUN_FLAG_MDID 21
-#define ICE_TUN_FLAG_MDID_OFF (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID)
+#define ICE_TUN_FLAG_MDID 20
+#define ICE_TUN_FLAG_MDID_OFF(word) (ICE_MDID_SIZE * (ICE_TUN_FLAG_MDID + (word)))
#define ICE_TUN_FLAG_MASK 0xFF
+#define ICE_DIR_FLAG_MASK 0x10
#define ICE_TUN_FLAG_VLAN_MASK 0x01
#define ICE_TUN_FLAG_FV_IND 2
diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index d4cc664ad7..c0df3a1815 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -2303,7 +2303,7 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid,
lkup_exts->field_mask[fv_word_idx] =
rg_entry->fv_mask[i];
if (prot == ICE_META_DATA_ID_HW &&
- off == ICE_TUN_FLAG_MDID_OFF)
+ off == ICE_TUN_FLAG_MDID_OFF(1))
vlan = true;
fv_word_idx++;
}
@@ -6770,6 +6770,7 @@ static struct ice_protocol_entry ice_prot_id_tbl[ICE_PROTOCOL_LAST] = {
{ ICE_GTP_NO_PAY, ICE_UDP_ILOS_HW },
{ ICE_VLAN_EX, ICE_VLAN_OF_HW },
{ ICE_VLAN_IN, ICE_VLAN_OL_HW },
+ { ICE_FLG_DIR, ICE_META_DATA_ID_HW},
};
/**
@@ -7488,9 +7489,10 @@ ice_get_fv(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,
/**
* ice_tun_type_match_word - determine if tun type needs a match mask
* @tun_type: tunnel type
+ * @off: offset of packet flag
* @mask: mask to be used for the tunnel
*/
-static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *mask)
+static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *off, u16 *mask)
{
switch (tun_type) {
case ICE_SW_TUN_VXLAN_GPE:
@@ -7506,15 +7508,23 @@ static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *mask)
case ICE_SW_TUN_PPPOE_IPV4_QINQ:
case ICE_SW_TUN_PPPOE_IPV6_QINQ:
*mask = ICE_TUN_FLAG_MASK;
+ *off = ICE_TUN_FLAG_MDID_OFF(1);
+ return true;
+
+ case ICE_SW_TUN_AND_NON_TUN:
+ *mask = ICE_DIR_FLAG_MASK;
+ *off = ICE_TUN_FLAG_MDID_OFF(0);
return true;
case ICE_SW_TUN_GENEVE_VLAN:
case ICE_SW_TUN_VXLAN_VLAN:
*mask = ICE_TUN_FLAG_MASK & ~ICE_TUN_FLAG_VLAN_MASK;
+ *off = ICE_TUN_FLAG_MDID_OFF(1);
return true;
default:
*mask = 0;
+ *off = 0;
return false;
}
}
@@ -7529,16 +7539,18 @@ ice_add_special_words(struct ice_adv_rule_info *rinfo,
struct ice_prot_lkup_ext *lkup_exts)
{
u16 mask;
+ u16 off;
/* If this is a tunneled packet, then add recipe index to match the
- * tunnel bit in the packet metadata flags.
+ * tunnel bit in the packet metadata flags. If this is a tun_and_non_tun
+ * packet, then add recipe index to match the direction bit in the flag.
*/
- if (ice_tun_type_match_word(rinfo->tun_type, &mask)) {
+ if (ice_tun_type_match_word(rinfo->tun_type, &off, &mask)) {
if (lkup_exts->n_val_words < ICE_MAX_CHAIN_WORDS) {
u8 word = lkup_exts->n_val_words++;
lkup_exts->fv_words[word].prot_id = ICE_META_DATA_ID_HW;
- lkup_exts->fv_words[word].off = ICE_TUN_FLAG_MDID_OFF;
+ lkup_exts->fv_words[word].off = off;
lkup_exts->field_mask[word] = mask;
} else {
return ICE_ERR_MAX_LIMIT;
@@ -7864,6 +7876,15 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
*/
ice_get_compat_fv_bitmap(hw, rinfo, fv_bitmap);
+ /* If it is a packet to match any, add a lookup element to match direction
+ * flag of source interface.
+ */
+ if (rinfo->tun_type == ICE_SW_TUN_AND_NON_TUN &&
+ lkups_cnt < ICE_MAX_CHAIN_WORDS) {
+ lkups[lkups_cnt].type = ICE_FLG_DIR;
+ lkups_cnt++;
+ }
+
status = ice_get_fv(hw, lkups, lkups_cnt, fv_bitmap, &rm->fv_list);
if (status)
goto err_unroll;
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v2] net/ice/base: fix direction match of flow that matches any
2022-05-12 7:42 ` [PATCH v2] net/ice/base: fix direction match of flow that matches any Yuying Zhang
@ 2022-05-17 7:46 ` Zhang, Qi Z
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Qi Z @ 2022-05-17 7:46 UTC (permalink / raw)
To: Zhang, Yuying, dev, Yang, Qiming; +Cc: stable
> -----Original Message-----
> From: Zhang, Yuying <yuying.zhang@intel.com>
> Sent: Thursday, May 12, 2022 3:42 PM
> To: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: Zhang, Yuying <yuying.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] net/ice/base: fix direction match of flow that matches any
>
> The tx/rx packets were dropped when creating drop any rule since the recipe
> didn't contain direction flag matching.
Slightly reword above line for easy understanding
The tx/rx packets were both dropped when creating drop any rule
for ingress direction only, the root cause is the recipe didn't
contain direction flag matching.
> This patch adds the packet flag which represents the direction of source
> interface to slove the issue.
>
> Fixes: 92317961a731 ("net/ice: support drop any and steer all to queue")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-17 7:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11 9:02 [PATCH v1] net/ice/base: support source interface FLG of switch filter Yuying Zhang
2022-05-12 7:42 ` [PATCH v2] net/ice/base: fix direction match of flow that matches any Yuying Zhang
2022-05-17 7:46 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).