[dpdk-dev] [PATCH v1 02/11] net/dpaa2: support Tx flow redirection action

[nipun.gupta@nxp.com]

From: Jun Yang <jun.yang@nxp.com>

TX redirection support by flow action RTE_FLOW_ACTION_TYPE_PHY_PORT
and RTE_FLOW_ACTION_TYPE_PORT_ID

This action is executed by HW to forward packets between ports.
If the ingress packets match the rule, the packets are switched
without software involved and perf is improved as well.

Signed-off-by: Jun Yang <jun.yang@nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c |   5 ++
 drivers/net/dpaa2/dpaa2_ethdev.h |   1 +
 drivers/net/dpaa2/dpaa2_flow.c   | 116 +++++++++++++++++++++++++++----
 drivers/net/dpaa2/mc/fsl_dpni.h  |  23 ++++++
 4 files changed, 132 insertions(+), 13 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 560b79151b..9cf55c0f0b 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2822,6 +2822,11 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
 	return ret;
 }
 
+int dpaa2_dev_is_dpaa2(struct rte_eth_dev *dev)
+{
+	return dev->device->driver == &rte_dpaa2_pmd.driver;
+}
+
 static int
 rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
 		struct rte_dpaa2_device *dpaa2_dev)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index b9c729f6cd..3f34d7ecff 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -240,6 +240,7 @@ uint16_t dummy_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts);
 void dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci);
 void dpaa2_flow_clean(struct rte_eth_dev *dev);
 uint16_t dpaa2_dev_tx_conf(void *queue)  __rte_unused;
+int dpaa2_dev_is_dpaa2(struct rte_eth_dev *dev);
 
 int dpaa2_timesync_enable(struct rte_eth_dev *dev);
 int dpaa2_timesync_disable(struct rte_eth_dev *dev);
diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index bfe17c350a..5de886ec5e 100644
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018-2020 NXP
+ * Copyright 2018-2021 NXP
  */
 
 #include <sys/queue.h>
@@ -30,10 +30,10 @@
 int mc_l4_port_identification;
 
 static char *dpaa2_flow_control_log;
-static int dpaa2_flow_miss_flow_id =
+static uint16_t dpaa2_flow_miss_flow_id =
 	DPNI_FS_MISS_DROP;
 
-#define FIXED_ENTRY_SIZE 54
+#define FIXED_ENTRY_SIZE DPNI_MAX_KEY_SIZE
 
 enum flow_rule_ipaddr_type {
 	FLOW_NONE_IPADDR,
@@ -83,9 +83,18 @@ static const
 enum rte_flow_action_type dpaa2_supported_action_type[] = {
 	RTE_FLOW_ACTION_TYPE_END,
 	RTE_FLOW_ACTION_TYPE_QUEUE,
+	RTE_FLOW_ACTION_TYPE_PHY_PORT,
+	RTE_FLOW_ACTION_TYPE_PORT_ID,
 	RTE_FLOW_ACTION_TYPE_RSS
 };
 
+static const
+enum rte_flow_action_type dpaa2_supported_fs_action_type[] = {
+	RTE_FLOW_ACTION_TYPE_QUEUE,
+	RTE_FLOW_ACTION_TYPE_PHY_PORT,
+	RTE_FLOW_ACTION_TYPE_PORT_ID
+};
+
 /* Max of enum rte_flow_item_type + 1, for both IPv4 and IPv6*/
 #define DPAA2_FLOW_ITEM_TYPE_GENERIC_IP (RTE_FLOW_ITEM_TYPE_META + 1)
 
@@ -2937,6 +2946,19 @@ dpaa2_configure_flow_raw(struct rte_flow *flow,
 	return 0;
 }
 
+static inline int dpaa2_fs_action_supported(
+		enum rte_flow_action_type action)
+{
+	int i;
+
+	for (i = 0; i < (int)(sizeof(dpaa2_supported_fs_action_type) /
+					sizeof(enum rte_flow_action_type)); i++) {
+		if (action == dpaa2_supported_fs_action_type[i])
+			return 1;
+	}
+
+	return 0;
+}
 /* The existing QoS/FS entry with IP address(es)
  * needs update after
  * new extract(s) are inserted before IP
@@ -3115,7 +3137,7 @@ dpaa2_flow_entry_update(
 			}
 		}
 
-		if (curr->action != RTE_FLOW_ACTION_TYPE_QUEUE) {
+		if (!dpaa2_fs_action_supported(curr->action)) {
 			curr = LIST_NEXT(curr, next);
 			continue;
 		}
@@ -3253,6 +3275,43 @@ dpaa2_flow_verify_attr(
 	return 0;
 }
 
+static inline struct rte_eth_dev *
+dpaa2_flow_redirect_dev(struct dpaa2_dev_priv *priv,
+	const struct rte_flow_action *action)
+{
+	const struct rte_flow_action_phy_port *phy_port;
+	const struct rte_flow_action_port_id *port_id;
+	int idx = -1;
+	struct rte_eth_dev *dest_dev;
+
+	if (action->type == RTE_FLOW_ACTION_TYPE_PHY_PORT) {
+		phy_port = (const struct rte_flow_action_phy_port *)
+					action->conf;
+		if (!phy_port->original)
+			idx = phy_port->index;
+	} else if (action->type == RTE_FLOW_ACTION_TYPE_PORT_ID) {
+		port_id = (const struct rte_flow_action_port_id *)
+					action->conf;
+		if (!port_id->original)
+			idx = port_id->id;
+	} else {
+		return NULL;
+	}
+
+	if (idx >= 0) {
+		if (!rte_eth_dev_is_valid_port(idx))
+			return NULL;
+		dest_dev = &rte_eth_devices[idx];
+	} else {
+		dest_dev = priv->eth_dev;
+	}
+
+	if (!dpaa2_dev_is_dpaa2(dest_dev))
+		return NULL;
+
+	return dest_dev;
+}
+
 static inline int
 dpaa2_flow_verify_action(
 	struct dpaa2_dev_priv *priv,
@@ -3278,6 +3337,14 @@ dpaa2_flow_verify_action(
 				return -1;
 			}
 			break;
+		case RTE_FLOW_ACTION_TYPE_PHY_PORT:
+		case RTE_FLOW_ACTION_TYPE_PORT_ID:
+			if (!dpaa2_flow_redirect_dev(priv, &actions[j])) {
+				DPAA2_PMD_ERR(
+					"Invalid port id of action");
+				return -ENOTSUP;
+			}
+			break;
 		case RTE_FLOW_ACTION_TYPE_RSS:
 			rss_conf = (const struct rte_flow_action_rss *)
 					(actions[j].conf);
@@ -3330,11 +3397,13 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
 	struct dpni_qos_tbl_cfg qos_cfg;
 	struct dpni_fs_action_cfg action;
 	struct dpaa2_dev_priv *priv = dev->data->dev_private;
-	struct dpaa2_queue *rxq;
+	struct dpaa2_queue *dest_q;
 	struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
 	size_t param;
 	struct rte_flow *curr = LIST_FIRST(&priv->flows);
 	uint16_t qos_index;
+	struct rte_eth_dev *dest_dev;
+	struct dpaa2_dev_priv *dest_priv;
 
 	ret = dpaa2_flow_verify_attr(priv, attr);
 	if (ret)
@@ -3446,12 +3515,32 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
 	while (!end_of_list) {
 		switch (actions[j].type) {
 		case RTE_FLOW_ACTION_TYPE_QUEUE:
-			dest_queue =
-				(const struct rte_flow_action_queue *)(actions[j].conf);
-			rxq = priv->rx_vq[dest_queue->index];
-			flow->action = RTE_FLOW_ACTION_TYPE_QUEUE;
+		case RTE_FLOW_ACTION_TYPE_PHY_PORT:
+		case RTE_FLOW_ACTION_TYPE_PORT_ID:
 			memset(&action, 0, sizeof(struct dpni_fs_action_cfg));
-			action.flow_id = rxq->flow_id;
+			flow->action = actions[j].type;
+
+			if (actions[j].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
+				dest_queue = (const struct rte_flow_action_queue *)
+								(actions[j].conf);
+				dest_q = priv->rx_vq[dest_queue->index];
+				action.flow_id = dest_q->flow_id;
+			} else {
+				dest_dev = dpaa2_flow_redirect_dev(priv,
+								   &actions[j]);
+				if (!dest_dev) {
+					DPAA2_PMD_ERR(
+						"Invalid destination device to redirect!");
+					return -1;
+				}
+
+				dest_priv = dest_dev->data->dev_private;
+				dest_q = dest_priv->tx_vq[0];
+				action.options =
+						DPNI_FS_OPT_REDIRECT_TO_DPNI_TX;
+				action.redirect_obj_token = dest_priv->token;
+				action.flow_id = dest_q->flow_id;
+			}
 
 			/* Configure FS table first*/
 			if (is_keycfg_configured & DPAA2_FS_TABLE_RECONFIGURE) {
@@ -3481,8 +3570,7 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
 					return -1;
 				}
 				tc_cfg.enable = true;
-				tc_cfg.fs_miss_flow_id =
-					dpaa2_flow_miss_flow_id;
+				tc_cfg.fs_miss_flow_id = dpaa2_flow_miss_flow_id;
 				ret = dpni_set_rx_fs_dist(dpni, CMD_PRI_LOW,
 							 priv->token, &tc_cfg);
 				if (ret < 0) {
@@ -3970,7 +4058,7 @@ struct rte_flow *dpaa2_flow_create(struct rte_eth_dev *dev,
 	ret = dpaa2_generic_flow_set(flow, dev, attr, pattern,
 			actions, error);
 	if (ret < 0) {
-		if (error->type > RTE_FLOW_ERROR_TYPE_ACTION)
+		if (error && error->type > RTE_FLOW_ERROR_TYPE_ACTION)
 			rte_flow_error_set(error, EPERM,
 					RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
 					attr, "unknown");
@@ -4002,6 +4090,8 @@ int dpaa2_flow_destroy(struct rte_eth_dev *dev,
 
 	switch (flow->action) {
 	case RTE_FLOW_ACTION_TYPE_QUEUE:
+	case RTE_FLOW_ACTION_TYPE_PHY_PORT:
+	case RTE_FLOW_ACTION_TYPE_PORT_ID:
 		if (priv->num_rx_tc > 1) {
 			/* Remove entry from QoS table first */
 			ret = dpni_remove_qos_entry(dpni, CMD_PRI_LOW, priv->token,
diff --git a/drivers/net/dpaa2/mc/fsl_dpni.h b/drivers/net/dpaa2/mc/fsl_dpni.h
index 34c6b20033..469ab9b3d4 100644
--- a/drivers/net/dpaa2/mc/fsl_dpni.h
+++ b/drivers/net/dpaa2/mc/fsl_dpni.h
@@ -1496,12 +1496,35 @@ int dpni_clear_qos_table(struct fsl_mc_io *mc_io,
  */
 #define DPNI_FS_OPT_SET_STASH_CONTROL  0x4
 
+/**
+ * Redirect matching traffic to Rx part of another dpni object. The frame
+ * will be classified according to new qos and flow steering rules from
+ * target dpni object.
+ */
+#define DPNI_FS_OPT_REDIRECT_TO_DPNI_RX		0x08
+
+/**
+ * Redirect matching traffic into Tx queue of another dpni object. The
+ * frame will be transmitted directly
+ */
+#define DPNI_FS_OPT_REDIRECT_TO_DPNI_TX		0x10
+
 /**
  * struct dpni_fs_action_cfg - Action configuration for table look-up
  * @flc: FLC value for traffic matching this rule.  Please check the Frame
  * Descriptor section in the hardware documentation for more information.
  * @flow_id: Identifies the Rx queue used for matching traffic.  Supported
  *     values are in range 0 to num_queue-1.
+ * @redirect_obj_token: token that identifies the object where frame is
+ * redirected when this rule is hit. This paraneter is used only when one of the
+ * flags DPNI_FS_OPT_REDIRECT_TO_DPNI_RX or DPNI_FS_OPT_REDIRECT_TO_DPNI_TX is
+ * set.
+ * The token is obtained using dpni_open() API call. The object must stay
+ * open during the operation to ensure the fact that application has access
+ * on it. If the object is destroyed of closed next actions will take place:
+ * - if DPNI_FS_OPT_DISCARD is set the frame will be discarded by current dpni
+ * - if DPNI_FS_OPT_DISCARD is cleared the frame will be enqueued in queue with
+ *   index provided in flow_id parameter.
  * @options: Any combination of DPNI_FS_OPT_ values.
  */
 struct dpni_fs_action_cfg {
-- 
2.17.1