[v2,1/2] net/ice: support flow redirect function

Message ID 1585589933-4247-2-git-send-email-beilei.xing@intel.com (mailing list archive)
State Accepted, archived
Delegated to: xiaolong ye
Headers
Series add flow redirect function |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Xing, Beilei March 30, 2020, 5:38 p.m. UTC
  Add a new ops "redirect" to flow engine, it's used to implement the
function that redirect a flow's destination. Currently only support
VSI-Redirect which will be used by DCF for handling VF-VSI mapping
table change.
A new API "ice_flow_redirect" is exposed, current usage is: it could
be called when there's VF-VSI mapping table change caused by VF reset.

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_generic_flow.c | 22 ++++++++++++++++++++++
 drivers/net/ice/ice_generic_flow.h | 21 +++++++++++++++++++++
 2 files changed, 43 insertions(+)
  

Comments

Xiaolong Ye March 31, 2020, 2:45 a.m. UTC | #1
On 03/31, Beilei Xing wrote:
>Add a new ops "redirect" to flow engine, it's used to implement the
>function that redirect a flow's destination. Currently only support
>VSI-Redirect which will be used by DCF for handling VF-VSI mapping
>table change.
>A new API "ice_flow_redirect" is exposed, current usage is: it could
>be called when there's VF-VSI mapping table change caused by VF reset.
>
>Signed-off-by: Beilei Xing <beilei.xing@intel.com>
>Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
>---
> drivers/net/ice/ice_generic_flow.c | 22 ++++++++++++++++++++++
> drivers/net/ice/ice_generic_flow.h | 21 +++++++++++++++++++++
> 2 files changed, 43 insertions(+)
>
>diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
>index a1648ee..823ff0e 100644
>--- a/drivers/net/ice/ice_generic_flow.c
>+++ b/drivers/net/ice/ice_generic_flow.c
>@@ -1961,3 +1961,25 @@ ice_flow_query(struct rte_eth_dev *dev,
> 	}
> 	return ret;
> }
>+
>+int
>+ice_flow_redirect(struct ice_adapter *ad,
>+		  struct ice_flow_redirect *rd)

No need to split into 2 lines.

>+{
>+	struct ice_pf *pf = &ad->pf;
>+	struct rte_flow *p_flow;
>+	void *temp;
>+	int ret;
>+
>+	TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) {
>+		if (!p_flow->engine->redirect)
>+			continue;
>+		ret = p_flow->engine->redirect(ad, p_flow, rd);
>+		if (ret) {
>+			PMD_DRV_LOG(ERR, "Failed to redirect flows");
>+			return ret;
>+		}
>+	}
>+
>+	return 0;
>+}
>diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
>index adc30ee..ede6ec8 100644
>--- a/drivers/net/ice/ice_generic_flow.h
>+++ b/drivers/net/ice/ice_generic_flow.h
>@@ -417,6 +417,20 @@ struct ice_pattern_match_item {
> 	void *meta;
> };
> 
>+enum ice_flow_redirect_type {
>+	ICE_FLOW_REDIRECT_VSI,
>+};
>+
>+struct ice_flow_redirect {
>+	enum ice_flow_redirect_type type;
>+	union {
>+		struct {
>+			uint16_t vsi_handle;
>+			uint16_t new_vsi_num;
>+		};
>+	};
>+};
>+
> typedef int (*engine_init_t)(struct ice_adapter *ad);
> typedef void (*engine_uninit_t)(struct ice_adapter *ad);
> typedef int (*engine_create_t)(struct ice_adapter *ad,
>@@ -430,6 +444,9 @@ typedef int (*engine_query_t)(struct ice_adapter *ad,
> 		struct rte_flow *flow,
> 		struct rte_flow_query_count *count,
> 		struct rte_flow_error *error);
>+typedef int(*engine_redirect_t)(struct ice_adapter *ad,
>+				struct rte_flow *flow,
>+				struct ice_flow_redirect *redirect);
> typedef void (*engine_free_t) (struct rte_flow *flow);
> typedef int (*parse_pattern_action_t)(struct ice_adapter *ad,
> 		struct ice_pattern_match_item *array,
>@@ -447,6 +464,7 @@ struct ice_flow_engine {
> 	engine_create_t create;
> 	engine_destroy_t destroy;
> 	engine_query_t query_count;
>+	engine_redirect_t redirect;
> 	engine_free_t free;
> 	enum ice_flow_engine_type type;
> };
>@@ -485,4 +503,7 @@ ice_search_pattern_match_item(const struct rte_flow_item pattern[],
> 		struct ice_pattern_match_item *array,
> 		uint32_t array_len,
> 		struct rte_flow_error *error);
>+int
>+ice_flow_redirect(struct ice_adapter *ad,
>+		  struct ice_flow_redirect *rd);

Ditto

> #endif
>-- 
>2.7.4
>

Applied to next-net-intel with above fixes.
  

Patch

diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index a1648ee..823ff0e 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1961,3 +1961,25 @@  ice_flow_query(struct rte_eth_dev *dev,
 	}
 	return ret;
 }
+
+int
+ice_flow_redirect(struct ice_adapter *ad,
+		  struct ice_flow_redirect *rd)
+{
+	struct ice_pf *pf = &ad->pf;
+	struct rte_flow *p_flow;
+	void *temp;
+	int ret;
+
+	TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) {
+		if (!p_flow->engine->redirect)
+			continue;
+		ret = p_flow->engine->redirect(ad, p_flow, rd);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Failed to redirect flows");
+			return ret;
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index adc30ee..ede6ec8 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -417,6 +417,20 @@  struct ice_pattern_match_item {
 	void *meta;
 };
 
+enum ice_flow_redirect_type {
+	ICE_FLOW_REDIRECT_VSI,
+};
+
+struct ice_flow_redirect {
+	enum ice_flow_redirect_type type;
+	union {
+		struct {
+			uint16_t vsi_handle;
+			uint16_t new_vsi_num;
+		};
+	};
+};
+
 typedef int (*engine_init_t)(struct ice_adapter *ad);
 typedef void (*engine_uninit_t)(struct ice_adapter *ad);
 typedef int (*engine_create_t)(struct ice_adapter *ad,
@@ -430,6 +444,9 @@  typedef int (*engine_query_t)(struct ice_adapter *ad,
 		struct rte_flow *flow,
 		struct rte_flow_query_count *count,
 		struct rte_flow_error *error);
+typedef int(*engine_redirect_t)(struct ice_adapter *ad,
+				struct rte_flow *flow,
+				struct ice_flow_redirect *redirect);
 typedef void (*engine_free_t) (struct rte_flow *flow);
 typedef int (*parse_pattern_action_t)(struct ice_adapter *ad,
 		struct ice_pattern_match_item *array,
@@ -447,6 +464,7 @@  struct ice_flow_engine {
 	engine_create_t create;
 	engine_destroy_t destroy;
 	engine_query_t query_count;
+	engine_redirect_t redirect;
 	engine_free_t free;
 	enum ice_flow_engine_type type;
 };
@@ -485,4 +503,7 @@  ice_search_pattern_match_item(const struct rte_flow_item pattern[],
 		struct ice_pattern_match_item *array,
 		uint32_t array_len,
 		struct rte_flow_error *error);
+int
+ice_flow_redirect(struct ice_adapter *ad,
+		  struct ice_flow_redirect *rd);
 #endif