From patchwork Thu May 23 17:57:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ergin, Mesut A" X-Patchwork-Id: 53675 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 210621B946; Thu, 23 May 2019 19:57:28 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 9A58F1B945 for ; Thu, 23 May 2019 19:57:25 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2019 10:57:24 -0700 X-ExtLoop1: 1 Received: from skx-pink.jf.intel.com ([10.54.80.236]) by fmsmga001.fm.intel.com with ESMTP; 23 May 2019 10:57:25 -0700 From: Mesut Ali Ergin To: Beilei Xing , Qi Zhang Cc: dev@dpdk.org, Mesut Ali Ergin Date: Thu, 23 May 2019 10:57:22 -0700 Message-Id: <1558634242-441514-1-git-send-email-mesut.a.ergin@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] net/i40e: Fail rte_flow MARK requests if RX func was vectorized X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Runtime requests to install an rte_flow with MARK action should fail if a vector RX function was already chosen for the device 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 change introduced in this patch must be reverted if/when vector RX functions start supporting correct FDIR processing for MARK actions. Signed-off-by: Mesut Ali Ergin --- drivers/net/i40e/i40e_flow.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 3afd779..9a14a1c 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 @@ -3079,6 +3080,16 @@ i40e_flow_parse_fdir_action(struct rte_eth_dev *dev, filter->action.behavior = I40E_FDIR_PASSTHRU; break; case RTE_FLOW_ACTION_TYPE_MARK: + 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) { + /* Vector RX Functions do not support MARK*/ + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, act, + "Action not supported when vector RX is in use."); + return -rte_errno; + } filter->action.behavior = I40E_FDIR_PASSTHRU; mark_spec = act->conf; filter->action.report_status = I40E_FDIR_REPORT_ID; @@ -3103,6 +3114,16 @@ i40e_flow_parse_fdir_action(struct rte_eth_dev *dev, "Invalid action."); return -rte_errno; } + 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) { + /* Vector RX Functions do not support MARK*/ + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, act, + "Action not supported when vector RX is in use."); + return -rte_errno; + } mark_spec = act->conf; filter->action.report_status = I40E_FDIR_REPORT_ID; filter->soft_id = mark_spec->id;