[dpdk-stable] [PATCH v3] net/i40e: Fail rte_flow MARK requests if RX func was vectorized

[Mesut Ali Ergin <mesut.a.ergin@intel.com>]

Runtime requests to install an rte_flow with MARK action should fail
if the device was started and a vector RX function was already chosen
for during configuration time.

Currently, i40e rte_flow driver would successfully install the flow
with MARK action, even when vector RX functions are in use. However,
those vector RX functions will fail to retrieve the MARK data from the
device descriptor into the mbuf. The original app installing the flow
would never know what went wrong. The function introduced in this patch
must be adjusted if/when certain vector RX functions start supporting
correct FDIR processing for MARK actions.

Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
Cc: stable@dpdk.org

Signed-off-by: Mesut Ali Ergin <mesut.a.ergin@intel.com>

v3:
 - Check for support made in an function for future extensibility
 - Fixes code style warnings
 - CC stable w/ fix reference
v2:
 - Check added to fail MARK request only if the device was started
---
 drivers/net/i40e/i40e_flow.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 8b2e297..66d4104 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -22,6 +22,7 @@
 #include "base/i40e_type.h"
 #include "base/i40e_prototype.h"
 #include "i40e_ethdev.h"
+#include "i40e_rxtx.h"
 
 #define I40E_IPV6_TC_MASK	(0xFF << I40E_FDIR_IPv6_TC_OFFSET)
 #define I40E_IPV6_FRAG_HEADER	44
@@ -3040,6 +3041,21 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 	return 0;
 }
 
+/* Check if device supports installing a new MARK action */
+static bool i40e_device_supports_mark(struct rte_eth_dev *dev)
+{
+	if (dev->data->dev_started) {
+		/* Vector RX currently doesn't support MARK action. */
+		if (dev->rx_pkt_burst == i40e_recv_scattered_pkts_vec ||
+		    dev->rx_pkt_burst == i40e_recv_pkts_vec ||
+		    dev->rx_pkt_burst == i40e_recv_scattered_pkts_vec_avx2 ||
+		    dev->rx_pkt_burst == i40e_recv_pkts_vec_avx2)
+			return false;
+	}
+
+	return true;
+}
+
 /* Parse to get the action info of a FDIR filter.
  * FDIR action supports QUEUE or (QUEUE + MARK).
  */
@@ -3079,6 +3095,13 @@ i40e_flow_parse_fdir_action(struct rte_eth_dev *dev,
 		filter->action.behavior = I40E_FDIR_PASSTHRU;
 		break;
 	case RTE_FLOW_ACTION_TYPE_MARK:
+		if (!i40e_device_supports_mark(dev)) {
+			/* MARK not supported */
+			rte_flow_error_set(error, EINVAL,
+					   RTE_FLOW_ERROR_TYPE_ACTION, act,
+					   "FDIR Action Error: MARK not supported.");
+			return -rte_errno;
+		}
 		filter->action.behavior = I40E_FDIR_PASSTHRU;
 		mark_spec = act->conf;
 		filter->action.report_status = I40E_FDIR_REPORT_ID;
@@ -3103,6 +3126,13 @@ i40e_flow_parse_fdir_action(struct rte_eth_dev *dev,
 			   "Invalid action.");
 			return -rte_errno;
 		}
+		if (!i40e_device_supports_mark(dev)) {
+			/* MARK not supported */
+			rte_flow_error_set(error, EINVAL,
+					   RTE_FLOW_ERROR_TYPE_ACTION, act,
+					   "FDIR Action Error: MARK not supported.");
+			return -rte_errno;
+		}
 		mark_spec = act->conf;
 		filter->action.report_status = I40E_FDIR_REPORT_ID;
 		filter->soft_id = mark_spec->id;
-- 
2.7.4