From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 30C8EA04B7; Tue, 13 Oct 2020 16:02:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D4A71DC1C; Tue, 13 Oct 2020 15:59:13 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id A44651BE89 for ; Tue, 13 Oct 2020 15:59:11 +0200 (CEST) IronPort-SDR: 2plB2WbE1Bl421iLGvQehJn5Ps5DbPpVCkXahTYBySUKMqcfAV4JX2hdNDAZoKUVMY4hcR2HLI QBFR3erP1Gvw== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="163273911" X-IronPort-AV: E=Sophos;i="5.77,371,1596524400"; d="scan'208";a="163273911" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2020 06:59:09 -0700 IronPort-SDR: 4Cfxe04ZoMHyC9E+EqD3ctW5QsUa/+1tMhS5WSBLIsOnpcQvNrNax9O8m8xrQcmgavMnPOcn3G G4FB4HsQmTEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,371,1596524400"; d="scan'208";a="313807612" Received: from silpixa00400050.ir.intel.com ([10.237.213.66]) by orsmga003.jf.intel.com with ESMTP; 13 Oct 2020 06:59:08 -0700 From: Padraig Connolly To: beilei.xing@intel.com Cc: dev@dpdk.org, Padraig Connolly , bernard.iremonger@intel.com Date: Tue, 13 Oct 2020 14:57:56 +0100 Message-Id: <20201013135756.23193-1-padraig.j.connolly@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1] net/i40e: fix qinq flow pattern to allow non full mask 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" Issue reported by customer that only full mask was allowed on inner and outer VLAN tag, thus not allowing mask to set VLAN ID filter only. Removed check that enforces inner vlan and outer vlan equal I40E_TCI_MASK (full mask 0xffff). Fixes: c2be7f9b232f ("net/i40e: fix parsing QinQ pattern") Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern") Cc: bernard.iremonger@intel.com Cc:stable@dpdk.org Signed-off-by: Padraig Connolly --- drivers/net/i40e/i40e_flow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index adc5da1c5..509c18c45 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4649,14 +4649,9 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, } /* Get filter specification */ - if ((o_vlan_mask != NULL) && (o_vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) && - (i_vlan_mask != NULL) && - (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { + if ((o_vlan_mask != NULL) && (i_vlan_mask != NULL)) { filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci) - & I40E_TCI_MASK; filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci) - & I40E_TCI_MASK; } else { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, -- 2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.