Bluetooth: Introduce HCI_CONN_FLAG_DEVICE_PRIVACY device flag
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/2 Bluetooth: Introduce HCI_CONN_FLAG_DEVICE_PRIVACY device flag
From: Luiz Augusto von Dentz <[email protected]>
This introduces HCI_CONN_FLAG_DEVICE_PRIVACY which can be used by userspace to indicate to the controller to use Device Privacy Mode to a specific device.
---
v2: Fix supported flags not actually checking if the hdev really supports the flags.
include/net/bluetooth/hci_core.h | 4 ++++ net/bluetooth/mgmt.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-)
include/net/bluetooth/hci_core.h +4 -0
@@ -160,6 +160,7 @@ struct bdaddr_list_with_flags {enum hci_conn_flags {HCI_CONN_FLAG_REMOTE_WAKEUP , +HCI_CONN_FLAG_DEVICE_PRIVACY ,HCI_CONN_FLAG_MAX };
@@ -1465,6 +1466,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define use_ll_privacy (dev) (ll_privacy_capable(dev) && \ hci_dev_test_flag(dev, HCI_ENABLE_LL_PRIVACY)) +#define privacy_mode_capable (dev) (use_ll_privacy(dev) && \ + (hdev->commands[39] & 0x04)) +/* Use enhanced synchronous connection if command is supported */ #define enhanced_sco_capable (dev) ((dev)->commands[29] & 0x08)
net/bluetooth/mgmt.c +26 -4
@@ -4349,7 +4349,22 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_NOT_SUPPORTED); } -#define SUPPORTED_DEVICE_FLAGS () ((1U << HCI_CONN_FLAG_MAX) - 1) +static u32 supported_device_flags (struct hci_dev *hdev) +{ +u32 flags =0 ; + +/* Check if adapter can wakeup the system */ +if (hdev->wakeup && hdev->wakeup (hdev)) + flags |=BIT (HCI_CONN_FLAG_REMOTE_WAKEUP ); + +/* Check if Privacy Mode can be set */ +if (privacy_mode_capable (hdev)) + flags |=BIT (HCI_CONN_FLAG_DEVICE_PRIVACY ); + +bt_dev_err (hdev,"flag 0x%8x" , flags); + +return flags; +}static int get_device_flags (struct sock *sk,struct hci_dev *hdev,void *data,u16 data_len)
@@ -4358,7 +4373,7 @@ static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,struct mgmt_rp_get_device_flags rp;struct bdaddr_list_with_flags *br_params;struct hci_conn_params *params; -u32 supported_flags =SUPPORTED_DEVICE_FLAGS (); +u32 supported_flags =supported_device_flags (hdev);u32 current_flags =0 ;u8 status =MGMT_STATUS_INVALID_PARAMS ;
@@ -4422,7 +4437,7 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,struct bdaddr_list_with_flags *br_params;struct hci_conn_params *params;u8 status =MGMT_STATUS_INVALID_PARAMS ; -u32 supported_flags =SUPPORTED_DEVICE_FLAGS (); +u32 supported_flags =supported_device_flags (hdev);u32 current_flags =__le32_to_cpu (cp->current_flags); bt_dev_dbg(hdev, "Set device flags %pMR (type 0x%x) = 0x%x",
@@ -4455,6 +4470,13 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,if (params) { params->current_flags = current_flags; status =MGMT_STATUS_SUCCESS ; + +/* Update passive scan if HCI_CONN_FLAG_DEVICE_PRIVACY +* has been set. +*/ +if (hci_conn_test_flag (HCI_CONN_FLAG_DEVICE_PRIVACY , + params->current_flags)) +hci_update_passive_scan (hdev); }else { bt_dev_warn(hdev, "No such LE device %pMR (0x%x)", &cp->addr.bdaddr,
@@ -7060,7 +7082,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, added:device_added (sk, hdev, &cp->addr.bdaddr, cp->addr.type, cp->action);device_flags_changed (NULL , hdev, &cp->addr.bdaddr, cp->addr.type, -SUPPORTED_DEVICE_FLAGS (), current_flags); +supported_device_flags (hdev), current_flags); err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE, MGMT_STATUS_SUCCESS, &cp->addr,
Signature · 1 line
2.33.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/2 Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list
From: Luiz Augusto von Dentz <[email protected]>
This adds support for Set Privacy Mode when updating the resolving list when HCI_CONN_FLAG_DEVICE_PRIVACY so the controller shall use Device Mode for devices programmed in the resolving list, Device Mode is actually required when the remote device are not able to use RPA as otherwise the default mode is Network Privacy Mode in which only allows RPAs thus the controller would filter out advertisement using identity addresses for which there is an IRK.
--- include/net/bluetooth/hci.h | 10 ++++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_event.c | 29 +++++++++++++++++ net/bluetooth/hci_sync.c | 53 ++++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 6 deletions(-)
include/net/bluetooth/hci.h +10 -0
@@ -1931,6 +1931,16 @@ struct hci_rp_le_read_transmit_power {__s8 max_le_tx_power; } __packed; +#define HCI_NETWORK_PRIVACY 0x00 +#define HCI_DEVICE_PRIVACY 0x01 + +#define HCI_OP_LE_SET_PRIVACY_MODE 0x204e +struct hci_cp_le_set_privacy_mode { +__u8 bdaddr_type; +bdaddr_t bdaddr; +__u8 mode; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;
include/net/bluetooth/hci_core.h +1 -0
@@ -755,6 +755,7 @@ struct hci_conn_params {struct hci_conn *conn;bool explicit_connect; +u8 privacy_mode;u32 current_flags; };
net/bluetooth/hci_event.c +29 -0
@@ -1300,6 +1300,31 @@ static void hci_cc_le_read_transmit_power(struct hci_dev *hdev, hdev->max_le_tx_power = rp->max_le_tx_power; } +static void hci_cc_le_set_privacy_mode (struct hci_dev *hdev, +struct sk_buff *skb) +{ +__u8 status = *((__u8 *)skb->data); +struct hci_cp_le_set_privacy_mode *cp; +struct hci_conn_params *params; + +bt_dev_dbg (hdev,"status 0x%2.2x" , status); + +if (status) +return ; + + cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_PRIVACY_MODE ); +if (!cp) +return ; + +hci_dev_lock (hdev); + + params =hci_conn_params_lookup (hdev, &cp->bdaddr, cp->bdaddr_type); +if (params) + params->privacy_mode = cp->mode; + +hci_dev_unlock (hdev); +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);
@@ -3812,6 +3837,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_read_transmit_power (hdev, skb);break ; +case HCI_OP_LE_SET_PRIVACY_MODE : +hci_cc_le_set_privacy_mode (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;
net/bluetooth/hci_sync.c +47 -6
72 lines not on this page · raw message
Signature · 1 line
2.33.1
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list
Hi Luiz,
Quoted 113 lines
This adds support for Set Privacy Mode when updating the resolving list when
HCI_CONN_FLAG_DEVICE_PRIVACYso the controller shall use Device Mode for devices programmed in the resolving list, Device Mode is actually required when the remote device are not able to use RPA as otherwise the default mode is Network Privacy Mode in which only allows RPAs thus the controller would filter out advertisement using identity addresses for which there is an IRK.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/hci.h | 10 ++++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_event.c | 29 +++++++++++++++++ net/bluetooth/hci_sync.c | 53 ++++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 6 deletions(-)include/net/bluetooth/hci.h +10
-0@@ -1931,6 +1931,16 @@ struct hci_rp_le_read_transmit_power {__s8 max_le_tx_power; } __packed; +#define HCI_NETWORK_PRIVACY 0x00 +#define HCI_DEVICE_PRIVACY 0x01 + +#define HCI_OP_LE_SET_PRIVACY_MODE 0x204e +struct hci_cp_le_set_privacy_mode { +__u8 bdaddr_type; +bdaddr_t bdaddr; +__u8 mode; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;include/net/bluetooth/hci_core.h +1
-0@@ -755,6 +755,7 @@ struct hci_conn_params {struct hci_conn *conn;bool explicit_connect; +u8 privacy_mode;u32 current_flags; };net/bluetooth/hci_event.c +29
-0@@ -1300,6 +1300,31 @@ static void hci_cc_le_read_transmit_power(struct hci_dev *hdev, hdev->max_le_tx_power = rp->max_le_tx_power; } +static void hci_cc_le_set_privacy_mode (struct hci_dev *hdev, +struct sk_buff *skb) +{ +__u8 status = *((__u8 *)skb->data); +struct hci_cp_le_set_privacy_mode *cp; +struct hci_conn_params *params; + +bt_dev_dbg (hdev,"status 0x%2.2x" , status); + +if (status) +return ; + + cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_PRIVACY_MODE ); +if (!cp) +return ; + +hci_dev_lock (hdev); + + params =hci_conn_params_lookup (hdev, &cp->bdaddr, cp->bdaddr_type); +if (params) + params->privacy_mode = cp->mode; + +hci_dev_unlock (hdev); +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);@@ -3812,6 +3837,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_read_transmit_power (hdev, skb);break ; +case HCI_OP_LE_SET_PRIVACY_MODE : +hci_cc_le_set_privacy_mode (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;net/bluetooth/hci_sync.c +9
-0@@ -1580,8 +1580,42 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, sizeof(cp), &cp, HCI_CMD_TIMEOUT); } +/* Set Device Privacy Mode. */ +static int hci_le_set_privacy_mode_sync (struct hci_dev *hdev, +struct hci_conn_params *params) +{ +struct hci_cp_le_set_privacy_mode cp; +struct smp_irk *irk; + +/* If device privacy mode has already been set there is nothing to do */ +if (params->privacy_mode ==HCI_DEVICE_PRIVACY )
net/bluetooth/hci_sync.c static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, · line 1601
Quoted 10 lines
net/bluetooth/hci_sync.c +10
-0+return 0 ; + +/* Set Privacy Mode requires the use of resolving list (aka. LL Privacy) +* by default Network Mode is used so only really send the command if +* Device Mode is required (HCI_CONN_FLAG_DEVICE_PRIVACY). +*/ +if (!privacy_mode_capable (hdev) || + !hci_conn_test_flag (HCI_CONN_FLAG_DEVICE_PRIVACY , + params->current_flags)) +return 0 ;
does this also account for the fact that LL Privacy is behind an experimental option. I think in the previous patch it is more important to check if LL Privacy is actually enabled via experimental setting.
Regards
Marcel
Luiz Augusto von Dentz
maintainerRe: [PATCH v2 2/2] Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list
Hi Marcel,
Quoted 120 lines · Marcel Holtmann
Hi Luiz,
Quoted 117 lines
This adds support for Set Privacy Mode when updating the resolving list when
HCI_CONN_FLAG_DEVICE_PRIVACYso the controller shall use Device Mode for devices programmed in the resolving list, Device Mode is actually required when the remote device are not able to use RPA as otherwise the default mode is Network Privacy Mode in which only allows RPAs thus the controller would filter out advertisement using identity addresses for which there is an IRK.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/hci.h | 10 ++++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_event.c | 29 +++++++++++++++++ net/bluetooth/hci_sync.c | 53 ++++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 6 deletions(-)include/net/bluetooth/hci.h +10
-0@@ -1931,6 +1931,16 @@ struct hci_rp_le_read_transmit_power {__s8 max_le_tx_power; } __packed; +#define HCI_NETWORK_PRIVACY 0x00 +#define HCI_DEVICE_PRIVACY 0x01 + +#define HCI_OP_LE_SET_PRIVACY_MODE 0x204e +struct hci_cp_le_set_privacy_mode { +__u8 bdaddr_type; +bdaddr_t bdaddr; +__u8 mode; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;include/net/bluetooth/hci_core.h +1
-0@@ -755,6 +755,7 @@ struct hci_conn_params {struct hci_conn *conn;bool explicit_connect; +u8 privacy_mode;u32 current_flags; };net/bluetooth/hci_event.c +29
-0@@ -1300,6 +1300,31 @@ static void hci_cc_le_read_transmit_power(struct hci_dev *hdev, hdev->max_le_tx_power = rp->max_le_tx_power; } +static void hci_cc_le_set_privacy_mode (struct hci_dev *hdev, +struct sk_buff *skb) +{ +__u8 status = *((__u8 *)skb->data); +struct hci_cp_le_set_privacy_mode *cp; +struct hci_conn_params *params; + +bt_dev_dbg (hdev,"status 0x%2.2x" , status); + +if (status) +return ; + + cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_PRIVACY_MODE ); +if (!cp) +return ; + +hci_dev_lock (hdev); + + params =hci_conn_params_lookup (hdev, &cp->bdaddr, cp->bdaddr_type); +if (params) + params->privacy_mode = cp->mode; + +hci_dev_unlock (hdev); +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);@@ -3812,6 +3837,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_read_transmit_power (hdev, skb);break ; +case HCI_OP_LE_SET_PRIVACY_MODE : +hci_cc_le_set_privacy_mode (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;net/bluetooth/hci_sync.c +13
-0@@ -1580,8 +1580,42 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, sizeof(cp), &cp, HCI_CMD_TIMEOUT); } +/* Set Device Privacy Mode. */ +static int hci_le_set_privacy_mode_sync (struct hci_dev *hdev, +struct hci_conn_params *params) +{ +struct hci_cp_le_set_privacy_mode cp; +struct smp_irk *irk; + +/* If device privacy mode has already been set there is nothing to do */ +if (params->privacy_mode ==HCI_DEVICE_PRIVACY ) +return 0 ; + +/* Set Privacy Mode requires the use of resolving list (aka. LL Privacy) +* by default Network Mode is used so only really send the command if
Quoted 8 lines
net/bluetooth/hci_sync.c static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, · line 1601
Quoted 6 lines
net/bluetooth/hci_sync.c +6
-0+* Device Mode is required (HCI_CONN_FLAG_DEVICE_PRIVACY). +*/ +if (!privacy_mode_capable (hdev) || + !hci_conn_test_flag (HCI_CONN_FLAG_DEVICE_PRIVACY , + params->current_flags)) +return 0 ;does this also account for the fact that LL Privacy is behind an experimental option. I think in the previous patch it is more important to check if LL Privacy is actually enabled via experimental setting.
Yep, it does check it:
#define privacy_mode_capable(dev) (use_ll_privacy(dev) && \
(hdev->commands[39] & 0x04))
That said, maybe we should check it again since one wouldn't be able to set HCI_CONN_FLAG_DEVICE_PRIVACY as it wouldn't be supported.
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list
Hi Luiz,
Quoted 126 lines
Quoted 117 lines
Quoted 117 lines
This adds support for Set Privacy Mode when updating the resolving list when
HCI_CONN_FLAG_DEVICE_PRIVACYso the controller shall use Device Mode for devices programmed in the resolving list, Device Mode is actually required when the remote device are not able to use RPA as otherwise the default mode is Network Privacy Mode in which only allows RPAs thus the controller would filter out advertisement using identity addresses for which there is an IRK.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/hci.h | 10 ++++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_event.c | 29 +++++++++++++++++ net/bluetooth/hci_sync.c | 53 ++++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 6 deletions(-)include/net/bluetooth/hci.h +10
-0@@ -1931,6 +1931,16 @@ struct hci_rp_le_read_transmit_power {__s8 max_le_tx_power; } __packed; +#define HCI_NETWORK_PRIVACY 0x00 +#define HCI_DEVICE_PRIVACY 0x01 + +#define HCI_OP_LE_SET_PRIVACY_MODE 0x204e +struct hci_cp_le_set_privacy_mode { +__u8 bdaddr_type; +bdaddr_t bdaddr; +__u8 mode; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;include/net/bluetooth/hci_core.h +1
-0@@ -755,6 +755,7 @@ struct hci_conn_params {struct hci_conn *conn;bool explicit_connect; +u8 privacy_mode;u32 current_flags; };net/bluetooth/hci_event.c +29
-0@@ -1300,6 +1300,31 @@ static void hci_cc_le_read_transmit_power(struct hci_dev *hdev, hdev->max_le_tx_power = rp->max_le_tx_power; } +static void hci_cc_le_set_privacy_mode (struct hci_dev *hdev, +struct sk_buff *skb) +{ +__u8 status = *((__u8 *)skb->data); +struct hci_cp_le_set_privacy_mode *cp; +struct hci_conn_params *params; + +bt_dev_dbg (hdev,"status 0x%2.2x" , status); + +if (status) +return ; + + cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_PRIVACY_MODE ); +if (!cp) +return ; + +hci_dev_lock (hdev); + + params =hci_conn_params_lookup (hdev, &cp->bdaddr, cp->bdaddr_type); +if (params) + params->privacy_mode = cp->mode; + +hci_dev_unlock (hdev); +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);@@ -3812,6 +3837,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_read_transmit_power (hdev, skb);break ; +case HCI_OP_LE_SET_PRIVACY_MODE : +hci_cc_le_set_privacy_mode (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;net/bluetooth/hci_sync.c +13
-0@@ -1580,8 +1580,42 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, sizeof(cp), &cp, HCI_CMD_TIMEOUT); } +/* Set Device Privacy Mode. */ +static int hci_le_set_privacy_mode_sync (struct hci_dev *hdev, +struct hci_conn_params *params) +{ +struct hci_cp_le_set_privacy_mode cp; +struct smp_irk *irk; + +/* If device privacy mode has already been set there is nothing to do */ +if (params->privacy_mode ==HCI_DEVICE_PRIVACY ) +return 0 ; + +/* Set Privacy Mode requires the use of resolving list (aka. LL Privacy) +* by default Network Mode is used so only really send the command if Quoted 8 lines
net/bluetooth/hci_sync.c static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, · line 1601
Quoted 6 lines
net/bluetooth/hci_sync.c +6
-0+* Device Mode is required (HCI_CONN_FLAG_DEVICE_PRIVACY). +*/ +if (!privacy_mode_capable (hdev) || + !hci_conn_test_flag (HCI_CONN_FLAG_DEVICE_PRIVACY , + params->current_flags)) +return 0 ;does this also account for the fact that LL Privacy is behind an experimental option. I think in the previous patch it is more important to check if LL Privacy is actually enabled via experimental setting.
Quoted 7 lines
Yep, it does check it:
#define
privacy_mode_capable(dev)(use_ll_privacy(dev)&& \
(hdev->commands[39] &0x04))That said, maybe we should check it again since one wouldn't be able to set
HCI_CONN_FLAG_DEVICE_PRIVACYas it wouldn't be supported.
I think we should just store the supported device flags in hdev determined during power on. And then just allow setting or unsetting of it based on the fact that it is supported.
On a different note, while checking above, I found this:
changed = !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY); hci_dev_set_flag(hdev, HCI_ENABLE_LL_PRIVACY);
This is not ok. It is fully racy. We need to have hci_dev_test_and_set_flag() and hci_dev_test_and_clear_flag() helpers.
Regards
Marcel
Luiz Augusto von Dentz
maintainerRe: [PATCH v2 2/2] Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list
Hi Marcel,
Quoted 131 lines · Marcel Holtmann
Hi Luiz,
Quoted 128 lines
Quoted 117 lines
Quoted 117 lines
This adds support for Set Privacy Mode when updating the resolving list when
HCI_CONN_FLAG_DEVICE_PRIVACYso the controller shall use Device Mode for devices programmed in the resolving list, Device Mode is actually required when the remote device are not able to use RPA as otherwise the default mode is Network Privacy Mode in which only allows RPAs thus the controller would filter out advertisement using identity addresses for which there is an IRK.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/hci.h | 10 ++++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_event.c | 29 +++++++++++++++++ net/bluetooth/hci_sync.c | 53 ++++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 6 deletions(-)include/net/bluetooth/hci.h +10
-0@@ -1931,6 +1931,16 @@ struct hci_rp_le_read_transmit_power {__s8 max_le_tx_power; } __packed; +#define HCI_NETWORK_PRIVACY 0x00 +#define HCI_DEVICE_PRIVACY 0x01 + +#define HCI_OP_LE_SET_PRIVACY_MODE 0x204e +struct hci_cp_le_set_privacy_mode { +__u8 bdaddr_type; +bdaddr_t bdaddr; +__u8 mode; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;include/net/bluetooth/hci_core.h +1
-0@@ -755,6 +755,7 @@ struct hci_conn_params {struct hci_conn *conn;bool explicit_connect; +u8 privacy_mode;u32 current_flags; };net/bluetooth/hci_event.c +29
-0@@ -1300,6 +1300,31 @@ static void hci_cc_le_read_transmit_power(struct hci_dev *hdev, hdev->max_le_tx_power = rp->max_le_tx_power; } +static void hci_cc_le_set_privacy_mode (struct hci_dev *hdev, +struct sk_buff *skb) +{ +__u8 status = *((__u8 *)skb->data); +struct hci_cp_le_set_privacy_mode *cp; +struct hci_conn_params *params; + +bt_dev_dbg (hdev,"status 0x%2.2x" , status); + +if (status) +return ; + + cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_PRIVACY_MODE ); +if (!cp) +return ; + +hci_dev_lock (hdev); + + params =hci_conn_params_lookup (hdev, &cp->bdaddr, cp->bdaddr_type); +if (params) + params->privacy_mode = cp->mode; + +hci_dev_unlock (hdev); +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);@@ -3812,6 +3837,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_read_transmit_power (hdev, skb);break ; +case HCI_OP_LE_SET_PRIVACY_MODE : +hci_cc_le_set_privacy_mode (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;net/bluetooth/hci_sync.c +13
-0@@ -1580,8 +1580,42 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, sizeof(cp), &cp, HCI_CMD_TIMEOUT); } +/* Set Device Privacy Mode. */ +static int hci_le_set_privacy_mode_sync (struct hci_dev *hdev, +struct hci_conn_params *params) +{ +struct hci_cp_le_set_privacy_mode cp; +struct smp_irk *irk; + +/* If device privacy mode has already been set there is nothing to do */ +if (params->privacy_mode ==HCI_DEVICE_PRIVACY ) +return 0 ; + +/* Set Privacy Mode requires the use of resolving list (aka. LL Privacy) +* by default Network Mode is used so only really send the command if Quoted 8 lines
net/bluetooth/hci_sync.c static int hci_le_add_resolve_list_sync(struct hci_dev *hdev, · line 1601
Quoted 6 lines
net/bluetooth/hci_sync.c +6
-0+* Device Mode is required (HCI_CONN_FLAG_DEVICE_PRIVACY). +*/ +if (!privacy_mode_capable (hdev) || + !hci_conn_test_flag (HCI_CONN_FLAG_DEVICE_PRIVACY , + params->current_flags)) +return 0 ;does this also account for the fact that LL Privacy is behind an experimental option. I think in the previous patch it is more important to check if LL Privacy is actually enabled via experimental setting.
Yep, it does check it:
Quoted 7 lines
Quoted 5 lines
#define
privacy_mode_capable(dev)(use_ll_privacy(dev)&& \
(hdev->commands[39] &0x04))That said, maybe we should check it again since one wouldn't be able to set
HCI_CONN_FLAG_DEVICE_PRIVACYas it wouldn't be supported.I think we should just store the supported device flags in hdev determined during power on. And then just allow setting or unsetting of it based on the fact that it is supported.
I'm afraid we can't do that all at power on though since some of the flag support can change e.g. by enabling LL Privacy, but I guess we can detect when things like LL Privacy is enabled via Set Experimental Features and then just enable Device Privacy Mode based on that.
Quoted 6 lines
On a different note, while checking above, I found this:
changed = !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY); hci_dev_set_flag(hdev, HCI_ENABLE_LL_PRIVACY);This is not ok. It is fully racy. We need to have
hci_dev_test_and_set_flag()andhci_dev_test_and_clear_flag()helpers.
Yep, actually they already exist but haven't been used for some reason.
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz
Marcel Holtmann
maintainerHi Luiz,
Quoted 41 lines
This introduces
HCI_CONN_FLAG_DEVICE_PRIVACYwhich can be used by userspace to indicate to the controller to use Device Privacy Mode to a specific device.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
v2: Fix supported flags not actually checking if the hdev really supports the flags.
include/net/bluetooth/hci_core.h| 4 ++++net/bluetooth/mgmt.c| 30 ++++++++++++++++++++++++++----2 files changed, 30 insertions(+), 4 deletions(-)include/net/bluetooth/hci_core.h +4
-0@@ -160,6 +160,7 @@ struct bdaddr_list_with_flags {enum hci_conn_flags {HCI_CONN_FLAG_REMOTE_WAKEUP , +HCI_CONN_FLAG_DEVICE_PRIVACY ,HCI_CONN_FLAG_MAX };@@ -1465,6 +1466,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define use_ll_privacy (dev) (ll_privacy_capable(dev) && \ hci_dev_test_flag(dev, HCI_ENABLE_LL_PRIVACY)) +#define privacy_mode_capable (dev) (use_ll_privacy(dev) && \ + (hdev->commands[39] & 0x04)) +/* Use enhanced synchronous connection if command is supported */ #define enhanced_sco_capable (dev) ((dev)->commands[29] & 0x08)net/bluetooth/mgmt.c +0
-0@@ -4349,7 +4349,22 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_NOT_SUPPORTED);
net/bluetooth/mgmt.c static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, · line 4358
Quoted 10 lines
net/bluetooth/mgmt.c +7
-1} -#define SUPPORTED_DEVICE_FLAGS () ((1U << HCI_CONN_FLAG_MAX) - 1) +static u32 supported_device_flags (struct hci_dev *hdev) +{ +u32 flags =0 ; + +/* Check if adapter can wakeup the system */ +if (hdev->wakeup && hdev->wakeup (hdev)) + flags |=BIT (HCI_CONN_FLAG_REMOTE_WAKEUP );
I would do this change as a separate patch since it has nothing to do with the device privacy setting.
Do we have to call hdev->wakeup() as well here? Isn’t the existence of the callback enough indication.
That also said, doesn’t it make sense to store the supported_flags in the device params struct. It would make it certainly easy to return. Potentially we have a few calls to Get Device Flags and its notifications that have to rebuild this flags field over and over again.
Regards
Marcel
Luiz Augusto von Dentz
maintainerHi Marcel,
Quoted 46 lines · Marcel Holtmann
Hi Luiz,
Quoted 43 lines
This introduces
HCI_CONN_FLAG_DEVICE_PRIVACYwhich can be used by userspace to indicate to the controller to use Device Privacy Mode to a specific device.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
v2: Fix supported flags not actually checking if the hdev really supports the flags.
include/net/bluetooth/hci_core.h| 4 ++++net/bluetooth/mgmt.c| 30 ++++++++++++++++++++++++++----2 files changed, 30 insertions(+), 4 deletions(-)include/net/bluetooth/hci_core.h +4
-0@@ -160,6 +160,7 @@ struct bdaddr_list_with_flags {enum hci_conn_flags {HCI_CONN_FLAG_REMOTE_WAKEUP , +HCI_CONN_FLAG_DEVICE_PRIVACY ,HCI_CONN_FLAG_MAX };@@ -1465,6 +1466,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define use_ll_privacy (dev) (ll_privacy_capable(dev) && \ hci_dev_test_flag(dev, HCI_ENABLE_LL_PRIVACY)) +#define privacy_mode_capable (dev) (use_ll_privacy(dev) && \ + (hdev->commands[39] & 0x04)) +/* Use enhanced synchronous connection if command is supported */ #define enhanced_sco_capable (dev) ((dev)->commands[29] & 0x08)net/bluetooth/mgmt.c +0
-0@@ -4349,7 +4349,22 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_NOT_SUPPORTED); }
Quoted 10 lines
net/bluetooth/mgmt.c static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, · line 4358
Quoted 8 lines
net/bluetooth/mgmt.c +7
-1-#define SUPPORTED_DEVICE_FLAGS () ((1U << HCI_CONN_FLAG_MAX) - 1) +static u32 supported_device_flags (struct hci_dev *hdev) +{ +u32 flags =0 ; + +/* Check if adapter can wakeup the system */ +if (hdev->wakeup && hdev->wakeup (hdev)) + flags |=BIT (HCI_CONN_FLAG_REMOTE_WAKEUP );I would do this change as a separate patch since it has nothing to do with the device privacy setting.
Will do.
Quoted 1 line
Do we have to call
hdev->wakeup()as well here? Isn’t the existence of the callback enough indication.
Hmm, right I guess we want to know if the driver is capable of waking up, not that it is actually enabled at that point since we are evaluating if it is supported. I will change that.
Quoted 1 line
That also said, doesn’t it make sense to store the
supported_flagsin the device params struct. It would make it certainly easy to return. Potentially we have a few calls to Get Device Flags and its notifications that have to rebuild this flags field over and over again.
But we only perform a lookup, so in case there are no hci_conn_params we would have to store it somewhere else, perhaps in hci_dev?
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz