Add Mesh functionality to net/bluetooth
Subsystems (2)
v7 cover Add Mesh functionality to net/bluetooth
Housekeeping and implementation
v2: Add checking for Packet Ownership when querying Tx queue state
Add cleanup of Tx queue when MGMT socket closes
v3: Fix CI complaints
v4: More indent clean-ups and proper var types
v5: Conform to the ADV Instance mechanism, and make fully compatible
with Extended Advertising mechanism.
v6: Paired with BlueZ user space unit tests (tools/mesh-tester)
v7: Fix white space -- Note: Will fail mgmt-tester until new version with Mesh Experimental feature patch is applied to BlueZ.
Brian Gix (2):
Bluetooth: Implement support for Mesh
Bluetooth: Add experimental wrapper for MGMT based mesh
include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 4 + include/net/bluetooth/hci_core.h | 16 +- include/net/bluetooth/mgmt.h | 52 +++ net/bluetooth/hci_core.c | 13 +- net/bluetooth/hci_event.c | 61 ++-- net/bluetooth/hci_sock.c | 1 + net/bluetooth/hci_sync.c | 87 ++++- net/bluetooth/mgmt.c | 588 +++++++++++++++++++++++++++++- net/bluetooth/mgmt_util.c | 74 ++++ net/bluetooth/mgmt_util.h | 18 + 11 files changed, 863 insertions(+), 52 deletions(-)
Signature · 1 line
2.37.2
PATCH v7 1/2 Bluetooth: Implement support for Mesh
The patch adds state bits, storage and HCI command chains for sending and receiving Bluetooth Mesh advertising packets, and delivery to requesting user space processes. It specifically creates 4 new MGMT commands and 2 new MGMT events:
MGMT_OP_SET_MESH_RECEIVER - Sets passive scan parameters and a list of AD Types which will trigger Mesh Packet Received events
MGMT_OP_MESH_READ_FEATURES - Returns information on how many outbound Mesh packets can be simultaneously queued, and what the currently queued handles are.
MGMT_OP_MESH_SEND - Command to queue a specific outbound Mesh packet, with the number of times it should be sent, and the BD Addr to use. Discrete advertisments are added to the ADV Instance list.
MGMT_OP_MESH_SEND_CANCEL - Command to cancel a prior outbound message request.
MGMT_EV_MESH_DEVICE_FOUND - Event to deliver entire received Mesh Advertisement packet, along with timing information.
MGMT_EV_MESH_PACKET_CMPLT - Event to indicate that an outbound packet is no longer queued for delivery.
--- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 3 + include/net/bluetooth/hci_core.h | 16 +- include/net/bluetooth/mgmt.h | 52 ++++ net/bluetooth/hci_core.c | 13 +- net/bluetooth/hci_event.c | 61 ++-- net/bluetooth/hci_sock.c | 1 + net/bluetooth/hci_sync.c | 87 +++++- net/bluetooth/mgmt.c | 480 +++++++++++++++++++++++++++++- net/bluetooth/mgmt_util.c | 74 +++++ net/bluetooth/mgmt_util.h | 18 ++ 11 files changed, 760 insertions(+), 46 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
@@ -627,6 +627,7 @@ static inline bool iso_enabled(void)int mgmt_init (void );void mgmt_exit (void ); +void mgmt_cleanup (struct sock *sk);void bt_sock_reclassify_lock (struct sock *sk,int proto);
include/net/bluetooth/hci.h +3 -0
@@ -354,6 +354,9 @@ enum {HCI_LE_SIMULTANEOUS_ROLES ,HCI_CMD_DRAIN_WORKQUEUE , +HCI_MESH , +HCI_MESH_SENDING , + __HCI_NUM_FLAGS, };
include/net/bluetooth/hci_core.h +14 -2
@@ -238,6 +238,7 @@ struct adv_info {bool enabled;bool pending;bool periodic; +__u8 mesh;__u8 instance;__u32 flags;__u16 timeout;
@@ -372,6 +373,8 @@ struct hci_dev {__u8 le_resolv_list_size;__u8 le_num_of_adv_sets;__u8 le_states[8 ]; +__u8 mesh_ad_types[16 ]; +__u8 mesh_send_ref;__u8 commands[64 ];__u8 hci_ver;__u16 hci_rev;
@@ -511,6 +514,7 @@ struct hci_dev {struct list_head cmd_sync_work_list;struct mutex cmd_sync_work_lock;struct work_struct cmd_sync_cancel_work; +struct work_struct reenable_adv_work;__u16 discov_timeout;struct delayed_work discov_off;
@@ -561,6 +565,7 @@ struct hci_dev {struct hci_conn_hash conn_hash; +struct list_head mesh_pending;struct list_head mgmt_pending;struct list_head reject_list;struct list_head accept_list;
@@ -614,6 +619,8 @@ struct hci_dev {struct delayed_work rpa_expired;bdaddr_t rpa; +struct delayed_work mesh_send_done; +enum {INTERLEAVE_SCAN_NONE ,INTERLEAVE_SCAN_NO_FILTER ,
@@ -1576,7 +1583,8 @@ struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, u16 adv_data_len, u8 *adv_data, u16 scan_rsp_len, u8 *scan_rsp_data, u16 timeout, u16 duration, s8 tx_power, - u32 min_interval, u32 max_interval); + u32 min_interval, u32 max_interval, + u8 mesh_handle);struct adv_info *hci_add_per_instance (struct hci_dev *hdev,u8 instance,u32 flags,u8 data_len,u8 *data,u32 min_interval,u32 max_interval);
@@ -1997,6 +2005,9 @@ void hci_mgmt_chan_unregister(struct hci_mgmt_chan *c);#define DISCOV_LE_FAST_ADV_INT_MAX 0x00F0/* 150 msec */ #define DISCOV_LE_PER_ADV_INT_MIN 0x00A0/* 200 msec */ #define DISCOV_LE_PER_ADV_INT_MAX 0x00A0/* 200 msec */ +#define DISCOV_LE_ADV_MESH_MIN 0x00A0/* 100 msec */ +#define DISCOV_LE_ADV_MESH_MAX 0x00A0/* 100 msec */ +#define INTERVAL_TO_MS (x) (((x) * 10) / 0x10)#define NAME_RESOLVE_DURATION msecs_to_jiffies(10240)/* 10.24 sec */
@@ -2048,7 +2059,8 @@ void mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status);void mgmt_stop_discovery_complete (struct hci_dev *hdev,u8 status);void mgmt_device_found (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,u8 *dev_class,s8 rssi,u32 flags, -u8 *eir,u16 eir_len,u8 *scan_rsp,u8 scan_rsp_len); +u8 *eir,u16 eir_len,u8 *scan_rsp,u8 scan_rsp_len, +u64 instant);void mgmt_remote_name (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,s8 rssi,u8 *name,u8 name_len);void mgmt_discovering (struct hci_dev *hdev,u8 discovering);
include/net/bluetooth/mgmt.h +52 -0
61 lines not on this page · raw message
net/bluetooth/hci_core.c +10 -3
@@ -1706,7 +1706,8 @@ struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, u16 adv_data_len, u8 *adv_data, u16 scan_rsp_len, u8 *scan_rsp_data, u16 timeout, u16 duration, s8 tx_power, - u32 min_interval, u32 max_interval) + u32 min_interval, u32 max_interval, + u8 mesh_handle) { struct adv_info *adv;
@@ -1717,7 +1718,7 @@ struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance,memset (adv->per_adv_data,0 ,sizeof (adv->per_adv_data)); }else {if (hdev->adv_instance_cnt >= hdev->le_num_of_adv_sets || - instance <1 || instance > hdev->le_num_of_adv_sets) + instance <1 || instance > hdev->le_num_of_adv_sets +1 )return ERR_PTR (-EOVERFLOW ); adv =kzalloc (sizeof (*adv),GFP_KERNEL );
@@ -1734,6 +1735,11 @@ struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance, adv->min_interval = min_interval; adv->max_interval = max_interval; adv->tx_power = tx_power; +/* Defining a mesh_handle changes the timing units to ms, +* rather than seconds, and ties the instance to the requested +* mesh_tx queue. +*/ + adv->mesh = mesh_handle;hci_set_adv_instance_data (hdev, instance, adv_data_len, adv_data, scan_rsp_len, scan_rsp_data);
@@ -1762,7 +1768,7 @@ struct adv_info *hci_add_per_instance(struct hci_dev *hdev, u8 instance, adv =hci_add_adv_instance (hdev, instance, flags,0 ,NULL ,0 ,NULL ,0 ,0 ,HCI_ADV_TX_POWER_NO_PREFERENCE , - min_interval, max_interval); + min_interval, max_interval,0 );if (IS_ERR (adv))return adv;
@@ -2486,6 +2492,7 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)mutex_init (&hdev->lock);mutex_init (&hdev->req_lock); +INIT_LIST_HEAD (&hdev->mesh_pending);INIT_LIST_HEAD (&hdev->mgmt_pending);INIT_LIST_HEAD (&hdev->reject_list);INIT_LIST_HEAD (&hdev->accept_list);
net/bluetooth/hci_event.c +38 -23
195 lines not on this page · raw message
net/bluetooth/hci_sock.c +1 -0
@@ -2065,6 +2065,7 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname,static void hci_sock_destruct (struct sock *sk) { +mgmt_cleanup (sk);skb_queue_purge (&sk->sk_receive_queue);skb_queue_purge (&sk->sk_write_queue); }
net/bluetooth/hci_sync.c +77 -10
174 lines not on this page · raw message
net/bluetooth/mgmt.c +472 -8
557 lines not on this page · raw message
net/bluetooth/mgmt_util.c +74 -0
77 lines not on this page · raw message
net/bluetooth/mgmt_util.h +18 -0
@@ -20,6 +20,16 @@SOFTWARE IS DISCLAIMED. */ +struct mgmt_mesh_tx { +struct list_head list; +int index; +size_t param_len; +struct sock *sk; +u8 handle; +u8 instance; +u8 param[sizeof (struct mgmt_cp_mesh_send ) +29 ]; +}; +struct mgmt_pending_cmd {struct list_head list;u16 opcode;
@@ -59,3 +69,11 @@ struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode, void *data, u16 len);void mgmt_pending_free (struct mgmt_pending_cmd *cmd);void mgmt_pending_remove (struct mgmt_pending_cmd *cmd); +void mgmt_mesh_foreach (struct hci_dev *hdev, +void (*cb)(struct mgmt_mesh_tx *mesh_tx,void *data), +void *data,struct sock *sk); +struct mgmt_mesh_tx *mgmt_mesh_find (struct hci_dev *hdev,u8 handle); +struct mgmt_mesh_tx *mgmt_mesh_next (struct hci_dev *hdev,struct sock *sk); +struct mgmt_mesh_tx *mgmt_mesh_add (struct sock *sk,struct hci_dev *hdev, +void *data,u16 len); +void mgmt_mesh_remove (struct mgmt_mesh_tx *mesh_tx);
Signature · 1 line
2.37.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=673367
---Test result---
Test Summary:
CheckPatch PASS 5.17 seconds GitLint PASS 1.70 seconds SubjectPrefix PASS 1.38 seconds BuildKernel PASS 35.54 seconds BuildKernel32 PASS 30.46 seconds Incremental Build with patchesPASS 70.95 seconds TestRunner: Setup PASS 497.18 seconds TestRunner: l2cap-tester PASS 16.67 seconds TestRunner: iso-tester PASS 15.35 seconds TestRunner: bnep-tester PASS 6.08 seconds TestRunner: mgmt-tester FAIL 97.94 seconds TestRunner: rfcomm-tester PASS 9.52 seconds TestRunner: sco-tester PASS 9.27 seconds TestRunner: smp-tester PASS 9.31 seconds TestRunner: userchan-tester PASS 6.34 seconds
Details
##############################
Test: TestRunner: mgmt-tester - FAIL - 97.94 seconds Run test-runner with mgmt-tester
Total: 494, Passed: 493 (99.8%), Failed: 1, Not Run: 0
Failed Test Cases
Read Exp Feature - Success Failed 0.088 seconds
---
Regards,
Linux Bluetooth
PATCH v7 2/2 Bluetooth: Add experimental wrapper for MGMT based mesh
In reply to Brian GixThis introduces a "Mesh UUID" and an Experimental Feature bit to the hdev mask, and depending all underlying Mesh functionality on it.
--- include/net/bluetooth/hci.h | 1 + net/bluetooth/mgmt.c | 112 +++++++++++++++++++++++++++++++++--- 2 files changed, 105 insertions(+), 8 deletions(-)
include/net/bluetooth/hci.h +1 -0
@@ -354,6 +354,7 @@ enum {HCI_LE_SIMULTANEOUS_ROLES ,HCI_CMD_DRAIN_WORKQUEUE , +HCI_MESH_EXPERIMENTAL ,HCI_MESH , HCI_MESH_SENDING,
net/bluetooth/mgmt.c +104 -8
174 lines not on this page · raw message
Signature · 1 line
2.37.2
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Thu, 1 Sep 2022 12:19:12 -0700 you wrote:
Housekeeping and implementation
v2: Add checking for Packet Ownership when querying Tx queue state
Add cleanup of Tx queue when MGMT socket closesv3: Fix CI complaints
[...]
Here is the summary with links:
- [v7,1/2] Bluetooth: Implement support for Mesh
https://git.kernel.org/bluetooth/bluetooth-next/c/6db7da4c50f0 - [v7,2/2] Bluetooth: Add experimental wrapper for MGMT based mesh https://git.kernel.org/bluetooth/bluetooth-next/c/45d33c081bcf
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html