Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Highlights:

   1) Support TX_RING in AF_PACKET TPACKET_V3 mode, from Sowmini
      Varadhan.

   2) Simplify classifier state on sk_buff in order to shrink it a bit.
      From Willem de Bruijn.

   3) Introduce SIPHASH and it's usage for secure sequence numbers and
      syncookies. From Jason A. Donenfeld.

   4) Reduce CPU usage for ICMP replies we are going to limit or
      suppress, from Jesper Dangaard Brouer.

   5) Introduce Shared Memory Communications socket layer, from Ursula
      Braun.

   6) Add RACK loss detection and allow it to actually trigger fast
      recovery instead of just assisting after other algorithms have
      triggered it. From Yuchung Cheng.

   7) Add xmit_more and BQL support to mvneta driver, from Simon Guinot.

   8) skb_cow_data avoidance in esp4 and esp6, from Steffen Klassert.

   9) Export MPLS packet stats via netlink, from Robert Shearman.

  10) Significantly improve inet port bind conflict handling, especially
      when an application is restarted and changes it's setting of
      reuseport. From Josef Bacik.

  11) Implement TX batching in vhost_net, from Jason Wang.

  12) Extend the dummy device so that VF (virtual function) features,
      such as configuration, can be more easily tested. From Phil
      Sutter.

  13) Avoid two atomic ops per page on x86 in bnx2x driver, from Eric
      Dumazet.

  14) Add new bpf MAP, implementing a longest prefix match trie. From
      Daniel Mack.

  15) Packet sample offloading support in mlxsw driver, from Yotam Gigi.

  16) Add new aquantia driver, from David VomLehn.

  17) Add bpf tracepoints, from Daniel Borkmann.

  18) Add support for port mirroring to b53 and bcm_sf2 drivers, from
      Florian Fainelli.

  19) Remove custom busy polling in many drivers, it is done in the core
      networking since 4.5 times. From Eric Dumazet.

  20) Support XDP adjust_head in virtio_net, from John Fastabend.

  21) Fix several major holes in neighbour entry confirmation, from
      Julian Anastasov.

  22) Add XDP support to bnxt_en driver, from Michael Chan.

  23) VXLAN offloads for enic driver, from Govindarajulu Varadarajan.

  24) Add IPVTAP driver (IP-VLAN based tap driver) from Sainath Grandhi.

  25) Support GRO in IPSEC protocols, from Steffen Klassert"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1764 commits)
  Revert "ath10k: Search SMBIOS for OEM board file extension"
  net: socket: fix recvmmsg not returning error from sock_error
  bnxt_en: use eth_hw_addr_random()
  bpf: fix unlocking of jited image when module ronx not set
  arch: add ARCH_HAS_SET_MEMORY config
  net: napi_watchdog() can use napi_schedule_irqoff()
  tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
  net/hsr: use eth_hw_addr_random()
  net: mvpp2: enable building on 64-bit platforms
  net: mvpp2: switch to build_skb() in the RX path
  net: mvpp2: simplify MVPP2_PRS_RI_* definitions
  net: mvpp2: fix indentation of MVPP2_EXT_GLOBAL_CTRL_DEFAULT
  net: mvpp2: remove unused register definitions
  net: mvpp2: simplify mvpp2_bm_bufs_add()
  net: mvpp2: drop useless fields in mvpp2_bm_pool and related code
  net: mvpp2: remove unused 'tx_skb' field of 'struct mvpp2_tx_queue'
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  net: mvpp2: handle too large value in mvpp2_rx_time_coal_set()
  net: mvpp2: handle too large value handling in mvpp2_rx_pkts_coal_set()
  net: mvpp2: remove useless arguments in mvpp2_rx_{pkts, time}_coal_set
  ...

1 files changed, 266 insertions, 71 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7ea85370c11c..f54f4265b37f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -98,6 +98,12 @@ static void		rt6_do_redirect(struct dst_entry *dst, struct sock *sk,
                                         struct sk_buff *skb);
 static void             rt6_dst_from_metrics_check(struct rt6_info *rt);
 static int rt6_score_route(struct rt6_info *rt, int oif, int strict);
+static size_t rt6_nlmsg_size(struct rt6_info *rt);
+static int rt6_fill_node(struct net *net,
+                         struct sk_buff *skb, struct rt6_info *rt,
+                         struct in6_addr *dst, struct in6_addr *src,
+                         int iif, int type, u32 portid, u32 seq,
+                         unsigned int flags);
 
 #ifdef CONFIG_IPV6_ROUTE_INFO
 static struct rt6_info *rt6_add_route_info(struct net *net,
@@ -217,6 +223,21 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
         return neigh_create(&nd_tbl, daddr, dst->dev);
 }
 
+static void ip6_confirm_neigh(const struct dst_entry *dst, const void *daddr)
+{
+        struct net_device *dev = dst->dev;
+        struct rt6_info *rt = (struct rt6_info *)dst;
+
+        daddr = choose_neigh_daddr(rt, NULL, daddr);
+        if (!daddr)
+                return;
+        if (dev->flags & (IFF_NOARP | IFF_LOOPBACK))
+                return;
+        if (ipv6_addr_is_multicast((const struct in6_addr *)daddr))
+                return;
+        __ipv6_confirm_neigh(dev, daddr);
+}
+
 static struct dst_ops ip6_dst_ops_template = {
         .family                 =       AF_INET6,
         .gc                     =       ip6_dst_gc,
@@ -233,6 +254,7 @@ static struct dst_ops ip6_dst_ops_template = {
         .redirect               =       rt6_do_redirect,
         .local_out              =       __ip6_local_out,
         .neigh_lookup           =       ip6_neigh_lookup,
+        .confirm_neigh          =       ip6_confirm_neigh,
 };
 
 static unsigned int ip6_blackhole_mtu(const struct dst_entry *dst)
@@ -1359,6 +1381,7 @@ static bool rt6_cache_allowed_for_pmtu(const struct rt6_info *rt)
 static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
                                  const struct ipv6hdr *iph, u32 mtu)
 {
+        const struct in6_addr *daddr, *saddr;
         struct rt6_info *rt6 = (struct rt6_info *)dst;
 
         if (rt6->rt6i_flags & RTF_LOCAL)
@@ -1367,26 +1390,26 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
         if (dst_metric_locked(dst, RTAX_MTU))
                 return;
 
-        dst_confirm(dst);
+        if (iph) {
+                daddr = &iph->daddr;
+                saddr = &iph->saddr;
+        } else if (sk) {
+                daddr = &sk->sk_v6_daddr;
+                saddr = &inet6_sk(sk)->saddr;
+        } else {
+                daddr = NULL;
+                saddr = NULL;
+        }
+        dst_confirm_neigh(dst, daddr);
         mtu = max_t(u32, mtu, IPV6_MIN_MTU);
         if (mtu >= dst_mtu(dst))
                 return;
 
         if (!rt6_cache_allowed_for_pmtu(rt6)) {
                 rt6_do_update_pmtu(rt6, mtu);
-        } else {
-                const struct in6_addr *daddr, *saddr;
+        } else if (daddr) {
                 struct rt6_info *nrt6;
 
-                if (iph) {
-                        daddr = &iph->daddr;
-                        saddr = &iph->saddr;
-                } else if (sk) {
-                        daddr = &sk->sk_v6_daddr;
-                        saddr = &inet6_sk(sk)->saddr;
-                } else {
-                        return;
-                }
                 nrt6 = ip6_rt_cache_alloc(rt6, daddr, saddr);
                 if (nrt6) {
                         rt6_do_update_pmtu(nrt6, mtu);
@@ -1897,7 +1920,7 @@ static struct rt6_info *ip6_route_info_create(struct fib6_config *cfg)
         if (cfg->fc_encap) {
                 struct lwtunnel_state *lwtstate;
 
-                err = lwtunnel_build_state(dev, cfg->fc_encap_type,
+                err = lwtunnel_build_state(cfg->fc_encap_type,
                                            cfg->fc_encap, AF_INET6, cfg,
                                            &lwtstate);
                 if (err)
@@ -2143,6 +2166,54 @@ int ip6_del_rt(struct rt6_info *rt)
         return __ip6_del_rt(rt, &info);
 }
 
+static int __ip6_del_rt_siblings(struct rt6_info *rt, struct fib6_config *cfg)
+{
+        struct nl_info *info = &cfg->fc_nlinfo;
+        struct sk_buff *skb = NULL;
+        struct fib6_table *table;
+        int err;
+
+        table = rt->rt6i_table;
+        write_lock_bh(&table->tb6_lock);
+
+        if (rt->rt6i_nsiblings && cfg->fc_delete_all_nh) {
+                struct rt6_info *sibling, *next_sibling;
+
+                /* prefer to send a single notification with all hops */
+                skb = nlmsg_new(rt6_nlmsg_size(rt), gfp_any());
+                if (skb) {
+                        u32 seq = info->nlh ? info->nlh->nlmsg_seq : 0;
+
+                        if (rt6_fill_node(info->nl_net, skb, rt,
+                                          NULL, NULL, 0, RTM_DELROUTE,
+                                          info->portid, seq, 0) < 0) {
+                                kfree_skb(skb);
+                                skb = NULL;
+                        } else
+                                info->skip_notify = 1;
+                }
+
+                list_for_each_entry_safe(sibling, next_sibling,
+                                         &rt->rt6i_siblings,
+                                         rt6i_siblings) {
+                        err = fib6_del(sibling, info);
+                        if (err)
+                                goto out;
+                }
+        }
+
+        err = fib6_del(rt, info);
+out:
+        write_unlock_bh(&table->tb6_lock);
+        ip6_rt_put(rt);
+
+        if (skb) {
+                rtnl_notify(skb, info->nl_net, info->portid, RTNLGRP_IPV6_ROUTE,
+                            info->nlh, gfp_any());
+        }
+        return err;
+}
+
 static int ip6_route_del(struct fib6_config *cfg)
 {
         struct fib6_table *table;
@@ -2179,7 +2250,11 @@ static int ip6_route_del(struct fib6_config *cfg)
                         dst_hold(&rt->dst);
                         read_unlock_bh(&table->tb6_lock);
 
-                        return __ip6_del_rt(rt, &cfg->fc_nlinfo);
+                        /* if gateway was specified only delete the one hop */
+                        if (cfg->fc_flags & RTF_GATEWAY)
+                                return __ip6_del_rt(rt, &cfg->fc_nlinfo);
+
+                        return __ip6_del_rt_siblings(rt, cfg);
                 }
         }
         read_unlock_bh(&table->tb6_lock);
@@ -2258,7 +2333,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
          * Look, redirects are sent only in response to data packets,
          * so that this nexthop apparently is reachable. --ANK
          */
-        dst_confirm(&rt->dst);
+        dst_confirm_neigh(&rt->dst, &ipv6_hdr(skb)->saddr);
 
         neigh = __neigh_lookup(&nd_tbl, &msg->target, skb->dev, 1);
         if (!neigh)
@@ -2634,6 +2709,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
         rt->dst.output = ip6_output;
         rt->rt6i_idev = idev;
 
+        rt->rt6i_protocol = RTPROT_KERNEL;
         rt->rt6i_flags = RTF_UP | RTF_NONEXTHOP;
         if (anycast)
                 rt->rt6i_flags |= RTF_ANYCAST;
@@ -2711,13 +2787,16 @@ struct arg_dev_net {
         struct net *net;
 };
 
+/* called with write lock held for table with rt */
 static int fib6_ifdown(struct rt6_info *rt, void *arg)
 {
         const struct arg_dev_net *adn = arg;
         const struct net_device *dev = adn->dev;
 
         if ((rt->dst.dev == dev || !dev) &&
-            rt != adn->net->ipv6.ip6_null_entry)
+            rt != adn->net->ipv6.ip6_null_entry &&
+            (rt->rt6i_nsiblings == 0 ||
+             !rt->rt6i_idev->cnf.ignore_routes_with_linkdown))
                 return -1;
 
         return 0;
@@ -2948,7 +3027,7 @@ static void ip6_print_replace_route_err(struct list_head *rt6_nh_list)
         struct rt6_nh *nh;
 
         list_for_each_entry(nh, rt6_nh_list, next) {
-                pr_warn("IPV6: multipath route replace failed (check consistency of installed routes): %pI6 nexthop %pI6 ifi %d\n",
+                pr_warn("IPV6: multipath route replace failed (check consistency of installed routes): %pI6c nexthop %pI6c ifi %d\n",
                         &nh->r_cfg.fc_dst, &nh->r_cfg.fc_gateway,
                         nh->r_cfg.fc_ifindex);
         }
@@ -2987,13 +3066,37 @@ static int ip6_route_info_append(struct list_head *rt6_nh_list,
         return 0;
 }
 
+static void ip6_route_mpath_notify(struct rt6_info *rt,
+                                   struct rt6_info *rt_last,
+                                   struct nl_info *info,
+                                   __u16 nlflags)
+{
+        /* if this is an APPEND route, then rt points to the first route
+         * inserted and rt_last points to last route inserted. Userspace
+         * wants a consistent dump of the route which starts at the first
+         * nexthop. Since sibling routes are always added at the end of
+         * the list, find the first sibling of the last route appended
+         */
+        if ((nlflags & NLM_F_APPEND) && rt_last && rt_last->rt6i_nsiblings) {
+                rt = list_first_entry(&rt_last->rt6i_siblings,
+                                      struct rt6_info,
+                                      rt6i_siblings);
+        }
+
+        if (rt)
+                inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags);
+}
+
 static int ip6_route_multipath_add(struct fib6_config *cfg)
 {
+        struct rt6_info *rt_notif = NULL, *rt_last = NULL;
+        struct nl_info *info = &cfg->fc_nlinfo;
         struct fib6_config r_cfg;
         struct rtnexthop *rtnh;
         struct rt6_info *rt;
         struct rt6_nh *err_nh;
         struct rt6_nh *nh, *nh_safe;
+        __u16 nlflags;
         int remaining;
         int attrlen;
         int err = 1;
@@ -3002,6 +3105,10 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
                        (cfg->fc_nlinfo.nlh->nlmsg_flags & NLM_F_REPLACE));
         LIST_HEAD(rt6_nh_list);
 
+        nlflags = replace ? NLM_F_REPLACE : NLM_F_CREATE;
+        if (info->nlh && info->nlh->nlmsg_flags & NLM_F_APPEND)
+                nlflags |= NLM_F_APPEND;
+
         remaining = cfg->fc_mp_len;
         rtnh = (struct rtnexthop *)cfg->fc_mp;
 
@@ -3044,9 +3151,20 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
                 rtnh = rtnh_next(rtnh, &remaining);
         }
 
+        /* for add and replace send one notification with all nexthops.
+         * Skip the notification in fib6_add_rt2node and send one with
+         * the full route when done
+         */
+        info->skip_notify = 1;
+
         err_nh = NULL;
         list_for_each_entry(nh, &rt6_nh_list, next) {
-                err = __ip6_ins_rt(nh->rt6_info, &cfg->fc_nlinfo, &nh->mxc);
+                rt_last = nh->rt6_info;
+                err = __ip6_ins_rt(nh->rt6_info, info, &nh->mxc);
+                /* save reference to first route for notification */
+                if (!rt_notif && !err)
+                        rt_notif = nh->rt6_info;
+
                 /* nh->rt6_info is used or freed at this point, reset to NULL*/
                 nh->rt6_info = NULL;
                 if (err) {
@@ -3068,9 +3186,18 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
                 nhn++;
         }
 
+        /* success ... tell user about new route */
+        ip6_route_mpath_notify(rt_notif, rt_last, info, nlflags);
         goto cleanup;
 
 add_errout:
+        /* send notification for routes that were added so that
+         * the delete notifications sent by ip6_route_del are
+         * coherent
+         */
+        if (rt_notif)
+                ip6_route_mpath_notify(rt_notif, rt_last, info, nlflags);
+
         /* Delete routes that were already added */
         list_for_each_entry(nh, &rt6_nh_list, next) {
                 if (err_nh == nh)
@@ -3138,8 +3265,10 @@ static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         if (cfg.fc_mp)
                 return ip6_route_multipath_del(&cfg);
-        else
+        else {
+                cfg.fc_delete_all_nh = 1;
                 return ip6_route_del(&cfg);
+        }
 }
 
 static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh)
@@ -3157,8 +3286,20 @@ static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh)
                 return ip6_route_add(&cfg);
 }
 
-static inline size_t rt6_nlmsg_size(struct rt6_info *rt)
+static size_t rt6_nlmsg_size(struct rt6_info *rt)
 {
+        int nexthop_len = 0;
+
+        if (rt->rt6i_nsiblings) {
+                nexthop_len = nla_total_size(0)  /* RTA_MULTIPATH */
+                            + NLA_ALIGN(sizeof(struct rtnexthop))
+                            + nla_total_size(16) /* RTA_GATEWAY */
+                            + nla_total_size(4)  /* RTA_OIF */
+                            + lwtunnel_get_encap_size(rt->dst.lwtstate);
+
+                nexthop_len *= rt->rt6i_nsiblings;
+        }
+
         return NLMSG_ALIGN(sizeof(struct rtmsg))
                + nla_total_size(16) /* RTA_SRC */
                + nla_total_size(16) /* RTA_DST */
@@ -3172,14 +3313,69 @@ static inline size_t rt6_nlmsg_size(struct rt6_info *rt)
                + nla_total_size(sizeof(struct rta_cacheinfo))
                + nla_total_size(TCP_CA_NAME_MAX) /* RTAX_CC_ALGO */
                + nla_total_size(1) /* RTA_PREF */
-               + lwtunnel_get_encap_size(rt->dst.lwtstate);
+               + lwtunnel_get_encap_size(rt->dst.lwtstate)
+               + nexthop_len;
+}
+
+static int rt6_nexthop_info(struct sk_buff *skb, struct rt6_info *rt,
+                            unsigned int *flags)
+{
+        if (!netif_running(rt->dst.dev) || !netif_carrier_ok(rt->dst.dev)) {
+                *flags |= RTNH_F_LINKDOWN;
+                if (rt->rt6i_idev->cnf.ignore_routes_with_linkdown)
+                        *flags |= RTNH_F_DEAD;
+        }
+
+        if (rt->rt6i_flags & RTF_GATEWAY) {
+                if (nla_put_in6_addr(skb, RTA_GATEWAY, &rt->rt6i_gateway) < 0)
+                        goto nla_put_failure;
+        }
+
+        if (rt->dst.dev &&
+            nla_put_u32(skb, RTA_OIF, rt->dst.dev->ifindex))
+                goto nla_put_failure;
+
+        if (rt->dst.lwtstate &&
+            lwtunnel_fill_encap(skb, rt->dst.lwtstate) < 0)
+                goto nla_put_failure;
+
+        return 0;
+
+nla_put_failure:
+        return -EMSGSIZE;
+}
+
+static int rt6_add_nexthop(struct sk_buff *skb, struct rt6_info *rt)
+{
+        struct rtnexthop *rtnh;
+        unsigned int flags = 0;
+
+        rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));
+        if (!rtnh)
+                goto nla_put_failure;
+
+        rtnh->rtnh_hops = 0;
+        rtnh->rtnh_ifindex = rt->dst.dev ? rt->dst.dev->ifindex : 0;
+
+        if (rt6_nexthop_info(skb, rt, &flags) < 0)
+                goto nla_put_failure;
+
+        rtnh->rtnh_flags = flags;
+
+        /* length of rtnetlink header + attributes */
+        rtnh->rtnh_len = nlmsg_get_pos(skb) - (void *)rtnh;
+
+        return 0;
+
+nla_put_failure:
+        return -EMSGSIZE;
 }
 
 static int rt6_fill_node(struct net *net,
                          struct sk_buff *skb, struct rt6_info *rt,
                          struct in6_addr *dst, struct in6_addr *src,
                          int iif, int type, u32 portid, u32 seq,
-                         int prefix, int nowait, unsigned int flags)
+                         unsigned int flags)
 {
         u32 metrics[RTAX_MAX];
         struct rtmsg *rtm;
@@ -3187,13 +3383,6 @@ static int rt6_fill_node(struct net *net,
         long expires;
         u32 table;
 
-        if (prefix) {   /* user wants prefix routes only */
-                if (!(rt->rt6i_flags & RTF_PREFIX_RT)) {
-                        /* success since this is not a prefix route */
-                        return 1;
-                }
-        }
-
         nlh = nlmsg_put(skb, portid, seq, type, sizeof(*rtm), flags);
         if (!nlh)
                 return -EMSGSIZE;
@@ -3233,11 +3422,6 @@ static int rt6_fill_node(struct net *net,
         else
                 rtm->rtm_type = RTN_UNICAST;
         rtm->rtm_flags = 0;
-        if (!netif_carrier_ok(rt->dst.dev)) {
-                rtm->rtm_flags |= RTNH_F_LINKDOWN;
-                if (rt->rt6i_idev->cnf.ignore_routes_with_linkdown)
-                        rtm->rtm_flags |= RTNH_F_DEAD;
-        }
         rtm->rtm_scope = RT_SCOPE_UNIVERSE;
         rtm->rtm_protocol = rt->rt6i_protocol;
         if (rt->rt6i_flags & RTF_DYNAMIC)
@@ -3271,19 +3455,12 @@ static int rt6_fill_node(struct net *net,
         if (iif) {
 #ifdef CONFIG_IPV6_MROUTE
                 if (ipv6_addr_is_multicast(&rt->rt6i_dst.addr)) {
-                        int err = ip6mr_get_route(net, skb, rtm, nowait,
-                                                  portid);
-
-                        if (err <= 0) {
-                                if (!nowait) {
-                                        if (err == 0)
-                                                return 0;
-                                        goto nla_put_failure;
-                                } else {
-                                        if (err == -EMSGSIZE)
-                                                goto nla_put_failure;
-                                }
-                        }
+                        int err = ip6mr_get_route(net, skb, rtm, portid);
+
+                        if (err == 0)
+                                return 0;
+                        if (err < 0)
+                                goto nla_put_failure;
                 } else
 #endif
                         if (nla_put_u32(skb, RTA_IIF, iif))
@@ -3308,17 +3485,35 @@ static int rt6_fill_node(struct net *net,
         if (rtnetlink_put_metrics(skb, metrics) < 0)
                 goto nla_put_failure;
 
-        if (rt->rt6i_flags & RTF_GATEWAY) {
-                if (nla_put_in6_addr(skb, RTA_GATEWAY, &rt->rt6i_gateway) < 0)
-                        goto nla_put_failure;
-        }
-
-        if (rt->dst.dev &&
-            nla_put_u32(skb, RTA_OIF, rt->dst.dev->ifindex))
-                goto nla_put_failure;
         if (nla_put_u32(skb, RTA_PRIORITY, rt->rt6i_metric))
                 goto nla_put_failure;
 
+        /* For multipath routes, walk the siblings list and add
+         * each as a nexthop within RTA_MULTIPATH.
+         */
+        if (rt->rt6i_nsiblings) {
+                struct rt6_info *sibling, *next_sibling;
+                struct nlattr *mp;
+
+                mp = nla_nest_start(skb, RTA_MULTIPATH);
+                if (!mp)
+                        goto nla_put_failure;
+
+                if (rt6_add_nexthop(skb, rt) < 0)
+                        goto nla_put_failure;
+
+                list_for_each_entry_safe(sibling, next_sibling,
+                                         &rt->rt6i_siblings, rt6i_siblings) {
+                        if (rt6_add_nexthop(skb, sibling) < 0)
+                                goto nla_put_failure;
+                }
+
+                nla_nest_end(skb, mp);
+        } else {
+                if (rt6_nexthop_info(skb, rt, &rtm->rtm_flags) < 0)
+                        goto nla_put_failure;
+        }
+
         expires = (rt->rt6i_flags & RTF_EXPIRES) ? rt->dst.expires - jiffies : 0;
 
         if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0)
@@ -3327,8 +3522,6 @@ static int rt6_fill_node(struct net *net,
         if (nla_put_u8(skb, RTA_PREF, IPV6_EXTRACT_PREF(rt->rt6i_flags)))
                 goto nla_put_failure;
 
-        if (lwtunnel_fill_encap(skb, rt->dst.lwtstate) < 0)
-                goto nla_put_failure;
 
         nlmsg_end(skb, nlh);
         return 0;
@@ -3341,18 +3534,26 @@ nla_put_failure:
 int rt6_dump_route(struct rt6_info *rt, void *p_arg)
 {
         struct rt6_rtnl_dump_arg *arg = (struct rt6_rtnl_dump_arg *) p_arg;
-        int prefix;
+        struct net *net = arg->net;
+
+        if (rt == net->ipv6.ip6_null_entry)
+                return 0;
 
         if (nlmsg_len(arg->cb->nlh) >= sizeof(struct rtmsg)) {
                 struct rtmsg *rtm = nlmsg_data(arg->cb->nlh);
-                prefix = (rtm->rtm_flags & RTM_F_PREFIX) != 0;
-        } else
-                prefix = 0;
 
-        return rt6_fill_node(arg->net,
+                /* user wants prefix routes only */
+                if (rtm->rtm_flags & RTM_F_PREFIX &&
+                    !(rt->rt6i_flags & RTF_PREFIX_RT)) {
+                        /* success since this is not a prefix route */
+                        return 1;
+                }
+        }
+
+        return rt6_fill_node(net,
                      arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
                      NETLINK_CB(arg->cb->skb).portid, arg->cb->nlh->nlmsg_seq,
-                     prefix, 0, NLM_F_MULTI);
+                     NLM_F_MULTI);
 }
 
 static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
@@ -3433,17 +3634,11 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
                 goto errout;
         }
 
-        /* Reserve room for dummy headers, this skb can pass
-           through good chunk of routing engine.
-         */
-        skb_reset_mac_header(skb);
-        skb_reserve(skb, MAX_HEADER + sizeof(struct ipv6hdr));
-
         skb_dst_set(skb, &rt->dst);
 
         err = rt6_fill_node(net, skb, rt, &fl6.daddr, &fl6.saddr, iif,
                             RTM_NEWROUTE, NETLINK_CB(in_skb).portid,
-                            nlh->nlmsg_seq, 0, 0, 0);
+                            nlh->nlmsg_seq, 0);
         if (err < 0) {
                 kfree_skb(skb);
                 goto errout;
@@ -3470,7 +3665,7 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info,
                 goto errout;
 
         err = rt6_fill_node(net, skb, rt, NULL, NULL, 0,
-                                event, info->portid, seq, 0, 0, nlm_flags);
+                                event, info->portid, seq, nlm_flags);
         if (err < 0) {
                 /* -EMSGSIZE implies BUG in rt6_nlmsg_size() */
                 WARN_ON(err == -EMSGSIZE);