Return-Path: Date: Mon, 30 Jan 2012 12:07:26 +0200 From: Emeltchenko Andrei To: Ulisses Furquim Cc: linux-bluetooth@vger.kernel.org Subject: Re: [RFC Draft] Bluetooth: Change socket lock to l2cap_chan lock Message-ID: <20120130100719.GA2618@aemeltch-MOBL1> References: <1327674288-894-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 In-Reply-To: Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Ulisses, On Fri, Jan 27, 2012 at 07:30:27PM -0200, Ulisses Furquim wrote: > Hi Andrei, > > On Fri, Jan 27, 2012 at 12:24 PM, Emeltchenko Andrei > wrote: > > +static void l2cap_state_change(struct l2cap_chan *chan, int state) > > +{ > > + ? ? ? lock_sock(chan->sk); > > + ? ? ? __l2cap_state_change(chan, state); > > + ? ? ? release_sock(chan->sk); > > +} > > Why do we lock sock here instead of l2cap_chan? What do you want to > chan lock protect? I want to protect access to sk->sk_state as it is checked in socket code inside critical section (look for example net/bluetooth/af_bluetooth.c). > > > @@ -737,7 +766,8 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *c > > ? ? ? ? ? ? ? ? ? ? ? ?L2CAP_DISCONN_REQ, sizeof(req), &req); > > > > ? ? ? ?l2cap_state_change(chan, BT_DISCONN); > > - ? ? ? sk->sk_err = err; > > + > > + ? ? ? l2cap_set_sock_err(chan, err); > > ?} > > Both l2cap_state_change and l2cap_set_sock_err now grab sock lock and > release. Maybe use the unlocked versions and add explicit lock and > unlock around them? Yes I will fix it. > > ?/* ---- L2CAP connections ---- */ > > @@ -747,15 +777,13 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > > > ? ? ? ?BT_DBG("conn %p", conn); > > > > - ? ? ? rcu_read_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); > > + ? ? ? ? ? ? ? l2cap_chan_lock(chan); > > > > ? ? ? ? ? ? ? ?if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { > > - ? ? ? ? ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ? ? ? ? ? ? ? ? ?continue; > > ? ? ? ? ? ? ? ?} > > > > @@ -764,7 +792,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > > > ? ? ? ? ? ? ? ? ? ? ? ?if (!l2cap_chan_check_security(chan) || > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?!__l2cap_no_conn_pending(chan)) { > > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?continue; > > ? ? ? ? ? ? ? ? ? ? ? ?} > > > > @@ -774,7 +802,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* l2cap_chan_close() calls list_del(chan) > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? * so release the lock */ > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?l2cap_chan_close(chan, ECONNRESET); > > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?continue; > > ? ? ? ? ? ? ? ? ? ? ? ?} > > > > @@ -794,6 +822,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > ? ? ? ? ? ? ? ? ? ? ? ?rsp.dcid = cpu_to_le16(chan->scid); > > > > ? ? ? ? ? ? ? ? ? ? ? ?if (l2cap_chan_check_security(chan)) { > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? lock_sock(sk); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?if (bt_sk(sk)->defer_setup) { > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct sock *parent = bt_sk(sk)->parent; > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.result = cpu_to_le16(L2CAP_CR_PEND); > > @@ -802,10 +831,11 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?parent->sk_data_ready(parent, 0); > > > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?} else { > > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? l2cap_state_change(chan, BT_CONFIG); > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? __l2cap_state_change(chan, BT_CONFIG); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?} > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? release_sock(sk); > > ? ? ? ? ? ? ? ? ? ? ? ?} else { > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.result = cpu_to_le16(L2CAP_CR_PEND); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.status = cpu_to_le16(L2CAP_CS_AUTHEN_PEND); > > @@ -816,7 +846,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > > > ? ? ? ? ? ? ? ? ? ? ? ?if (test_bit(CONF_REQ_SENT, &chan->conf_state) || > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rsp.result != L2CAP_CR_SUCCESS) { > > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?continue; > > ? ? ? ? ? ? ? ? ? ? ? ?} > > > > @@ -826,10 +856,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn) > > ? ? ? ? ? ? ? ? ? ? ? ?chan->num_conf_req++; > > ? ? ? ? ? ? ? ?} > > > > - ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ?} > > - > > - ? ? ? rcu_read_unlock(); > > ?} > > You are removing the RCU usage which was protecting conn->chan_l. What > are you going to use to protect this list? The RCU usage in the case > of conn->chan_l is missing a lock in the updaters of the list IMO, > though. I think that RCU usage is not correct here since we can delete element from the list and then take the reference, this shall be changed to list_for_each_entry_safe as it was originally. I am also thinking about returning chan_lock mutex. > You are also changing bh_lock_sock which is a spin_lock to chan_lock > on a mutex and that might lead to issues. IIRC Padovan left > bh_lock_sock here so we don't sleep inside RCU reader section which > was causing deadlocks and long delays. I think that you cannot sleep in the RCU critical section in principle. bh_lock_sock looks like a hack to allow use RCU critical section but as I said above it looks completely wrong. > > > > ? ? ? ? ? ? ? ?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); > > - ? ? ? ? ? ? ? ? ? ? ? l2cap_state_change(chan, BT_CONNECTED); > > + ? ? ? ? ? ? ? ? ? ? ? lock_sock(sk); > > + ? ? ? ? ? ? ? ? ? ? ? __l2cap_state_change(chan, BT_CONNECTED); > > ? ? ? ? ? ? ? ? ? ? ? ?sk->sk_state_change(sk); > > + ? ? ? ? ? ? ? ? ? ? ? release_sock(sk); > > So we are grabbing l2cap_chan lock and then sock lock. Is that order > always the same? We're using mutexes in process context so we need to > be careful with deadlocks even on UP machines. Hopefully the order is always the same. > > ? ? ? ? ? ? ? ?} else if (chan->state == BT_CONNECT) > > ? ? ? ? ? ? ? ? ? ? ? ?l2cap_do_start(chan); > > > > - ? ? ? ? ? ? ? bh_unlock_sock(sk); > > + ? ? ? ? ? ? ? l2cap_chan_unlock(chan); > > ? ? ? ?} > > > > - ? ? ? rcu_read_unlock(); > > ?} > > > > > @@ -4517,12 +4564,8 @@ 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; > > - > > - ? ? ? ? ? ? ? bh_lock_sock(sk); > > + ? ? ? list_for_each_entry(chan, &conn->chan_l, list) { > > + ? ? ? ? ? ? ? l2cap_chan_lock(chan); > > > > ? ? ? ? ? ? ? ?BT_DBG("chan->scid %d", chan->scid); > > Again removing RCU protecting conn->chan_l. There are other places > where you are removing reader side protection of conn->chan_l, so > please take a look at what you are going to do. Here it is removed because I use mutex which sleeps and this does not work in RCU critical section. I really think that it is better to remove RCU critical section at all then to use dirty hacks with bh_lock_sock. > > > Well, I had just a quick look. Have you done some testing with this? Thanks for reviewing. > How was it? Maybe running PTS against it would be good. Actually this works. The only issues I had so far were kernel crashes related to wrong RCU usage, I have sent patches changing RCU list iteration to _safe list iteration last week. I've tested so far with my l2test test scripts. There are also warnings related to delayed work for which I think you sent patches also. Best regards Andrei Emeltchenko