From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934725AbbA1Exj (ORCPT ); Tue, 27 Jan 2015 23:53:39 -0500 Received: from mail.kernel.org ([198.145.29.136]:39710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964868AbbA1EVs (ORCPT ); Tue, 27 Jan 2015 23:21:48 -0500 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Marcelo Ricardo Leitner , Ben Hutchings , Zefan Li Subject: [PATCH 3.4 85/91] ipv4: avoid parallel route cache gc executions Date: Wed, 28 Jan 2015 12:08:56 +0800 Message-Id: <1422418236-12852-169-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422418050-12581-1-git-send-email-lizf@kernel.org> References: <1422418050-12581-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marcelo Ricardo Leitner 3.4.105-rc1 review patch. If anyone has any objections, please let me know. ------------------ When rt_intern_hash() has to deal with neighbour cache overflowing, it triggers the route cache garbage collector in an attempt to free some references on neighbour entries. Such call cannot be done async but should also not run in parallel with an already-running one, so that they don't collapse fighting over the hash lock entries. This patch thus blocks parallel executions with spinlocks: - A call from worker and from rt_intern_hash() are not the same, and cannot be merged, thus they will wait each other on rt_gc_lock. - Calls to gc from rt_intern_hash() may happen in parallel but we must wait for it to finish in order to try again. This dedup and synchrinozation is then performed by the locking just before calling __do_rt_garbage_collect(). Signed-off-by: Marcelo Ricardo Leitner Acked-by: Hannes Frederic Sowa Signed-off-by: Ben Hutchings Signed-off-by: Zefan Li --- net/ipv4/route.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 90de2f9..9e7909e 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -986,6 +986,7 @@ static void __do_rt_garbage_collect(int elasticity, int min_interval) static unsigned long last_gc; static int rover; static int equilibrium; + static DEFINE_SPINLOCK(rt_gc_lock); struct rtable *rth; struct rtable __rcu **rthp; unsigned long now = jiffies; @@ -997,6 +998,8 @@ static void __do_rt_garbage_collect(int elasticity, int min_interval) * do not make it too frequently. */ + spin_lock(&rt_gc_lock); + RT_CACHE_STAT_INC(gc_total); if (now - last_gc < min_interval && @@ -1089,7 +1092,7 @@ static void __do_rt_garbage_collect(int elasticity, int min_interval) if (net_ratelimit()) pr_warn("dst cache overflow\n"); RT_CACHE_STAT_INC(gc_dst_overflow); - return; + goto out; work_done: expire += min_interval; @@ -1097,7 +1100,8 @@ work_done: dst_entries_get_fast(&ipv4_dst_ops) < ipv4_dst_ops.gc_thresh || dst_entries_get_slow(&ipv4_dst_ops) < ipv4_dst_ops.gc_thresh) expire = ip_rt_gc_timeout; -out: return; +out: + spin_unlock(&rt_gc_lock); } static void __rt_garbage_collect(struct work_struct *w) @@ -1172,7 +1176,7 @@ static struct rtable *rt_intern_hash(unsigned hash, struct rtable *rt, unsigned long now; u32 min_score; int chain_length; - int attempts = !in_softirq(); + int attempts = 1; restart: chain_length = 0; @@ -1308,8 +1312,15 @@ restart: can be released. Try to shrink route cache, it is most likely it holds some neighbour records. */ - if (attempts-- > 0) { - __do_rt_garbage_collect(1, 0); + if (!in_softirq() && attempts-- > 0) { + static DEFINE_SPINLOCK(lock); + + if (spin_trylock(&lock)) { + __do_rt_garbage_collect(1, 0); + spin_unlock(&lock); + } else { + spin_unlock_wait(&lock); + } goto restart; } -- 1.9.1