diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-07-28 14:47:58 -0700 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2020-08-03 10:13:54 -0700 |
| commit | 966e50597666d530b69de2abb9c83ff0a9bd3ee6 (patch) | |
| tree | 64be01ad8586a2d61243ba51f7e93ad34834a971 /net/ipv4/udp_tunnel_nic.c | |
| parent | b206490940216542c68563699b279eed3c55107c (diff) | |
| download | linux-next-966e50597666d530b69de2abb9c83ff0a9bd3ee6.tar.gz | |
udp_tunnel: add the ability to hard-code IANA VXLAN
mlx5 has the IANA VXLAN port (4789) hard coded by the device,
instead of being added dynamically when tunnels are created.
To support this add a workaround flag to struct udp_tunnel_nic_info.
Skipping updates for the port is fairly trivial, dumping the hard
coded port via ethtool requires some code duplication. The port
is not a part of any real table, we dump it in a special table
which has no tunnel types supported and only one entry.
This is the last known workaround / hack needed to convert
all drivers to the new infra.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'net/ipv4/udp_tunnel_nic.c')
| -rw-r--r-- | net/ipv4/udp_tunnel_nic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/udp_tunnel_nic.c b/net/ipv4/udp_tunnel_nic.c index f0dbd9905a53..69962165c0e8 100644 --- a/net/ipv4/udp_tunnel_nic.c +++ b/net/ipv4/udp_tunnel_nic.c @@ -7,6 +7,7 @@ #include <linux/types.h> #include <linux/workqueue.h> #include <net/udp_tunnel.h> +#include <net/vxlan.h> enum udp_tunnel_nic_table_entry_flags { UDP_TUNNEL_NIC_ENTRY_ADD = BIT(0), @@ -504,6 +505,12 @@ __udp_tunnel_nic_add_port(struct net_device *dev, struct udp_tunnel_info *ti) return; if (!netif_running(dev) && info->flags & UDP_TUNNEL_NIC_INFO_OPEN_ONLY) return; + if (info->flags & UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN && + ti->port == htons(IANA_VXLAN_UDP_PORT)) { + if (ti->type != UDP_TUNNEL_TYPE_VXLAN) + netdev_warn(dev, "device assumes port 4789 will be used by vxlan tunnels\n"); + return; + } if (!udp_tunnel_nic_is_capable(dev, utn, ti)) return; |