Return-Path: Date: Thu, 24 May 2012 03:32:35 -0300 From: Gustavo Padovan To: linux-bluetooth@vger.kernel.org Cc: Gustavo Padovan Subject: Re: [RFC 3/3] Blueooth: Remove parent socket usage from l2cap_core.c Message-ID: <20120524063235.GE21117@joana> References: <1337821964-4618-9-git-send-email-gustavo@padovan.org> <1337839374-20443-1-git-send-email-gustavo@padovan.org> <1337839374-20443-2-git-send-email-gustavo@padovan.org> <1337839374-20443-3-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1337839374-20443-3-git-send-email-gustavo@padovan.org> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: This is Bluetooth: and not Blueooth: * Gustavo Padovan [2012-05-24 03:02:54 -0300]: > From: Gustavo Padovan > > We can lock the parent lock only inside the new_connection() call, then we > just use the l2cap_chan_lock() in core code. > > Signed-off-by: Gustavo Padovan > --- > net/bluetooth/l2cap_core.c | 16 ++++++---------- > net/bluetooth/l2cap_sock.c | 9 ++++++++- > 2 files changed, 14 insertions(+), 11 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 5ff294f9..314ce74 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -1139,7 +1139,7 @@ static struct l2cap_chan *l2cap_global_chan_by_scid(int state, u16 cid, > > static void l2cap_le_conn_ready(struct l2cap_conn *conn) > { > - struct sock *parent, *sk; > + struct sock *sk; > struct l2cap_chan *chan, *pchan; > > BT_DBG(""); > @@ -1150,9 +1150,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) > if (!pchan) > return; > > - parent = pchan->sk; > - > - lock_sock(parent); > + l2cap_chan_lock(pchan); > > chan = pchan->ops->new_connection(pchan->data); > if (!chan) > @@ -1170,7 +1168,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) > l2cap_chan_ready(chan); > > clean: > - release_sock(parent); > + l2cap_chan_unlock(pchan); > } > > static void l2cap_conn_ready(struct l2cap_conn *conn) > @@ -3308,7 +3306,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd > struct l2cap_conn_req *req = (struct l2cap_conn_req *) data; > struct l2cap_conn_rsp rsp; > struct l2cap_chan *chan = NULL, *pchan; > - struct sock *parent, *sk = NULL; > + struct sock *sk = NULL; > int result, status = L2CAP_CS_NO_INFO; > > u16 dcid = 0, scid = __le16_to_cpu(req->scid); > @@ -3323,10 +3321,8 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd > goto sendresp; > } > > - parent = pchan->sk; > - > mutex_lock(&conn->chan_lock); > - lock_sock(parent); > + l2cap_chan_lock(pchan); > > /* Check if the ACL is secure enough (if not SDP) */ > if (psm != cpu_to_le16(0x0001) && > @@ -3388,7 +3384,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd > } > > response: > - release_sock(parent); > + l2cap_chan_unlock(pchan); > mutex_unlock(&conn->chan_lock); > > sendresp: > diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c > index f4c3e2c..be3e934 100644 > --- a/net/bluetooth/l2cap_sock.c > +++ b/net/bluetooth/l2cap_sock.c > @@ -900,16 +900,21 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(void *data) > { > struct sock *sk, *parent = data; > > + lock_sock(parent); > + > /* Check for backlog size */ > if (sk_acceptq_is_full(parent)) { > BT_DBG("backlog full %d", parent->sk_ack_backlog); > + release_sock(parent); > return NULL; > } > > sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP, > GFP_ATOMIC); > - if (!sk) > + if (!sk) { > + release_sock(parent); > return NULL; > + } > > bt_sock_reclassify_lock(sk, BTPROTO_L2CAP); > > @@ -917,6 +922,8 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(void *data) > > bt_accept_enqueue(parent, sk); > > + release_sock(parent); > + > return l2cap_pi(sk)->chan; > } > > -- > 1.7.10.1 > Gustavo