* [PATCH v3 net-next 0/2] Bare UDP L3 Encapsulation Module
@ 2019-11-16 5:43 Martin Varghese
2019-11-16 5:44 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc Martin Varghese
2019-11-16 5:45 ` [PATCH v3 net-next 2/2] Special handling for IP & MPLS Martin Varghese
0 siblings, 2 replies; 13+ messages in thread
From: Martin Varghese @ 2019-11-16 5:43 UTC (permalink / raw)
To: netdev, davem, corbet, kuznet, yoshfuji, scott.drennan, jbenc,
martin.varghese
From: Martin Varghese <martin.varghese@nokia.com>
There are various L3 encapsulation standards using UDP being discussed to
leverage the UDP based load balancing capability of different networks.
MPLSoUDP (https://tools.ietf.org/html/rfc7510) is one among them.
The Bareudp tunnel module provides a generic L3 encapsulation tunnelling
support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside
a UDP tunnel.
Special Handling
----------------
The bareudp device supports special handling for MPLS & IP as they can have
multiple ethertypes.
MPLS procotcol can have ethertypes 0x8847 (unicast) & 0x8848 (multicast).
IP proctocol can have ethertypes 0x0800 (v4) & 0x86dd (v6).
This special handling can be enabled only for ethertype 0x0800 & 0x8847 with a
flag called extended mode.
Usage
------
1. Device creation & deletion
a. ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847
This creates a bareudp tunnel device which tunnels L3 traffic with ethertype
0x8847 (MPLS traffic). The destination port of the UDP header will be set to 6635
The device will listen on UDP port 6635 to receive traffic.
b. ip link delete bareudp0
2. Device creation with extended mode enabled
There are two ways to create a bareudp device for MPLS & IP with extended mode
enabled.
a. ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847 extmode 1
b. ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls
Why not FOU ?
------------
FOU by design does l4 encapsulation.It maps udp port to ipproto (IP protocol number
for l4 protocol).
Bareudp acheives a generic l3 encapsulation.It maps udp port to l3 ethertype
For example in the case of MPLS -
In the egress direction an MPLS packet "eth header | mpls header | payload" is
encapsulated to "eth header | ip header | udp header | mpls header | payload"
In the Ingress direction the udp tunnel packet
"eth header | ip header | udp header | mpls header | payload" is decapsulated to
"eth header | mpls header | payload"
Martin Varghese (2):
UDP tunnel encapsulation module for tunnelling different protocols
like MPLS,IP,NSH etc.
Special handling for IP & MPLS.
Documentation/networking/bareudp.rst | 44 ++
Documentation/networking/index.rst | 1 +
drivers/net/Kconfig | 13 +
drivers/net/Makefile | 1 +
drivers/net/bareudp.c | 876 +++++++++++++++++++++++++++++++++++
include/net/bareudp.h | 20 +
include/net/ip6_tunnel.h | 45 ++
include/net/ip_tunnels.h | 42 ++
include/uapi/linux/if_link.h | 13 +
9 files changed, 1055 insertions(+)
create mode 100644 Documentation/networking/bareudp.rst
create mode 100644 drivers/net/bareudp.c
create mode 100644 include/net/bareudp.h
--
1.8.3.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-16 5:43 [PATCH v3 net-next 0/2] Bare UDP L3 Encapsulation Module Martin Varghese
@ 2019-11-16 5:44 ` Martin Varghese
2019-11-18 17:23 ` Willem de Bruijn
2019-11-20 11:10 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc kbuild test robot
2019-11-16 5:45 ` [PATCH v3 net-next 2/2] Special handling for IP & MPLS Martin Varghese
1 sibling, 2 replies; 13+ messages in thread
From: Martin Varghese @ 2019-11-16 5:44 UTC (permalink / raw)
To: netdev, davem, corbet, kuznet, yoshfuji, scott.drennan, jbenc,
martin.varghese
From: Martin Varghese <martin.varghese@nokia.com>
The Bareudp tunnel module provides a generic L3 encapsulation
tunnelling module for tunnelling different protocols like MPLS,
IP,NSH etc inside a UDP tunnel.
Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
---
Changes in v2:
- Fixed documentation errors.
- Converted documentation to rst format.
- Moved ip tunnel rt lookup code to a common location.
- Removed seperate v4 and v6 socket.
- Added call to skb_ensure_writable before updating ethernet header.
- Simplified bareudp_destroy_tunnels as deleting devices under a
namespace is taken care be the default pernet exit code.
- Fixed bareudp_change_mtu.
Changes in v3:
- Re-sending the patch again.
Documentation/networking/bareudp.rst | 26 ++
Documentation/networking/index.rst | 1 +
drivers/net/Kconfig | 13 +
drivers/net/Makefile | 1 +
drivers/net/bareudp.c | 808 +++++++++++++++++++++++++++++++++++
include/net/bareudp.h | 19 +
include/net/ip6_tunnel.h | 45 ++
include/net/ip_tunnels.h | 42 ++
include/uapi/linux/if_link.h | 12 +
9 files changed, 967 insertions(+)
create mode 100644 Documentation/networking/bareudp.rst
create mode 100644 drivers/net/bareudp.c
create mode 100644 include/net/bareudp.h
diff --git a/Documentation/networking/bareudp.rst b/Documentation/networking/bareudp.rst
new file mode 100644
index 0000000..2828521
--- /dev/null
+++ b/Documentation/networking/bareudp.rst
@@ -0,0 +1,26 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+========================================
+Bare UDP Tunnelling Module Documentation
+========================================
+
+There are various L3 encapsulation standards using UDP being discussed to
+leverage the UDP based load balancing capability of different networks.
+MPLSoUDP (__ https://tools.ietf.org/html/rfc7510) is one among them.
+
+The Bareudp tunnel module provides a generic L3 encapsulation tunnelling
+support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside
+a UDP tunnel.
+
+Usage
+------
+
+1) Device creation & deletion
+
+ a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.
+
+ This creates a bareudp tunnel device which tunnels L3 traffic with ethertype
+ 0x8847 (MPLS traffic). The destination port of the UDP header will be set to
+ 6635.The device will listen on UDP port 6635 to receive traffic.
+
+ b) ip link delete bareudp0
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst
index d4dca42..0e954a3 100644
--- a/Documentation/networking/index.rst
+++ b/Documentation/networking/index.rst
@@ -33,6 +33,7 @@ Contents:
scaling
tls
tls-offload
+ bareudp
.. only:: subproject and html
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index df1c798..b4b57b5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -215,6 +215,19 @@ config GENEVE
To compile this driver as a module, choose M here: the module
will be called geneve.
+config BAREUDP
+ tristate "Bare UDP Encapsulation"
+ depends on INET && NET_UDP_TUNNEL
+ depends on IPV6 || !IPV6
+ select NET_IP_TUNNEL
+ select GRO_CELLS
+ help
+ This adds a bare UDP tunnel module for tunnelling different
+ kinds of traffic like MPLS, IP, etc. inside a UDP tunnel.
+
+ To compile this driver as a module, choose M here: the module
+ will be called bareudp.
+
config GTP
tristate "GPRS Tunneling Protocol datapath (GTP-U)"
depends on INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d3ba05..0bb7de5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_VXLAN) += vxlan.o
obj-$(CONFIG_GENEVE) += geneve.o
+obj-$(CONFIG_BAREUDP) += bareudp.o
obj-$(CONFIG_GTP) += gtp.o
obj-$(CONFIG_NLMON) += nlmon.o
obj-$(CONFIG_NET_VRF) += vrf.o
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
new file mode 100644
index 0000000..5a8e64a
--- /dev/null
+++ b/drivers/net/bareudp.c
@@ -0,0 +1,808 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Bareudp: UDP tunnel encasulation for different Payload types like
+ * MPLS, NSH, IP, etc.
+ * Copyright (c) 2019 Nokia, Inc.
+ * Authors: Martin Varghese, <martin.varghese@nokia.com>
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/etherdevice.h>
+#include <linux/hash.h>
+#include <net/dst_metadata.h>
+#include <net/gro_cells.h>
+#include <net/rtnetlink.h>
+#include <net/protocol.h>
+#include <net/ip6_tunnel.h>
+#include <net/ip_tunnels.h>
+#include <net/udp_tunnel.h>
+#include <net/bareudp.h>
+
+#define BAREUDP_BASE_HLEN sizeof(struct udphdr)
+#define BAREUDP_IPV4_HLEN (ETH_HLEN + sizeof(struct iphdr) + \
+ sizeof(struct udphdr))
+#define BAREUDP_IPV6_HLEN (ETH_HLEN + sizeof(struct ipv6hdr) + \
+ sizeof(struct udphdr))
+
+static bool log_ecn_error = true;
+module_param(log_ecn_error, bool, 0644);
+MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+
+/* per-network namespace private data for this module */
+
+static unsigned int bareudp_net_id;
+
+struct bareudp_net {
+ struct list_head bareudp_list;
+};
+
+struct bareudp_sock {
+ struct socket *sock;
+ struct rcu_head rcu;
+ struct bareudp_dev *bareudp;
+};
+
+/* Pseudo network device */
+struct bareudp_dev {
+ struct net *net; /* netns for packet i/o */
+ struct net_device *dev; /* netdev for bareudp tunnel */
+ __be16 ethertype;
+ u16 sport_min;
+ struct bareudp_conf conf;
+ struct bareudp_sock __rcu *sock;
+ struct list_head next; /* bareudp node on namespace list */
+ struct gro_cells gro_cells;
+};
+
+static sa_family_t bareudp_get_sk_family(struct bareudp_sock *bs)
+{
+ return bs->sock->sk->sk_family;
+}
+
+static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
+{
+ struct bareudp_sock *bs;
+ struct ethhdr *eh;
+ struct bareudp_dev *bareudp;
+ struct metadata_dst *tun_dst = NULL;
+ struct pcpu_sw_netstats *stats;
+ unsigned int len;
+ int err = 0;
+ void *oiph;
+ u16 proto;
+
+ if (unlikely(!pskb_may_pull(skb, BAREUDP_BASE_HLEN)))
+ goto drop;
+
+ bs = rcu_dereference_sk_user_data(sk);
+ if (!bs)
+ goto drop;
+
+ bareudp = bs->bareudp;
+ proto = bareudp->ethertype;
+
+ if (iptunnel_pull_header(skb, BAREUDP_BASE_HLEN,
+ proto,
+ !net_eq(bareudp->net,
+ dev_net(bareudp->dev)))) {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ tun_dst = udp_tun_rx_dst(skb, bareudp_get_sk_family(bs), TUNNEL_KEY,
+ 0, 0);
+ if (!tun_dst) {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ skb_dst_set(skb, &tun_dst->dst);
+
+ skb_push(skb, sizeof(struct ethhdr));
+ skb_reset_mac_header(skb);
+
+ err = skb_ensure_writable(skb, sizeof(struct ethhdr));
+ if (unlikely(err))
+ goto drop;
+
+ eh = (struct ethhdr *)skb->data;
+ eh->h_proto = proto;
+ skb->protocol = eth_type_trans(skb, bareudp->dev);
+ oiph = skb_network_header(skb);
+ skb_reset_network_header(skb);
+
+ if (bareudp_get_sk_family(bs) == AF_INET)
+ err = IP_ECN_decapsulate(oiph, skb);
+#if IS_ENABLED(CONFIG_IPV6)
+ else
+ err = IP6_ECN_decapsulate(oiph, skb);
+#endif
+
+ if (unlikely(err)) {
+ if (log_ecn_error) {
+ if (bareudp_get_sk_family(bs) == AF_INET)
+ net_info_ratelimited("non-ECT from %pI4 "
+ "with TOS=%#x\n",
+ &((struct iphdr *)oiph)->saddr,
+ ((struct iphdr *)oiph)->tos);
+#if IS_ENABLED(CONFIG_IPV6)
+ else
+ net_info_ratelimited("non-ECT from %pI6\n",
+ &((struct ipv6hdr *)oiph)->saddr);
+#endif
+ }
+ if (err > 1) {
+ ++bareudp->dev->stats.rx_frame_errors;
+ ++bareudp->dev->stats.rx_errors;
+ goto drop;
+ }
+ }
+
+ len = skb->len;
+ err = gro_cells_receive(&bareudp->gro_cells, skb);
+ if (likely(err == NET_RX_SUCCESS)) {
+ stats = this_cpu_ptr(bareudp->dev->tstats);
+ u64_stats_update_begin(&stats->syncp);
+ stats->rx_packets++;
+ stats->rx_bytes += len;
+ u64_stats_update_end(&stats->syncp);
+ }
+ return 0;
+drop:
+ /* Consume bad packet */
+ kfree_skb(skb);
+
+ return 0;
+}
+
+static struct socket *bareudp_create_sock(struct net *net, bool ipv6,
+ __be16 port)
+{
+ struct socket *sock;
+ struct udp_port_cfg udp_conf;
+ int err;
+
+ memset(&udp_conf, 0, sizeof(udp_conf));
+#if IS_ENABLED(CONFIG_IPV6)
+ udp_conf.family = AF_INET6;
+#else
+ udp_conf.family = AF_INET;
+#endif
+ udp_conf.local_udp_port = port;
+ /* Open UDP socket */
+ err = udp_sock_create(net, &udp_conf, &sock);
+ if (err < 0)
+ return ERR_PTR(err);
+
+ return sock;
+}
+
+static int bareudp_err_lookup(struct sock *sk, struct sk_buff *skb)
+{
+ return 0;
+}
+
+/* Create new listen socket if needed */
+static struct bareudp_sock *bareudp_socket_create(struct net *net, __be16 port,
+ bool ipv6)
+{
+ struct bareudp_sock *bs;
+ struct socket *sock;
+ struct udp_tunnel_sock_cfg tunnel_cfg;
+
+ bs = kzalloc(sizeof(*bs), GFP_KERNEL);
+ if (!bs)
+ return ERR_PTR(-ENOMEM);
+
+ sock = bareudp_create_sock(net, ipv6, port);
+ if (IS_ERR(sock)) {
+ kfree(bs);
+ return ERR_CAST(sock);
+ }
+
+ bs->sock = sock;
+
+ /* Mark socket as an encapsulation socket */
+ memset(&tunnel_cfg, 0, sizeof(tunnel_cfg));
+ tunnel_cfg.sk_user_data = bs;
+ tunnel_cfg.encap_type = 1;
+ tunnel_cfg.encap_rcv = bareudp_udp_encap_recv;
+ tunnel_cfg.encap_err_lookup = bareudp_err_lookup;
+ tunnel_cfg.encap_destroy = NULL;
+ setup_udp_tunnel_sock(net, sock, &tunnel_cfg);
+
+ if (sock->sk->sk_family == AF_INET6)
+ udp_encap_enable();
+
+ return bs;
+}
+
+static int bareudp_sock_add(struct bareudp_dev *bareudp, bool ipv6)
+{
+ struct net *net = bareudp->net;
+ struct bareudp_sock *bs;
+
+ bs = bareudp_socket_create(net, bareudp->conf.port, ipv6);
+ if (IS_ERR(bs))
+ return PTR_ERR(bs);
+
+ rcu_assign_pointer(bareudp->sock, bs);
+ bs->bareudp = bareudp;
+
+ return 0;
+}
+
+static void __bareudp_sock_release(struct bareudp_sock *bs)
+{
+ if (!bs)
+ return;
+
+ udp_tunnel_sock_release(bs->sock);
+ kfree_rcu(bs, rcu);
+}
+
+static void bareudp_sock_release(struct bareudp_dev *bareudp)
+{
+ struct bareudp_sock *bs = rtnl_dereference(bareudp->sock);
+
+ rcu_assign_pointer(bareudp->sock, NULL);
+ synchronize_net();
+ __bareudp_sock_release(bs);
+}
+
+static int bareudp_fill_metadata_dst(struct net_device *dev,
+ struct sk_buff *skb)
+{
+ struct ip_tunnel_info *info = skb_tunnel_info(skb);
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+ bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
+
+ if (ip_tunnel_info_af(info) == AF_INET) {
+ struct rtable *rt;
+ struct flowi4 fl4;
+
+ rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
+ use_cache);
+ if (IS_ERR(rt))
+ return PTR_ERR(rt);
+
+ ip_rt_put(rt);
+ info->key.u.ipv4.src = fl4.saddr;
+#if IS_ENABLED(CONFIG_IPV6)
+ } else if (ip_tunnel_info_af(info) == AF_INET6) {
+ struct dst_entry *dst;
+ struct flowi6 fl6;
+ struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
+
+ dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
+ info, use_cache);
+ if (IS_ERR(dst))
+ return PTR_ERR(dst);
+
+ dst_release(dst);
+ info->key.u.ipv6.src = fl6.saddr;
+#endif
+ } else {
+ return -EINVAL;
+ }
+
+ info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
+ bareudp->sport_min,
+ USHRT_MAX, true);
+ info->key.tp_dst = bareudp->conf.port;
+ return 0;
+}
+
+static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev,
+ struct bareudp_dev *bareudp,
+ const struct ip_tunnel_info *info)
+{
+ bool xnet = !net_eq(bareudp->net, dev_net(bareudp->dev));
+ struct bareudp_sock *bs4 = rcu_dereference(bareudp->sock);
+ const struct ip_tunnel_key *key = &info->key;
+ bool udp_sum = !!(info->key.tun_flags & TUNNEL_CSUM);
+ bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
+ int err;
+ struct rtable *rt;
+ struct flowi4 fl4;
+ __u8 tos, ttl;
+ __be16 sport;
+ __be16 df;
+ int min_headroom;
+
+ rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
+ use_cache);
+ if (IS_ERR(rt))
+ return PTR_ERR(rt);
+
+ skb_tunnel_check_pmtu(skb, &rt->dst,
+ BAREUDP_IPV4_HLEN + info->options_len);
+
+ sport = udp_flow_src_port(bareudp->net, skb,
+ bareudp->sport_min, USHRT_MAX,
+ true);
+ tos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
+ ttl = key->ttl;
+ df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
+ skb_scrub_packet(skb, xnet);
+
+ if (!skb_pull(skb, skb->mac_len))
+ goto free_dst;
+
+ skb_reset_mac_header(skb);
+
+ min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len +
+ BAREUDP_BASE_HLEN + info->options_len + sizeof(struct iphdr);
+
+ err = skb_cow_head(skb, min_headroom);
+ if (unlikely(err))
+ goto free_dst;
+
+ err = udp_tunnel_handle_offloads(skb, udp_sum);
+ if (err)
+ goto free_dst;
+
+ skb_set_inner_protocol(skb, bareudp->ethertype);
+
+ udp_tunnel_xmit_skb(rt, bs4->sock->sk, skb, fl4.saddr, fl4.daddr,
+ tos, ttl, df, sport, bareudp->conf.port,
+ !net_eq(bareudp->net, dev_net(bareudp->dev)),
+ !(info->key.tun_flags & TUNNEL_CSUM));
+ return 0;
+
+free_dst:
+ dst_release(&rt->dst);
+ return err;
+}
+
+#if IS_ENABLED(CONFIG_IPV6)
+static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
+ struct bareudp_dev *bareudp,
+ const struct ip_tunnel_info *info)
+{
+ bool xnet = !net_eq(bareudp->net, dev_net(bareudp->dev));
+ struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
+ const struct ip_tunnel_key *key = &info->key;
+ bool udp_sum = !!(info->key.tun_flags & TUNNEL_CSUM);
+ bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
+ struct dst_entry *dst = NULL;
+ struct flowi6 fl6;
+ __u8 prio, ttl;
+ __be16 sport;
+ int min_headroom;
+ int err;
+
+ dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6, info,
+ use_cache);
+ if (IS_ERR(dst))
+ return PTR_ERR(dst);
+
+ skb_tunnel_check_pmtu(skb, dst, BAREUDP_IPV6_HLEN + info->options_len);
+
+ sport = udp_flow_src_port(bareudp->net, skb,
+ bareudp->sport_min, USHRT_MAX,
+ true);
+ prio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
+ ttl = key->ttl;
+
+ skb_scrub_packet(skb, xnet);
+ if (!skb_pull(skb, skb->mac_len))
+ goto free_dst;
+
+ skb_reset_mac_header(skb);
+
+ min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len +
+ BAREUDP_BASE_HLEN + info->options_len + sizeof(struct iphdr);
+
+ err = skb_cow_head(skb, min_headroom);
+ if (unlikely(err))
+ goto free_dst;
+
+ err = udp_tunnel_handle_offloads(skb, udp_sum);
+ if (err)
+ goto free_dst;
+
+ udp_tunnel6_xmit_skb(dst, bs6->sock->sk, skb, dev,
+ &fl6.saddr, &fl6.daddr, prio, ttl,
+ info->key.label, sport, bareudp->conf.port,
+ !(info->key.tun_flags & TUNNEL_CSUM));
+ return 0;
+
+free_dst:
+ dst_release(dst);
+ return err;
+}
+#endif
+
+static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+ struct ip_tunnel_info *info = NULL;
+ int err;
+
+ if (skb->protocol != bareudp->ethertype) {
+ err = -EINVAL;
+ goto tx_error;
+ }
+
+ info = skb_tunnel_info(skb);
+ if (unlikely(!info || !(info->mode & IP_TUNNEL_INFO_TX))) {
+ err = -EINVAL;
+ goto tx_error;
+ }
+
+ rcu_read_lock();
+#if IS_ENABLED(CONFIG_IPV6)
+ if (info->mode & IP_TUNNEL_INFO_IPV6)
+ err = bareudp6_xmit_skb(skb, dev, bareudp, info);
+ else
+#endif
+ err = bareudp_xmit_skb(skb, dev, bareudp, info);
+
+ rcu_read_unlock();
+
+ if (likely(!err))
+ return NETDEV_TX_OK;
+tx_error:
+ dev_kfree_skb(skb);
+
+ if (err == -ELOOP)
+ dev->stats.collisions++;
+ else if (err == -ENETUNREACH)
+ dev->stats.tx_carrier_errors++;
+
+ dev->stats.tx_errors++;
+ return NETDEV_TX_OK;
+}
+
+static int bareudp_open(struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+ int ret = 0;
+
+ ret = bareudp_sock_add(bareudp, true);
+ return ret;
+}
+
+static int bareudp_stop(struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+
+ bareudp_sock_release(bareudp);
+ return 0;
+}
+
+static int bareudp_init(struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+ int err;
+
+ dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
+ if (!dev->tstats)
+ return -ENOMEM;
+
+ err = gro_cells_init(&bareudp->gro_cells, dev);
+ if (err) {
+ free_percpu(dev->tstats);
+ return err;
+ }
+ return 0;
+}
+
+static void bareudp_uninit(struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+
+ gro_cells_destroy(&bareudp->gro_cells);
+ free_percpu(dev->tstats);
+}
+
+static int bareudp_change_mtu(struct net_device *dev, int new_mtu)
+{
+ dev->mtu = new_mtu;
+ return 0;
+}
+
+static const struct net_device_ops bareudp_netdev_ops = {
+ .ndo_init = bareudp_init,
+ .ndo_uninit = bareudp_uninit,
+ .ndo_open = bareudp_open,
+ .ndo_stop = bareudp_stop,
+ .ndo_start_xmit = bareudp_xmit,
+ .ndo_get_stats64 = ip_tunnel_get_stats64,
+ .ndo_change_mtu = bareudp_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_fill_metadata_dst = bareudp_fill_metadata_dst,
+};
+
+static const struct nla_policy bareudp_policy[IFLA_BAREUDP_MAX + 1] = {
+ [IFLA_BAREUDP_PORT] = { .type = NLA_U16 },
+ [IFLA_BAREUDP_ETHERTYPE] = { .type = NLA_U16 },
+ [IFLA_BAREUDP_SRCPORT_MIN] = { .type = NLA_U16 },
+};
+
+static int bareudp_validate(struct nlattr *tb[], struct nlattr *data[],
+ struct netlink_ext_ack *extack)
+{
+ if (!data) {
+ NL_SET_ERR_MSG(extack,
+ "Not enough attributes provided to perform the operation");
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static void bareudp_get_drvinfo(struct net_device *dev,
+ struct ethtool_drvinfo *drvinfo)
+{
+ strlcpy(drvinfo->driver, "bareudp", sizeof(drvinfo->driver));
+}
+
+static const struct ethtool_ops bareudp_ethtool_ops = {
+ .get_drvinfo = bareudp_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+};
+
+/* Info for udev, that this is a virtual tunnel endpoint */
+static struct device_type bareudp_type = {
+ .name = "bareudp",
+};
+
+/* Initialize the device structure. */
+static void bareudp_setup(struct net_device *dev)
+{
+ ether_setup(dev);
+
+ dev->netdev_ops = &bareudp_netdev_ops;
+ dev->ethtool_ops = &bareudp_ethtool_ops;
+ dev->needs_free_netdev = true;
+
+ SET_NETDEV_DEVTYPE(dev, &bareudp_type);
+
+ dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
+ dev->features |= NETIF_F_RXCSUM;
+ dev->features |= NETIF_F_GSO_SOFTWARE;
+
+ dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
+ dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+
+ /* MTU range: 68 - (something less than 65535) */
+ dev->min_mtu = ETH_MIN_MTU;
+ dev->max_mtu = IP_MAX_MTU - BAREUDP_BASE_HLEN - dev->hard_header_len;
+
+ netif_keep_dst(dev);
+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;
+ dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;
+ eth_hw_addr_random(dev);
+}
+
+static struct bareudp_dev *bareudp_find_dev(struct bareudp_net *bn,
+ const struct bareudp_conf *conf)
+{
+ struct bareudp_dev *bareudp, *t = NULL;
+
+ list_for_each_entry(bareudp, &bn->bareudp_list, next) {
+ if (conf->port == bareudp->conf.port)
+ t = bareudp;
+ }
+ return t;
+}
+
+static int bareudp_configure(struct net *net, struct net_device *dev,
+ struct bareudp_conf *conf)
+{
+ struct bareudp_net *bn = net_generic(net, bareudp_net_id);
+ struct bareudp_dev *t, *bareudp = netdev_priv(dev);
+ int err;
+
+ bareudp->net = net;
+ bareudp->dev = dev;
+ t = bareudp_find_dev(bn, conf);
+ if (t)
+ return -EBUSY;
+
+ bareudp->conf = *conf;
+ bareudp->ethertype = conf->ethertype;
+ bareudp->sport_min = conf->sport_min;
+ err = register_netdevice(dev);
+ if (err)
+ return err;
+
+ list_add(&bareudp->next, &bn->bareudp_list);
+ return 0;
+}
+
+static int bareudp2info(struct nlattr *data[], struct bareudp_conf *conf)
+{
+ if (!data[IFLA_BAREUDP_PORT] || !data[IFLA_BAREUDP_ETHERTYPE])
+ return -EINVAL;
+
+ if (data[IFLA_BAREUDP_PORT])
+ conf->port = nla_get_u16(data[IFLA_BAREUDP_PORT]);
+
+ if (data[IFLA_BAREUDP_ETHERTYPE])
+ conf->ethertype = nla_get_u16(data[IFLA_BAREUDP_ETHERTYPE]);
+
+ if (data[IFLA_BAREUDP_SRCPORT_MIN])
+ conf->sport_min = nla_get_u16(data[IFLA_BAREUDP_SRCPORT_MIN]);
+
+ return 0;
+}
+
+static void bareudp_link_config(struct net_device *dev,
+ struct nlattr *tb[])
+{
+ if (tb[IFLA_MTU])
+ bareudp_change_mtu(dev, nla_get_u32(tb[IFLA_MTU]));
+}
+
+static int bareudp_newlink(struct net *net, struct net_device *dev,
+ struct nlattr *tb[], struct nlattr *data[],
+ struct netlink_ext_ack *extack)
+{
+ struct bareudp_conf conf;
+ int err;
+
+ err = bareudp2info(data, &conf);
+ if (err)
+ return err;
+
+ err = bareudp_configure(net, dev, &conf);
+ if (err)
+ return err;
+
+ bareudp_link_config(dev, tb);
+ return 0;
+}
+
+static void bareudp_dellink(struct net_device *dev, struct list_head *head)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+
+ list_del(&bareudp->next);
+ unregister_netdevice_queue(dev, head);
+}
+
+static size_t bareudp_get_size(const struct net_device *dev)
+{
+ return nla_total_size(sizeof(__be16)) + /* IFLA_BAREUDP_PORT */
+ nla_total_size(sizeof(__be16)) + /* IFLA_BAREUDP_ETHERTYPE */
+ nla_total_size(sizeof(__u16)) + /* IFLA_BAREUDP_SRCPORT_MIN */
+ 0;
+}
+
+static int bareudp_fill_info(struct sk_buff *skb, const struct net_device *dev)
+{
+ struct bareudp_dev *bareudp = netdev_priv(dev);
+
+ if (nla_put_be16(skb, IFLA_BAREUDP_PORT, bareudp->conf.port))
+ goto nla_put_failure;
+ if (nla_put_be16(skb, IFLA_BAREUDP_ETHERTYPE, bareudp->conf.ethertype))
+ goto nla_put_failure;
+ if (nla_put_u16(skb, IFLA_BAREUDP_SRCPORT_MIN, bareudp->conf.sport_min))
+ goto nla_put_failure;
+
+ return 0;
+
+nla_put_failure:
+ return -EMSGSIZE;
+}
+
+static struct rtnl_link_ops bareudp_link_ops __read_mostly = {
+ .kind = "bareudp",
+ .maxtype = IFLA_BAREUDP_MAX,
+ .policy = bareudp_policy,
+ .priv_size = sizeof(struct bareudp_dev),
+ .setup = bareudp_setup,
+ .validate = bareudp_validate,
+ .newlink = bareudp_newlink,
+ .dellink = bareudp_dellink,
+ .get_size = bareudp_get_size,
+ .fill_info = bareudp_fill_info,
+};
+
+struct net_device *bareudp_dev_create(struct net *net, const char *name,
+ u8 name_assign_type,
+ struct bareudp_conf *conf)
+{
+ struct nlattr *tb[IFLA_MAX + 1];
+ struct net_device *dev;
+ LIST_HEAD(list_kill);
+ int err;
+
+ memset(tb, 0, sizeof(tb));
+ dev = rtnl_create_link(net, name, name_assign_type,
+ &bareudp_link_ops, tb, NULL);
+ if (IS_ERR(dev))
+ return dev;
+
+ err = bareudp_configure(net, dev, conf);
+ if (err) {
+ free_netdev(dev);
+ return ERR_PTR(err);
+ }
+ err = bareudp_change_mtu(dev, IP_MAX_MTU);
+ if (err)
+ goto err;
+
+ err = rtnl_configure_link(dev, NULL);
+ if (err < 0)
+ goto err;
+
+ return dev;
+err:
+ bareudp_dellink(dev, &list_kill);
+ unregister_netdevice_many(&list_kill);
+ return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(bareudp_dev_create);
+
+static __net_init int bareudp_init_net(struct net *net)
+{
+ struct bareudp_net *bn = net_generic(net, bareudp_net_id);
+
+ INIT_LIST_HEAD(&bn->bareudp_list);
+ return 0;
+}
+
+static void bareudp_destroy_tunnels(struct net *net, struct list_head *head)
+{
+ struct bareudp_net *bn = net_generic(net, bareudp_net_id);
+ struct bareudp_dev *bareudp, *next;
+
+ list_for_each_entry_safe(bareudp, next, &bn->bareudp_list, next)
+ unregister_netdevice_queue(bareudp->dev, head);
+}
+
+static void __net_exit bareudp_exit_batch_net(struct list_head *net_list)
+{
+ struct net *net;
+ LIST_HEAD(list);
+
+ rtnl_lock();
+ list_for_each_entry(net, net_list, exit_list)
+ bareudp_destroy_tunnels(net, &list);
+
+ /* unregister the devices gathered above */
+ unregister_netdevice_many(&list);
+ rtnl_unlock();
+}
+
+static struct pernet_operations bareudp_net_ops = {
+ .init = bareudp_init_net,
+ .exit_batch = bareudp_exit_batch_net,
+ .id = &bareudp_net_id,
+ .size = sizeof(struct bareudp_net),
+};
+
+static int __init bareudp_init_module(void)
+{
+ int rc;
+
+ rc = register_pernet_subsys(&bareudp_net_ops);
+ if (rc)
+ goto out1;
+
+ rc = rtnl_link_register(&bareudp_link_ops);
+ if (rc)
+ goto out2;
+
+ return 0;
+out2:
+ unregister_pernet_subsys(&bareudp_net_ops);
+out1:
+ return rc;
+}
+late_initcall(bareudp_init_module);
+
+static void __exit bareudp_cleanup_module(void)
+{
+ rtnl_link_unregister(&bareudp_link_ops);
+ unregister_pernet_subsys(&bareudp_net_ops);
+}
+module_exit(bareudp_cleanup_module);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Martin Varghese <martin.varghese@nokia.com>");
+MODULE_DESCRIPTION("Interface driver for UDP encapsulated traffic");
diff --git a/include/net/bareudp.h b/include/net/bareudp.h
new file mode 100644
index 0000000..513fae6
--- /dev/null
+++ b/include/net/bareudp.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __NET_BAREUDP_H
+#define __NET_BAREUDP_H
+
+#include <linux/types.h>
+#include <linux/skbuff.h>
+
+struct bareudp_conf {
+ __be16 ethertype;
+ __be16 port;
+ u16 sport_min;
+};
+
+struct net_device *bareudp_dev_create(struct net *net, const char *name,
+ u8 name_assign_type,
+ struct bareudp_conf *info);
+
+#endif
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 028eaea..73d9b0e 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -165,5 +165,50 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
iptunnel_xmit_stats(dev, pkt_len);
}
}
+
+static inline struct dst_entry *ip6tunnel_get_dst(struct sk_buff *skb,
+ struct net_device *dev,
+ struct net *net,
+ struct socket *sock,
+ struct flowi6 *fl6,
+ const struct ip_tunnel_info *info,
+ bool use_cache)
+{
+ struct dst_entry *dst = NULL;
+ struct dst_cache *dst_cache;
+ __u8 prio;
+
+
+ memset(fl6, 0, sizeof(*fl6));
+ fl6->flowi6_mark = skb->mark;
+ fl6->flowi6_proto = IPPROTO_UDP;
+ fl6->daddr = info->key.u.ipv6.dst;
+ fl6->saddr = info->key.u.ipv6.src;
+ prio = info->key.tos;
+
+ fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
+ info->key.label);
+ dst_cache = (struct dst_cache *)&info->dst_cache;
+ if (use_cache) {
+ dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
+ if (dst)
+ return dst;
+ }
+ if (ipv6_stub->ipv6_dst_lookup(net, sock->sk, &dst,
+ fl6)) {
+ netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
+ return ERR_PTR(-ENETUNREACH);
+ }
+ if (dst->dev == dev) { /* is this necessary? */
+ netdev_dbg(dev, "circular route to %pI6\n", &fl6->daddr);
+ dst_release(dst);
+ return ERR_PTR(-ELOOP);
+ }
+
+ if (use_cache)
+ dst_cache_set_ip6(dst_cache, dst, &fl6->saddr);
+ return dst;
+}
+
#endif
#endif
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index af64560..c76f9bf 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -490,6 +490,48 @@ static inline int ip_tunnel_collect_metadata(void)
return static_branch_unlikely(&ip_tunnel_metadata_cnt);
}
+static inline struct rtable *iptunnel_get_v4_rt(struct sk_buff *skb,
+ struct net_device *dev,
+ struct net *net,
+ struct flowi4 *fl4,
+ const struct ip_tunnel_info *info,
+ bool use_cache)
+{
+ struct dst_cache *dst_cache;
+ struct rtable *rt = NULL;
+ __u8 tos;
+
+
+ memset(fl4, 0, sizeof(*fl4));
+ fl4->flowi4_mark = skb->mark;
+ fl4->flowi4_proto = IPPROTO_UDP;
+ fl4->daddr = info->key.u.ipv4.dst;
+ fl4->saddr = info->key.u.ipv4.src;
+
+ tos = info->key.tos;
+ fl4->flowi4_tos = RT_TOS(tos);
+
+ dst_cache = (struct dst_cache *)&info->dst_cache;
+ if (use_cache) {
+ rt = dst_cache_get_ip4(dst_cache, &fl4->saddr);
+ if (rt)
+ return rt;
+ }
+ rt = ip_route_output_key(net, fl4);
+ if (IS_ERR(rt)) {
+ netdev_dbg(dev, "no route to %pI4\n", &fl4->daddr);
+ return ERR_PTR(-ENETUNREACH);
+ }
+ if (rt->dst.dev == dev) { /* is this necessary? */
+ netdev_dbg(dev, "circular route to %pI4\n", &fl4->daddr);
+ ip_rt_put(rt);
+ return ERR_PTR(-ELOOP);
+ }
+ if (use_cache)
+ dst_cache_set_ip4(dst_cache, &rt->dst, fl4->saddr);
+ return rt;
+}
+
void __init ip_tunnel_core_init(void);
void ip_tunnel_need_metadata(void);
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 4a8c02c..012f7e8 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -580,6 +580,18 @@ enum ifla_geneve_df {
GENEVE_DF_MAX = __GENEVE_DF_END - 1,
};
+/* Bareudp section */
+enum {
+ IFLA_BAREUDP_UNSPEC,
+ IFLA_BAREUDP_PORT,
+ IFLA_BAREUDP_ETHERTYPE,
+ IFLA_BAREUDP_SRCPORT_MIN,
+ __IFLA_BAREUDP_MAX
+};
+
+#define IFLA_BAREUDP_MAX (__IFLA_BAREUDP_MAX - 1)
+
+
/* PPP section */
enum {
IFLA_PPP_UNSPEC,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 net-next 2/2] Special handling for IP & MPLS.
2019-11-16 5:43 [PATCH v3 net-next 0/2] Bare UDP L3 Encapsulation Module Martin Varghese
2019-11-16 5:44 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc Martin Varghese
@ 2019-11-16 5:45 ` Martin Varghese
2019-11-18 17:30 ` Willem de Bruijn
1 sibling, 1 reply; 13+ messages in thread
From: Martin Varghese @ 2019-11-16 5:45 UTC (permalink / raw)
To: netdev, davem, corbet, kuznet, yoshfuji, scott.drennan, jbenc,
martin.varghese
From: Martin Varghese <martin.varghese@nokia.com>
Special handling is needed in bareudp module for IP & MPLS as they support
more than one ethertypes.
MPLS has 2 ethertypes. 0x8847 for MPLS unicast and 0x8848 for MPLS multicast.
While decapsulating MPLS packet from UDP packet the tunnel destination IP
address is checked to determine the ethertype. The ethertype of the packet
will be set to 0x8848 if the tunnel destination IP address is a multicast
IP address. The ethertype of the packet will be set to 0x8847 if the
tunnel destination IP address is a unicast IP address.
IP has 2 ethertypes.0x0800 for IPV4 and 0x86dd for IPv6. The version field
of the IP header tunnelled will be checked to determine the ethertype.
This special handling to tunnel additional ethertypes will be disabled by
default and can be enabled using a flag called ext mode. This flag can be
used only with ethertypes 0x8847 and 0x0800.
Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
---
Changes in v2:
- Fixed documentation errors.
- Changed commit message.
Changes in v3:
- Re-sending the patch.
Documentation/networking/bareudp.rst | 18 ++++++++
drivers/net/bareudp.c | 82 +++++++++++++++++++++++++++++++++---
include/net/bareudp.h | 1 +
include/uapi/linux/if_link.h | 1 +
4 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/Documentation/networking/bareudp.rst b/Documentation/networking/bareudp.rst
index 2828521..1f01dfd 100644
--- a/Documentation/networking/bareudp.rst
+++ b/Documentation/networking/bareudp.rst
@@ -12,6 +12,15 @@ The Bareudp tunnel module provides a generic L3 encapsulation tunnelling
support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside
a UDP tunnel.
+Special Handling
+----------------
+The bareudp device supports special handling for MPLS & IP as they can have
+multiple ethertypes.
+MPLS procotcol can have ethertypes ETH_P_MPLS_UC (unicast) & ETH_P_MPLS_MC (multicast).
+IP proctocol can have ethertypes ETH_P_IP (v4) & ETH_P_IPV6 (v6).
+This special handling can be enabled only for ethertypes ETH_P_IP & ETH_P_MPLS_UC
+with a flag called extended mode.
+
Usage
------
@@ -24,3 +33,12 @@ Usage
6635.The device will listen on UDP port 6635 to receive traffic.
b) ip link delete bareudp0
+
+2) Device creation with extended mode enabled
+
+There are two ways to create a bareudp device for MPLS & IP with extended mode
+enabled.
+
+ a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847 extmode
+
+ b) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 5a8e64a..636127a 100644
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -50,6 +50,7 @@ struct bareudp_dev {
struct net_device *dev; /* netdev for bareudp tunnel */
__be16 ethertype;
u16 sport_min;
+ bool ext_mode;
struct bareudp_conf conf;
struct bareudp_sock __rcu *sock;
struct list_head next; /* bareudp node on namespace list */
@@ -81,15 +82,64 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto drop;
bareudp = bs->bareudp;
- proto = bareudp->ethertype;
+ if (!bareudp)
+ goto drop;
+
+ if (bareudp->ethertype == htons(ETH_P_IP)) {
+ struct iphdr *iphdr;
+
+ iphdr = (struct iphdr *)(skb->data + BAREUDP_BASE_HLEN);
+ if (iphdr->version == 4) {
+ proto = bareudp->ethertype;
+ } else if (bareudp->ext_mode && (iphdr->version == 6)) {
+ proto = htons(ETH_P_IPV6);
+ } else {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ } else if (bareudp->ethertype == htons(ETH_P_MPLS_UC)) {
+ struct iphdr *tunnel_hdr;
+
+ tunnel_hdr = (struct iphdr *)skb_network_header(skb);
+ if (tunnel_hdr->version == 4) {
+ if (!ipv4_is_multicast(tunnel_hdr->daddr)) {
+ proto = bareudp->ethertype;
+ } else if (bareudp->ext_mode &&
+ ipv4_is_multicast(tunnel_hdr->daddr)) {
+ proto = htons(ETH_P_MPLS_MC);
+ } else {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ } else {
+ int addr_type;
+ struct ipv6hdr *tunnel_hdr_v6;
+
+ tunnel_hdr_v6 = (struct ipv6hdr *)skb_network_header(skb);
+ addr_type =
+ ipv6_addr_type((struct in6_addr *)&tunnel_hdr_v6->daddr);
+ if (!(addr_type & IPV6_ADDR_MULTICAST)) {
+ proto = bareudp->ethertype;
+ } else if (bareudp->ext_mode &&
+ (addr_type & IPV6_ADDR_MULTICAST)) {
+ proto = htons(ETH_P_MPLS_MC);
+ } else {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ }
+ } else {
+ proto = bareudp->ethertype;
+ }
if (iptunnel_pull_header(skb, BAREUDP_BASE_HLEN,
- proto,
- !net_eq(bareudp->net,
- dev_net(bareudp->dev)))) {
+ proto,
+ !net_eq(bareudp->net,
+ dev_net(bareudp->dev)))) {
bareudp->dev->stats.rx_dropped++;
goto drop;
}
+
tun_dst = udp_tun_rx_dst(skb, bareudp_get_sk_family(bs), TUNNEL_KEY,
0, 0);
if (!tun_dst) {
@@ -421,10 +471,13 @@ static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)
int err;
if (skb->protocol != bareudp->ethertype) {
- err = -EINVAL;
- goto tx_error;
+ if (!bareudp->ext_mode ||
+ (skb->protocol != htons(ETH_P_MPLS_MC) &&
+ skb->protocol != htons(ETH_P_IPV6))) {
+ err = -EINVAL;
+ goto tx_error;
+ }
}
-
info = skb_tunnel_info(skb);
if (unlikely(!info || !(info->mode & IP_TUNNEL_INFO_TX))) {
err = -EINVAL;
@@ -520,6 +573,7 @@ static int bareudp_change_mtu(struct net_device *dev, int new_mtu)
[IFLA_BAREUDP_PORT] = { .type = NLA_U16 },
[IFLA_BAREUDP_ETHERTYPE] = { .type = NLA_U16 },
[IFLA_BAREUDP_SRCPORT_MIN] = { .type = NLA_U16 },
+ [IFLA_BAREUDP_EXTMODE] = { .type = NLA_FLAG },
};
static int bareudp_validate(struct nlattr *tb[], struct nlattr *data[],
@@ -602,9 +656,15 @@ static int bareudp_configure(struct net *net, struct net_device *dev,
if (t)
return -EBUSY;
+ if (conf->ext_mode &&
+ (conf->ethertype != htons(ETH_P_MPLS_UC) &&
+ conf->ethertype != htons(ETH_P_IP)))
+ return -EINVAL;
+
bareudp->conf = *conf;
bareudp->ethertype = conf->ethertype;
bareudp->sport_min = conf->sport_min;
+ bareudp->ext_mode = conf->ext_mode;
err = register_netdevice(dev);
if (err)
return err;
@@ -627,6 +687,11 @@ static int bareudp2info(struct nlattr *data[], struct bareudp_conf *conf)
if (data[IFLA_BAREUDP_SRCPORT_MIN])
conf->sport_min = nla_get_u16(data[IFLA_BAREUDP_SRCPORT_MIN]);
+ if (data[IFLA_BAREUDP_EXTMODE])
+ conf->ext_mode = true;
+ else
+ conf->ext_mode = false;
+
return 0;
}
@@ -669,6 +734,7 @@ static size_t bareudp_get_size(const struct net_device *dev)
return nla_total_size(sizeof(__be16)) + /* IFLA_BAREUDP_PORT */
nla_total_size(sizeof(__be16)) + /* IFLA_BAREUDP_ETHERTYPE */
nla_total_size(sizeof(__u16)) + /* IFLA_BAREUDP_SRCPORT_MIN */
+ nla_total_size(0) + /* IFLA_BAREUDP_EXTMODE */
0;
}
@@ -682,6 +748,8 @@ static int bareudp_fill_info(struct sk_buff *skb, const struct net_device *dev)
goto nla_put_failure;
if (nla_put_u16(skb, IFLA_BAREUDP_SRCPORT_MIN, bareudp->conf.sport_min))
goto nla_put_failure;
+ if (bareudp->ext_mode && nla_put_flag(skb, IFLA_BAREUDP_EXTMODE))
+ goto nla_put_failure;
return 0;
diff --git a/include/net/bareudp.h b/include/net/bareudp.h
index 513fae6..2c121d8 100644
--- a/include/net/bareudp.h
+++ b/include/net/bareudp.h
@@ -10,6 +10,7 @@ struct bareudp_conf {
__be16 ethertype;
__be16 port;
u16 sport_min;
+ bool ext_mode;
};
struct net_device *bareudp_dev_create(struct net *net, const char *name,
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 012f7e8..2b91c872 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -586,6 +586,7 @@ enum {
IFLA_BAREUDP_PORT,
IFLA_BAREUDP_ETHERTYPE,
IFLA_BAREUDP_SRCPORT_MIN,
+ IFLA_BAREUDP_EXTMODE,
__IFLA_BAREUDP_MAX
};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-16 5:44 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc Martin Varghese
@ 2019-11-18 17:23 ` Willem de Bruijn
2019-11-28 16:24 ` Martin Varghese
2019-11-20 11:10 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc kbuild test robot
1 sibling, 1 reply; 13+ messages in thread
From: Willem de Bruijn @ 2019-11-18 17:23 UTC (permalink / raw)
To: Martin Varghese
Cc: Network Development, David Miller, corbet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, scott.drennan, Jiri Benc, martin.varghese
On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
<martinvarghesenokia@gmail.com> wrote:
>
> From: Martin Varghese <martin.varghese@nokia.com>
>
> The Bareudp tunnel module provides a generic L3 encapsulation
> tunnelling module for tunnelling different protocols like MPLS,
> IP,NSH etc inside a UDP tunnel.
>
> Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
> ---
> Changes in v2:
> - Fixed documentation errors.
> - Converted documentation to rst format.
> - Moved ip tunnel rt lookup code to a common location.
This does not actually deduplicate with the existing code in geneve
(and vxlan, maybe others).
Mentioned a few more obvious examples inline. I won't keep harping on
this point, as I have no real stake in this.
But if you don't deduplicate from the start, I'm skeptical that it
will happen later. And then fixes to one driver are likely to be
missed for the other, slowly drifting the code further apart.
> +1) Device creation & deletion
> +
> + a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.
> +
> + This creates a bareudp tunnel device which tunnels L3 traffic with ethertype
> + 0x8847 (MPLS traffic). The destination port of the UDP header will be set to
> + 6635.The device will listen on UDP port 6635 to receive traffic.
> +
Might be useful to also document how to use this on transmission.
> +struct bareudp_sock {
> + struct socket *sock;
> + struct rcu_head rcu;
> + struct bareudp_dev *bareudp;
> +};
Is this intermediate struct needed, or could struct bareudp_dev
directly hang off of sk_user_data if it gains a struct rcu_head?
Especially now that there is a 1:1 relationship between socket and
device.
> + skb_push(skb, sizeof(struct ethhdr));
> + skb_reset_mac_header(skb);
> +
> + err = skb_ensure_writable(skb, sizeof(struct ethhdr));
> + if (unlikely(err))
> + goto drop;
> +
> + eh = (struct ethhdr *)skb->data;
> + eh->h_proto = proto;
> + skb->protocol = eth_type_trans(skb, bareudp->dev);
> + oiph = skb_network_header(skb);
> + skb_reset_network_header(skb);
After decapsulation packets now have a fake ethernet header with
garbage in the src and dst address. Tcpdump will show that.
Instead of pseudo Ethernet, should this device be of link layer type
ARPHRD_NONE. Or alternatively a new type analogous to ARPHRD_TUNNEL
that includes the udp header?
The same can probably be said about geneve, so no strong objection to
what is here. Just a point for thought.
> + if (bareudp_get_sk_family(bs) == AF_INET)
> + err = IP_ECN_decapsulate(oiph, skb);
> +#if IS_ENABLED(CONFIG_IPV6)
> + else
> + err = IP6_ECN_decapsulate(oiph, skb);
> +#endif
with dual stack sockets, should this check now be based on packet
header instead of bareudp_get_sk_family?
> + if (unlikely(err)) {
> + if (log_ecn_error) {
> + if (bareudp_get_sk_family(bs) == AF_INET)
> + net_info_ratelimited("non-ECT from %pI4 "
> + "with TOS=%#x\n",
> + &((struct iphdr *)oiph)->saddr,
> + ((struct iphdr *)oiph)->tos);
> +#if IS_ENABLED(CONFIG_IPV6)
> + else
> + net_info_ratelimited("non-ECT from %pI6\n",
> + &((struct ipv6hdr *)oiph)->saddr);
> +#endif
> + }
> + if (err > 1) {
> + ++bareudp->dev->stats.rx_frame_errors;
> + ++bareudp->dev->stats.rx_errors;
> + goto drop;
> + }
> + }
> +
> + len = skb->len;
> + err = gro_cells_receive(&bareudp->gro_cells, skb);
> + if (likely(err == NET_RX_SUCCESS)) {
> + stats = this_cpu_ptr(bareudp->dev->tstats);
> + u64_stats_update_begin(&stats->syncp);
> + stats->rx_packets++;
> + stats->rx_bytes += len;
> + u64_stats_update_end(&stats->syncp);
> + }
> + return 0;
> +drop:
> + /* Consume bad packet */
> + kfree_skb(skb);
> +
> + return 0;
> +}
All of this can pretty easily be shared with geneve.
> +static struct socket *bareudp_create_sock(struct net *net, bool ipv6,
> + __be16 port)
> +{
> + struct socket *sock;
> + struct udp_port_cfg udp_conf;
> + int err;
> +
> + memset(&udp_conf, 0, sizeof(udp_conf));
> +#if IS_ENABLED(CONFIG_IPV6)
> + udp_conf.family = AF_INET6;
> +#else
> + udp_conf.family = AF_INET;
> +#endif
Still need to take bool ipv6 in account when creating the socket?
> +static int bareudp_sock_add(struct bareudp_dev *bareudp, bool ipv6)
> +{
> + struct net *net = bareudp->net;
> + struct bareudp_sock *bs;
> +
> + bs = bareudp_socket_create(net, bareudp->conf.port, ipv6);
> + if (IS_ERR(bs))
> + return PTR_ERR(bs);
> +
> + rcu_assign_pointer(bareudp->sock, bs);
> + bs->bareudp = bareudp;
> +
> + return 0;
Especially now that the device only has one socket, probably no need
to have a separate bareudp_socket_create from bareudp_sock_add. Same
for __bareudp_sock_release and bareudp_sock_release.
> +}
> +
> +static void __bareudp_sock_release(struct bareudp_sock *bs)
> +{
> + if (!bs)
> + return;
> +
> + udp_tunnel_sock_release(bs->sock);
> + kfree_rcu(bs, rcu);
> +}
> +
> +static void bareudp_sock_release(struct bareudp_dev *bareudp)
> +{
> + struct bareudp_sock *bs = rtnl_dereference(bareudp->sock);
> +
> + rcu_assign_pointer(bareudp->sock, NULL);
> + synchronize_net();
> + __bareudp_sock_release(bs);
> +}
> +
> +static int bareudp_fill_metadata_dst(struct net_device *dev,
> + struct sk_buff *skb)
> +{
> + struct ip_tunnel_info *info = skb_tunnel_info(skb);
> + struct bareudp_dev *bareudp = netdev_priv(dev);
> + bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> +
> + if (ip_tunnel_info_af(info) == AF_INET) {
> + struct rtable *rt;
> + struct flowi4 fl4;
> +
> + rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
> + use_cache);
> + if (IS_ERR(rt))
> + return PTR_ERR(rt);
> +
> + ip_rt_put(rt);
> + info->key.u.ipv4.src = fl4.saddr;
> +#if IS_ENABLED(CONFIG_IPV6)
> + } else if (ip_tunnel_info_af(info) == AF_INET6) {
> + struct dst_entry *dst;
> + struct flowi6 fl6;
> + struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
> +
> + dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
> + info, use_cache);
> + if (IS_ERR(dst))
> + return PTR_ERR(dst);
> +
> + dst_release(dst);
> + info->key.u.ipv6.src = fl6.saddr;
> +#endif
> + } else {
> + return -EINVAL;
> + }
> +
> + info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
> + bareudp->sport_min,
> + USHRT_MAX, true);
> + info->key.tp_dst = bareudp->conf.port;
> + return 0;
> +}
This can probably all be deduplicated with geneve_fill_metadata_dst
once both use iptunnel_get_v4_rt.
> +static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)
> +{
> + struct bareudp_dev *bareudp = netdev_priv(dev);
> + struct ip_tunnel_info *info = NULL;
> + int err;
> +
> + if (skb->protocol != bareudp->ethertype) {
> + err = -EINVAL;
> + goto tx_error;
> + }
> +
> + info = skb_tunnel_info(skb);
Like geneve, should this have two modes, either associated with LWT if
geneve->collect_md, else static for the device (geneve->info)? As
opposed to requiring collect_md mode.
> +/* Initialize the device structure. */
> +static void bareudp_setup(struct net_device *dev)
> +{
> + ether_setup(dev);
> +
> + dev->netdev_ops = &bareudp_netdev_ops;
> + dev->ethtool_ops = &bareudp_ethtool_ops;
> + dev->needs_free_netdev = true;
> +
> + SET_NETDEV_DEVTYPE(dev, &bareudp_type);
> +
> + dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
> + dev->features |= NETIF_F_RXCSUM;
> + dev->features |= NETIF_F_GSO_SOFTWARE;
> +
> + dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
> + dev->hw_features |= NETIF_F_GSO_SOFTWARE;
> +
> + /* MTU range: 68 - (something less than 65535) */
> + dev->min_mtu = ETH_MIN_MTU;
> + dev->max_mtu = IP_MAX_MTU - BAREUDP_BASE_HLEN - dev->hard_header_len;
For IPv6, MSS is 64 kB without headers, so dev->max_mtu could perhaps
be IP_MAX_MTU. Also, why is hard_header_len subtracted? Again, same
for geneve, so if it works there, fine to leave here. Just something
that surprised me and might be worth giving another thought.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 2/2] Special handling for IP & MPLS.
2019-11-16 5:45 ` [PATCH v3 net-next 2/2] Special handling for IP & MPLS Martin Varghese
@ 2019-11-18 17:30 ` Willem de Bruijn
2019-11-28 16:12 ` Martin Varghese
0 siblings, 1 reply; 13+ messages in thread
From: Willem de Bruijn @ 2019-11-18 17:30 UTC (permalink / raw)
To: Martin Varghese
Cc: Network Development, David Miller, corbet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, scott.drennan, Jiri Benc, martin.varghese
On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
<martinvarghesenokia@gmail.com> wrote:
>
> From: Martin Varghese <martin.varghese@nokia.com>
>
> Special handling is needed in bareudp module for IP & MPLS as they support
> more than one ethertypes.
>
> MPLS has 2 ethertypes. 0x8847 for MPLS unicast and 0x8848 for MPLS multicast.
> While decapsulating MPLS packet from UDP packet the tunnel destination IP
> address is checked to determine the ethertype. The ethertype of the packet
> will be set to 0x8848 if the tunnel destination IP address is a multicast
> IP address. The ethertype of the packet will be set to 0x8847 if the
> tunnel destination IP address is a unicast IP address.
>
> IP has 2 ethertypes.0x0800 for IPV4 and 0x86dd for IPv6. The version field
> of the IP header tunnelled will be checked to determine the ethertype.
If using ipv6 dual stack, it might make more sense to use extended
mode with the ipv6 device instead of the ipv4 device.
Also, the term extended mode is not self describing. Dual stack as
term would be, but is not relevant to MPLS. Maybe "dual_proto"?
> diff --git a/Documentation/networking/bareudp.rst b/Documentation/networking/bareudp.rst
> index 2828521..1f01dfd 100644
> --- a/Documentation/networking/bareudp.rst
> +++ b/Documentation/networking/bareudp.rst
> @@ -12,6 +12,15 @@ The Bareudp tunnel module provides a generic L3 encapsulation tunnelling
> support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside
> a UDP tunnel.
>
> +Special Handling
> +----------------
> +The bareudp device supports special handling for MPLS & IP as they can have
> +multiple ethertypes.
> +MPLS procotcol can have ethertypes ETH_P_MPLS_UC (unicast) & ETH_P_MPLS_MC (multicast).
> +IP proctocol can have ethertypes ETH_P_IP (v4) & ETH_P_IPV6 (v6).
proctocol -> protocol
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-16 5:44 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc Martin Varghese
@ 2019-11-20 11:10 ` kbuild test robot
2019-11-20 11:10 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc kbuild test robot
1 sibling, 0 replies; 13+ messages in thread
From: kbuild test robot @ 2019-11-20 11:10 UTC (permalink / raw)
To: Martin Varghese
Cc: kbuild-all, netdev, davem, corbet, kuznet, yoshfuji,
scott.drennan, jbenc, martin.varghese
[-- Attachment #1: Type: text/plain, Size: 4447 bytes --]
Hi Martin,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
[also build test ERROR on v5.4-rc8 next-20191120]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Martin-Varghese/Bare-UDP-L3-Encapsulation-Module/20191116-135036
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 20021578ba226bda1f0ddf50e4d4a12ea1c6c6c1
config: powerpc-tqm8560_defconfig (attached as .config)
compiler: powerpc-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from include/net/dst_metadata.h:6:0,
from net/core/dev.c:101:
include/net/ip_tunnels.h: In function 'iptunnel_get_v4_rt':
>> include/net/ip_tunnels.h:514:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
--
In file included from net/ipv4/ip_tunnel_core.c:26:0:
include/net/ip_tunnels.h: In function 'iptunnel_get_v4_rt':
>> include/net/ip_tunnels.h:514:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
In file included from net/ipv4/ip_tunnel_core.c:27:0:
include/net/ip6_tunnel.h: In function 'ip6tunnel_get_dst':
>> include/net/ip6_tunnel.h:191:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
>> include/net/ip6_tunnel.h:193:9: error: implicit declaration of function 'dst_cache_get_ip6'; did you mean 'dst_cache_get_ip4'? [-Werror=implicit-function-declaration]
dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
^~~~~~~~~~~~~~~~~
dst_cache_get_ip4
include/net/ip6_tunnel.h:193:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
^
>> include/net/ip6_tunnel.h:209:3: error: implicit declaration of function 'dst_cache_set_ip6'; did you mean 'dst_cache_set_ip4'? [-Werror=implicit-function-declaration]
dst_cache_set_ip6(dst_cache, dst, &fl6->saddr);
^~~~~~~~~~~~~~~~~
dst_cache_set_ip4
cc1: some warnings being treated as errors
vim +514 include/net/ip_tunnels.h
492
493 static inline struct rtable *iptunnel_get_v4_rt(struct sk_buff *skb,
494 struct net_device *dev,
495 struct net *net,
496 struct flowi4 *fl4,
497 const struct ip_tunnel_info *info,
498 bool use_cache)
499 {
500 struct dst_cache *dst_cache;
501 struct rtable *rt = NULL;
502 __u8 tos;
503
504
505 memset(fl4, 0, sizeof(*fl4));
506 fl4->flowi4_mark = skb->mark;
507 fl4->flowi4_proto = IPPROTO_UDP;
508 fl4->daddr = info->key.u.ipv4.dst;
509 fl4->saddr = info->key.u.ipv4.src;
510
511 tos = info->key.tos;
512 fl4->flowi4_tos = RT_TOS(tos);
513
> 514 dst_cache = (struct dst_cache *)&info->dst_cache;
515 if (use_cache) {
516 rt = dst_cache_get_ip4(dst_cache, &fl4->saddr);
517 if (rt)
518 return rt;
519 }
520 rt = ip_route_output_key(net, fl4);
521 if (IS_ERR(rt)) {
522 netdev_dbg(dev, "no route to %pI4\n", &fl4->daddr);
523 return ERR_PTR(-ENETUNREACH);
524 }
525 if (rt->dst.dev == dev) { /* is this necessary? */
526 netdev_dbg(dev, "circular route to %pI4\n", &fl4->daddr);
527 ip_rt_put(rt);
528 return ERR_PTR(-ELOOP);
529 }
530 if (use_cache)
531 dst_cache_set_ip4(dst_cache, &rt->dst, fl4->saddr);
532 return rt;
533 }
534
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 16148 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.
@ 2019-11-20 11:10 ` kbuild test robot
0 siblings, 0 replies; 13+ messages in thread
From: kbuild test robot @ 2019-11-20 11:10 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 4553 bytes --]
Hi Martin,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
[also build test ERROR on v5.4-rc8 next-20191120]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Martin-Varghese/Bare-UDP-L3-Encapsulation-Module/20191116-135036
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 20021578ba226bda1f0ddf50e4d4a12ea1c6c6c1
config: powerpc-tqm8560_defconfig (attached as .config)
compiler: powerpc-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from include/net/dst_metadata.h:6:0,
from net/core/dev.c:101:
include/net/ip_tunnels.h: In function 'iptunnel_get_v4_rt':
>> include/net/ip_tunnels.h:514:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
--
In file included from net/ipv4/ip_tunnel_core.c:26:0:
include/net/ip_tunnels.h: In function 'iptunnel_get_v4_rt':
>> include/net/ip_tunnels.h:514:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
In file included from net/ipv4/ip_tunnel_core.c:27:0:
include/net/ip6_tunnel.h: In function 'ip6tunnel_get_dst':
>> include/net/ip6_tunnel.h:191:39: error: 'const struct ip_tunnel_info' has no member named 'dst_cache'
dst_cache = (struct dst_cache *)&info->dst_cache;
^~
>> include/net/ip6_tunnel.h:193:9: error: implicit declaration of function 'dst_cache_get_ip6'; did you mean 'dst_cache_get_ip4'? [-Werror=implicit-function-declaration]
dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
^~~~~~~~~~~~~~~~~
dst_cache_get_ip4
include/net/ip6_tunnel.h:193:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
^
>> include/net/ip6_tunnel.h:209:3: error: implicit declaration of function 'dst_cache_set_ip6'; did you mean 'dst_cache_set_ip4'? [-Werror=implicit-function-declaration]
dst_cache_set_ip6(dst_cache, dst, &fl6->saddr);
^~~~~~~~~~~~~~~~~
dst_cache_set_ip4
cc1: some warnings being treated as errors
vim +514 include/net/ip_tunnels.h
492
493 static inline struct rtable *iptunnel_get_v4_rt(struct sk_buff *skb,
494 struct net_device *dev,
495 struct net *net,
496 struct flowi4 *fl4,
497 const struct ip_tunnel_info *info,
498 bool use_cache)
499 {
500 struct dst_cache *dst_cache;
501 struct rtable *rt = NULL;
502 __u8 tos;
503
504
505 memset(fl4, 0, sizeof(*fl4));
506 fl4->flowi4_mark = skb->mark;
507 fl4->flowi4_proto = IPPROTO_UDP;
508 fl4->daddr = info->key.u.ipv4.dst;
509 fl4->saddr = info->key.u.ipv4.src;
510
511 tos = info->key.tos;
512 fl4->flowi4_tos = RT_TOS(tos);
513
> 514 dst_cache = (struct dst_cache *)&info->dst_cache;
515 if (use_cache) {
516 rt = dst_cache_get_ip4(dst_cache, &fl4->saddr);
517 if (rt)
518 return rt;
519 }
520 rt = ip_route_output_key(net, fl4);
521 if (IS_ERR(rt)) {
522 netdev_dbg(dev, "no route to %pI4\n", &fl4->daddr);
523 return ERR_PTR(-ENETUNREACH);
524 }
525 if (rt->dst.dev == dev) { /* is this necessary? */
526 netdev_dbg(dev, "circular route to %pI4\n", &fl4->daddr);
527 ip_rt_put(rt);
528 return ERR_PTR(-ELOOP);
529 }
530 if (use_cache)
531 dst_cache_set_ip4(dst_cache, &rt->dst, fl4->saddr);
532 return rt;
533 }
534
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 16148 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 2/2] Special handling for IP & MPLS.
2019-11-18 17:30 ` Willem de Bruijn
@ 2019-11-28 16:12 ` Martin Varghese
2019-11-29 18:20 ` Willem de Bruijn
0 siblings, 1 reply; 13+ messages in thread
From: Martin Varghese @ 2019-11-28 16:12 UTC (permalink / raw)
To: Willem de Bruijn
Cc: Network Development, David Miller, corbet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, scott.drennan, Jiri Benc, martin.varghese
On Mon, Nov 18, 2019 at 12:30:11PM -0500, Willem de Bruijn wrote:
> On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> <martinvarghesenokia@gmail.com> wrote:
> >
> > From: Martin Varghese <martin.varghese@nokia.com>
> >
> > Special handling is needed in bareudp module for IP & MPLS as they support
> > more than one ethertypes.
> >
> > MPLS has 2 ethertypes. 0x8847 for MPLS unicast and 0x8848 for MPLS multicast.
> > While decapsulating MPLS packet from UDP packet the tunnel destination IP
> > address is checked to determine the ethertype. The ethertype of the packet
> > will be set to 0x8848 if the tunnel destination IP address is a multicast
> > IP address. The ethertype of the packet will be set to 0x8847 if the
> > tunnel destination IP address is a unicast IP address.
> >
> > IP has 2 ethertypes.0x0800 for IPV4 and 0x86dd for IPv6. The version field
> > of the IP header tunnelled will be checked to determine the ethertype.
>
> If using ipv6 dual stack, it might make more sense to use extended
> mode with the ipv6 device instead of the ipv4 device.
>
ipv6 dual stack (v6 socket) is for the tunnel.the ethertype mentioned above
is for the inner protocol being tunnelled
> Also, the term extended mode is not self describing. Dual stack as
> term would be, but is not relevant to MPLS. Maybe "dual_proto"?
>
multi_proto ?
> > diff --git a/Documentation/networking/bareudp.rst b/Documentation/networking/bareudp.rst
> > index 2828521..1f01dfd 100644
> > --- a/Documentation/networking/bareudp.rst
> > +++ b/Documentation/networking/bareudp.rst
> > @@ -12,6 +12,15 @@ The Bareudp tunnel module provides a generic L3 encapsulation tunnelling
> > support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside
> > a UDP tunnel.
> >
> > +Special Handling
> > +----------------
> > +The bareudp device supports special handling for MPLS & IP as they can have
> > +multiple ethertypes.
> > +MPLS procotcol can have ethertypes ETH_P_MPLS_UC (unicast) & ETH_P_MPLS_MC (multicast).
> > +IP proctocol can have ethertypes ETH_P_IP (v4) & ETH_P_IPV6 (v6).
>
> proctocol -> protocol
Noted.
Thanks for your time
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-18 17:23 ` Willem de Bruijn
@ 2019-11-28 16:24 ` Martin Varghese
2019-11-29 18:18 ` Willem de Bruijn
0 siblings, 1 reply; 13+ messages in thread
From: Martin Varghese @ 2019-11-28 16:24 UTC (permalink / raw)
To: Willem de Bruijn
Cc: Network Development, David Miller, corbet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, scott.drennan, Jiri Benc, martin.varghese
On Mon, Nov 18, 2019 at 12:23:09PM -0500, Willem de Bruijn wrote:
> On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> <martinvarghesenokia@gmail.com> wrote:
> >
> > From: Martin Varghese <martin.varghese@nokia.com>
> >
> > The Bareudp tunnel module provides a generic L3 encapsulation
> > tunnelling module for tunnelling different protocols like MPLS,
> > IP,NSH etc inside a UDP tunnel.
> >
> > Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
> > ---
> > Changes in v2:
> > - Fixed documentation errors.
> > - Converted documentation to rst format.
> > - Moved ip tunnel rt lookup code to a common location.
>
> This does not actually deduplicate with the existing code in geneve
> (and vxlan, maybe others).
>
> Mentioned a few more obvious examples inline. I won't keep harping on
> this point, as I have no real stake in this.
>
> But if you don't deduplicate from the start, I'm skeptical that it
> will happen later. And then fixes to one driver are likely to be
> missed for the other, slowly drifting the code further apart.
>
Adaptation of geneve module to use the generic API will be in a
seperate patch series.
> > +1) Device creation & deletion
> > +
> > + a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.
> > +
> > + This creates a bareudp tunnel device which tunnels L3 traffic with ethertype
> > + 0x8847 (MPLS traffic). The destination port of the UDP header will be set to
> > + 6635.The device will listen on UDP port 6635 to receive traffic.
> > +
>
> Might be useful to also document how to use this on transmission.
>
> > +struct bareudp_sock {
> > + struct socket *sock;
> > + struct rcu_head rcu;
> > + struct bareudp_dev *bareudp;
> > +};
>
> Is this intermediate struct needed, or could struct bareudp_dev
> directly hang off of sk_user_data if it gains a struct rcu_head?
> Especially now that there is a 1:1 relationship between socket and
> device.
>
will check.
> > + skb_push(skb, sizeof(struct ethhdr));
> > + skb_reset_mac_header(skb);
> > +
> > + err = skb_ensure_writable(skb, sizeof(struct ethhdr));
> > + if (unlikely(err))
> > + goto drop;
> > +
> > + eh = (struct ethhdr *)skb->data;
> > + eh->h_proto = proto;
> > + skb->protocol = eth_type_trans(skb, bareudp->dev);
> > + oiph = skb_network_header(skb);
> > + skb_reset_network_header(skb);
>
> After decapsulation packets now have a fake ethernet header with
> garbage in the src and dst address. Tcpdump will show that.
>
> Instead of pseudo Ethernet, should this device be of link layer type
> ARPHRD_NONE. Or alternatively a new type analogous to ARPHRD_TUNNEL
> that includes the udp header?
>
> The same can probably be said about geneve, so no strong objection to
> what is here. Just a point for thought.
>
I am pondering more on this comment.
> > + if (bareudp_get_sk_family(bs) == AF_INET)
> > + err = IP_ECN_decapsulate(oiph, skb);
> > +#if IS_ENABLED(CONFIG_IPV6)
> > + else
> > + err = IP6_ECN_decapsulate(oiph, skb);
> > +#endif
>
> with dual stack sockets, should this check now be based on packet
> header instead of bareudp_get_sk_family?
>
Noted
> > + if (unlikely(err)) {
> > + if (log_ecn_error) {
> > + if (bareudp_get_sk_family(bs) == AF_INET)
> > + net_info_ratelimited("non-ECT from %pI4 "
> > + "with TOS=%#x\n",
> > + &((struct iphdr *)oiph)->saddr,
> > + ((struct iphdr *)oiph)->tos);
> > +#if IS_ENABLED(CONFIG_IPV6)
> > + else
> > + net_info_ratelimited("non-ECT from %pI6\n",
> > + &((struct ipv6hdr *)oiph)->saddr);
> > +#endif
> > + }
> > + if (err > 1) {
> > + ++bareudp->dev->stats.rx_frame_errors;
> > + ++bareudp->dev->stats.rx_errors;
> > + goto drop;
> > + }
> > + }
> > +
> > + len = skb->len;
> > + err = gro_cells_receive(&bareudp->gro_cells, skb);
> > + if (likely(err == NET_RX_SUCCESS)) {
> > + stats = this_cpu_ptr(bareudp->dev->tstats);
> > + u64_stats_update_begin(&stats->syncp);
> > + stats->rx_packets++;
> > + stats->rx_bytes += len;
> > + u64_stats_update_end(&stats->syncp);
> > + }
> > + return 0;
> > +drop:
> > + /* Consume bad packet */
> > + kfree_skb(skb);
> > +
> > + return 0;
> > +}
>
> All of this can pretty easily be shared with geneve.
>
if we remove the bareudp_get_sk_family(bs) check.we may mot
have lot of common code.will check.
> > +static struct socket *bareudp_create_sock(struct net *net, bool ipv6,
> > + __be16 port)
> > +{
> > + struct socket *sock;
> > + struct udp_port_cfg udp_conf;
> > + int err;
> > +
> > + memset(&udp_conf, 0, sizeof(udp_conf));
> > +#if IS_ENABLED(CONFIG_IPV6)
> > + udp_conf.family = AF_INET6;
> > +#else
> > + udp_conf.family = AF_INET;
> > +#endif
>
> Still need to take bool ipv6 in account when creating the socket?
>
noted
> > +static int bareudp_sock_add(struct bareudp_dev *bareudp, bool ipv6)
> > +{
> > + struct net *net = bareudp->net;
> > + struct bareudp_sock *bs;
> > +
> > + bs = bareudp_socket_create(net, bareudp->conf.port, ipv6);
> > + if (IS_ERR(bs))
> > + return PTR_ERR(bs);
> > +
> > + rcu_assign_pointer(bareudp->sock, bs);
> > + bs->bareudp = bareudp;
> > +
> > + return 0;
>
> Especially now that the device only has one socket, probably no need
> to have a separate bareudp_socket_create from bareudp_sock_add. Same
> for __bareudp_sock_release and bareudp_sock_release.
>
NOted
> > +}
> > +
> > +static void __bareudp_sock_release(struct bareudp_sock *bs)
> > +{
> > + if (!bs)
> > + return;
> > +
> > + udp_tunnel_sock_release(bs->sock);
> > + kfree_rcu(bs, rcu);
> > +}
> > +
> > +static void bareudp_sock_release(struct bareudp_dev *bareudp)
> > +{
> > + struct bareudp_sock *bs = rtnl_dereference(bareudp->sock);
> > +
> > + rcu_assign_pointer(bareudp->sock, NULL);
> > + synchronize_net();
> > + __bareudp_sock_release(bs);
> > +}
> > +
> > +static int bareudp_fill_metadata_dst(struct net_device *dev,
> > + struct sk_buff *skb)
> > +{
> > + struct ip_tunnel_info *info = skb_tunnel_info(skb);
> > + struct bareudp_dev *bareudp = netdev_priv(dev);
> > + bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> > +
> > + if (ip_tunnel_info_af(info) == AF_INET) {
> > + struct rtable *rt;
> > + struct flowi4 fl4;
> > +
> > + rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
> > + use_cache);
> > + if (IS_ERR(rt))
> > + return PTR_ERR(rt);
> > +
> > + ip_rt_put(rt);
> > + info->key.u.ipv4.src = fl4.saddr;
> > +#if IS_ENABLED(CONFIG_IPV6)
> > + } else if (ip_tunnel_info_af(info) == AF_INET6) {
> > + struct dst_entry *dst;
> > + struct flowi6 fl6;
> > + struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
> > +
> > + dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
> > + info, use_cache);
> > + if (IS_ERR(dst))
> > + return PTR_ERR(dst);
> > +
> > + dst_release(dst);
> > + info->key.u.ipv6.src = fl6.saddr;
> > +#endif
> > + } else {
> > + return -EINVAL;
> > + }
> > +
> > + info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
> > + bareudp->sport_min,
> > + USHRT_MAX, true);
> > + info->key.tp_dst = bareudp->conf.port;
> > + return 0;
> > +}
>
> This can probably all be deduplicated with geneve_fill_metadata_dst
> once both use iptunnel_get_v4_rt.
>
Do you have any preference of file to keep the common function
>
> > +static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)
> > +{
> > + struct bareudp_dev *bareudp = netdev_priv(dev);
> > + struct ip_tunnel_info *info = NULL;
> > + int err;
> > +
> > + if (skb->protocol != bareudp->ethertype) {
> > + err = -EINVAL;
> > + goto tx_error;
> > + }
> > +
> > + info = skb_tunnel_info(skb);
>
> Like geneve, should this have two modes, either associated with LWT if
> geneve->collect_md, else static for the device (geneve->info)? As
> opposed to requiring collect_md mode.
>
This module will be used with OVS mostly and so it need not
support static mode.
> > +/* Initialize the device structure. */
> > +static void bareudp_setup(struct net_device *dev)
> > +{
> > + ether_setup(dev);
> > +
> > + dev->netdev_ops = &bareudp_netdev_ops;
> > + dev->ethtool_ops = &bareudp_ethtool_ops;
> > + dev->needs_free_netdev = true;
> > +
> > + SET_NETDEV_DEVTYPE(dev, &bareudp_type);
> > +
> > + dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
> > + dev->features |= NETIF_F_RXCSUM;
> > + dev->features |= NETIF_F_GSO_SOFTWARE;
> > +
> > + dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
> > + dev->hw_features |= NETIF_F_GSO_SOFTWARE;
> > +
> > + /* MTU range: 68 - (something less than 65535) */
> > + dev->min_mtu = ETH_MIN_MTU;
> > + dev->max_mtu = IP_MAX_MTU - BAREUDP_BASE_HLEN - dev->hard_header_len;
>
> For IPv6, MSS is 64 kB without headers, so dev->max_mtu could perhaps
> be IP_MAX_MTU. Also, why is hard_header_len subtracted? Again, same
> for geneve, so if it works there, fine to leave here. Just something
> that surprised me and might be worth giving another thought.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-28 16:24 ` Martin Varghese
@ 2019-11-29 18:18 ` Willem de Bruijn
2019-12-31 15:32 ` Martin Varghese
0 siblings, 1 reply; 13+ messages in thread
From: Willem de Bruijn @ 2019-11-29 18:18 UTC (permalink / raw)
To: Martin Varghese
Cc: Willem de Bruijn, Network Development, David Miller, corbet,
Alexey Kuznetsov, Hideaki YOSHIFUJI, scott.drennan, Jiri Benc,
martin.varghese
On Thu, Nov 28, 2019 at 11:25 AM Martin Varghese
<martinvarghesenokia@gmail.com> wrote:
>
> On Mon, Nov 18, 2019 at 12:23:09PM -0500, Willem de Bruijn wrote:
> > On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> > <martinvarghesenokia@gmail.com> wrote:
> > >
> > > From: Martin Varghese <martin.varghese@nokia.com>
> > >
> > > The Bareudp tunnel module provides a generic L3 encapsulation
> > > tunnelling module for tunnelling different protocols like MPLS,
> > > IP,NSH etc inside a UDP tunnel.
> > >
> > > Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
> > > +static int bareudp_fill_metadata_dst(struct net_device *dev,
> > > + struct sk_buff *skb)
> > > +{
> > > + struct ip_tunnel_info *info = skb_tunnel_info(skb);
> > > + struct bareudp_dev *bareudp = netdev_priv(dev);
> > > + bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> > > +
> > > + if (ip_tunnel_info_af(info) == AF_INET) {
> > > + struct rtable *rt;
> > > + struct flowi4 fl4;
> > > +
> > > + rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
> > > + use_cache);
> > > + if (IS_ERR(rt))
> > > + return PTR_ERR(rt);
> > > +
> > > + ip_rt_put(rt);
> > > + info->key.u.ipv4.src = fl4.saddr;
> > > +#if IS_ENABLED(CONFIG_IPV6)
> > > + } else if (ip_tunnel_info_af(info) == AF_INET6) {
> > > + struct dst_entry *dst;
> > > + struct flowi6 fl6;
> > > + struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
> > > +
> > > + dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
> > > + info, use_cache);
> > > + if (IS_ERR(dst))
> > > + return PTR_ERR(dst);
> > > +
> > > + dst_release(dst);
> > > + info->key.u.ipv6.src = fl6.saddr;
> > > +#endif
> > > + } else {
> > > + return -EINVAL;
> > > + }
> > > +
> > > + info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
> > > + bareudp->sport_min,
> > > + USHRT_MAX, true);
> > > + info->key.tp_dst = bareudp->conf.port;
> > > + return 0;
> > > +}
> >
> > This can probably all be deduplicated with geneve_fill_metadata_dst
> > once both use iptunnel_get_v4_rt.
> >
>
> Do you have any preference of file to keep the common function
Perhaps net/ipv4/udp_tunnel.c
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 2/2] Special handling for IP & MPLS.
2019-11-28 16:12 ` Martin Varghese
@ 2019-11-29 18:20 ` Willem de Bruijn
0 siblings, 0 replies; 13+ messages in thread
From: Willem de Bruijn @ 2019-11-29 18:20 UTC (permalink / raw)
To: Martin Varghese
Cc: Willem de Bruijn, Network Development, David Miller, corbet,
Alexey Kuznetsov, Hideaki YOSHIFUJI, scott.drennan, Jiri Benc,
martin.varghese
On Thu, Nov 28, 2019 at 11:13 AM Martin Varghese
<martinvarghesenokia@gmail.com> wrote:
>
> On Mon, Nov 18, 2019 at 12:30:11PM -0500, Willem de Bruijn wrote:
> > On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> > <martinvarghesenokia@gmail.com> wrote:
> > >
> > > From: Martin Varghese <martin.varghese@nokia.com>
> > >
> > > Special handling is needed in bareudp module for IP & MPLS as they support
> > > more than one ethertypes.
> > >
> > > MPLS has 2 ethertypes. 0x8847 for MPLS unicast and 0x8848 for MPLS multicast.
> > > While decapsulating MPLS packet from UDP packet the tunnel destination IP
> > > address is checked to determine the ethertype. The ethertype of the packet
> > > will be set to 0x8848 if the tunnel destination IP address is a multicast
> > > IP address. The ethertype of the packet will be set to 0x8847 if the
> > > tunnel destination IP address is a unicast IP address.
> > >
> > > IP has 2 ethertypes.0x0800 for IPV4 and 0x86dd for IPv6. The version field
> > > of the IP header tunnelled will be checked to determine the ethertype.
> >
> > If using ipv6 dual stack, it might make more sense to use extended
> > mode with the ipv6 device instead of the ipv4 device.
> >
> ipv6 dual stack (v6 socket) is for the tunnel.the ethertype mentioned above
> is for the inner protocol being tunnelled
>
> > Also, the term extended mode is not self describing. Dual stack as
> > term would be, but is not relevant to MPLS. Maybe "dual_proto"?
> >
> multi_proto ?
Sounds good to me, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-11-29 18:18 ` Willem de Bruijn
@ 2019-12-31 15:32 ` Martin Varghese
2020-01-02 19:55 ` Willem de Bruijn
0 siblings, 1 reply; 13+ messages in thread
From: Martin Varghese @ 2019-12-31 15:32 UTC (permalink / raw)
To: Willem de Bruijn
Cc: Network Development, David Miller, corbet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, scott.drennan, Jiri Benc, martin.varghese
On Fri, Nov 29, 2019 at 01:18:36PM -0500, Willem de Bruijn wrote:
> On Thu, Nov 28, 2019 at 11:25 AM Martin Varghese
> <martinvarghesenokia@gmail.com> wrote:
> >
> > On Mon, Nov 18, 2019 at 12:23:09PM -0500, Willem de Bruijn wrote:
> > > On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> > > <martinvarghesenokia@gmail.com> wrote:
> > > >
> > > > From: Martin Varghese <martin.varghese@nokia.com>
> > > >
> > > > The Bareudp tunnel module provides a generic L3 encapsulation
> > > > tunnelling module for tunnelling different protocols like MPLS,
> > > > IP,NSH etc inside a UDP tunnel.
> > > >
> > > > Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
>
> > > > +static int bareudp_fill_metadata_dst(struct net_device *dev,
> > > > + struct sk_buff *skb)
> > > > +{
> > > > + struct ip_tunnel_info *info = skb_tunnel_info(skb);
> > > > + struct bareudp_dev *bareudp = netdev_priv(dev);
> > > > + bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> > > > +
> > > > + if (ip_tunnel_info_af(info) == AF_INET) {
> > > > + struct rtable *rt;
> > > > + struct flowi4 fl4;
> > > > +
> > > > + rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
> > > > + use_cache);
> > > > + if (IS_ERR(rt))
> > > > + return PTR_ERR(rt);
> > > > +
> > > > + ip_rt_put(rt);
> > > > + info->key.u.ipv4.src = fl4.saddr;
> > > > +#if IS_ENABLED(CONFIG_IPV6)
> > > > + } else if (ip_tunnel_info_af(info) == AF_INET6) {
> > > > + struct dst_entry *dst;
> > > > + struct flowi6 fl6;
> > > > + struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
> > > > +
> > > > + dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
> > > > + info, use_cache);
> > > > + if (IS_ERR(dst))
> > > > + return PTR_ERR(dst);
> > > > +
> > > > + dst_release(dst);
> > > > + info->key.u.ipv6.src = fl6.saddr;
> > > > +#endif
> > > > + } else {
> > > > + return -EINVAL;
> > > > + }
> > > > +
> > > > + info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
> > > > + bareudp->sport_min,
> > > > + USHRT_MAX, true);
> > > > + info->key.tp_dst = bareudp->conf.port;
> > > > + return 0;
> > > > +}
> > >
> > > This can probably all be deduplicated with geneve_fill_metadata_dst
> > > once both use iptunnel_get_v4_rt.
> > >
> >
> > Do you have any preference of file to keep the common function
>
> Perhaps net/ipv4/udp_tunnel.c
I was trying this change and i found i dont have a lot of generic code here.
Populating L4 ports is function of the protocol implementation
and it is differnt for geneve and for bareudp
The one thing we could do is to write a generic API to derive the
tunnel src address.
But since it is a very small piece i dont see much value add by making it
generic and i prefer to keep the way as it is now
But i am open for both the option. What you think ?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc.
2019-12-31 15:32 ` Martin Varghese
@ 2020-01-02 19:55 ` Willem de Bruijn
0 siblings, 0 replies; 13+ messages in thread
From: Willem de Bruijn @ 2020-01-02 19:55 UTC (permalink / raw)
To: Martin Varghese
Cc: Willem de Bruijn, Network Development, David Miller, corbet,
Alexey Kuznetsov, Hideaki YOSHIFUJI, scott.drennan, Jiri Benc,
martin.varghese
On Tue, Dec 31, 2019 at 10:33 AM Martin Varghese
<martinvarghesenokia@gmail.com> wrote:
>
> On Fri, Nov 29, 2019 at 01:18:36PM -0500, Willem de Bruijn wrote:
> > On Thu, Nov 28, 2019 at 11:25 AM Martin Varghese
> > <martinvarghesenokia@gmail.com> wrote:
> > >
> > > On Mon, Nov 18, 2019 at 12:23:09PM -0500, Willem de Bruijn wrote:
> > > > On Sat, Nov 16, 2019 at 12:45 AM Martin Varghese
> > > > <martinvarghesenokia@gmail.com> wrote:
> > > > >
> > > > > From: Martin Varghese <martin.varghese@nokia.com>
> > > > >
> > > > > The Bareudp tunnel module provides a generic L3 encapsulation
> > > > > tunnelling module for tunnelling different protocols like MPLS,
> > > > > IP,NSH etc inside a UDP tunnel.
> > > > >
> > > > > Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
> >
> > > > > +static int bareudp_fill_metadata_dst(struct net_device *dev,
> > > > > + struct sk_buff *skb)
> > > > > +{
> > > > > + struct ip_tunnel_info *info = skb_tunnel_info(skb);
> > > > > + struct bareudp_dev *bareudp = netdev_priv(dev);
> > > > > + bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> > > > > +
> > > > > + if (ip_tunnel_info_af(info) == AF_INET) {
> > > > > + struct rtable *rt;
> > > > > + struct flowi4 fl4;
> > > > > +
> > > > > + rt = iptunnel_get_v4_rt(skb, dev, bareudp->net, &fl4, info,
> > > > > + use_cache);
> > > > > + if (IS_ERR(rt))
> > > > > + return PTR_ERR(rt);
> > > > > +
> > > > > + ip_rt_put(rt);
> > > > > + info->key.u.ipv4.src = fl4.saddr;
> > > > > +#if IS_ENABLED(CONFIG_IPV6)
> > > > > + } else if (ip_tunnel_info_af(info) == AF_INET6) {
> > > > > + struct dst_entry *dst;
> > > > > + struct flowi6 fl6;
> > > > > + struct bareudp_sock *bs6 = rcu_dereference(bareudp->sock);
> > > > > +
> > > > > + dst = ip6tunnel_get_dst(skb, dev, bareudp->net, bs6->sock, &fl6,
> > > > > + info, use_cache);
> > > > > + if (IS_ERR(dst))
> > > > > + return PTR_ERR(dst);
> > > > > +
> > > > > + dst_release(dst);
> > > > > + info->key.u.ipv6.src = fl6.saddr;
> > > > > +#endif
> > > > > + } else {
> > > > > + return -EINVAL;
> > > > > + }
> > > > > +
> > > > > + info->key.tp_src = udp_flow_src_port(bareudp->net, skb,
> > > > > + bareudp->sport_min,
> > > > > + USHRT_MAX, true);
> > > > > + info->key.tp_dst = bareudp->conf.port;
> > > > > + return 0;
> > > > > +}
> > > >
> > > > This can probably all be deduplicated with geneve_fill_metadata_dst
> > > > once both use iptunnel_get_v4_rt.
> > > >
> > >
> > > Do you have any preference of file to keep the common function
> >
> > Perhaps net/ipv4/udp_tunnel.c
>
> I was trying this change and i found i dont have a lot of generic code here.
>
> Populating L4 ports is function of the protocol implementation
> and it is differnt for geneve and for bareudp
If geneve can use iptunnel_get_v4_rt, then it seems like the only
implementation specific logic is deriving net and sk. Would it help to
just pass those explicitly to the shared helper
(udptunnel_fill_metadata_dst)?
It is hard to say without seeing the geneve conversion to
iptunnel_get_v4_rt. Maybe that throws up a constraint I'm missing.
Lacking that, I'll trust your judgment.
> The one thing we could do is to write a generic API to derive the
> tunnel src address.
>
> But since it is a very small piece i dont see much value add by making it
> generic and i prefer to keep the way as it is now
In that case, that sounds sensible.
>
> But i am open for both the option. What you think ?
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-01-02 19:56 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-16 5:43 [PATCH v3 net-next 0/2] Bare UDP L3 Encapsulation Module Martin Varghese
2019-11-16 5:44 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS,IP,NSH etc Martin Varghese
2019-11-18 17:23 ` Willem de Bruijn
2019-11-28 16:24 ` Martin Varghese
2019-11-29 18:18 ` Willem de Bruijn
2019-12-31 15:32 ` Martin Varghese
2020-01-02 19:55 ` Willem de Bruijn
2019-11-20 11:10 ` kbuild test robot
2019-11-20 11:10 ` [PATCH v3 net-next 1/2] UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc kbuild test robot
2019-11-16 5:45 ` [PATCH v3 net-next 2/2] Special handling for IP & MPLS Martin Varghese
2019-11-18 17:30 ` Willem de Bruijn
2019-11-28 16:12 ` Martin Varghese
2019-11-29 18:20 ` Willem de Bruijn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.