From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv3 02/16] Bluetooth: Revert to mutexes from RCU list
Date: Thu, 9 Feb 2012 16:17:23 +0200 [thread overview]
Message-ID: <1328797057-26331-3-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1328797057-26331-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Usage of RCU list looks not reasonalbe for a number of reasons:
our code sleep and we have to use socket spinlocks, some parts
of code are updaters thus we need to use mutexes anyway.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 108 ++++++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8dfccb3..ae08944 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -77,36 +77,24 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn,
static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16 cid)
{
- struct l2cap_chan *c, *r = NULL;
-
- rcu_read_lock();
+ struct l2cap_chan *c;
- list_for_each_entry_rcu(c, &conn->chan_l, list) {
- if (c->dcid == cid) {
- r = c;
- break;
- }
+ list_for_each_entry(c, &conn->chan_l, list) {
+ if (c->dcid == cid)
+ return c;
}
-
- rcu_read_unlock();
- return r;
+ return NULL;
}
static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid)
{
- struct l2cap_chan *c, *r = NULL;
-
- rcu_read_lock();
+ struct l2cap_chan *c;
- list_for_each_entry_rcu(c, &conn->chan_l, list) {
- if (c->scid == cid) {
- r = c;
- break;
- }
+ list_for_each_entry(c, &conn->chan_l, list) {
+ if (c->scid == cid)
+ return c;
}
-
- rcu_read_unlock();
- return r;
+ return NULL;
}
/* Find channel with given SCID.
@@ -115,36 +103,34 @@ static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 ci
{
struct l2cap_chan *c;
+ mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_scid(conn, cid);
if (c)
lock_sock(c->sk);
+ mutex_unlock(&conn->chan_lock);
return c;
}
static struct l2cap_chan *__l2cap_get_chan_by_ident(struct l2cap_conn *conn, u8 ident)
{
- struct l2cap_chan *c, *r = NULL;
-
- rcu_read_lock();
+ struct l2cap_chan *c;
- list_for_each_entry_rcu(c, &conn->chan_l, list) {
- if (c->ident == ident) {
- r = c;
- break;
- }
+ list_for_each_entry(c, &conn->chan_l, list) {
+ if (c->ident == ident)
+ return c;
}
-
- rcu_read_unlock();
- return r;
+ return NULL;
}
static inline struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn, u8 ident)
{
struct l2cap_chan *c;
+ mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_ident(conn, ident);
if (c)
lock_sock(c->sk);
+ mutex_unlock(&conn->chan_lock);
return c;
}
@@ -259,6 +245,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
BT_DBG("chan %p state %d", chan, chan->state);
+ mutex_lock(&chan->conn->chan_lock);
lock_sock(sk);
if (chan->state == BT_CONNECTED || chan->state == BT_CONFIG)
@@ -272,6 +259,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
l2cap_chan_close(chan, reason);
release_sock(sk);
+ mutex_unlock(&chan->conn->chan_lock);
chan->ops->close(chan->data);
l2cap_chan_put(chan);
@@ -357,7 +345,9 @@ static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
l2cap_chan_hold(chan);
- list_add_rcu(&chan->list, &conn->chan_l);
+ mutex_lock(&conn->chan_lock);
+ list_add(&chan->list, &conn->chan_l);
+ mutex_unlock(&conn->chan_lock);
}
/* Delete channel.
@@ -374,8 +364,7 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
if (conn) {
/* Delete from channel list */
- list_del_rcu(&chan->list);
- synchronize_rcu();
+ list_del(&chan->list);
l2cap_chan_put(chan);
@@ -426,10 +415,12 @@ static void l2cap_chan_cleanup_listen(struct sock *parent)
/* Close not yet accepted channels */
while ((sk = bt_accept_dequeue(parent, NULL))) {
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+
__clear_chan_timer(chan);
lock_sock(sk);
l2cap_chan_close(chan, ECONNRESET);
release_sock(sk);
+
chan->ops->close(chan->data);
}
}
@@ -743,13 +734,13 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *c
/* ---- L2CAP connections ---- */
static void l2cap_conn_start(struct l2cap_conn *conn)
{
- struct l2cap_chan *chan;
+ struct l2cap_chan *chan, *tmp;
BT_DBG("conn %p", conn);
- rcu_read_lock();
+ mutex_lock(&conn->chan_lock);
- list_for_each_entry_rcu(chan, &conn->chan_l, list) {
+ list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) {
struct sock *sk = chan->sk;
bh_lock_sock(sk);
@@ -829,7 +820,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
bh_unlock_sock(sk);
}
- rcu_read_unlock();
+ mutex_unlock(&conn->chan_lock);
}
/* Find socket with cid and source bdaddr.
@@ -941,9 +932,9 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
if (conn->hcon->out && conn->hcon->type == LE_LINK)
smp_conn_security(conn, conn->hcon->pending_sec_level);
- rcu_read_lock();
+ mutex_lock(&conn->chan_lock);
- list_for_each_entry_rcu(chan, &conn->chan_l, list) {
+ list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk;
bh_lock_sock(sk);
@@ -963,7 +954,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
bh_unlock_sock(sk);
}
- rcu_read_unlock();
+ mutex_unlock(&conn->chan_lock);
}
/* Notify sockets that we cannot guaranty reliability anymore */
@@ -973,16 +964,16 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
BT_DBG("conn %p", conn);
- rcu_read_lock();
+ mutex_lock(&conn->chan_lock);
- list_for_each_entry_rcu(chan, &conn->chan_l, list) {
+ list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk;
if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
sk->sk_err = err;
}
- rcu_read_unlock();
+ mutex_unlock(&conn->chan_lock);
}
static void l2cap_info_timeout(struct work_struct *work)
@@ -1009,6 +1000,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
kfree_skb(conn->rx_skb);
+ mutex_lock(&conn->chan_lock);
+
/* Kill channels */
list_for_each_entry_safe(chan, l, &conn->chan_l, list) {
sk = chan->sk;
@@ -1018,6 +1011,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
chan->ops->close(chan->data);
}
+ mutex_unlock(&conn->chan_lock);
+
hci_chan_del(conn->hchan);
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
@@ -1075,6 +1070,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
conn->feat_mask = 0;
spin_lock_init(&conn->lock);
+ mutex_init(&conn->chan_lock);
INIT_LIST_HEAD(&conn->chan_l);
@@ -1815,9 +1811,9 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
BT_DBG("conn %p", conn);
- rcu_read_lock();
+ mutex_lock(&conn->chan_lock);
- list_for_each_entry_rcu(chan, &conn->chan_l, list) {
+ list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk;
if (chan->chan_type != L2CAP_CHAN_RAW)
continue;
@@ -1833,7 +1829,7 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
kfree_skb(nskb);
}
- rcu_read_unlock();
+ mutex_unlock(&conn->chan_lock);
}
/* ---- L2CAP signalling commands ---- */
@@ -2756,6 +2752,7 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd
return -EFAULT;
}
+ mutex_lock(&conn->chan_lock);
sk = chan->sk;
switch (result) {
@@ -2783,6 +2780,8 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd
}
release_sock(sk);
+ mutex_unlock(&conn->chan_lock);
+
return 0;
}
@@ -3033,6 +3032,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd
if (!chan)
return 0;
+ mutex_lock(&conn->chan_lock);
sk = chan->sk;
rsp.dcid = cpu_to_le16(chan->scid);
@@ -3043,6 +3043,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd
l2cap_chan_del(chan, ECONNRESET);
release_sock(sk);
+ mutex_unlock(&conn->chan_lock);
chan->ops->close(chan->data);
return 0;
@@ -3064,6 +3065,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
if (!chan)
return 0;
+ mutex_lock(&conn->chan_lock);
sk = chan->sk;
l2cap_chan_del(chan, 0);
@@ -4515,11 +4517,9 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
cancel_delayed_work(&conn->security_timer);
}
- rcu_read_lock();
-
- list_for_each_entry_rcu(chan, &conn->chan_l, list) {
- struct sock *sk = chan->sk;
+ mutex_lock(&conn->chan_lock);
+ list_for_each_entry(chan, &conn->chan_l, list) {
bh_lock_sock(sk);
BT_DBG("chan->scid %d", chan->scid);
@@ -4597,7 +4597,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
bh_unlock_sock(sk);
}
- rcu_read_unlock();
+ mutex_unlock(&conn->chan_lock);
return 0;
}
--
1.7.8.3
next prev parent reply other threads:[~2012-02-09 14:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 14:17 [RFCv3 00/16] Bluetooth: Change socket lock to l2cap_chan lock Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 01/16] Bluetooth: trivial: Fix long line Emeltchenko Andrei
2012-02-09 14:26 ` Marcel Holtmann
2012-02-09 14:17 ` Emeltchenko Andrei [this message]
2012-02-09 14:27 ` [RFCv3 02/16] Bluetooth: Revert to mutexes from RCU list Marcel Holtmann
2012-02-09 17:54 ` Ulisses Furquim
2012-02-10 8:09 ` Emeltchenko Andrei
2012-02-09 18:37 ` Gustavo Padovan
2012-02-09 18:48 ` Ulisses Furquim
2012-02-09 14:17 ` [RFCv3 03/16] Bluetooth: Do not use sk lock in get_chan functions Emeltchenko Andrei
2012-02-09 14:28 ` Marcel Holtmann
2012-02-09 14:40 ` Emeltchenko Andrei
2012-02-09 18:08 ` Gustavo Padovan
2012-02-09 18:33 ` Ulisses Furquim
2012-02-10 8:16 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 04/16] Bluetooth: Add l2cap_chan_lock Emeltchenko Andrei
2012-02-09 19:24 ` Gustavo Padovan
2012-02-10 8:39 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 05/16] Bluetooth: Add locked and unlocked state_change Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 06/16] Bluetooth: Add socket error function Emeltchenko Andrei
2012-02-09 14:30 ` Marcel Holtmann
2012-02-09 18:13 ` Gustavo Padovan
2012-02-10 8:46 ` Emeltchenko Andrei
2012-02-10 12:40 ` Gustavo Padovan
2012-02-09 14:17 ` [RFCv3 07/16] Bluetooth: Add unlocked __l2cap_chan_add function Emeltchenko Andrei
2012-02-09 14:31 ` Marcel Holtmann
2012-02-09 17:54 ` Ulisses Furquim
2012-02-10 8:53 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 08/16] Bluetooth: Use chan lock in timers Emeltchenko Andrei
2012-02-09 14:33 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 09/16] Bluetooth: Use chan lock in L2CAP sig commands Emeltchenko Andrei
2012-02-09 14:35 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 10/16] Bluetooth: Use chan lock in chan delete functions Emeltchenko Andrei
2012-02-09 14:36 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 11/16] Bluetooth: Use chan lock in L2CAP conn start Emeltchenko Andrei
2012-02-09 14:37 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 12/16] Bluetooth: Use chan lock in receiving data Emeltchenko Andrei
2012-02-09 14:38 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 13/16] Bluetooth: Change locking logic for conn/chan ready Emeltchenko Andrei
2012-02-09 14:39 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 14/16] Bluetooth: Change locking logic in security_cfm Emeltchenko Andrei
2012-02-09 14:40 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 15/16] Bluetooth: Use l2cap chan lock in socket connect Emeltchenko Andrei
2012-02-09 14:42 ` Marcel Holtmann
2012-02-09 18:25 ` Ulisses Furquim
2012-02-10 9:18 ` Emeltchenko Andrei
2012-02-10 18:31 ` Ulisses Furquim
2012-02-13 8:47 ` Emeltchenko Andrei
2012-02-14 1:12 ` Ulisses Furquim
2012-02-09 14:17 ` [RFCv3 16/16] Bluetooth: Remove socket lock check Emeltchenko Andrei
2012-02-09 14:43 ` Marcel Holtmann
2012-02-09 14:50 ` Emeltchenko Andrei
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=1328797057-26331-3-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).