Commit 23b9ceb7 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg

Bluetooth: Create debugfs directory for each connection handle

For every internal representation of a Bluetooth connection which is
identified by hci_conn, create a debugfs directory with the handle
number as directory name.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent a8e1bfaa
...@@ -440,6 +440,7 @@ struct hci_conn { ...@@ -440,6 +440,7 @@ struct hci_conn {
struct delayed_work le_conn_timeout; struct delayed_work le_conn_timeout;
struct device dev; struct device dev;
struct dentry *debugfs;
struct hci_dev *hdev; struct hci_dev *hdev;
void *l2cap_data; void *l2cap_data;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
/* Bluetooth HCI connection handling. */ /* Bluetooth HCI connection handling. */
#include <linux/export.h> #include <linux/export.h>
#include <linux/debugfs.h>
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
...@@ -547,6 +548,8 @@ int hci_conn_del(struct hci_conn *conn) ...@@ -547,6 +548,8 @@ int hci_conn_del(struct hci_conn *conn)
hci_conn_del_sysfs(conn); hci_conn_del_sysfs(conn);
debugfs_remove_recursive(conn->debugfs);
if (test_bit(HCI_CONN_PARAM_REMOVAL_PEND, &conn->flags)) if (test_bit(HCI_CONN_PARAM_REMOVAL_PEND, &conn->flags))
hci_conn_params_del(conn->hdev, &conn->dst, conn->dst_type); hci_conn_params_del(conn->hdev, &conn->dst, conn->dst_type);
......
...@@ -1062,3 +1062,15 @@ void hci_debugfs_create_le(struct hci_dev *hdev) ...@@ -1062,3 +1062,15 @@ void hci_debugfs_create_le(struct hci_dev *hdev)
debugfs_create_u16("discov_interleaved_timeout", 0644, hdev->debugfs, debugfs_create_u16("discov_interleaved_timeout", 0644, hdev->debugfs,
&hdev->discov_interleaved_timeout); &hdev->discov_interleaved_timeout);
} }
void hci_debugfs_create_conn(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
char name[6];
if (IS_ERR_OR_NULL(hdev->debugfs))
return;
snprintf(name, sizeof(name), "%u", conn->handle);
conn->debugfs = debugfs_create_dir(name, hdev->debugfs);
}
...@@ -23,3 +23,4 @@ ...@@ -23,3 +23,4 @@
void hci_debugfs_create_common(struct hci_dev *hdev); void hci_debugfs_create_common(struct hci_dev *hdev);
void hci_debugfs_create_bredr(struct hci_dev *hdev); void hci_debugfs_create_bredr(struct hci_dev *hdev);
void hci_debugfs_create_le(struct hci_dev *hdev); void hci_debugfs_create_le(struct hci_dev *hdev);
void hci_debugfs_create_conn(struct hci_conn *conn);
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <net/bluetooth/mgmt.h> #include <net/bluetooth/mgmt.h>
#include "hci_request.h" #include "hci_request.h"
#include "hci_debugfs.h"
#include "a2mp.h" #include "a2mp.h"
#include "amp.h" #include "amp.h"
#include "smp.h" #include "smp.h"
...@@ -2162,6 +2163,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -2162,6 +2163,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
} else } else
conn->state = BT_CONNECTED; conn->state = BT_CONNECTED;
hci_debugfs_create_conn(conn);
hci_conn_add_sysfs(conn); hci_conn_add_sysfs(conn);
if (test_bit(HCI_AUTH, &hdev->flags)) if (test_bit(HCI_AUTH, &hdev->flags))
...@@ -3638,6 +3640,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, ...@@ -3638,6 +3640,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
conn->handle = __le16_to_cpu(ev->handle); conn->handle = __le16_to_cpu(ev->handle);
conn->state = BT_CONNECTED; conn->state = BT_CONNECTED;
hci_debugfs_create_conn(conn);
hci_conn_add_sysfs(conn); hci_conn_add_sysfs(conn);
break; break;
...@@ -4178,6 +4181,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev, ...@@ -4178,6 +4181,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
hcon->disc_timeout = HCI_DISCONN_TIMEOUT; hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
hci_conn_drop(hcon); hci_conn_drop(hcon);
hci_debugfs_create_conn(hcon);
hci_conn_add_sysfs(hcon); hci_conn_add_sysfs(hcon);
amp_physical_cfm(bredr_hcon, hcon); amp_physical_cfm(bredr_hcon, hcon);
...@@ -4384,6 +4388,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -4384,6 +4388,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
conn->le_conn_latency = le16_to_cpu(ev->latency); conn->le_conn_latency = le16_to_cpu(ev->latency);
conn->le_supv_timeout = le16_to_cpu(ev->supervision_timeout); conn->le_supv_timeout = le16_to_cpu(ev->supervision_timeout);
hci_debugfs_create_conn(conn);
hci_conn_add_sysfs(conn); hci_conn_add_sysfs(conn);
hci_proto_connect_cfm(conn, ev->status); hci_proto_connect_cfm(conn, ev->status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment