From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 3F6FF1DB1 for ; Wed, 5 Apr 2017 16:04:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491401044; x=1522937044; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=G5dby60I9OznvmIUUNkIqlabj6W1fx0ktPuR+7PI8kk=; b=P1xEYetqRt9gIu+RJ/g8RSw+jxFoe5wwW0Mv44WkDFMfefvX0vDszetb F3PiDHcUIHfeqAhgj1xca23oGJyepg==; Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 07:04:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,278,1486454400"; d="scan'208";a="244582410" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by fmsmga004.fm.intel.com with ESMTP; 05 Apr 2017 07:04:00 -0700 From: Bernard Iremonger To: dev@dpdk.org, beilei.xing@intel.com Cc: wenzhuo.lu@intel.com, Bernard Iremonger Date: Wed, 5 Apr 2017 15:03:57 +0100 Message-Id: <1491401037-28611-1-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1491236049-6747-1-git-send-email-bernard.iremonger@intel.com> References: <1491236049-6747-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2] net/i40e: fix QinQ eth pattern parsing 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: , X-List-Received-Date: Wed, 05 Apr 2017 14:04:04 -0000 The eth keyword only should be accepted. Fixes: d46e85af6b5c ("net/i40e: parse QinQ pattern") Signed-off-by: Bernard Iremonger --- Changes in v2: rebased to latest dpdk-next-net Document the i40e_flow_parse_qinq_pattern function. Parse the eth keyword in similar way to mpls parsing function. drivers/net/i40e/i40e_flow.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 9f541eaff..3cf0e5a70 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1740,6 +1740,13 @@ i40e_flow_parse_mpls_filter(struct rte_eth_dev *dev, return ret; } +/* 1. Last in item should be NULL as range is not supported. + * 2. Supported filter types: QINQ. + * 3. Mask of fields which need to be matched should be + * filled with 1. + * 4. Mask of fields which needn't to be matched should be + * filled with 0. + */ static int i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, const struct rte_flow_item *pattern, @@ -1747,8 +1754,6 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, struct i40e_tunnel_filter_conf *filter) { const struct rte_flow_item *item = pattern; - const struct rte_flow_item_eth *eth_spec; - const struct rte_flow_item_eth *eth_mask; const struct rte_flow_item_vlan *vlan_spec = NULL; const struct rte_flow_item_vlan *vlan_mask = NULL; const struct rte_flow_item_vlan *i_vlan_spec = NULL; @@ -1770,13 +1775,11 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, item_type = item->type; switch (item_type) { case RTE_FLOW_ITEM_TYPE_ETH: - eth_spec = (const struct rte_flow_item_eth *)item->spec; - eth_mask = (const struct rte_flow_item_eth *)item->mask; - if (eth_spec && eth_mask) { + if (item->spec || item->mask) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, - "Invalid ether spec/mask"); + "Invalid ETH item"); return -rte_errno; } break; -- 2.11.0