Merge branch 'vxlan-ipv6-metadata-dst' (d445ed9b) · Commits · 戴 / test

drivers/net/vxlan.c

+57 −12

Original line number	Diff line number	Diff line
		@@ -1848,6 +1848,34 @@ static int vxlan_xmit_skb(struct rtable rt, struct sock sk, struct sk_buff *sk
		!(vxflags & VXLAN_F_UDP_CSUM));
		}

		#if IS_ENABLED(CONFIG_IPV6)
		static struct dst_entry vxlan6_get_route(struct vxlan_dev vxlan,
		struct sk_buff *skb, int oif,
		const struct in6_addr *daddr,
		struct in6_addr *saddr)
		{
		struct dst_entry *ndst;
		struct flowi6 fl6;
		int err;

		memset(&fl6, 0, sizeof(fl6));
		fl6.flowi6_oif = oif;
		fl6.daddr = *daddr;
		fl6.saddr = vxlan->cfg.saddr.sin6.sin6_addr;
		fl6.flowi6_mark = skb->mark;
		fl6.flowi6_proto = IPPROTO_UDP;

		err = ipv6_stub->ipv6_dst_lookup(vxlan->net,
		vxlan->vn6_sock->sock->sk,
		&ndst, &fl6);
		if (err < 0)
		return ERR_PTR(err);

		*saddr = fl6.saddr;
		return ndst;
		}
		#endif

		/* Bypass encapsulation if the destination is local */
		static void vxlan_encap_bypass(struct sk_buff skb, struct vxlan_dev src_vxlan,
		struct vxlan_dev *dst_vxlan)
		@@ -2035,21 +2063,17 @@ static void vxlan_xmit_one(struct sk_buff skb, struct net_device dev,
		#if IS_ENABLED(CONFIG_IPV6)
		} else {
		struct dst_entry *ndst;
		struct flowi6 fl6;
		struct in6_addr saddr;
		u32 rt6i_flags;

		if (!vxlan->vn6_sock)
		goto drop;
		sk = vxlan->vn6_sock->sock->sk;

		memset(&fl6, 0, sizeof(fl6));
		fl6.flowi6_oif = rdst ? rdst->remote_ifindex : 0;
		fl6.daddr = dst->sin6.sin6_addr;
		fl6.saddr = vxlan->cfg.saddr.sin6.sin6_addr;
		fl6.flowi6_mark = skb->mark;
		fl6.flowi6_proto = IPPROTO_UDP;

		if (ipv6_stub->ipv6_dst_lookup(vxlan->net, sk, &ndst, &fl6)) {
		ndst = vxlan6_get_route(vxlan, skb,
		rdst ? rdst->remote_ifindex : 0,
		&dst->sin6.sin6_addr, &saddr);
		if (IS_ERR(ndst)) {
		netdev_dbg(dev, "no route to %pI6\n",
		&dst->sin6.sin6_addr);
		dev->stats.tx_carrier_errors++;
		@@ -2081,7 +2105,7 @@ static void vxlan_xmit_one(struct sk_buff skb, struct net_device dev,
		}

		ttl = ttl ? : ip6_dst_hoplimit(ndst);
		err = vxlan6_xmit_skb(ndst, sk, skb, dev, &fl6.saddr, &fl6.daddr,
		err = vxlan6_xmit_skb(ndst, sk, skb, dev, &saddr, &dst->sin6.sin6_addr,
		0, ttl, src_port, dst_port, htonl(vni << 8), md,
		!net_eq(vxlan->net, dev_net(vxlan->dev)),
		flags);
		@@ -2395,9 +2419,30 @@ static int vxlan_fill_metadata_dst(struct net_device dev, struct sk_buff skb)
		vxlan->cfg.port_max, true);
		dport = info->key.tp_dst ? : vxlan->cfg.dst_port;

		if (ip_tunnel_info_af(info) == AF_INET)
		if (ip_tunnel_info_af(info) == AF_INET) {
		if (!vxlan->vn4_sock)
		return -EINVAL;
		return egress_ipv4_tun_info(dev, skb, info, sport, dport);
		} else {
		#if IS_ENABLED(CONFIG_IPV6)
		struct dst_entry *ndst;

		if (!vxlan->vn6_sock)
		return -EINVAL;
		ndst = vxlan6_get_route(vxlan, skb, 0,
		&info->key.u.ipv6.dst,
		&info->key.u.ipv6.src);
		if (IS_ERR(ndst))
		return PTR_ERR(ndst);
		dst_release(ndst);

		info->key.tp_src = sport;
		info->key.tp_dst = dport;
		#else /* !CONFIG_IPV6 */
		return -EPFNOSUPPORT;
		#endif
		}
		return 0;
		}

		static const struct net_device_ops vxlan_netdev_ops = {

Admin message