{"id":808988,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808988/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170901204103.16129-1-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901204103.16129-1-fw@strlen.de>","list_archive_url":null,"date":"2017-09-01T20:41:03","name":"[nf] netfilter: xtables: add scheduling opportunity in get_counters","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8059c0fea50c5bd80fd17fc19238f2564ba262db","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.2/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170901204103.16129-1-fw@strlen.de/mbox/","series":[{"id":1109,"url":"http://patchwork.ozlabs.org/api/1.2/series/1109/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1109","date":"2017-09-01T20:41:03","name":"[nf] netfilter: xtables: add scheduling opportunity in get_counters","version":1,"mbox":"http://patchwork.ozlabs.org/series/1109/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808988/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808988/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkWNK6kt1z9sMN\n\tfor ;\n\tSat, 2 Sep 2017 06:40:49 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752456AbdIAUkr (ORCPT );\n\tFri, 1 Sep 2017 16:40:47 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:47754 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1752419AbdIAUkr (ORCPT\n\t);\n\tFri, 1 Sep 2017 16:40:47 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dnshS-0003kd-FP; Fri, 01 Sep 2017 22:37:58 +0200"],"From":"Florian Westphal ","To":"","Cc":"edumazet@google.com, Florian Westphal ","Subject":"[PATCH nf] netfilter: xtables: add scheduling opportunity in\n\tget_counters","Date":"Fri, 1 Sep 2017 22:41:03 +0200","Message-Id":"<20170901204103.16129-1-fw@strlen.de>","X-Mailer":"git-send-email 2.13.0","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"There are reports about spurious softlockups during iptables-restore, a\nbacktrace i saw points at get_counters -- it uses a sequence lock and also\nhas unbounded restart loop.\n\nSigned-off-by: Florian Westphal \n---\n net/ipv4/netfilter/arp_tables.c | 1 +\n net/ipv4/netfilter/ip_tables.c | 1 +\n net/ipv6/netfilter/ip6_tables.c | 1 +\n 3 files changed, 3 insertions(+)","diff":"diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c\nindex 9e9d9afd18f7..14b20cf4cfd3 100644\n--- a/net/ipv4/netfilter/arp_tables.c\n+++ b/net/ipv4/netfilter/arp_tables.c\n@@ -629,6 +629,7 @@ static void get_counters(const struct xt_table_info *t,\n \n \t\t\tADD_COUNTER(counters[i], bcnt, pcnt);\n \t\t\t++i;\n+\t\t\tcond_resched();\n \t\t}\n \t}\n }\ndiff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c\nindex 622ed2887cd5..92ef5a2ef0c3 100644\n--- a/net/ipv4/netfilter/ip_tables.c\n+++ b/net/ipv4/netfilter/ip_tables.c\n@@ -782,6 +782,7 @@ get_counters(const struct xt_table_info *t,\n \n \t\t\tADD_COUNTER(counters[i], bcnt, pcnt);\n \t\t\t++i; /* macro does multi eval of i */\n+\t\t\tcond_resched();\n \t\t}\n \t}\n }\ndiff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c\nindex 1f90644056ac..1e9c775dc3d6 100644\n--- a/net/ipv6/netfilter/ip6_tables.c\n+++ b/net/ipv6/netfilter/ip6_tables.c\n@@ -801,6 +801,7 @@ get_counters(const struct xt_table_info *t,\n \n \t\t\tADD_COUNTER(counters[i], bcnt, pcnt);\n \t\t\t++i;\n+\t\t\tcond_resched();\n \t\t}\n \t}\n }\n","prefixes":["nf"]}