Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3093fbe7 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

route: Per route IP tunnel metadata via lightweight tunnel 



This introduces a new IP tunnel lightweight tunnel type which allows
to specify IP tunnel instructions per route. Only IPv4 is supported
at this point.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b7179d3

drivers/net/vxlan.c

+8 −2
Original line number Diff line number Diff line
@@ -1935,7 +1935,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan, 
static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,

			   struct vxlan_rdst *rdst, bool did_rsc)

{

	struct ip_tunnel_info *info = skb_tunnel_info(skb);

	struct ip_tunnel_info *info;

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct sock *sk = vxlan->vn_sock->sock->sk;

	struct rtable *rt = NULL;
@@ -1952,6 +1952,9 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	int err;

	u32 flags = vxlan->flags;



	/* FIXME: Support IPv6 */

	info = skb_tunnel_info(skb, AF_INET);



	if (rdst) {

		dst_port = rdst->remote_port ? rdst->remote_port : vxlan->dst_port;

		vni = rdst->remote_vni;
@@ -2141,12 +2144,15 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	const struct ip_tunnel_info *info = skb_tunnel_info(skb);

	const struct ip_tunnel_info *info;

	struct ethhdr *eth;

	bool did_rsc = false;

	struct vxlan_rdst *rdst, *fdst = NULL;

	struct vxlan_fdb *f;



	/* FIXME: Support IPv6 */

	info = skb_tunnel_info(skb, AF_INET);



	skb_reset_mac_header(skb);

	eth = eth_hdr(skb);

include/net/dst_metadata.h

+11 −1
Original line number Diff line number Diff line
@@ -23,13 +23,23 @@ static inline struct metadata_dst *skb_metadata_dst(struct sk_buff *skb) 
	return NULL;

}



static inline struct ip_tunnel_info *skb_tunnel_info(struct sk_buff *skb)

static inline struct ip_tunnel_info *skb_tunnel_info(struct sk_buff *skb,

						     int family)

{

	struct metadata_dst *md_dst = skb_metadata_dst(skb);

	struct rtable *rt;



	if (md_dst)

		return &md_dst->u.tun_info;



	switch (family) {

	case AF_INET:

		rt = (struct rtable *)skb_dst(skb);

		if (rt && rt->rt_lwtstate)

			return lwt_tun_info(rt->rt_lwtstate);

		break;

	}



	return NULL;

}

include/net/ip_tunnels.h

+6 −1
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
#include <net/dsfield.h>

#include <net/gro_cells.h>

#include <net/inet_ecn.h>

#include <net/ip.h>

#include <net/netns/generic.h>

#include <net/rtnetlink.h>

#include <net/lwtunnel.h>



#if IS_ENABLED(CONFIG_IPV6)

#include <net/ipv6.h>
@@ -298,6 +298,11 @@ static inline void *ip_tunnel_info_opts(struct ip_tunnel_info *info, size_t n) 
	return info + 1;

}



static inline struct ip_tunnel_info *lwt_tun_info(struct lwtunnel_state *lwtstate)

{

	return (struct ip_tunnel_info *)lwtstate->data;

}



#endif /* CONFIG_INET */



#endif /* __NET_IP_TUNNELS_H */

include/uapi/linux/lwtunnel.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
enum lwtunnel_encap_types {

	LWTUNNEL_ENCAP_NONE,

	LWTUNNEL_ENCAP_MPLS,

	LWTUNNEL_ENCAP_IP,

	__LWTUNNEL_ENCAP_MAX,

};

include/uapi/linux/rtnetlink.h

+15 −0
Original line number Diff line number Diff line
@@ -286,6 +286,21 @@ enum rt_class_t { 


/* Routing message attributes */



enum ip_tunnel_t {

	IP_TUN_UNSPEC,

	IP_TUN_ID,

	IP_TUN_DST,

	IP_TUN_SRC,

	IP_TUN_TTL,

	IP_TUN_TOS,

	IP_TUN_SPORT,

	IP_TUN_DPORT,

	IP_TUN_FLAGS,

	__IP_TUN_MAX,

};



#define IP_TUN_MAX (__IP_TUN_MAX - 1)



enum rtattr_type_t {

	RTA_UNSPEC,

	RTA_DST,