From: Jules Irenge <jbi.octave@gmail.com>
To: boqun.feng@gmail.com
Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
netdev@vger.kernel.org, Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netfilter-devel@vger.kernel.org (open list:NETFILTER),
coreteam@netfilter.org (open list:NETFILTER)
Subject: [PATCH 5/8] netfilter: conntrack: Add missing annotations for nf_conntrack_all_lock() and nf_conntrack_all_unlock()
Date: Wed, 11 Mar 2020 01:09:05 +0000 [thread overview]
Message-ID: <20200311010908.42366-6-jbi.octave@gmail.com> (raw)
In-Reply-To: <20200311010908.42366-1-jbi.octave@gmail.com>
Sparse reports warnings at nf_conntrack_all_lock()
and nf_conntrack_all_unlock()
warning: context imbalance in nf_conntrack_all_lock()
- wrong count at exit
warning: context imbalance in nf_conntrack_all_unlock()
- unexpected unlock
Add the missing __acquires(&nf_conntrack_locks_all_lock)
Add missing __releases(&nf_conntrack_locks_all_lock)
Signed-off-by: Jules Irenge <jbi.octave@gmail.com>
---
net/netfilter/nf_conntrack_core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index d1305423640f..a0bc122d5df1 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -143,6 +143,7 @@ static bool nf_conntrack_double_lock(struct net *net, unsigned int h1,
}
static void nf_conntrack_all_lock(void)
+ __acquires(&nf_conntrack_locks_all_lock)
{
int i;
@@ -162,6 +163,7 @@ static void nf_conntrack_all_lock(void)
}
static void nf_conntrack_all_unlock(void)
+ __releases(&nf_conntrack_locks_all_lock)
{
/* All prior stores must be complete before we clear
* 'nf_conntrack_locks_all'. Otherwise nf_conntrack_lock()
--
2.24.1
next prev parent reply other threads:[~2020-03-11 1:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0/8>
2020-03-11 1:09 ` [PATCH 0/8] Lock warning cleanups Jules Irenge
2020-03-11 1:09 ` [PATCH 1/8] bpf: Add missing annotations for __bpf_prog_enter() and __bpf_prog_exit() Jules Irenge
2020-03-13 19:49 ` Daniel Borkmann
2020-03-11 1:09 ` [PATCH 2/8] raw: Add missing annotations to raw_seq_start() and raw_seq_stop() Jules Irenge
2020-03-11 1:15 ` Eric Dumazet
2020-03-11 1:40 ` Jules Irenge
2020-03-12 6:20 ` David Miller
2020-03-11 1:09 ` [PATCH 3/8] tcp: Add missing annotation for tcp_child_process() Jules Irenge
2020-03-11 1:14 ` Eric Dumazet
2020-03-11 1:28 ` Jules Irenge
2020-03-12 6:20 ` David Miller
2020-03-11 1:09 ` [PATCH 4/8] netfilter: Add missing annotation for ctnetlink_parse_nat_setup() Jules Irenge
2020-03-27 17:22 ` Pablo Neira Ayuso
2020-03-11 1:09 ` Jules Irenge [this message]
2020-03-27 17:22 ` [PATCH 5/8] netfilter: conntrack: Add missing annotations for nf_conntrack_all_lock() and nf_conntrack_all_unlock() Pablo Neira Ayuso
2020-03-11 1:09 ` [PATCH 6/8] net: Add missing annotation for *netlink_seq_start() Jules Irenge
2020-03-12 6:20 ` David Miller
2020-03-11 1:09 ` [PATCH 7/8] ALSA: firewire-tascam: Add missing annotation for tscm_hwdep_read_queue() Jules Irenge
2020-03-11 3:19 ` Takashi Sakamoto
2020-03-11 6:56 ` Takashi Iwai
2020-03-11 1:09 ` [PATCH 8/8] ALSA: firewire-tascam: Add missing annotation for tscm_hwdep_read_locked() Jules Irenge
2020-03-11 3:18 ` Takashi Sakamoto
2020-03-11 6:56 ` Takashi Iwai
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=20200311010908.42366-6-jbi.octave@gmail.com \
--to=jbi.octave@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).