diff mbox series

[v2] net/ice: revert mark action in switch filter

Message ID 20230625062111.139578-1-zhichaox.zeng@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/ice: revert mark action in switch filter |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-aarch-unit-testing success Testing PASS
ci/iol-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-abi-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-unit-testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS

Commit Message

Zhichao Zeng June 25, 2023, 6:21 a.m. UTC 
  For current implementation, switch filter missed the consumption part of
mark id for app, and switch filter captures the rules first instead of
FDIR, which makes the FDIR rules lost.

Revert this commit to disable mark action in switch filter and recover
the mark action hit in FDIR by default.

Fixes: e24f43f2c824 ("net/ice: support flow mark action in switch")
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
---
 drivers/net/ice/ice_switch_filter.c | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Yan, Zhirun July 3, 2023, 2:35 a.m. UTC | #1 
> -----Original Message-----
> From: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
> Sent: Sunday, June 25, 2023 2:21 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zeng, ZhichaoX
> <zhichaox.zeng@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Yan,
> Zhirun <zhirun.yan@intel.com>
> Subject: [PATCH v2] net/ice: revert mark action in switch filter
> 
> For current implementation, switch filter missed the consumption part of mark
> id for app, and switch filter captures the rules first instead of FDIR, which makes
> the FDIR rules lost.
> 
> Revert this commit to disable mark action in switch filter and recover the mark
> action hit in FDIR by default.
> 
> Fixes: e24f43f2c824 ("net/ice: support flow mark action in switch")
> Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
> ---

Acked-by: Zhirun Yan <zhirun.yan@intel.com>
Qi Zhang July 3, 2023, 2:43 a.m. UTC | #2 
> -----Original Message-----
> From: Yan, Zhirun <zhirun.yan@intel.com>
> Sent: Monday, July 3, 2023 10:35 AM
> To: Zeng, ZhichaoX <zhichaox.zeng@intel.com>; dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Subject: RE: [PATCH v2] net/ice: revert mark action in switch filter
> 
> 
> 
> > -----Original Message-----
> > From: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
> > Sent: Sunday, June 25, 2023 2:21 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zeng, ZhichaoX
> > <zhichaox.zeng@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Yan,
> > Zhirun <zhirun.yan@intel.com>
> > Subject: [PATCH v2] net/ice: revert mark action in switch filter
> >
> > For current implementation, switch filter missed the consumption part
> > of mark id for app, and switch filter captures the rules first instead
> > of FDIR, which makes the FDIR rules lost.
> >
> > Revert this commit to disable mark action in switch filter and recover
> > the mark action hit in FDIR by default.
> >
> > Fixes: e24f43f2c824 ("net/ice: support flow mark action in switch")
> > Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
> > ---
> 
> Acked-by: Zhirun Yan <zhirun.yan@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 1ff4b1afda..110d8895fe 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1715,7 +1715,6 @@  ice_switch_parse_action(struct ice_pf *pf,
 	struct rte_eth_dev_data *dev_data = pf->adapter->pf.dev_data;
 	const struct rte_flow_action_queue *act_q;
 	const struct rte_flow_action_rss *act_qgrop;
-	const struct rte_flow_action_mark *act_mark;
 	uint16_t base_queue, i;
 	const struct rte_flow_action *action;
 	enum rte_flow_action_type action_type;
@@ -1768,13 +1767,6 @@  ice_switch_parse_action(struct ice_pf *pf,
 				ICE_DROP_PACKET;
 			break;
 
-		case RTE_FLOW_ACTION_TYPE_MARK:
-			act_mark = action->conf;
-			rule_info->sw_act.fltr_act =
-				ICE_SET_MARK;
-			rule_info->sw_act.markid = act_mark->id;
-			break;
-
 		case RTE_FLOW_ACTION_TYPE_VOID:
 			break;
 
@@ -1830,7 +1822,6 @@  ice_switch_check_action(const struct rte_flow_action *actions,
 		case RTE_FLOW_ACTION_TYPE_RSS:
 		case RTE_FLOW_ACTION_TYPE_QUEUE:
 		case RTE_FLOW_ACTION_TYPE_DROP:
-		case RTE_FLOW_ACTION_TYPE_MARK:
 		case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
 		case RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR:
 			actions_num++;