aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-02-08 15:00:39 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-08 15:00:39 -0800
commit2fc1b5dd99f66d93ffc23fd8df82d384c1a354c8 (patch)
tree7a0cdb9d0c683a7f7883f96a903eda997c90e2df
parentd696c7bdaa55e2208e56c6f98e6bc1599f34286d (diff)
downloadlinux-linaro-stable-2fc1b5dd99f66d93ffc23fd8df82d384c1a354c8.tar.gz
dst: call cond_resched() in dst_gc_task()
Kernel bugzilla #15239 On some workloads, it is quite possible to get a huge dst list to process in dst_gc_task(), and trigger soft lockup detection. Fix is to call cond_resched(), as we run in process context. Reported-by: Pawel Staszewski <pstaszewski@itcare.pl> Tested-by: Pawel Staszewski <pstaszewski@itcare.pl> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dst.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dst.c b/net/core/dst.c
index 57bc4d5b8d08..cb1b3488b739 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -17,6 +17,7 @@
#include <linux/string.h>
#include <linux/types.h>
#include <net/net_namespace.h>
+#include <linux/sched.h>
#include <net/dst.h>
@@ -79,6 +80,7 @@ loop:
while ((dst = next) != NULL) {
next = dst->next;
prefetch(&next->next);
+ cond_resched();
if (likely(atomic_read(&dst->__refcnt))) {
last->next = dst;
last = dst;