Skip to contentSkip to conversation

net/ice: fix FDIR flag issue

PATCH Superseded Beilei Xing 3 participants 4 messages Jan 20, 2020 – Jan 22, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ice: fix FDIR flag issue

If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf.

Fixes f5cafa961fae ("net/ice: add flow director create and destroy")
Fixes bd984f155f49 ("net/ice/base: support FDIR")
---
 drivers/net/ice/base/ice_fdir.c      | 2 +-
 drivers/net/ice/base/ice_fdir.h      | 1 +
 drivers/net/ice/base/ice_lan_tx_rx.h | 1 +
 drivers/net/ice/ice_fdir_filter.c    | 4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_fdir.c +1 -1
index 87fa0af..20d64f8 100644
@@ -418,7 +418,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;
 	fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;
 	fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;
-	fdir_fltr_ctx.fdid_prio = 3;
+	fdir_fltr_ctx.fdid_prio = input->fdid_prio;
 	fdir_fltr_ctx.desc_prof = 1;
 	fdir_fltr_ctx.desc_prof_prio = 3;
 	ice_set_fd_desc_val(&fdir_fltr_ctx, fdesc);
drivers/net/ice/base/ice_fdir.h +1 -0
index db1f835..c811f76 100644
@@ -202,6 +202,7 @@ struct ice_fdir_fltr {
 	u8 cnt_ena;
 	u8 fltr_status;
 	u16 cnt_index;
+	u8 fdid_prio;
 	u32 fltr_id;
 };
 
drivers/net/ice/base/ice_lan_tx_rx.h +1 -0
index a97c63c..d6f66cf 100644
@@ -162,6 +162,7 @@ struct ice_fltr_desc {
 
 #define ICE_FXD_FLTR_QW1_FDID_PRI_S	25
 #define ICE_FXD_FLTR_QW1_FDID_PRI_M	(0x7ULL << ICE_FXD_FLTR_QW1_FDID_PRI_S)
+#define ICE_FXD_FLTR_QW1_FDID_PRI_ZERO	0x0ULL
 #define ICE_FXD_FLTR_QW1_FDID_PRI_ONE	0x1ULL
 
 #define ICE_FXD_FLTR_QW1_FDID_MDID_S	28
drivers/net/ice/ice_fdir_filter.c +4 -0
index fa87074..8359a8c 100644
@@ -1534,6 +1534,10 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 			   RTE_FLOW_ERROR_TYPE_ACTION, actions,
 			   "Too many mark actions");
 		return -rte_errno;
+	} else if (mark_num == 0) {
+		filter->input.fdid_prio = ICE_FXD_FLTR_QW1_FDID_PRI_ZERO;
+	} else {
+		filter->input.fdid_prio = ICE_FXD_FLTR_QW1_FDID_PRI_ONE;
 	}
 
 	if (counter_num >= 2) {
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, January 20, 2020 8:19 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Cao, Yahui <[email protected]>
Cc: [email protected]
Subject: [PATCH] net/ice: fix FDIR flag issue

Quoted 8 lines

If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf.

Fixes f5cafa961fae ("net/ice: add flow director create and destroy")
Fixes bd984f155f49 ("net/ice/base: support FDIR")
#2 lore raw

PATCH v2 1/1 net/ice: fix FDIR flag issue

In reply to Beilei Xing

If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf.

Fixes f5cafa961fae ("net/ice: add flow director create and destroy")
Fixes bd984f155f49 ("net/ice/base: support FDIR")

---

V2 change:
- Code refine.

 drivers/net/ice/base/ice_fdir.c   | 2 +-
 drivers/net/ice/base/ice_fdir.h   | 1 +
 drivers/net/ice/ice_fdir_filter.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_fdir.c +1 -1
index 87fa0af..20d64f8 100644
@@ -418,7 +418,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;
 	fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;
 	fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;
-	fdir_fltr_ctx.fdid_prio = 3;
+	fdir_fltr_ctx.fdid_prio = input->fdid_prio;
 	fdir_fltr_ctx.desc_prof = 1;
 	fdir_fltr_ctx.desc_prof_prio = 3;
 	ice_set_fd_desc_val(&fdir_fltr_ctx, fdesc);
drivers/net/ice/base/ice_fdir.h +1 -0
index db1f835..c811f76 100644
@@ -202,6 +202,7 @@ struct ice_fdir_fltr {
 	u8 cnt_ena;
 	u8 fltr_status;
 	u16 cnt_index;
+	u8 fdid_prio;
 	u32 fltr_id;
 };
 
drivers/net/ice/ice_fdir_filter.c +1 -0
index fa87074..42b9628 100644
@@ -1504,6 +1504,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 
 			mark_spec = actions->conf;
 			filter->input.fltr_id = mark_spec->id;
+			filter->input.fdid_prio = ICE_FXD_FLTR_QW1_FDID_PRI_ONE;
 			break;
 		case RTE_FLOW_ACTION_TYPE_COUNT:
 			counter_num++;
Signature · 1 line
2.7.4
Applied
#3 lore raw
Quoted 59 lines · Beilei Xing

If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf.

Fixes f5cafa961fae ("net/ice: add flow director create and destroy")
Fixes bd984f155f49 ("net/ice/base: support FDIR")

---

V2 change:
- Code refine.

drivers/net/ice/base/ice_fdir.c   | 2 +-
drivers/net/ice/base/ice_fdir.h   | 1 +
drivers/net/ice/ice_fdir_filter.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_fdir.c +1 -1
index 87fa0af..20d64f8 100644
@@ -418,7 +418,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;
 	fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;
 	fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;
-	fdir_fltr_ctx.fdid_prio = 3;
+	fdir_fltr_ctx.fdid_prio = input->fdid_prio;
 	fdir_fltr_ctx.desc_prof = 1;
 	fdir_fltr_ctx.desc_prof_prio = 3;
 	ice_set_fd_desc_val(&fdir_fltr_ctx, fdesc);
drivers/net/ice/base/ice_fdir.h +1 -0
index db1f835..c811f76 100644
@@ -202,6 +202,7 @@ struct ice_fdir_fltr {
 	u8 cnt_ena;
 	u8 fltr_status;
 	u16 cnt_index;
+	u8 fdid_prio;
 	u32 fltr_id;
 };
 
drivers/net/ice/ice_fdir_filter.c +1 -0
index fa87074..42b9628 100644
@@ -1504,6 +1504,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 
 			mark_spec = actions->conf;
 			filter->input.fltr_id = mark_spec->id;
+			filter->input.fdid_prio = ICE_FXD_FLTR_QW1_FDID_PRI_ONE;
 			break;
 		case RTE_FLOW_ACTION_TYPE_COUNT:
 			counter_num++;
Signature · 1 line
2.7.4

Applied to dpdk-next-net-intel, Thanks.