patches for 4.14

Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>

diff --git a/queue-4.14/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch b/queue-4.14/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch
new file mode 100644 (file)
index 0000000..f707e82
--- /dev/null
+++ b/queue-4.14/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch
@@ -0,0 +1,39 @@
+From 0d58b4de98fed31b337c156766f8e5d3cfb259ad Mon Sep 17 00:00:00 2001
+From: Yueyi Li <liyueyi@live.com>
+Date: Mon, 24 Dec 2018 07:40:07 +0000
+Subject: arm64: kaslr: Reserve size of ARM64_MEMSTART_ALIGN in linear region
+
+[ Upstream commit c8a43c18a97845e7f94ed7d181c11f41964976a2 ]
+
+When KASLR is enabled (CONFIG_RANDOMIZE_BASE=y), the top 4K of kernel
+virtual address space may be mapped to physical addresses despite being
+reserved for ERR_PTR values.
+
+Fix the randomization of the linear region so that we avoid mapping the
+last page of the virtual address space.
+
+Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Signed-off-by: liyueyi <liyueyi@live.com>
+[will: rewrote commit message; merged in suggestion from Ard]
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
+---
+ arch/arm64/mm/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
+index caa295cd5d09..9e6c822d458d 100644
+--- a/arch/arm64/mm/init.c
++++ b/arch/arm64/mm/init.c
+@@ -447,7 +447,7 @@ void __init arm64_memblock_init(void)
+                * memory spans, randomize the linear region as well.
+                */
+               if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) {
+-                      range = range / ARM64_MEMSTART_ALIGN + 1;
++                      range /= ARM64_MEMSTART_ALIGN;
+                       memstart_addr -= ARM64_MEMSTART_ALIGN *
+                                        ((range * memstart_offset_seed) >> 16);
+               }
+-- 
+2.19.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 8580fb5f1b872af8305e6cfade66337c74fa0ba7..9c5c352cec2ee78059049ccb260dd50c00a89460 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -10,3 +10,5 @@ x86-vdso-use-ld-instead-of-cc-to-link.patch
 x86-vdso-drop-implicit-common-page-size-linker-flag.patch
 lib-string.c-implement-a-basic-bcmp.patch
 stating-ccree-revert-staging-ccree-fix-leak-of-impor.patch
+arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch
+xfrm-reuse-uncached_list-to-track-xdsts.patch

diff --git a/queue-4.14/xfrm-reuse-uncached_list-to-track-xdsts.patch b/queue-4.14/xfrm-reuse-uncached_list-to-track-xdsts.patch
new file mode 100644 (file)
index 0000000..f1c6d5a
--- /dev/null
+++ b/queue-4.14/xfrm-reuse-uncached_list-to-track-xdsts.patch
@@ -0,0 +1,199 @@
+From 66a256e4423a44db3bd0433babc7ad6beaa5853d Mon Sep 17 00:00:00 2001
+From: Xin Long <lucien.xin@gmail.com>
+Date: Wed, 14 Feb 2018 19:06:02 +0800
+Subject: xfrm: reuse uncached_list to track xdsts
+
+[ Upstream commit 510c321b557121861601f9d259aadd65aa274f35 ]
+
+In early time, when freeing a xdst, it would be inserted into
+dst_garbage.list first. Then if it's refcnt was still held
+somewhere, later it would be put into dst_busy_list in
+dst_gc_task().
+
+When one dev was being unregistered, the dev of these dsts in
+dst_busy_list would be set with loopback_dev and put this dev.
+So that this dev's removal wouldn't get blocked, and avoid the
+kmsg warning:
+
+  kernel:unregister_netdevice: waiting for veth0 to become \
+  free. Usage count = 2
+
+However after Commit 52df157f17e5 ("xfrm: take refcnt of dst
+when creating struct xfrm_dst bundle"), the xdst will not be
+freed with dst gc, and this warning happens.
+
+To fix it, we need to find these xdsts that are still held by
+others when removing the dev, and free xdst's dev and set it
+with loopback_dev.
+
+But unfortunately after flow_cache for xfrm was deleted, no
+list tracks them anymore. So we need to save these xdsts
+somewhere to release the xdst's dev later.
+
+To make this easier, this patch is to reuse uncached_list to
+track xdsts, so that the dev refcnt can be released in the
+event NETDEV_UNREGISTER process of fib_netdev_notifier.
+
+Thanks to Florian, we could move forward this fix quickly.
+
+Fixes: 52df157f17e5 ("xfrm: take refcnt of dst when creating struct xfrm_dst bundle")
+Reported-by: Jianlin Shi <jishi@redhat.com>
+Reported-by: Hangbin Liu <liuhangbin@gmail.com>
+Tested-by: Eyal Birger <eyal.birger@gmail.com>
+Signed-off-by: Xin Long <lucien.xin@gmail.com>
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
+---
+ include/net/ip6_route.h |  3 +++
+ include/net/route.h     |  3 +++
+ net/ipv4/route.c        | 21 +++++++++++++--------
+ net/ipv4/xfrm4_policy.c |  4 +++-
+ net/ipv6/route.c        |  4 ++--
+ net/ipv6/xfrm6_policy.c |  5 +++++
+ 6 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
+index bee528135cf1..00eb9162dbf1 100644
+--- a/include/net/ip6_route.h
++++ b/include/net/ip6_route.h
+@@ -165,6 +165,9 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu);
+ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
+ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway);
+ 
++void rt6_uncached_list_add(struct rt6_info *rt);
++void rt6_uncached_list_del(struct rt6_info *rt);
++
+ static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb)
+ {
+       const struct dst_entry *dst = skb_dst(skb);
+diff --git a/include/net/route.h b/include/net/route.h
+index 6077a0fb3044..1ab8b6f82812 100644
+--- a/include/net/route.h
++++ b/include/net/route.h
+@@ -228,6 +228,9 @@ struct in_ifaddr;
+ void fib_add_ifaddr(struct in_ifaddr *);
+ void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *);
+ 
++void rt_add_uncached_list(struct rtable *rt);
++void rt_del_uncached_list(struct rtable *rt);
++
+ static inline void ip_rt_put(struct rtable *rt)
+ {
+       /* dst_release() accepts a NULL parameter.
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index a1bf87711bfa..9fc2dbce424f 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1440,7 +1440,7 @@ struct uncached_list {
+ 
+ static DEFINE_PER_CPU_ALIGNED(struct uncached_list, rt_uncached_list);
+ 
+-static void rt_add_uncached_list(struct rtable *rt)
++void rt_add_uncached_list(struct rtable *rt)
+ {
+       struct uncached_list *ul = raw_cpu_ptr(&rt_uncached_list);
+ 
+@@ -1451,14 +1451,8 @@ static void rt_add_uncached_list(struct rtable *rt)
+       spin_unlock_bh(&ul->lock);
+ }
+ 
+-static void ipv4_dst_destroy(struct dst_entry *dst)
++void rt_del_uncached_list(struct rtable *rt)
+ {
+-      struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);
+-      struct rtable *rt = (struct rtable *) dst;
+-
+-      if (p != &dst_default_metrics && refcount_dec_and_test(&p->refcnt))
+-              kfree(p);
+-
+       if (!list_empty(&rt->rt_uncached)) {
+               struct uncached_list *ul = rt->rt_uncached_list;
+ 
+@@ -1468,6 +1462,17 @@ static void ipv4_dst_destroy(struct dst_entry *dst)
+       }
+ }
+ 
++static void ipv4_dst_destroy(struct dst_entry *dst)
++{
++      struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);
++      struct rtable *rt = (struct rtable *)dst;
++
++      if (p != &dst_default_metrics && refcount_dec_and_test(&p->refcnt))
++              kfree(p);
++
++      rt_del_uncached_list(rt);
++}
++
+ void rt_flush_dev(struct net_device *dev)
+ {
+       struct net *net = dev_net(dev);
+diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
+index 4b586e7d5637..fbebda67ac1b 100644
+--- a/net/ipv4/xfrm4_policy.c
++++ b/net/ipv4/xfrm4_policy.c
+@@ -103,6 +103,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
+       xdst->u.rt.rt_mtu_locked = rt->rt_mtu_locked;
+       xdst->u.rt.rt_table_id = rt->rt_table_id;
+       INIT_LIST_HEAD(&xdst->u.rt.rt_uncached);
++      rt_add_uncached_list(&xdst->u.rt);
+ 
+       return 0;
+ }
+@@ -242,7 +243,8 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)
+       struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
+ 
+       dst_destroy_metrics_generic(dst);
+-
++      if (xdst->u.rt.rt_uncached_list)
++              rt_del_uncached_list(&xdst->u.rt);
+       xfrm_dst_destroy(xdst);
+ }
+ 
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index 00f8fe8cebd5..620553401d75 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -124,7 +124,7 @@ struct uncached_list {
+ 
+ static DEFINE_PER_CPU_ALIGNED(struct uncached_list, rt6_uncached_list);
+ 
+-static void rt6_uncached_list_add(struct rt6_info *rt)
++void rt6_uncached_list_add(struct rt6_info *rt)
+ {
+       struct uncached_list *ul = raw_cpu_ptr(&rt6_uncached_list);
+ 
+@@ -135,7 +135,7 @@ static void rt6_uncached_list_add(struct rt6_info *rt)
+       spin_unlock_bh(&ul->lock);
+ }
+ 
+-static void rt6_uncached_list_del(struct rt6_info *rt)
++void rt6_uncached_list_del(struct rt6_info *rt)
+ {
+       if (!list_empty(&rt->rt6i_uncached)) {
+               struct uncached_list *ul = rt->rt6i_uncached_list;
+diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
+index d6b012295b45..d99929113230 100644
+--- a/net/ipv6/xfrm6_policy.c
++++ b/net/ipv6/xfrm6_policy.c
+@@ -113,6 +113,9 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
+       xdst->u.rt6.rt6i_gateway = rt->rt6i_gateway;
+       xdst->u.rt6.rt6i_dst = rt->rt6i_dst;
+       xdst->u.rt6.rt6i_src = rt->rt6i_src;
++      INIT_LIST_HEAD(&xdst->u.rt6.rt6i_uncached);
++      rt6_uncached_list_add(&xdst->u.rt6);
++      atomic_inc(&dev_net(dev)->ipv6.rt6_stats->fib_rt_uncache);
+ 
+       return 0;
+ }
+@@ -243,6 +246,8 @@ static void xfrm6_dst_destroy(struct dst_entry *dst)
+       if (likely(xdst->u.rt6.rt6i_idev))
+               in6_dev_put(xdst->u.rt6.rt6i_idev);
+       dst_destroy_metrics_generic(dst);
++      if (xdst->u.rt6.rt6i_uncached_list)
++              rt6_uncached_list_del(&xdst->u.rt6);
+       xfrm_dst_destroy(xdst);
+ }
+ 
+-- 
+2.19.1
+