Skip to content

Commit

Permalink
Bluetooth: Improve debugging messages for hci_conn
Browse files Browse the repository at this point in the history 
Improve debugging of hci_conn objects by: adding print to hci_conn
refcounting, adding object spcifier when missing, change conn to hcon
since conn is heavily used for l2cap_conn objects and this is misleading.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Andrei Emeltchenko authored and Gustavo Padovan committed Jun 30, 2012
1 parent b82c29d commit 38b3fef
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 22 deletions.
6 changes: 6 additions & 0 deletions include/net/bluetooth/hci_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,12 +587,18 @@ void hci_conn_put_device(struct hci_conn *conn);

static inline void hci_conn_hold(struct hci_conn *conn)
{
BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt),
atomic_read(&conn->refcnt) + 1);

atomic_inc(&conn->refcnt);
cancel_delayed_work(&conn->disc_work);
}

static inline void hci_conn_put(struct hci_conn *conn)
{
BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt),
atomic_read(&conn->refcnt) - 1);

if (atomic_dec_and_test(&conn->refcnt)) {
unsigned long timeo;
if (conn->type == ACL_LINK || conn->type == LE_LINK) {
Expand Down
44 changes: 22 additions & 22 deletions net/bluetooth/hci_conn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void hci_acl_connect_cancel(struct hci_conn *conn)
{
struct hci_cp_create_conn_cancel cp;

BT_DBG("%p", conn);
BT_DBG("hcon %p", conn);

if (conn->hdev->hci_ver < BLUETOOTH_VER_1_2)
return;
Expand All @@ -120,7 +120,7 @@ void hci_acl_disconn(struct hci_conn *conn, __u8 reason)
{
struct hci_cp_disconnect cp;

BT_DBG("%p", conn);
BT_DBG("hcon %p", conn);

conn->state = BT_DISCONN;

Expand All @@ -134,7 +134,7 @@ void hci_add_sco(struct hci_conn *conn, __u16 handle)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_add_sco cp;

BT_DBG("%p", conn);
BT_DBG("hcon %p", conn);

conn->state = BT_CONNECT;
conn->out = true;
Expand All @@ -152,7 +152,7 @@ void hci_setup_sync(struct hci_conn *conn, __u16 handle)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_setup_sync_conn cp;

BT_DBG("%p", conn);
BT_DBG("hcon %p", conn);

conn->state = BT_CONNECT;
conn->out = true;
Expand Down Expand Up @@ -196,7 +196,7 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_start_enc cp;

BT_DBG("%p", conn);
BT_DBG("hcon %p", conn);

memset(&cp, 0, sizeof(cp));

Expand All @@ -213,11 +213,11 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
{
struct hci_conn *sco = conn->link;

BT_DBG("%p", conn);

if (!sco)
return;

BT_DBG("hcon %p", conn);

if (!status) {
if (lmp_esco_capable(conn->hdev))
hci_setup_sync(sco, conn->handle);
Expand All @@ -235,7 +235,7 @@ static void hci_conn_timeout(struct work_struct *work)
disc_work.work);
__u8 reason;

BT_DBG("conn %p state %s", conn, state_to_string(conn->state));
BT_DBG("hcon %p state %s", conn, state_to_string(conn->state));

if (atomic_read(&conn->refcnt))
return;
Expand Down Expand Up @@ -266,7 +266,7 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;

BT_DBG("conn %p mode %d", conn, conn->mode);
BT_DBG("hcon %p mode %d", conn, conn->mode);

if (test_bit(HCI_RAW, &hdev->flags))
return;
Expand Down Expand Up @@ -301,7 +301,7 @@ static void hci_conn_idle(unsigned long arg)
{
struct hci_conn *conn = (void *) arg;

BT_DBG("conn %p mode %d", conn, conn->mode);
BT_DBG("hcon %p mode %d", conn, conn->mode);

hci_conn_enter_sniff_mode(conn);
}
Expand Down Expand Up @@ -382,7 +382,7 @@ int hci_conn_del(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;

BT_DBG("%s conn %p handle %d", hdev->name, conn, conn->handle);
BT_DBG("%s hcon %p handle %d", hdev->name, conn, conn->handle);

del_timer(&conn->idle_timer);

Expand Down Expand Up @@ -557,7 +557,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
/* Check link security requirement */
int hci_conn_check_link_mode(struct hci_conn *conn)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (hci_conn_ssp_enabled(conn) && !(conn->link_mode & HCI_LM_ENCRYPT))
return 0;
Expand All @@ -568,7 +568,7 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
/* Authenticate remote device */
static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (conn->pending_sec_level > sec_level)
sec_level = conn->pending_sec_level;
Expand Down Expand Up @@ -602,7 +602,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
/* Encrypt the the link */
static void hci_conn_encrypt(struct hci_conn *conn)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (!test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags)) {
struct hci_cp_set_conn_encrypt cp;
Expand All @@ -616,7 +616,7 @@ static void hci_conn_encrypt(struct hci_conn *conn)
/* Enable security */
int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

/* For sdp we don't need the link key. */
if (sec_level == BT_SECURITY_SDP)
Expand Down Expand Up @@ -669,7 +669,7 @@ EXPORT_SYMBOL(hci_conn_security);
/* Check secure link requirement */
int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (sec_level != BT_SECURITY_HIGH)
return 1; /* Accept if non-secure is required */
Expand All @@ -684,7 +684,7 @@ EXPORT_SYMBOL(hci_conn_check_secure);
/* Change link key */
int hci_conn_change_link_key(struct hci_conn *conn)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->flags)) {
struct hci_cp_change_conn_link_key cp;
Expand All @@ -699,7 +699,7 @@ int hci_conn_change_link_key(struct hci_conn *conn)
/* Switch role */
int hci_conn_switch_role(struct hci_conn *conn, __u8 role)
{
BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

if (!role && conn->link_mode & HCI_LM_MASTER)
return 1;
Expand All @@ -720,7 +720,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
{
struct hci_dev *hdev = conn->hdev;

BT_DBG("conn %p mode %d", conn, conn->mode);
BT_DBG("hcon %p mode %d", conn, conn->mode);

if (test_bit(HCI_RAW, &hdev->flags))
return;
Expand Down Expand Up @@ -894,7 +894,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
struct hci_dev *hdev = conn->hdev;
struct hci_chan *chan;

BT_DBG("%s conn %p", hdev->name, conn);
BT_DBG("%s hcon %p", hdev->name, conn);

chan = kzalloc(sizeof(struct hci_chan), GFP_KERNEL);
if (!chan)
Expand All @@ -913,7 +913,7 @@ int hci_chan_del(struct hci_chan *chan)
struct hci_conn *conn = chan->conn;
struct hci_dev *hdev = conn->hdev;

BT_DBG("%s conn %p chan %p", hdev->name, conn, chan);
BT_DBG("%s hcon %p chan %p", hdev->name, conn, chan);

list_del_rcu(&chan->list);

Expand All @@ -929,7 +929,7 @@ void hci_chan_list_flush(struct hci_conn *conn)
{
struct hci_chan *chan, *n;

BT_DBG("conn %p", conn);
BT_DBG("hcon %p", conn);

list_for_each_entry_safe(chan, n, &conn->chan_list, list)
hci_chan_del(chan);
Expand Down

0 comments on commit 38b3fef

Please sign in to comment.