vxlan: add ipv6 route short circuit support

route short circuit only has IPv4 part, this patch adds
the IPv6 part. nd_tbl will be needed.

Cc: David S. Miller <davem@davemloft.net>
Cc: David Stevens <dlstevens@us.ibm.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index faf131e02a72b8ba725e13f983036188b68448d8..c833763fe5c49924c2ad88c50564e660af4e9713 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1200,7 +1200,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
        struct neighbour *n;
-       struct iphdr *pip;
 
        if (is_multicast_ether_addr(eth_hdr(skb)->h_dest))
                return false;
@@ -1208,6 +1207,9 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
        n = NULL;
        switch (ntohs(eth_hdr(skb)->h_proto)) {
        case ETH_P_IP:
+       {
+               struct iphdr *pip;
+
                if (!pskb_may_pull(skb, sizeof(struct iphdr)))
                        return false;
                pip = ip_hdr(skb);
@@ -1223,6 +1225,29 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
                }
 
                break;
+       }
+#if IS_ENABLED(CONFIG_IPV6)
+       case ETH_P_IPV6:
+       {
+               struct ipv6hdr *pip6;
+
+               if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
+                       return false;
+               pip6 = ipv6_hdr(skb);
+               n = neigh_lookup(ipv6_stub->nd_tbl, &pip6->daddr, dev);
+               if (!n && (vxlan->flags & VXLAN_F_L3MISS)) {
+                       union vxlan_addr ipa = {
+                               .sin6.sin6_addr = pip6->daddr,
+                               .sa.sa_family = AF_INET6,
+                       };
+
+                       vxlan_ip_miss(dev, &ipa);
+                       return false;
+               }
+
+               break;
+       }
+#endif
        default:
                return false;
        }
@@ -1659,7 +1684,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        did_rsc = false;
 
        if (f && (f->flags & NTF_ROUTER) && (vxlan->flags & VXLAN_F_RSC) &&
-           ntohs(eth->h_proto) == ETH_P_IP) {
+           (ntohs(eth->h_proto) == ETH_P_IP ||
+            ntohs(eth->h_proto) == ETH_P_IPV6)) {
                did_rsc = route_shortcircuit(dev, skb);
                if (did_rsc)
                        f = vxlan_find_mac(vxlan, eth->h_dest);

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 5339cab356bb0c6543fdade38c822e7fdb6c7c58..bcf957341b62c8fc9c43bbad7e64f286dc889df7 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -153,6 +153,7 @@ struct ipv6_stub {
        int (*ipv6_dst_lookup)(struct sock *sk, struct dst_entry **dst,
                                struct flowi6 *fl6);
        void (*udpv6_encap_enable)(void);
+       struct neigh_table *nd_tbl;
 };
 extern const struct ipv6_stub *ipv6_stub __read_mostly;
 

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 0c9c22f7487a0c5a1fec2ed4ab814b3e6e457603..1996a7c34f73280acb2ab18951c6945ffb10f3a2 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -815,6 +815,7 @@ static const struct ipv6_stub ipv6_stub_impl = {
        .ipv6_sock_mc_drop = ipv6_sock_mc_drop,
        .ipv6_dst_lookup = ip6_dst_lookup,
        .udpv6_encap_enable = udpv6_encap_enable,
+       .nd_tbl = &nd_tbl,
 };
 
 static int __init inet6_init(void)