Commit fc4099f1 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Fix egress tunnel info. 



While transitioning to netdev based vport we broke OVS
feature which allows user to retrieve tunnel packet egress
information for lwtunnel devices.  Following patch fixes it
by introducing ndo operation to get the tunnel egress info.
Same ndo operation can be used for lwtunnel devices and compat
ovs-tnl-vport devices. So after adding such device operation
we can remove similar operation from ovs-vport.

Fixes: 614732ea ("openvswitch: Use regular VXLAN net_device device").
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c472b9b

drivers/net/geneve.c

+33 −7
Original line number Diff line number Diff line
@@ -594,14 +594,12 @@ static struct rtable *geneve_get_rt(struct sk_buff *skb, 
	rt = ip_route_output_key(geneve->net, fl4);

	if (IS_ERR(rt)) {

		netdev_dbg(dev, "no route to %pI4\n", &fl4->daddr);

		dev->stats.tx_carrier_errors++;

		return rt;

		return ERR_PTR(-ENETUNREACH);

	}

	if (rt->dst.dev == dev) { /* is this necessary? */

		netdev_dbg(dev, "circular route to %pI4\n", &fl4->daddr);

		dev->stats.collisions++;

		ip_rt_put(rt);

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-ELOOP);

	}

	return rt;

}
@@ -627,12 +625,12 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct ip_tunnel_info *info = NULL;

	struct rtable *rt = NULL;

	const struct iphdr *iip; /* interior IP header */

	int err = -EINVAL;

	struct flowi4 fl4;

	__u8 tos, ttl;

	__be16 sport;

	bool udp_csum;

	__be16 df;

	int err;



	if (geneve->collect_md) {

		info = skb_tunnel_info(skb);
@@ -647,7 +645,7 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) 
	rt = geneve_get_rt(skb, dev, &fl4, info);

	if (IS_ERR(rt)) {

		netdev_dbg(dev, "no route to %pI4\n", &fl4.daddr);

		dev->stats.tx_carrier_errors++;

		err = PTR_ERR(rt);

		goto tx_error;

	}
@@ -699,10 +697,37 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) 
tx_error:

	dev_kfree_skb(skb);

err:

	if (err == -ELOOP)

		dev->stats.collisions++;

	else if (err == -ENETUNREACH)

		dev->stats.tx_carrier_errors++;

	else

		dev->stats.tx_errors++;

	return NETDEV_TX_OK;

}



static int geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)

{

	struct ip_tunnel_info *info = skb_tunnel_info(skb);

	struct geneve_dev *geneve = netdev_priv(dev);

	struct rtable *rt;

	struct flowi4 fl4;



	if (ip_tunnel_info_af(info) != AF_INET)

		return -EINVAL;



	rt = geneve_get_rt(skb, dev, &fl4, info);

	if (IS_ERR(rt))

		return PTR_ERR(rt);



	ip_rt_put(rt);

	info->key.u.ipv4.src = fl4.saddr;

	info->key.tp_src = udp_flow_src_port(geneve->net, skb,

					     1, USHRT_MAX, true);

	info->key.tp_dst = geneve->dst_port;

	return 0;

}



static const struct net_device_ops geneve_netdev_ops = {

	.ndo_init		= geneve_init,

	.ndo_uninit		= geneve_uninit,
@@ -713,6 +738,7 @@ static const struct net_device_ops geneve_netdev_ops = { 
	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_fill_metadata_dst	= geneve_fill_metadata_dst,

};



static void geneve_get_drvinfo(struct net_device *dev,

drivers/net/vxlan.c

+41 −0
Original line number Diff line number Diff line
@@ -2337,6 +2337,46 @@ static int vxlan_change_mtu(struct net_device *dev, int new_mtu) 
	return 0;

}



static int egress_ipv4_tun_info(struct net_device *dev, struct sk_buff *skb,

				struct ip_tunnel_info *info,

				__be16 sport, __be16 dport)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct rtable *rt;

	struct flowi4 fl4;



	memset(&fl4, 0, sizeof(fl4));

	fl4.flowi4_tos = RT_TOS(info->key.tos);

	fl4.flowi4_mark = skb->mark;

	fl4.flowi4_proto = IPPROTO_UDP;

	fl4.daddr = info->key.u.ipv4.dst;



	rt = ip_route_output_key(vxlan->net, &fl4);

	if (IS_ERR(rt))

		return PTR_ERR(rt);

	ip_rt_put(rt);



	info->key.u.ipv4.src = fl4.saddr;

	info->key.tp_src = sport;

	info->key.tp_dst = dport;

	return 0;

}



static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct ip_tunnel_info *info = skb_tunnel_info(skb);

	__be16 sport, dport;



	sport = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,

				  vxlan->cfg.port_max, true);

	dport = info->key.tp_dst ? : vxlan->cfg.dst_port;



	if (ip_tunnel_info_af(info) == AF_INET)

		return egress_ipv4_tun_info(dev, skb, info, sport, dport);

	return -EINVAL;

}



static const struct net_device_ops vxlan_netdev_ops = {

	.ndo_init		= vxlan_init,

	.ndo_uninit		= vxlan_uninit,
@@ -2351,6 +2391,7 @@ static const struct net_device_ops vxlan_netdev_ops = { 
	.ndo_fdb_add		= vxlan_fdb_add,

	.ndo_fdb_del		= vxlan_fdb_delete,

	.ndo_fdb_dump		= vxlan_fdb_dump,

	.ndo_fill_metadata_dst	= vxlan_fill_metadata_dst,

};



/* Info for udev, that this is a virtual tunnel endpoint */

include/linux/netdevice.h

+7 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,10 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 *	This function is used to pass protocol port error state information

 *	to the switch driver. The switch driver can react to the proto_down

 *      by doing a phys down on the associated switch port.

 * int (*ndo_fill_metadata_dst)(struct net_device *dev, struct sk_buff *skb);

 *	This function is used to get egress tunnel information for given skb.

 *	This is useful for retrieving outer tunnel header parameters while

 *	sampling packet.

 *

 */

struct net_device_ops {
@@ -1227,6 +1231,8 @@ struct net_device_ops { 
	int			(*ndo_get_iflink)(const struct net_device *dev);

	int			(*ndo_change_proto_down)(struct net_device *dev,

							 bool proto_down);

	int			(*ndo_fill_metadata_dst)(struct net_device *dev,

						       struct sk_buff *skb);

};



/**
@@ -2203,6 +2209,7 @@ void dev_add_offload(struct packet_offload *po); 
void dev_remove_offload(struct packet_offload *po);



int dev_get_iflink(const struct net_device *dev);

int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);

struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,

				      unsigned short mask);

struct net_device *dev_get_by_name(struct net *net, const char *name);

include/net/dst_metadata.h

+32 −0
Original line number Diff line number Diff line
@@ -60,6 +60,38 @@ static inline struct metadata_dst *tun_rx_dst(int md_size) 
	return tun_dst;

}



static inline struct metadata_dst *tun_dst_unclone(struct sk_buff *skb)

{

	struct metadata_dst *md_dst = skb_metadata_dst(skb);

	int md_size = md_dst->u.tun_info.options_len;

	struct metadata_dst *new_md;



	if (!md_dst)

		return ERR_PTR(-EINVAL);



	new_md = metadata_dst_alloc(md_size, GFP_ATOMIC);

	if (!new_md)

		return ERR_PTR(-ENOMEM);



	memcpy(&new_md->u.tun_info, &md_dst->u.tun_info,

	       sizeof(struct ip_tunnel_info) + md_size);

	skb_dst_drop(skb);

	dst_hold(&new_md->dst);

	skb_dst_set(skb, &new_md->dst);

	return new_md;

}



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

{

	struct metadata_dst *dst;



	dst = tun_dst_unclone(skb);

	if (IS_ERR(dst))

		return NULL;



	return &dst->u.tun_info;

}



static inline struct metadata_dst *ip_tun_rx_dst(struct sk_buff *skb,

						 __be16 flags,

						 __be64 tunnel_id,

net/core/dev.c

+27 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#include <linux/rtnetlink.h>

#include <linux/stat.h>

#include <net/dst.h>

#include <net/dst_metadata.h>

#include <net/pkt_sched.h>

#include <net/checksum.h>

#include <net/xfrm.h>
@@ -681,6 +682,32 @@ int dev_get_iflink(const struct net_device *dev) 
}

EXPORT_SYMBOL(dev_get_iflink);



/**

 *	dev_fill_metadata_dst - Retrieve tunnel egress information.

 *	@dev: targeted interface

 *	@skb: The packet.

 *

 *	For better visibility of tunnel traffic OVS needs to retrieve

 *	egress tunnel information for a packet. Following API allows

 *	user to get this info.

 */

int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)

{

	struct ip_tunnel_info *info;



	if (!dev->netdev_ops  || !dev->netdev_ops->ndo_fill_metadata_dst)

		return -EINVAL;



	info = skb_tunnel_info_unclone(skb);

	if (!info)

		return -ENOMEM;

	if (unlikely(!(info->mode & IP_TUNNEL_INFO_TX)))

		return -EINVAL;



	return dev->netdev_ops->ndo_fill_metadata_dst(dev, skb);

}

EXPORT_SYMBOL_GPL(dev_fill_metadata_dst);



/**

 *	__dev_get_by_name	- find a device by its name

 *	@net: the applicable net namespace

CRA Git | Maintained and supported by SUSTech CRA and CCSE