From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf] netfilter: conntrack: init all_locks to avoid debug warning
Date: Fri, 29 Apr 2016 11:27:42 +0200 [thread overview]
Message-ID: <20160429092742.GA14700@salvia> (raw)
In-Reply-To: <20160429092307.GA13111@salvia>
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
On Fri, Apr 29, 2016 at 11:23:07AM +0200, Pablo Neira Ayuso wrote:
> On Sun, Apr 24, 2016 at 01:17:14AM +0200, Florian Westphal wrote:
> > Else we get 'BUG: spinlock bad magic on CPU#' on resize when
> > spin lock debugging is enabled.
>
> Applied, thanks Florian.
Wait, probably better this?
[-- Attachment #2: x.patch --]
[-- Type: text/x-diff, Size: 1025 bytes --]
commit 70d72b7e060e0a16b9ded9d0fbd3dff109743de3
Author: Florian Westphal <fw@strlen.de>
Date: Sun Apr 24 01:17:14 2016 +0200
netfilter: conntrack: init all_locks to avoid debug warning
Else we get 'BUG: spinlock bad magic on CPU#' on resize when
spin lock debugging is enabled.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index afde5f5..895d11d 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -66,7 +66,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_locks);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(nf_conntrack_expect_lock);
EXPORT_SYMBOL_GPL(nf_conntrack_expect_lock);
-static __read_mostly spinlock_t nf_conntrack_locks_all_lock;
+static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);
static __read_mostly bool nf_conntrack_locks_all;
void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)
next prev parent reply other threads:[~2016-04-29 9:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-23 23:17 [PATCH nf] netfilter: conntrack: init all_locks to avoid debug warning Florian Westphal
2016-04-29 9:23 ` Pablo Neira Ayuso
2016-04-29 9:27 ` Pablo Neira Ayuso [this message]
2016-04-29 9:31 ` Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160429092742.GA14700@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.