* [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c
@ 2012-07-13 12:47 Jaganath Kanakkassery
2012-07-13 12:47 ` [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero Jaganath Kanakkassery
2012-07-16 10:52 ` [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Andrei Emeltchenko
0 siblings, 2 replies; 6+ messages in thread
From: Jaganath Kanakkassery @ 2012-07-13 12:47 UTC (permalink / raw)
To: linux-bluetooth; +Cc: s.syam, Jaganath Kanakkassery
Refactor the code in order to use the l2cap_chan_destroy()
from l2cap_chan_put() under the refcnt protection.
Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
---
include/net/bluetooth/l2cap.h | 16 ++--------------
net/bluetooth/l2cap_core.c | 15 +++++++++++++++
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index e5164ff..d8a6145 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -670,20 +670,8 @@ enum {
L2CAP_EV_RECV_FRAME,
};
-static inline void l2cap_chan_hold(struct l2cap_chan *c)
-{
- BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
-
- atomic_inc(&c->refcnt);
-}
-
-static inline void l2cap_chan_put(struct l2cap_chan *c)
-{
- BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
-
- if (atomic_dec_and_test(&c->refcnt))
- kfree(c);
-}
+void l2cap_chan_hold(struct l2cap_chan *c);
+void l2cap_chan_put(struct l2cap_chan *c);
static inline void l2cap_chan_lock(struct l2cap_chan *chan)
{
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9fd0599..552a8ce 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -425,6 +425,21 @@ void l2cap_chan_destroy(struct l2cap_chan *chan)
l2cap_chan_put(chan);
}
+void l2cap_chan_hold(struct l2cap_chan *c)
+{
+ BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
+
+ atomic_inc(&c->refcnt);
+}
+
+void l2cap_chan_put(struct l2cap_chan *c)
+{
+ BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
+
+ if (atomic_dec_and_test(&c->refcnt))
+ kfree(c);
+}
+
void l2cap_chan_set_defaults(struct l2cap_chan *chan)
{
chan->fcs = L2CAP_FCS_CRC16;
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero
2012-07-13 12:47 [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Jaganath Kanakkassery
@ 2012-07-13 12:47 ` Jaganath Kanakkassery
2012-07-25 7:43 ` Gustavo Padovan
2012-07-16 10:52 ` [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Andrei Emeltchenko
1 sibling, 1 reply; 6+ messages in thread
From: Jaganath Kanakkassery @ 2012-07-13 12:47 UTC (permalink / raw)
To: linux-bluetooth; +Cc: s.syam, Jaganath Kanakkassery
Move the l2cap channel list chan->global_l under the refcnt
protection and free it based on the refcnt.
Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
---
include/net/bluetooth/l2cap.h | 1 -
net/bluetooth/a2mp.c | 2 +-
net/bluetooth/l2cap_core.c | 8 +++++---
net/bluetooth/l2cap_sock.c | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index d8a6145..3450532 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -758,7 +758,6 @@ int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid);
struct l2cap_chan *l2cap_chan_create(void);
void l2cap_chan_close(struct l2cap_chan *chan, int reason);
-void l2cap_chan_destroy(struct l2cap_chan *chan);
int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
bdaddr_t *dst, u8 dst_type);
int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 4ff0bf3..cf16a7c 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -412,7 +412,7 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
static void a2mp_chan_close_cb(struct l2cap_chan *chan)
{
- l2cap_chan_destroy(chan);
+ l2cap_chan_put(chan);
}
static void a2mp_chan_state_change_cb(struct l2cap_chan *chan, int state)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 552a8ce..6b12f48 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -416,13 +416,15 @@ struct l2cap_chan *l2cap_chan_create(void)
return chan;
}
-void l2cap_chan_destroy(struct l2cap_chan *chan)
+static void l2cap_chan_destroy(struct l2cap_chan *chan)
{
+ BT_DBG("chan %p", chan);
+
write_lock(&chan_list_lock);
list_del(&chan->global_l);
write_unlock(&chan_list_lock);
- l2cap_chan_put(chan);
+ kfree(chan);
}
void l2cap_chan_hold(struct l2cap_chan *c)
@@ -437,7 +439,7 @@ void l2cap_chan_put(struct l2cap_chan *c)
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
if (atomic_dec_and_test(&c->refcnt))
- kfree(c);
+ l2cap_chan_destroy(c);
}
void l2cap_chan_set_defaults(struct l2cap_chan *chan)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index a4bb27e..79350d1 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -823,7 +823,7 @@ static void l2cap_sock_kill(struct sock *sk)
/* Kill poor orphan */
- l2cap_chan_destroy(l2cap_pi(sk)->chan);
+ l2cap_chan_put(l2cap_pi(sk)->chan);
sock_set_flag(sk, SOCK_DEAD);
sock_put(sk);
}
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero
2012-07-13 12:47 ` [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero Jaganath Kanakkassery
@ 2012-07-25 7:43 ` Gustavo Padovan
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Padovan @ 2012-07-25 7:43 UTC (permalink / raw)
To: Jaganath Kanakkassery; +Cc: linux-bluetooth, s.syam
Hi Jaganath,
* Jaganath Kanakkassery <jaganath.k@samsung.com> [2012-07-13 18:17:55 +0530]:
> Move the l2cap channel list chan->global_l under the refcnt
> protection and free it based on the refcnt.
>
> Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
> Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
> ---
> include/net/bluetooth/l2cap.h | 1 -
> net/bluetooth/a2mp.c | 2 +-
> net/bluetooth/l2cap_core.c | 8 +++++---
> net/bluetooth/l2cap_sock.c | 2 +-
> 4 files changed, 7 insertions(+), 6 deletions(-)
Both patches have been applied to bluetooth-next. Thanks.
Gustavo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c
2012-07-13 12:47 [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Jaganath Kanakkassery
2012-07-13 12:47 ` [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero Jaganath Kanakkassery
@ 2012-07-16 10:52 ` Andrei Emeltchenko
2012-07-16 10:55 ` Andrei Emeltchenko
1 sibling, 1 reply; 6+ messages in thread
From: Andrei Emeltchenko @ 2012-07-16 10:52 UTC (permalink / raw)
To: Jaganath Kanakkassery; +Cc: linux-bluetooth, s.syam
Hi Jaganath,
On Fri, Jul 13, 2012 at 06:17:54PM +0530, Jaganath Kanakkassery wrote:
> Refactor the code in order to use the l2cap_chan_destroy()
> from l2cap_chan_put() under the refcnt protection.
>
> Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
> Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
Both patches looks OK to me.
Reviewed-by: Emeltchenko Andrei <andrei.emeltchenko@nokia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c
2012-07-16 10:52 ` [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Andrei Emeltchenko
@ 2012-07-16 10:55 ` Andrei Emeltchenko
2012-07-20 6:32 ` Jaganath Kanakkassery
0 siblings, 1 reply; 6+ messages in thread
From: Andrei Emeltchenko @ 2012-07-16 10:55 UTC (permalink / raw)
To: Jaganath Kanakkassery, linux-bluetooth, s.syam
On Mon, Jul 16, 2012 at 01:52:58PM +0300, Andrei Emeltchenko wrote:
> Hi Jaganath,
>
> On Fri, Jul 13, 2012 at 06:17:54PM +0530, Jaganath Kanakkassery wrote:
> > Refactor the code in order to use the l2cap_chan_destroy()
> > from l2cap_chan_put() under the refcnt protection.
> >
> > Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
> > Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
>
> Both patches looks OK to me.
>
> Reviewed-by: Emeltchenko Andrei <andrei.emeltchenko@nokia.com>
sorry old ab :(
Reviewed-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c
2012-07-16 10:55 ` Andrei Emeltchenko
@ 2012-07-20 6:32 ` Jaganath Kanakkassery
0 siblings, 0 replies; 6+ messages in thread
From: Jaganath Kanakkassery @ 2012-07-20 6:32 UTC (permalink / raw)
To: Andrei Emeltchenko, linux-bluetooth, s.syam
Hi,
--------------------------------------------------
From: "Andrei Emeltchenko" <andrei.emeltchenko.news@gmail.com>
Sent: Monday, July 16, 2012 4:25 PM
To: "Jaganath Kanakkassery" <jaganath.k@samsung.com>;
<linux-bluetooth@vger.kernel.org>; <s.syam@samsung.com>
Subject: Re: [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to
l2cap_core.c
> On Mon, Jul 16, 2012 at 01:52:58PM +0300, Andrei Emeltchenko wrote:
>> Hi Jaganath,
>>
>> On Fri, Jul 13, 2012 at 06:17:54PM +0530, Jaganath Kanakkassery wrote:
>> > Refactor the code in order to use the l2cap_chan_destroy()
>> > from l2cap_chan_put() under the refcnt protection.
>> >
>> > Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
>> > Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
>>
>> Both patches looks OK to me.
>>
>> Reviewed-by: Emeltchenko Andrei <andrei.emeltchenko@nokia.com>
>
> sorry old ab :(
>
> Reviewed-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> --
Ping.
Thanks,
Jaganath
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-25 7:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-13 12:47 [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Jaganath Kanakkassery
2012-07-13 12:47 ` [PATCH v1 2/2] Bluetooth: Free the l2cap channel list only when refcount is zero Jaganath Kanakkassery
2012-07-25 7:43 ` Gustavo Padovan
2012-07-16 10:52 ` [PATCH v1 1/2] Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Andrei Emeltchenko
2012-07-16 10:55 ` Andrei Emeltchenko
2012-07-20 6:32 ` Jaganath Kanakkassery
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).