Mesh demon switched to using kernel Mesh MGMT
Subsystems (2)
v5 cover Mesh demon switched to using kernel Mesh MGMT
This patchset enables the mesh daemon (bluetooth-meshd) to use the new MGMT mesh opcodes and events to send and receive Mesh packets. By default, the daemon attempts to enable the experimental mesh functionality, and query the kernel for active mesh support before then enumerating the available controllers and selecting ojne that works.
If no kernel support is found, it will continue to use a raw HCI socket for mesh support.
v2-v3: Fix whitespace and spelling
v4: Rework missed 2 new files... readded.
v5: Fix null-point dereference found by CI
Brian Gix (2):
mesh: Improve PB-ADV timing for reliability
mesh: Add new kernel MGMT based IO transport
Makefile.mesh | 9 +- mesh/main.c | 39 +- mesh/mesh-io-api.h | 11 +- mesh/mesh-io-generic.c | 47 +-- mesh/mesh-io-mgmt.c | 788 +++++++++++++++++++++++++++++++++++++++++ mesh/mesh-io-mgmt.h | 11 + mesh/mesh-io-unit.c | 13 +- mesh/mesh-io.c | 189 +++++++--- mesh/mesh-io.h | 4 +- mesh/mesh-mgmt.c | 164 +++++++-- mesh/mesh-mgmt.h | 12 +- mesh/mesh.c | 6 +- mesh/mesh.h | 2 +- mesh/pb-adv.c | 9 +- 14 files changed, 1160 insertions(+), 144 deletions(-) create mode 100644 mesh/mesh-io-mgmt.c create mode 100644 mesh/mesh-io-mgmt.h
Signature · 1 line
2.37.3
PATCH v5 1/2 mesh: Improve PB-ADV timing for reliability
Because provisioning is not speed dependent, Timing on outbound PB-ADV packets have been modified to be less likely missed by remote controlers with looser timing capabilities.
--- mesh/pb-adv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mesh/pb-adv.c +6 -3
@@ -23,6 +23,8 @@#include "mesh/provision.h" #include "mesh/pb-adv.h" +#include "mesh/util.h" +struct pb_adv_session {mesh_prov_open_func_t open_cb;
@@ -158,7 +160,7 @@ static void send_adv_segs(struct pb_adv_session *session, const uint8_t *data,l_debug ("max_seg: %2.2x" , max_seg);l_debug ("size: %2.2x, CRC: %2.2x" , size, buf[9 ]); -pb_adv_send (session,MESH_IO_TX_COUNT_UNLIMITED ,200 , +pb_adv_send (session,MESH_IO_TX_COUNT_UNLIMITED ,500 , buf, init_size +10 ); consumed = init_size;
@@ -174,7 +176,7 @@ static void send_adv_segs(struct pb_adv_session *session, const uint8_t *data, buf[6 ] = (i <<2 ) |0x02 ;memcpy (buf +7 , data + consumed, seg_size); -pb_adv_send (session,MESH_IO_TX_COUNT_UNLIMITED ,200 , +pb_adv_send (session,MESH_IO_TX_COUNT_UNLIMITED ,500 , buf, seg_size +7 ); consumed += seg_size;
@@ -270,7 +272,8 @@ static void send_ack(struct pb_adv_session *session, uint8_t trans_num) ack.trans_num = trans_num; ack.opcode =PB_ADV_ACK ; -pb_adv_send (session,1 ,100 , &ack,sizeof (ack)); +pb_adv_send (session,MESH_IO_TX_COUNT_UNLIMITED ,500 , + &ack,sizeof (ack)); }static void send_close_ind (struct pb_adv_session *session,uint8_t reason)
Signature · 1 line
2.37.3
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=679972
---Test result---
Test Summary:
CheckPatch PASS 3.72 seconds GitLint PASS 1.59 seconds Prep - Setup ELL PASS 32.34 seconds Build - Prep PASS 0.80 seconds Build - Configure PASS 10.16 seconds Build - Make PASS 962.18 seconds Make Check PASS 13.10 seconds Make Check w/Valgrind PASS 346.94 seconds Make Distcheck PASS 288.02 seconds Build w/ext ELL - Configure PASS 10.29 seconds Build w/ext ELL - Make PASS 101.50 seconds Incremental Build w/ patches PASS 239.82 seconds Scan Build PASS 663.36 seconds
---
Regards,
Linux Bluetooth
PATCH v5 2/2 mesh: Add new kernel MGMT based IO transport
In reply to Brian Gix1. Re-structures MGMT handling such that it is used to detect kernel support of the mesh MGMT opcodes and events before selecting between using MGMT or the legacy raw HCI socket method.
2. Re-structures main() to allow command line to prefer MGMT over HCI or visa versa, plus optionally pass an explicte controller.
3. Adds mesh-io-mgmt as a transport.
--- Makefile.mesh | 9 +- mesh/main.c | 39 +- mesh/mesh-io-api.h | 11 +- mesh/mesh-io-generic.c | 47 +-- mesh/mesh-io-mgmt.c | 788 +++++++++++++++++++++++++++++++++++++++++ mesh/mesh-io-mgmt.h | 11 + mesh/mesh-io-unit.c | 13 +- mesh/mesh-io.c | 189 +++++++--- mesh/mesh-io.h | 4 +- mesh/mesh-mgmt.c | 164 +++++++-- mesh/mesh-mgmt.h | 12 +- mesh/mesh.c | 6 +- mesh/mesh.h | 2 +- 13 files changed, 1154 insertions(+), 141 deletions(-) create mode 100644 mesh/mesh-io-mgmt.c create mode 100644 mesh/mesh-io-mgmt.h
Makefile.mesh +4 -5
@@ -13,12 +13,11 @@ endif mesh_sources = mesh/mesh.h mesh/mesh.c \ mesh/net-keys.h mesh/net-keys.c \ mesh/mesh-io.h mesh/mesh-io.c \ - mesh/mesh-mgmt.c mesh/mesh-mgmt.h \ + mesh/mesh-mgmt.h mesh/mesh-mgmt.c \ mesh/error.h mesh/mesh-io-api.h \ - mesh/mesh-io-generic.h \ - mesh/mesh-io-generic.c \ - mesh/mesh-io-unit.h \ - mesh/mesh-io-unit.c \ + mesh/mesh-io-unit.h mesh/mesh-io-unit.c \ + mesh/mesh-io-mgmt.h mesh/mesh-io-mgmt.c \ + mesh/mesh-io-generic.h mesh/mesh-io-generic.c \ mesh/net.h mesh/net.c \ mesh/crypto.h mesh/crypto.c \ mesh/friend.h mesh/friend.c \
mesh/main.c +35 -4
@@ -123,6 +123,12 @@ static void disconnect_callback(void *user_data)l_main_quit (); } +static void kill_to (struct l_timeout *timeout,void *user_data) +{ +l_timeout_remove (timeout); +l_main_quit (); +} +static void signal_handler (uint32_t signo,void *user_data) {static bool terminated;
@@ -131,13 +137,38 @@ static void signal_handler(uint32_t signo, void *user_data)return ;l_info ("Terminating" ); -l_main_quit (); +mesh_cleanup (true); +l_timeout_create (1 , kill_to,NULL ,NULL ); terminated = true; }static bool parse_io (const char *optarg,enum mesh_io_type *type,void **opts) { -if (strstr (optarg,"generic" ) == optarg) { +if (strstr (optarg,"auto" ) == optarg) { +int *index =l_new (int,1 ); + + *type =MESH_IO_TYPE_AUTO ; + *opts = index; + + optarg +=strlen ("auto" ); +if (!*optarg) { + *index =MGMT_INDEX_NONE ; +return true; + } + +if (*optarg !=':' ) +return false; + + optarg++; + +if (sscanf (optarg,"hci%d" , index) ==1 ) +return true; + +if (sscanf (optarg,"%d" , index) ==1 ) +return true; + +return false; + }else if (strstr (optarg,"generic" ) == optarg) {int *index =l_new (int,1 ); *type =MESH_IO_TYPE_GENERIC ;
@@ -251,7 +282,7 @@ int main(int argc, char *argv[]) }if (!io) - io =l_strdup_printf ("generic" ); + io =l_strdup_printf ("auto" );if (!parse_io (io, &io_type, &io_opts)) {l_error ("Invalid io: %s" , io);
@@ -295,7 +326,7 @@ done:l_free (io);l_free (io_opts); -mesh_cleanup (); +mesh_cleanup (false);l_dbus_destroy (dbus);l_main_exit ();
mesh/mesh-io-api.h +7 -4
@@ -10,8 +10,7 @@struct mesh_io_private ; -typedef bool (*mesh_io_init_t )(struct mesh_io *io,void *opts, -mesh_io_ready_func_t cb,void *user_data); +typedef bool (*mesh_io_init_t )(struct mesh_io *io,void *opts,void *user_data);typedef bool (*mesh_io_destroy_t )(struct mesh_io *io);typedef bool (*mesh_io_caps_t )(struct mesh_io *io,struct mesh_io_caps *caps); typedef bool (*mesh_io_send_t)(struct mesh_io *io,
@@ -36,9 +35,13 @@ struct mesh_io_api { };struct mesh_io { -enum mesh_io_type type; -const struct mesh_io_api *api; +int index; +int favored_index; +mesh_io_ready_func_t ready; +struct l_queue *rx_regs;struct mesh_io_private *pvt; +void *user_data; +const struct mesh_io_api *api; };struct mesh_io_table {
mesh/mesh-io-generic.c +11 -36
94 lines not on this page · raw message
mesh/mesh-io-mgmt.c new file +788 -0
788 lines not on this page · raw message
mesh/mesh-io-mgmt.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2018 Intel Corporation. All rights reserved. +* +* +*/ + +extern const struct mesh_io_api mesh_io_mgmt;
mesh/mesh-io-unit.c +6 -7
@@ -25,13 +25,13 @@#include "mesh/dbus.h" #include "mesh/mesh-io.h" #include "mesh/mesh-io-api.h" -#include "mesh/mesh-io-generic.h" +#include "mesh/mesh-io-unit.h" struct mesh_io_private { +struct mesh_io *io;struct l_io *sio;void *user_data;char *unique_name; -mesh_io_ready_func_t ready_callback;struct l_timeout *tx_timeout;struct l_queue *rx_regs;struct l_queue *tx_pkts;
@@ -203,14 +203,13 @@ static void unit_up(void *user_data)l_debug ("Started io-unit" ); -if (pvt->ready_callback) - pvt->ready_callback (pvt->user_data, true); +if (pvt->io && pvt->io->ready) + pvt->io->ready (pvt->user_data, true);l_timeout_create_ms (1 , get_name, pvt,NULL ); } -static bool unit_init (struct mesh_io *io,void *opt, -mesh_io_ready_func_t cb,void *user_data) +static bool unit_init (struct mesh_io *io,void *opt,void *user_data) {struct mesh_io_private *pvt;char *sk_path;
@@ -247,7 +246,7 @@ static bool unit_init(struct mesh_io *io, void *opt, pvt->rx_regs =l_queue_new (); pvt->tx_pkts =l_queue_new (); - pvt->ready_callback = cb; + pvt->io = io; pvt->user_data = user_data; io->pvt = pvt;
mesh/mesh-io.c +142 -47
271 lines not on this page · raw message
mesh/mesh-io.h +3 -1
@@ -14,8 +14,10 @@ struct mesh_io;enum mesh_io_type {MESH_IO_TYPE_NONE =0 , +MESH_IO_TYPE_UNIT_TEST , +MESH_IO_TYPE_AUTO ,/* If MGMT required, add after here */ +MESH_IO_TYPE_MGMT ,MESH_IO_TYPE_GENERIC , -MESH_IO_TYPE_UNIT_TEST };enum mesh_io_timing_type {
mesh/mesh-mgmt.c +130 -34
242 lines not on this page · raw message
mesh/mesh-mgmt.h +11 -1
@@ -9,6 +9,16 @@*/ #include <stdbool.h> -typedef void (*mesh_mgmt_read_info_func_t )(int index,void *user_data); +typedef void (*mesh_mgmt_read_info_func_t )(int index,bool added,bool powered, +bool mesh,void *user_data);bool mesh_mgmt_list (mesh_mgmt_read_info_func_t cb,void *user_data); +unsigned int mesh_mgmt_send (uint16_t opcode,uint16_t index, +uint16_t length,const void *param, +mgmt_request_func_t callback, +void *user_data,mgmt_destroy_func_t destroy); +unsigned int mesh_mgmt_register (uint16_t event,uint16_t index, +mgmt_notify_func_t callback, +void *user_data,mgmt_destroy_func_t destroy); +bool mesh_mgmt_unregister (unsigned int id); +void mesh_mgmt_destroy (void );
mesh/mesh.c +5 -1
@@ -324,11 +324,15 @@ static void free_pending_join_call(bool failed) join_pending =NULL ; } -void mesh_cleanup (void ) +void mesh_cleanup (bool signaled) {struct l_dbus_message *reply;mesh_io_destroy (mesh.io); + mesh.io =NULL ; + +if (signaled) +return ;if (join_pending) {
mesh/mesh.h +1 -1
@@ -28,7 +28,7 @@ typedef void (*prov_rx_cb_t)(void *user_data, const uint8_t *data,bool mesh_init (const char *config_dir,const char *mesh_conf_fname,enum mesh_io_type type,void *opts,mesh_ready_func_t cb,void *user_data); -void mesh_cleanup (void ); +void mesh_cleanup (bool signaled);bool mesh_dbus_init (struct l_dbus *dbus);const char *mesh_status_str (uint8_t err);
Signature · 1 line
2.37.3
This series was applied to bluetooth/bluez.git (master) by Brian Gix <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Brian Gix <[email protected]>:
Quoted 10 lines · On Fri, 23 Sep 2022 11:00:16 -0700 you wrote:
This patchset enables the mesh daemon (bluetooth-meshd) to use the new MGMT mesh opcodes and events to send and receive Mesh packets. By default, the daemon attempts to enable the experimental mesh functionality, and query the kernel for active mesh support before then enumerating the available controllers and selecting ojne that works.
If no kernel support is found, it will continue to use a raw HCI socket for mesh support.
[...]
Here is the summary with links:
- [BlueZ,v5,1/2] mesh: Improve PB-ADV timing for reliability
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=491be481a91c - [BlueZ,v5,2/2] mesh: Add new kernel MGMT based IO transport https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=9966cb8b6999
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html