Creates GRE devices using rtnetlink and tunnel metadata.
Co-Authored-by: Thadeu Lima de Souza Cascardo <casca...@redhat.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <casca...@redhat.com>
Signed-off-by: Eric Garver <e...@erig.me>
---
lib/dpif-netlink-rtnl.c | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c
index 6ab882c73756..3fce2194661d 100644
--- a/lib/dpif-netlink-rtnl.c
+++ b/lib/dpif-netlink-rtnl.c
@@ -38,6 +38,13 @@
#define IFLA_VXLAN_COLLECT_METADATA 25
#endif
+#ifndef IFLA_GRE_MAX
+#define IFLA_GRE_MAX 0
+#endif
+#if IFLA_GRE_MAX < 18
+#define IFLA_GRE_COLLECT_METADATA 18
+#endif
+
static const struct nl_policy rtlink_policy[] = {
[IFLA_LINKINFO] = { .type = NL_A_NESTED },
};
@@ -51,6 +58,9 @@ static const struct nl_policy vxlan_policy[] = {
[IFLA_VXLAN_UDP_ZERO_CSUM6_RX] = { .type = NL_A_U8 },
[IFLA_VXLAN_PORT] = { .type = NL_A_U16 },
};
+static const struct nl_policy gre_policy[] = {
+ [IFLA_GRE_COLLECT_METADATA] = { .type = NL_A_FLAG },
+};
static int
rtnl_transact(uint32_t type, uint32_t flags, const char *name,
@@ -142,6 +152,30 @@ dpif_netlink_rtnl_vxlan_verify(const struct
netdev_tunnel_config *tnl_cfg,
return err;
}
+static int
+dpif_netlink_rtnl_gre_verify(const struct netdev_tunnel_config OVS_UNUSED *tnl,
+ const char *name, const char *kind)
+{
+ struct ofpbuf *reply;
+ int err;
+
+ err = dpif_netlink_rtnl_getlink(name, &reply);
+
+ if (!err) {
+ struct nlattr *gre[ARRAY_SIZE(gre_policy)];
+
+ err = rtnl_policy_parse(kind, reply, gre_policy, gre,
+ ARRAY_SIZE(gre_policy));
+ if (!err) {
+ if (!nl_attr_get_flag(gre[IFLA_GRE_COLLECT_METADATA])) {
+ err = EINVAL;
+ }
+ }
+ ofpbuf_delete(reply);
+ }
+
+ return err;
+}
static int
dpif_netlink_rtnl_verify(const struct netdev_tunnel_config *tnl_cfg,
@@ -151,6 +185,7 @@ dpif_netlink_rtnl_verify(const struct netdev_tunnel_config
*tnl_cfg,
case OVS_VPORT_TYPE_VXLAN:
return dpif_netlink_rtnl_vxlan_verify(tnl_cfg, name, "vxlan");
case OVS_VPORT_TYPE_GRE:
+ return dpif_netlink_rtnl_gre_verify(tnl_cfg, name, "gretap");
case OVS_VPORT_TYPE_GENEVE:
case OVS_VPORT_TYPE_NETDEV:
case OVS_VPORT_TYPE_INTERNAL:
@@ -197,6 +232,8 @@ dpif_netlink_rtnl_create(const struct netdev_tunnel_config
*tnl_cfg,
nl_msg_put_be16(&request, IFLA_VXLAN_PORT, tnl_cfg->dst_port);
break;
case OVS_VPORT_TYPE_GRE:
+ nl_msg_put_flag(&request, IFLA_GRE_COLLECT_METADATA);
+ break;
case OVS_VPORT_TYPE_GENEVE:
case OVS_VPORT_TYPE_NETDEV:
case OVS_VPORT_TYPE_INTERNAL:
@@ -246,6 +283,8 @@ try_again:
err = dpif_netlink_rtnl_create(tnl_cfg, name, type, "vxlan", flags);
break;
case OVS_VPORT_TYPE_GRE:
+ err = dpif_netlink_rtnl_create(tnl_cfg, name, type, "gretap", flags);
+ break;
case OVS_VPORT_TYPE_GENEVE:
case OVS_VPORT_TYPE_NETDEV:
case OVS_VPORT_TYPE_INTERNAL:
@@ -277,8 +316,8 @@ dpif_netlink_rtnl_port_destroy(const char *name, const char
*type)
{
switch (netdev_to_ovs_vport_type(type)) {
case OVS_VPORT_TYPE_VXLAN:
- return dpif_netlink_rtnl_destroy(name);
case OVS_VPORT_TYPE_GRE:
+ return dpif_netlink_rtnl_destroy(name);
case OVS_VPORT_TYPE_GENEVE:
case OVS_VPORT_TYPE_NETDEV:
case OVS_VPORT_TYPE_INTERNAL:
--
2.12.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
