浏览代码

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>
Eric Dumazet 15 年之前
父节点
当前提交
2fc1b5dd99
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      net/core/dst.c

+ 2 - 0
net/core/dst.c

@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include <net/net_namespace.h>
 #include <net/net_namespace.h>
+#include <linux/sched.h>
 
 
 #include <net/dst.h>
 #include <net/dst.h>
 
 
@@ -79,6 +80,7 @@ loop:
 	while ((dst = next) != NULL) {
 	while ((dst = next) != NULL) {
 		next = dst->next;
 		next = dst->next;
 		prefetch(&next->next);
 		prefetch(&next->next);
+		cond_resched();
 		if (likely(atomic_read(&dst->__refcnt))) {
 		if (likely(atomic_read(&dst->__refcnt))) {
 			last->next = dst;
 			last->next = dst;
 			last = dst;
 			last = dst;