[dpdk-dev] [PATCH] net/i40e: fix parsing tunnel filter issue

Beilei Xing beilei.xing at intel.com
Tue Jan 24 03:44:27 CET 2017


VNI of VXLAN is parsed wrongly. The root cause is that
array vni in item VXLAN also uses network byte ordering.

Fixes: d416530e6358 ("net/i40e: parse tunnel filter")

Signed-off-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_flow.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 76bb332..51b3223 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -1196,6 +1196,20 @@ i40e_check_tenant_id_mask(const uint8_t *mask)
 	return is_masked;
 }
 
+static uint32_t
+i40e_flow_set_tenant_id(const uint8_t *vni)
+{
+	uint32_t tenant_id;
+
+#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
+	tenant_id = (vni[0] << 16) | (vni[1] << 8) | vni[2];
+#else
+	tenant_id = vni[0] | (vni[1] << 8) | (vni[2] << 16);
+#endif
+
+	return tenant_id;
+}
+
 /* 1. Last in item should be NULL as range is not supported.
  * 2. Supported filter types: IMAC_IVLAN_TENID, IMAC_IVLAN,
  *    IMAC_TENID, OMAC_TENID_IMAC and IMAC.
@@ -1364,8 +1378,8 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern,
 			& I40E_TCI_MASK;
 		if (vxlan_spec && vxlan_mask && !is_vni_masked) {
 			/* If there's vxlan */
-			rte_memcpy(&filter->tenant_id, vxlan_spec->vni,
-				   RTE_DIM(vxlan_spec->vni));
+			filter->tenant_id =
+				i40e_flow_set_tenant_id(vxlan_spec->vni);
 			if (!o_eth_spec && !o_eth_mask &&
 				i_eth_spec && i_eth_mask)
 				filter->filter_type =
@@ -1402,8 +1416,8 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern,
 		/* If there's no inner vlan */
 		if (vxlan_spec && vxlan_mask && !is_vni_masked) {
 			/* If there's vxlan */
-			rte_memcpy(&filter->tenant_id, vxlan_spec->vni,
-				   RTE_DIM(vxlan_spec->vni));
+			filter->tenant_id =
+				i40e_flow_set_tenant_id(vxlan_spec->vni);
 			if (!o_eth_spec && !o_eth_mask &&
 				i_eth_spec && i_eth_mask)
 				filter->filter_type =
-- 
2.5.5



More information about the dev mailing list