From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCHv1 13/14] Bluetooth: Use l2cap chan lock in socket connect
Date: Wed, 22 Feb 2012 11:53:46 +0200 [thread overview]
Message-ID: <20120222095344.GF24328@aemeltch-MOBL1> (raw)
In-Reply-To: <20120221174507.GA22229@joana>
Hi Gustavo,
On Tue, Feb 21, 2012 at 03:46:57PM -0200, Gustavo Padovan wrote:
> Hi Andrei,
>
> * Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-02-21 12:55:06 +0200]:
>
> > From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> >
> > Function l2cap_chan_connect does not return with locked socket
> > anymore. So we take explicit lock in l2cap_sock_connect.
> >
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > ---
> > net/bluetooth/l2cap_core.c | 18 ++++++++++++++----
> > net/bluetooth/l2cap_sock.c | 2 ++
> > 2 files changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index 49aa226..9e0af6e 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -1159,7 +1159,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
> >
> > hci_dev_lock(hdev);
> >
> > - lock_sock(sk);
> > + l2cap_chan_lock(chan);
> >
> > /* PSM must be odd and lsb of upper byte must be 0 */
> > if ((__le16_to_cpu(psm) & 0x0101) != 0x0001 && !cid &&
> > @@ -1186,17 +1186,21 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
> > goto done;
> > }
> >
> > + lock_sock(sk);
> > +
> > switch (sk->sk_state) {
> > case BT_CONNECT:
> > case BT_CONNECT2:
> > case BT_CONFIG:
> > /* Already connecting */
> > err = 0;
> > + release_sock(sk);
> > goto done;
> >
> > case BT_CONNECTED:
> > /* Already connected */
> > err = -EISCONN;
> > + release_sock(sk);
> > goto done;
> >
> > case BT_OPEN:
> > @@ -1206,11 +1210,15 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
> >
> > default:
> > err = -EBADFD;
> > + release_sock(sk);
> > goto done;
> > }
> >
> > /* Set destination address and psm */
> > bacpy(&bt_sk(sk)->dst, dst);
> > +
> > + release_sock(sk);
> > +
> > chan->psm = psm;
> > chan->dcid = cid;
> >
> > @@ -1238,23 +1246,25 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
> > /* Update source addr of the socket */
> > bacpy(src, conn->src);
> >
> > + l2cap_chan_unlock(chan);
> > l2cap_chan_add(conn, chan);
> > + l2cap_chan_lock(chan);
>
> What are you trying to do here?
I am following the same locking sequence, otherwise lockdep warns.
> > - __l2cap_state_change(chan, BT_CONNECT);
> > + l2cap_state_change(chan, BT_CONNECT);
> > __set_chan_timer(chan, sk->sk_sndtimeo);
> >
> > if (hcon->state == BT_CONNECTED) {
> > if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {
> > __clear_chan_timer(chan);
> > if (l2cap_chan_check_security(chan))
> > - __l2cap_state_change(chan, BT_CONNECTED);
> > + l2cap_state_change(chan, BT_CONNECTED);
> > } else
> > l2cap_do_start(chan);
> > }
> >
> > err = 0;
> > -
>
> Do not remove this line, please.
OK.
Best regards
Andrei Emeltchenko
next prev parent reply other threads:[~2012-02-22 9:53 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 ` [PATCHv1 11/14] Bluetooth: Change locking logic for conn/chan ready Andrei Emeltchenko
2012-02-21 17:31 ` 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 [this message]
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=20120222095344.GF24328@aemeltch-MOBL1 \
--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).