From: Steffen Klassert <steffen.klassert@secunet•com>
To: Florian Westphal <fw@strlen•de>
Cc: <netdev@vger•kernel.org>
Subject: Re: [PATCH ipsec-next 8/8] xfrm: policy: convert policy_lock to spinlock
Date: Wed, 24 Aug 2016 13:28:47 +0200 [thread overview]
Message-ID: <20160824112847.GP3735@gauss.secunet.com> (raw)
In-Reply-To: <1470921479-25592-9-git-send-email-fw@strlen.de>
On Thu, Aug 11, 2016 at 03:17:59PM +0200, Florian Westphal wrote:
> @@ -972,14 +972,14 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
> if (pol->type != type)
> continue;
> __xfrm_policy_unlink(pol, dir);
> - write_unlock_bh(&net->xfrm.xfrm_policy_lock);
> + spin_unlock_bh(&net->xfrm.xfrm_policy_lock);
> cnt++;
>
> xfrm_audit_policy_delete(pol, 1, task_valid);
>
> xfrm_policy_kill(pol);
>
> - write_lock_bh(&net->xfrm.xfrm_policy_lock);
> + spin_unlock_bh(&net->xfrm.xfrm_policy_lock);
I've just noticed that you accidentally replaced write_lock_bh
with spin_unlock_bh here.
I fixed it up in the ipsec-next testing branch with:
>From 4141b36ab16d7a66b4cf712f2d21eba61c5927e5 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet•com>
Date: Wed, 24 Aug 2016 13:08:40 +0200
Subject: [PATCH ipsec-next] xfrm: Fix xfrm_policy_lock imbalance
An earlier patch accidentally replaced a write_lock_bh
with a spin_unlock_bh. Fix this by using spin_lock_bh
instead.
Fixes: 9d0380df6217 ("xfrm: policy: convert policy_lock to spinlock")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet•com>
---
net/xfrm/xfrm_policy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index dd01fd2..f7ce626 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -979,7 +979,7 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
xfrm_policy_kill(pol);
- spin_unlock_bh(&net->xfrm.xfrm_policy_lock);
+ spin_lock_bh(&net->xfrm.xfrm_policy_lock);
goto again1;
}
--
1.9.1
next prev parent reply other threads:[~2016-08-24 11:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 13:17 Subject: [PATCH ipsec-next 0/8] xfrm: policy: convert lookups to rcu Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 1/8] xfrm: policy: use rcu versions for iteration and list add/del Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 2/8] xfrm: policy: prepare policy_bydst hash for rcu lookups Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 3/8] xfrm: policy: add sequence count to sync with hash resize Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 4/8] xfrm: policy: use atomic_inc_not_zero in rcu section Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 5/8] xfrm: policy: make xfrm_policy_lookup_bytype lockless Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 6/8] xfrm: policy: only use rcu in xfrm_sk_policy_lookup Florian Westphal
2016-11-16 16:43 ` Nicolas Dichtel
2016-11-16 17:30 ` Florian Westphal
2016-11-17 8:55 ` Nicolas Dichtel
2016-08-11 13:17 ` [PATCH ipsec-next 7/8] xfrm: policy: don't acquire policy lock in xfrm_spd_getinfo Florian Westphal
2016-08-11 13:17 ` [PATCH ipsec-next 8/8] xfrm: policy: convert policy_lock to spinlock Florian Westphal
2016-08-24 11:28 ` Steffen Klassert [this message]
2016-08-24 11:30 ` Florian Westphal
2016-08-12 8:22 ` Subject: [PATCH ipsec-next 0/8] xfrm: policy: convert lookups to rcu Steffen Klassert
2016-08-22 5:15 ` Steffen Klassert
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=20160824112847.GP3735@gauss.secunet.com \
--to=steffen.klassert@secunet$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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