Bluetooth: Add experimental wrapper for MGMT based mesh

This introduces a "Mesh UUID" and an Experimental Feature bit to the
hdev mask, and depending all underlying Mesh functionality on it.

Signed-off-by: Brian Gix <brian.gix@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b3ade68..e004ba0 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -354,6 +354,7 @@ enum {
        HCI_LE_SIMULTANEOUS_ROLES,
        HCI_CMD_DRAIN_WORKQUEUE,
 
+       HCI_MESH_EXPERIMENTAL,
        HCI_MESH,
        HCI_MESH_SENDING,
 

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index e1c404a..4c421eb 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2203,7 +2203,8 @@ static int set_mesh(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 
        bt_dev_dbg(hdev, "sock %p", sk);
 
-       if (!lmp_le_capable(hdev))
+       if (!lmp_le_capable(hdev) ||
+           !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))
                return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_MESH_RECEIVER,
                                       MGMT_STATUS_NOT_SUPPORTED);
 
@@ -2322,7 +2323,8 @@ static int mesh_features(struct sock *sk, struct hci_dev *hdev,
 {
        struct mgmt_rp_mesh_read_features rp;
 
-       if (!lmp_le_capable(hdev))
+       if (!lmp_le_capable(hdev) ||
+           !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))
                return mgmt_cmd_status(sk, hdev->id, MGMT_OP_MESH_READ_FEATURES,
                                       MGMT_STATUS_NOT_SUPPORTED);
 
@@ -2376,6 +2378,11 @@ static int mesh_send_cancel(struct sock *sk, struct hci_dev *hdev,
        struct mgmt_pending_cmd *cmd;
        int err;
 
+       if (!lmp_le_capable(hdev) ||
+           !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))
+               return mgmt_cmd_status(sk, hdev->id, MGMT_OP_MESH_SEND_CANCEL,
+                                      MGMT_STATUS_NOT_SUPPORTED);
+
        if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))
                return mgmt_cmd_status(sk, hdev->id, MGMT_OP_MESH_SEND_CANCEL,
                                       MGMT_STATUS_REJECTED);
@@ -2407,6 +2414,10 @@ static int mesh_send(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
        bool sending;
        int err = 0;
 
+       if (!lmp_le_capable(hdev) ||
+           !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))
+               return mgmt_cmd_status(sk, hdev->id, MGMT_OP_MESH_SEND,
+                                      MGMT_STATUS_NOT_SUPPORTED);
        if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED) ||
            len <= MGMT_MESH_SEND_SIZE ||
            len > (MGMT_MESH_SEND_SIZE + 31))
@@ -4365,17 +4376,30 @@ static const u8 iso_socket_uuid[16] = {
        0x6a, 0x49, 0xe0, 0x05, 0x88, 0xf1, 0xba, 0x6f,
 };
 
+/* 2ce463d7-7a03-4d8d-bf05-5f24e8f36e76 */
+static const u8 mgmt_mesh_uuid[16] = {
+       0x76, 0x6e, 0xf3, 0xe8, 0x24, 0x5f, 0x05, 0xbf,
+       0x8d, 0x4d, 0x03, 0x7a, 0xd7, 0x63, 0xe4, 0x2c,
+};
+
 static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
                                  void *data, u16 data_len)
 {
-       char buf[122];   /* Enough space for 6 features: 2 + 20 * 6 */
-       struct mgmt_rp_read_exp_features_info *rp = (void *)buf;
+       struct mgmt_rp_read_exp_features_info *rp;
+       size_t len;
        u16 idx = 0;
        u32 flags;
+       int status;
 
        bt_dev_dbg(hdev, "sock %p", sk);
 
-       memset(&buf, 0, sizeof(buf));
+       /* Enough space for 7 features */
+       len = sizeof(*rp) + (sizeof(rp->features[0]) * 7);
+       rp = kmalloc(len, GFP_KERNEL);
+       if (!rp)
+               return -ENOMEM;
+
+       memset(rp, 0, len);
 
 #ifdef CONFIG_BT_FEATURE_DEBUG
        if (!hdev) {
@@ -4439,6 +4463,17 @@ static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
                idx++;
        }
 
+       if (hdev && lmp_le_capable(hdev)) {
+               if (hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))
+                       flags = BIT(0);
+               else
+                       flags = 0;
+
+               memcpy(rp->features[idx].uuid, mgmt_mesh_uuid, 16);
+               rp->features[idx].flags = cpu_to_le32(flags);
+               idx++;
+       }
+
        rp->feature_count = cpu_to_le16(idx);
 
        /* After reading the experimental features information, enable
@@ -4446,9 +4481,12 @@ static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
         */
        hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);
 
-       return mgmt_cmd_complete(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
-                                MGMT_OP_READ_EXP_FEATURES_INFO,
-                                0, rp, sizeof(*rp) + (20 * idx));
+       status = mgmt_cmd_complete(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
+                                  MGMT_OP_READ_EXP_FEATURES_INFO,
+                                  0, rp, sizeof(*rp) + (20 * idx));
+
+       kfree(rp);
+       return status;
 }
 
 static int exp_ll_privacy_feature_changed(bool enabled, struct hci_dev *hdev,
@@ -4576,6 +4614,63 @@ static int set_debug_func(struct sock *sk, struct hci_dev *hdev,
 }
 #endif
 
+static int set_mgmt_mesh_func(struct sock *sk, struct hci_dev *hdev,
+                             struct mgmt_cp_set_exp_feature *cp, u16 data_len)
+{
+       struct mgmt_rp_set_exp_feature rp;
+       bool val, changed;
+       int err;
+
+       /* Command requires to use the controller index */
+       if (!hdev)
+               return mgmt_cmd_status(sk, MGMT_INDEX_NONE,
+                                      MGMT_OP_SET_EXP_FEATURE,
+                                      MGMT_STATUS_INVALID_INDEX);
+
+       /* Changes can only be made when controller is powered down */
+       if (hdev_is_powered(hdev))
+               return mgmt_cmd_status(sk, hdev->id,
+                                      MGMT_OP_SET_EXP_FEATURE,
+                                      MGMT_STATUS_REJECTED);
+
+       /* Parameters are limited to a single octet */
+       if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)
+               return mgmt_cmd_status(sk, hdev->id,
+                                      MGMT_OP_SET_EXP_FEATURE,
+                                      MGMT_STATUS_INVALID_PARAMS);
+
+       /* Only boolean on/off is supported */
+       if (cp->param[0] != 0x00 && cp->param[0] != 0x01)
+               return mgmt_cmd_status(sk, hdev->id,
+                                      MGMT_OP_SET_EXP_FEATURE,
+                                      MGMT_STATUS_INVALID_PARAMS);
+
+       val = !!cp->param[0];
+
+       if (val) {
+               changed = !hci_dev_test_and_set_flag(hdev,
+                                                    HCI_MESH_EXPERIMENTAL);
+       } else {
+               hci_dev_clear_flag(hdev, HCI_MESH);
+               changed = hci_dev_test_and_clear_flag(hdev,
+                                                     HCI_MESH_EXPERIMENTAL);
+       }
+
+       memcpy(rp.uuid, mgmt_mesh_uuid, 16);
+       rp.flags = cpu_to_le32(val ? BIT(0) : 0);
+
+       hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);
+
+       err = mgmt_cmd_complete(sk, hdev->id,
+                               MGMT_OP_SET_EXP_FEATURE, 0,
+                               &rp, sizeof(rp));
+
+       if (changed)
+               exp_feature_changed(hdev, mgmt_mesh_uuid, val, sk);
+
+       return err;
+}
+
 static int set_rpa_resolution_func(struct sock *sk, struct hci_dev *hdev,
                                   struct mgmt_cp_set_exp_feature *cp,
                                   u16 data_len)
@@ -4891,6 +4986,7 @@ static const struct mgmt_exp_feature {
 #ifdef CONFIG_BT_FEATURE_DEBUG
        EXP_FEAT(debug_uuid, set_debug_func),
 #endif
+       EXP_FEAT(mgmt_mesh_uuid, set_mgmt_mesh_func),
        EXP_FEAT(rpa_resolution_uuid, set_rpa_resolution_func),
        EXP_FEAT(quality_report_uuid, set_quality_report_func),
        EXP_FEAT(offload_codecs_uuid, set_offload_codec_func),