d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ice: fix VXLAN/NVGRE flow matching

Browse Source 
For VXLAN/NVGRE packet, vni/tni should be included in the matching
keys. This patch fixes this issue.

Fixes: d76116a467 ("net/ice: add generic flow API")

Signed-off-by: Ying A Wang <ying.a.wang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Ying A Wang 2019-07-24 07:20:59 +08:00 committed by Ferruh Yigit
parent 84dd950a2f
commit 94f00800d7
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ice/ice_generic_flow.c
View File

@ -464,6 +464,10 @@ static uint64_t ice_get_flow_field(const struct rte_flow_item pattern[],
"Invalid VXLAN item");
return 0;
}
if (vxlan_mask->vni[0] == UINT8_MAX &&
vxlan_mask->vni[1] == UINT8_MAX &&
vxlan_mask->vni[2] == UINT8_MAX)
input_set |= ICE_INSET_TUN_ID;
is_tunnel = 1;
break;
@ -482,6 +486,10 @@ static uint64_t ice_get_flow_field(const struct rte_flow_item pattern[],
"Invalid NVGRE item");
return 0;
}
if (nvgre_mask->tni[0] == UINT8_MAX &&
nvgre_mask->tni[1] == UINT8_MAX &&
nvgre_mask->tni[2] == UINT8_MAX)
input_set |= ICE_INSET_TUN_ID;
is_tunnel = 1;
break;

18
drivers/net/ice/ice_generic_flow.h
View File

@ -83,24 +83,30 @@ struct ice_flow_pattern {
ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TOS | ICE_INSET_ICMP6)
#define INSET_TUNNEL_IPV4_TYPE1 ( \
ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
ICE_INSET_TUN_IPV4_TTL | ICE_INSET_TUN_IPV4_PROTO)
ICE_INSET_TUN_IPV4_TTL | ICE_INSET_TUN_IPV4_PROTO | \
ICE_INSET_TUN_ID)
#define INSET_TUNNEL_IPV4_TYPE2 ( \
ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
ICE_INSET_TUN_IPV4_TTL | ICE_INSET_TUN_IPV4_PROTO | \
ICE_INSET_TUN_SRC_PORT | ICE_INSET_TUN_DST_PORT)
ICE_INSET_TUN_SRC_PORT | ICE_INSET_TUN_DST_PORT | \
ICE_INSET_TUN_ID)
#define INSET_TUNNEL_IPV4_TYPE3 ( \
ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
ICE_INSET_TUN_IPV4_TTL | ICE_INSET_ICMP)
ICE_INSET_TUN_IPV4_TTL | ICE_INSET_ICMP | \
ICE_INSET_TUN_ID)
#define INSET_TUNNEL_IPV6_TYPE1 ( \
ICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST | \
ICE_INSET_TUN_IPV6_TTL | ICE_INSET_TUN_IPV6_PROTO)
ICE_INSET_TUN_IPV6_TTL | ICE_INSET_TUN_IPV6_PROTO | \
ICE_INSET_TUN_ID)
#define INSET_TUNNEL_IPV6_TYPE2 ( \
ICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST | \
ICE_INSET_TUN_IPV6_TTL | ICE_INSET_TUN_IPV6_PROTO | \
ICE_INSET_TUN_SRC_PORT | ICE_INSET_TUN_DST_PORT)
ICE_INSET_TUN_SRC_PORT | ICE_INSET_TUN_DST_PORT | \
ICE_INSET_TUN_ID)
#define INSET_TUNNEL_IPV6_TYPE3 ( \
ICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST | \
ICE_INSET_TUN_IPV6_TTL | ICE_INSET_ICMP6)
ICE_INSET_TUN_IPV6_TTL | ICE_INSET_ICMP6 | \
ICE_INSET_TUN_ID)
/* L2 */
static enum rte_flow_item_type pattern_ethertype[] = {