mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 00:35:33 +00:00
Code Issues Releases Wiki Activity

dpif-netlink-rtnl: Support VXLAN-GPE

Browse Source 
Add support for creating VXLAN tunnels with GPE. This enables layer3
VXLAN tunnels with kernel datapath.

Signed-off-by: Eric Garver <e@erig.me>
Signed-off-by: Joe Stringer <joe@ovn.org>
This commit is contained in:
Eric Garver
2017-07-10 15:39:53 -04:00
committed by Joe Stringer
parent a8a3eee492
commit c33c412fb1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dpif-netlink-rtnl.c
View File

@@ -33,12 +33,13 @@ VLOG_DEFINE_THIS_MODULE(dpif_netlink_rtnl);
#ifndef IFLA_VXLAN_MAX #ifndef IFLA_VXLAN_MAX
#define IFLA_VXLAN_MAX 0 #define IFLA_VXLAN_MAX 0
#endif #endif
#if IFLA_VXLAN_MAX < 25 #if IFLA_VXLAN_MAX < 27
#define IFLA_VXLAN_LEARNING 7 #define IFLA_VXLAN_LEARNING 7
#define IFLA_VXLAN_PORT 15 #define IFLA_VXLAN_PORT 15
#define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20 #define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20
#define IFLA_VXLAN_GBP 23 #define IFLA_VXLAN_GBP 23
#define IFLA_VXLAN_COLLECT_METADATA 25 #define IFLA_VXLAN_COLLECT_METADATA 25
#define IFLA_VXLAN_GPE 27
#endif #endif
#ifndef IFLA_GRE_MAX #ifndef IFLA_GRE_MAX
@@ -69,6 +70,7 @@ static const struct nl_policy vxlan_policy[] = {
[IFLA_VXLAN_LEARNING] = { .type = NL_A_U8 }, [IFLA_VXLAN_LEARNING] = { .type = NL_A_U8 },
[IFLA_VXLAN_UDP_ZERO_CSUM6_RX] = { .type = NL_A_U8 }, [IFLA_VXLAN_UDP_ZERO_CSUM6_RX] = { .type = NL_A_U8 },
[IFLA_VXLAN_PORT] = { .type = NL_A_U16 }, [IFLA_VXLAN_PORT] = { .type = NL_A_U16 },
[IFLA_VXLAN_GPE] = { .type = NL_A_FLAG },
}; };
static const struct nl_policy gre_policy[] = { static const struct nl_policy gre_policy[] = {
[IFLA_GRE_COLLECT_METADATA] = { .type = NL_A_FLAG }, [IFLA_GRE_COLLECT_METADATA] = { .type = NL_A_FLAG },
@@ -171,7 +173,9 @@ dpif_netlink_rtnl_vxlan_verify(const struct netdev_tunnel_config *tnl_cfg,
|| (tnl_cfg->dst_port || (tnl_cfg->dst_port
!= nl_attr_get_be16(vxlan[IFLA_VXLAN_PORT])) != nl_attr_get_be16(vxlan[IFLA_VXLAN_PORT]))
|| (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GBP) || (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GBP)
&& !nl_attr_get_flag(vxlan[IFLA_VXLAN_GBP]))) { && !nl_attr_get_flag(vxlan[IFLA_VXLAN_GBP]))
|| (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GPE)
&& !nl_attr_get_flag(vxlan[IFLA_VXLAN_GPE]))) {
err = EINVAL; err = EINVAL;
} }
} }
@@ -289,6 +293,9 @@ dpif_netlink_rtnl_create(const struct netdev_tunnel_config *tnl_cfg,
if (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GBP)) { if (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GBP)) {
nl_msg_put_flag(&request, IFLA_VXLAN_GBP); nl_msg_put_flag(&request, IFLA_VXLAN_GBP);
} }
if (tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GPE)) {
nl_msg_put_flag(&request, IFLA_VXLAN_GPE);
}
nl_msg_put_be16(&request, IFLA_VXLAN_PORT, tnl_cfg->dst_port); nl_msg_put_be16(&request, IFLA_VXLAN_PORT, tnl_cfg->dst_port);
break; break;
case OVS_VPORT_TYPE_GRE: case OVS_VPORT_TYPE_GRE: