From: Marcel Holtmann <marcel@holtmann.org>
To: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [RFCv3 15/16] Bluetooth: Use l2cap chan lock in socket connect
Date: Thu, 09 Feb 2012 15:42:16 +0100 [thread overview]
Message-ID: <1328798536.28848.33.camel@aeonflux> (raw)
In-Reply-To: <1328797057-26331-16-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 24 ++++++++++++++++++------
> net/bluetooth/l2cap_sock.c | 2 ++
> 2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 2b97cf7..bb390ec 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -1182,7 +1182,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 &&
> @@ -1209,18 +1209,20 @@ 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;
> - goto done;
> + goto sock_release;
>
> case BT_CONNECTED:
> /* Already connected */
> err = -EISCONN;
> - goto done;
> + goto sock_release;
>
> case BT_OPEN:
> case BT_BOUND:
> @@ -1229,11 +1231,14 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
>
> default:
> err = -EBADFD;
> - goto done;
> + goto sock_release;
> }
>
> /* Set destination address and psm */
> bacpy(&bt_sk(sk)->dst, dst);
> +
> + release_sock(sk);
> +
> chan->psm = psm;
> chan->dcid = cid;
>
> @@ -1261,23 +1266,30 @@ 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);
>
> - __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;
> + goto done;
> +
> +sock_release:
> + release_sock(sk);
I don't like this jumping. Just use release_sock(sk) directly in the
error path above.
And I think we need to simplify this function a little bit and maybe
split it into more logical pieces.
Regards
Marcel
next prev parent reply other threads:[~2012-02-09 14:42 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 ` [RFCv3 02/16] Bluetooth: Revert to mutexes from RCU list Emeltchenko Andrei
2012-02-09 14:27 ` 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 [this message]
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=1328798536.28848.33.camel@aeonflux \
--to=marcel@holtmann.org \
--cc=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