| Message ID | 20170906124757.13934-1-fw@strlen.de |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [nf] netfilter: core: remove erroneous warn_on | expand |
Florian Westphal <fw@strlen.de> writes: > kernel test robot reported: > > WARNING: CPU: 0 PID: 1244 at net/netfilter/core.c:218 __nf_hook_entries_try_shrink+0x49/0xcd > [..] > > After allowing batching in nf_unregister_net_hooks its possible that an earlier > call to __nf_hook_entries_try_shrink already compacted the list. > If this happens we don't need to do anything. > > Fixes: d3ad2c17b4047 ("netfilter: core: batch nf_unregister_net_hooks synchronize_net calls") > Reported-by: kernel test robot <xiaolong.ye@intel.com> > Signed-off-by: Florian Westphal <fw@strlen.de> > --- Acked-by: Aaron Conole <aconole@bytheb.org> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 06, 2017 at 02:47:57PM +0200, Florian Westphal wrote: > kernel test robot reported: > > WARNING: CPU: 0 PID: 1244 at net/netfilter/core.c:218 __nf_hook_entries_try_shrink+0x49/0xcd > [..] > > After allowing batching in nf_unregister_net_hooks its possible that an earlier > call to __nf_hook_entries_try_shrink already compacted the list. > If this happens we don't need to do anything. Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 04fe25abc5f6..52cd2901a097 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -215,7 +215,7 @@ static void *__nf_hook_entries_try_shrink(struct nf_hook_entries __rcu **pp) if (skip == hook_entries) goto out_assign; - if (WARN_ON(skip == 0)) + if (skip == 0) return NULL; hook_entries -= skip;
kernel test robot reported: WARNING: CPU: 0 PID: 1244 at net/netfilter/core.c:218 __nf_hook_entries_try_shrink+0x49/0xcd [..] After allowing batching in nf_unregister_net_hooks its possible that an earlier call to __nf_hook_entries_try_shrink already compacted the list. If this happens we don't need to do anything. Fixes: d3ad2c17b4047 ("netfilter: core: batch nf_unregister_net_hooks synchronize_net calls") Reported-by: kernel test robot <xiaolong.ye@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> --- net/netfilter/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)