* [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset match
@ 2019-07-23 23:20 Wang Ying A
2019-07-24 13:06 ` Zhang, Qi Z
0 siblings, 1 reply; 3+ messages in thread
From: Wang Ying A @ 2019-07-23 23:20 UTC (permalink / raw)
To: qi.z.zhang; +Cc: qiming.yang, dev, ying.a.wang, stable
For VXLAN/NVGRE packet, vni/tni should be included in the matching
keys. This patch fixes this issue.
Fixes: d76116a4678f ("net/ice: add generic flow API")
Cc: stable@dpdk.org
Signed-off-by: Wang Ying A <ying.a.wang@intel.com>
---
drivers/net/ice/ice_generic_flow.c | 8 ++++++++
drivers/net/ice/ice_generic_flow.h | 18 ++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 1d07c83..5fcf428 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -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;
diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h
index 2aa79e0..1953905 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -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[] = {
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset match
2019-07-23 23:20 [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset match Wang Ying A
@ 2019-07-24 13:06 ` Zhang, Qi Z
2019-07-24 13:12 ` Zhang, Qi Z
0 siblings, 1 reply; 3+ messages in thread
From: Zhang, Qi Z @ 2019-07-24 13:06 UTC (permalink / raw)
To: Wang, Ying A; +Cc: Yang, Qiming, dev, stable
> -----Original Message-----
> From: Wang, Ying A
> Sent: Wednesday, July 24, 2019 7:21 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: Yang, Qiming <qiming.yang@intel.com>; dev@dpdk.org; Wang, Ying A
> <ying.a.wang@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/ice: add vni/tni support for flow inputset match
>
> For VXLAN/NVGRE packet, vni/tni should be included in the matching keys. This
> patch fixes this issue.
>
> Fixes: d76116a4678f ("net/ice: add generic flow API")
> Cc: stable@dpdk.org
No need to cc stable since fix for current release.
>
> Signed-off-by: Wang Ying A <ying.a.wang@intel.com>
> ---
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Thanks
Qi
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset match
2019-07-24 13:06 ` Zhang, Qi Z
@ 2019-07-24 13:12 ` Zhang, Qi Z
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Qi Z @ 2019-07-24 13:12 UTC (permalink / raw)
To: Zhang, Qi Z, Wang, Ying A; +Cc: Yang, Qiming, dev, stable
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhang, Qi Z
> Sent: Wednesday, July 24, 2019 9:07 PM
> To: Wang, Ying A <ying.a.wang@intel.com>
> Cc: Yang, Qiming <qiming.yang@intel.com>; dev@dpdk.org; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset
> match
>
>
>
> > -----Original Message-----
> > From: Wang, Ying A
> > Sent: Wednesday, July 24, 2019 7:21 AM
> > To: Zhang, Qi Z <qi.z.zhang@intel.com>
> > Cc: Yang, Qiming <qiming.yang@intel.com>; dev@dpdk.org; Wang, Ying A
> > <ying.a.wang@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/ice: add vni/tni support for flow inputset match
> >
> > For VXLAN/NVGRE packet, vni/tni should be included in the matching
> > keys. This patch fixes this issue.
> >
> > Fixes: d76116a4678f ("net/ice: add generic flow API")
> > Cc: stable@dpdk.org
>
> No need to cc stable since fix for current release.
>
> >
> > Signed-off-by: Wang Ying A <ying.a.wang@intel.com>
> > ---
>
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
>
> Thanks
> Qi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-24 13:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 23:20 [dpdk-dev] [PATCH] net/ice: add vni/tni support for flow inputset match Wang Ying A
2019-07-24 13:06 ` Zhang, Qi Z
2019-07-24 13:12 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).