drop 4.14 patch

diff --git a/queue-4.14/ipv4-fix-race-condition-between-route-lookup-and-invalidation.patch b/queue-4.14/ipv4-fix-race-condition-between-route-lookup-and-invalidation.patch
deleted file mode 100644 (file)
index 4a87b33..0000000
--- a/queue-4.14/ipv4-fix-race-condition-between-route-lookup-and-invalidation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From foo@baz Thu 24 Oct 2019 09:41:49 PM EDT
-From: Wei Wang <weiwan@google.com>
-Date: Wed, 16 Oct 2019 12:03:15 -0700
-Subject: ipv4: fix race condition between route lookup and invalidation
-
-From: Wei Wang <weiwan@google.com>
-
-[ Upstream commit 5018c59607a511cdee743b629c76206d9c9e6d7b ]
-
-Jesse and Ido reported the following race condition:
-<CPU A, t0> - Received packet A is forwarded and cached dst entry is
-taken from the nexthop ('nhc->nhc_rth_input'). Calls skb_dst_set()
-
-<t1> - Given Jesse has busy routers ("ingesting full BGP routing tables
-from multiple ISPs"), route is added / deleted and rt_cache_flush() is
-called
-
-<CPU B, t2> - Received packet B tries to use the same cached dst entry
-from t0, but rt_cache_valid() is no longer true and it is replaced in
-rt_cache_route() by the newer one. This calls dst_dev_put() on the
-original dst entry which assigns the blackhole netdev to 'dst->dev'
-
-<CPU A, t3> - dst_input(skb) is called on packet A and it is dropped due
-to 'dst->dev' being the blackhole netdev
-
-There are 2 issues in the v4 routing code:
-1. A per-netns counter is used to do the validation of the route. That
-means whenever a route is changed in the netns, users of all routes in
-the netns needs to redo lookup. v6 has an implementation of only
-updating fn_sernum for routes that are affected.
-2. When rt_cache_valid() returns false, rt_cache_route() is called to
-throw away the current cache, and create a new one. This seems
-unnecessary because as long as this route does not change, the route
-cache does not need to be recreated.
-
-To fully solve the above 2 issues, it probably needs quite some code
-changes and requires careful testing, and does not suite for net branch.
-
-So this patch only tries to add the deleted cached rt into the uncached
-list, so user could still be able to use it to receive packets until
-it's done.
-
-Fixes: 95c47f9cf5e0 ("ipv4: call dst_dev_put() properly")
-Signed-off-by: Wei Wang <weiwan@google.com>
-Reported-by: Ido Schimmel <idosch@idosch.org>
-Reported-by: Jesse Hathaway <jesse@mbuki-mvuki.org>
-Tested-by: Jesse Hathaway <jesse@mbuki-mvuki.org>
-Acked-by: Martin KaFai Lau <kafai@fb.com>
-Cc: David Ahern <dsahern@gmail.com>
-Reviewed-by: Ido Schimmel <idosch@mellanox.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/route.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -1451,7 +1451,7 @@ static bool rt_cache_route(struct fib_nh
-       prev = cmpxchg(p, orig, rt);
-       if (prev == orig) {
-               if (orig) {
--                      dst_dev_put(&orig->dst);
-+                      rt_add_uncached_list(orig);
-                       dst_release(&orig->dst);
-               }
-       } else {

diff --git a/queue-4.14/series b/queue-4.14/series
index cec69338d23e5e63cf67128d278f66254234f894..260be31a86cedd88b33b6be70c1ff9007d96fbd9 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -16,7 +16,6 @@ namespace-fix-namespace.pl-script-to-support-relativ.patch
 md-raid0-fix-warning-message-for-parameter-default_l.patch
 revert-drm-radeon-fix-eeh-during-kexec.patch
 ocfs2-fix-panic-due-to-ocfs2_wq-is-null.patch
-ipv4-fix-race-condition-between-route-lookup-and-invalidation.patch
 ipv4-return-enetunreach-if-we-can-t-create-route-but-saddr-is-valid.patch
 net-bcmgenet-fix-rgmii_mode_en-value-for-genet-v1-2-3.patch
 net-bcmgenet-set-phydev-dev_flags-only-for-internal-phys.patch