From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv1 11/14] Bluetooth: Change locking logic for conn/chan ready
Date: Tue, 21 Feb 2012 12:55:04 +0200 [thread overview]
Message-ID: <1329821707-11817-12-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1329821707-11817-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
In l2cap_conn_ready and l2cap_chan_ready change locking logic and
use explicit socket when needed.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 24c7729..7baee68 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -920,7 +920,11 @@ clean:
static void l2cap_chan_ready(struct l2cap_chan *chan)
{
struct sock *sk = chan->sk;
- struct sock *parent = bt_sk(sk)->parent;
+ struct sock *parent;
+
+ lock_sock(sk);
+
+ parent = bt_sk(sk)->parent;
BT_DBG("sk %p, parent %p", sk, parent);
@@ -932,6 +936,8 @@ static void l2cap_chan_ready(struct l2cap_chan *chan)
if (parent)
parent->sk_data_ready(parent, 0);
+
+ release_sock(sk);
}
static void l2cap_conn_ready(struct l2cap_conn *conn)
@@ -949,23 +955,25 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
mutex_lock(&conn->chan_lock);
list_for_each_entry(chan, &conn->chan_l, list) {
- struct sock *sk = chan->sk;
- bh_lock_sock(sk);
+ l2cap_chan_lock(chan);
if (conn->hcon->type == LE_LINK) {
if (smp_conn_security(conn, chan->sec_level))
l2cap_chan_ready(chan);
} else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {
+ struct sock *sk = chan->sk;
__clear_chan_timer(chan);
+ lock_sock(sk);
__l2cap_state_change(chan, BT_CONNECTED);
sk->sk_state_change(sk);
+ release_sock(sk);
} else if (chan->state == BT_CONNECT)
l2cap_do_start(chan);
- bh_unlock_sock(sk);
+ l2cap_chan_unlock(chan);
}
mutex_unlock(&conn->chan_lock);
--
1.7.9
next prev parent reply other threads:[~2012-02-21 10:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 10:54 [PATCHv1 00/14] Bluetooth: Change socket lock to l2cap_chan lock Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 01/14] Bluetooth: trivial: Fix long line Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 02/14] Bluetooth: Revert to mutexes from RCU list Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 03/14] Bluetooth: Add l2cap_chan_lock Andrei Emeltchenko
2012-02-21 16:51 ` Ulisses Furquim
2012-02-21 17:25 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 04/14] Bluetooth: Add locked and unlocked state_change Andrei Emeltchenko
2012-02-21 16:52 ` Ulisses Furquim
2012-02-21 17:26 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 05/14] Bluetooth: Add socket error function Andrei Emeltchenko
2012-02-21 16:57 ` Ulisses Furquim
2012-02-21 17:27 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 06/14] Bluetooth: Add unlocked __l2cap_chan_add function Andrei Emeltchenko
2012-02-21 17:01 ` Ulisses Furquim
2012-02-22 9:25 ` Andrei Emeltchenko
2012-02-21 17:28 ` Gustavo Padovan
2012-02-21 10:55 ` [PATCHv1 07/14] Bluetooth: Use chan lock in timers Andrei Emeltchenko
2012-02-21 17:06 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 08/14] Bluetooth: Use chan lock in L2CAP sig commands Andrei Emeltchenko
2012-02-21 17:18 ` Ulisses Furquim
2012-02-21 17:57 ` Gustavo Padovan
2012-02-21 10:55 ` [PATCHv1 09/14] Bluetooth: Use chan lock in L2CAP conn start Andrei Emeltchenko
2012-02-21 17:20 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 10/14] Bluetooth: Use chan lock in receiving data Andrei Emeltchenko
2012-02-21 20:28 ` Ulisses Furquim
2012-02-21 10:55 ` Andrei Emeltchenko [this message]
2012-02-21 17:31 ` [PATCHv1 11/14] Bluetooth: Change locking logic for conn/chan ready Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 12/14] Bluetooth: Change locking logic in security_cfm Andrei Emeltchenko
2012-02-21 17:32 ` Ulisses Furquim
2012-02-21 17:56 ` Gustavo Padovan
2012-02-21 20:44 ` Andrei Emeltchenko
2012-02-21 21:18 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 13/14] Bluetooth: Use l2cap chan lock in socket connect Andrei Emeltchenko
2012-02-21 17:36 ` Ulisses Furquim
2012-02-21 17:46 ` Gustavo Padovan
2012-02-22 9:53 ` Andrei Emeltchenko
2012-02-21 10:55 ` [PATCHv1 14/14] Bluetooth: Remove socket lock check Andrei Emeltchenko
2012-02-21 17:37 ` Ulisses Furquim
2012-02-22 9:59 ` Andrei Emeltchenko
2012-02-21 17:51 ` Gustavo Padovan
2012-02-21 19:24 ` [PATCHv1 00/14] Bluetooth: Change socket lock to l2cap_chan lock Johan Hedberg
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=1329821707-11817-12-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@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 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).