Skip to contentSkip to conversation

Bluetooth: HCI: Fix not always setting Scan Response/Advertising Data

PATCH In review Luiz Augusto von Dentz 3 participants 3 messages Jun 14, 2022 – Jun 17, 2022

Subsystems (2)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH v2 1/1 Bluetooth: HCI: Fix not always setting Scan Response/Advertising Data

From: Luiz Augusto von Dentz <[email protected]>

The scan response and advertising data needs to be tracked on a per instance (adv_info) since when these instaces are removed so are their data, to fix that new flags are introduced which is used to mark when the data changes and then checked to confirm when the data needs to be synced with the controller.

---
v2: Mark scan_rsp_changed when either MGMT_ADV_FLAG_APPEARANCE or MGMT_ADV_FLAG_LOCAL_NAME have been set.

 include/net/bluetooth/hci_core.h | 11 ++++++
 net/bluetooth/hci_core.c         | 42 ++++++++++----------
 net/bluetooth/hci_sync.c         | 66 ++++++++++++++++++++++----------
 3 files changed, 76 insertions(+), 43 deletions(-)
include/net/bluetooth/hci_core.h +11 -0
index 5b92a9abe141..15237ee5f761 100644
@@ -246,8 +246,10 @@ struct adv_info {
 	__u16	duration;
 	__u16	adv_data_len;
 	__u8	adv_data[HCI_MAX_EXT_AD_LENGTH];
+	bool	adv_data_changed;
 	__u16	scan_rsp_len;
 	__u8	scan_rsp_data[HCI_MAX_EXT_AD_LENGTH];
+	bool	scan_rsp_changed;
 	__s8	tx_power;
 	__u32   min_interval;
 	__u32   max_interval;
@@ -261,6 +263,15 @@ struct adv_info {
 
 #define HCI_ADV_TX_POWER_NO_PREFERENCE 0x7F
 
+#define DATA_CMP(_d1, _l1, _d2, _l2) \
+	(_l1 == _l2 ? memcmp(_d1, _d2, _l1) : _l1 - _l2)
+
+#define ADV_DATA_CMP(_adv, _data, _len) \
+	DATA_CMP((_adv)->adv_data, (_adv)->adv_data_len, _data, _len)
+
+#define SCAN_RSP_CMP(_adv, _data, _len) \
+	DATA_CMP((_adv)->scan_rsp_data, (_adv)->scan_rsp_len, _data, _len)
+
 struct monitored_device {
 	struct list_head list;
 
net/bluetooth/hci_core.c +20 -22

67 lines not on this page · raw message

net/bluetooth/hci_sync.c +45 -21

98 lines not on this page · raw message

Signature · 1 line
2.35.3
#1 lore raw

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=650299

---Test result---

Test Summary:

CheckPatch                    PASS      1.73 seconds
GitLint                       PASS      0.73 seconds
SubjectPrefix                 PASS      0.60 seconds
BuildKernel                   PASS      31.61 seconds
BuildKernel32                 PASS      27.69 seconds
Incremental Build with patchesPASS      36.55 seconds
TestRunner: Setup             PASS      488.05 seconds
TestRunner: l2cap-tester      PASS      18.50 seconds
TestRunner: bnep-tester       PASS      6.18 seconds
TestRunner: mgmt-tester       PASS      102.56 seconds
TestRunner: rfcomm-tester     PASS      9.22 seconds
TestRunner: sco-tester        PASS      9.52 seconds
TestRunner: smp-tester        PASS      9.19 seconds
TestRunner: userchan-tester   PASS      6.08 seconds

---
Regards,
Linux Bluetooth

Tested-by on v2 1/1
#2 lore raw
In reply to Luiz Augusto von Dentz

Hi Luiz

I tested with my new test case added to mgmt-tester and passed.

On 6/14/22, 10:46 AM, "Luiz Augusto von Dentz" <[email protected]> wrote:

From: Luiz Augusto von Dentz <[email protected]>

The scan response and advertising data needs to be tracked on a per instance (adv_info) since when these instaces are removed so are their data, to fix that new flags are introduced which is used to mark when the data changes and then checked to confirm when the data needs to be synced with the controller.

    Signed-off-by: Luiz Augusto von Dentz <[email protected]>

    ---
    v2: Mark scan_rsp_changed when either MGMT_ADV_FLAG_APPEARANCE or
    MGMT_ADV_FLAG_LOCAL_NAME have been set.

     include/net/bluetooth/hci_core.h | 11 ++++++
     net/bluetooth/hci_core.c         | 42 ++++++++++----------
     net/bluetooth/hci_sync.c         | 66 ++++++++++++++++++++++----------
     3 files changed, 76 insertions(+), 43 deletions(-)

    diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
    index 5b92a9abe141..15237ee5f761 100644
    --- a/include/net/bluetooth/hci_core.h
    +++ b/include/net/bluetooth/hci_core.h
    @@ -246,8 +246,10 @@ struct adv_info {
     	__u16	duration;
     	__u16	adv_data_len;
     	__u8	adv_data[HCI_MAX_EXT_AD_LENGTH];
    +	bool	adv_data_changed;
     	__u16	scan_rsp_len;
     	__u8	scan_rsp_data[HCI_MAX_EXT_AD_LENGTH];
    +	bool	scan_rsp_changed;
     	__s8	tx_power;
     	__u32   min_interval;
     	__u32   max_interval;
    @@ -261,6 +263,15 @@ struct adv_info {

     #define HCI_ADV_TX_POWER_NO_PREFERENCE 0x7F

    +#define DATA_CMP(_d1, _l1, _d2, _l2) \
    +	(_l1 == _l2 ? memcmp(_d1, _d2, _l1) : _l1 - _l2)
    +
    +#define ADV_DATA_CMP(_adv, _data, _len) \
    +	DATA_CMP((_adv)->adv_data, (_adv)->adv_data_len, _data, _len)
    +
    +#define SCAN_RSP_CMP(_adv, _data, _len) \
    +	DATA_CMP((_adv)->scan_rsp_data, (_adv)->scan_rsp_len, _data, _len)
    +
     struct monitored_device {
     	struct list_head list;

    diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
    index 6faae50d933d..05c13f639b94 100644
    --- a/net/bluetooth/hci_core.c
    +++ b/net/bluetooth/hci_core.c
    @@ -1727,18 +1727,12 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,
     	}

     	adv_instance->flags = flags;
    -	adv_instance->adv_data_len = adv_data_len;
    -	adv_instance->scan_rsp_len = scan_rsp_len;
     	adv_instance->min_interval = min_interval;
     	adv_instance->max_interval = max_interval;
     	adv_instance->tx_power = tx_power;

    -	if (adv_data_len)
    -		memcpy(adv_instance->adv_data, adv_data, adv_data_len);
    -
    -	if (scan_rsp_len)
    -		memcpy(adv_instance->scan_rsp_data,
    -		       scan_rsp_data, scan_rsp_len);
    +	hci_set_adv_instance_data(hdev, instance, adv_data_len, adv_data,
    +				  scan_rsp_len, scan_rsp_data);

     	adv_instance->timeout = timeout;
     	adv_instance->remaining_time = timeout;
    @@ -1761,29 +1755,33 @@ int hci_set_adv_instance_data(struct hci_dev *hdev, u8 instance,
     			      u16 adv_data_len, u8 *adv_data,
     			      u16 scan_rsp_len, u8 *scan_rsp_data)
     {
    -	struct adv_info *adv_instance;
    +	struct adv_info *adv;

    -	adv_instance = hci_find_adv_instance(hdev, instance);
    +	adv = hci_find_adv_instance(hdev, instance);

     	/* If advertisement doesn't exist, we can't modify its data */
    -	if (!adv_instance)
    +	if (!adv)
     		return -ENOENT;

    -	if (adv_data_len) {
    -		memset(adv_instance->adv_data, 0,
    -		       sizeof(adv_instance->adv_data));
    -		memcpy(adv_instance->adv_data, adv_data, adv_data_len);
    -		adv_instance->adv_data_len = adv_data_len;
    +	if (adv_data_len && ADV_DATA_CMP(adv, adv_data, adv_data_len)) {
    +		memset(adv->adv_data, 0, sizeof(adv->adv_data));
    +		memcpy(adv->adv_data, adv_data, adv_data_len);
    +		adv->adv_data_len = adv_data_len;
    +		adv->adv_data_changed = true;
     	}

    -	if (scan_rsp_len) {
    -		memset(adv_instance->scan_rsp_data, 0,
    -		       sizeof(adv_instance->scan_rsp_data));
    -		memcpy(adv_instance->scan_rsp_data,
    -		       scan_rsp_data, scan_rsp_len);
    -		adv_instance->scan_rsp_len = scan_rsp_len;
    +	if (scan_rsp_len && SCAN_RSP_CMP(adv, scan_rsp_data, scan_rsp_len)) {
    +		memset(adv->scan_rsp_data, 0, sizeof(adv->scan_rsp_data));
    +		memcpy(adv->scan_rsp_data, scan_rsp_data, scan_rsp_len);
    +		adv->scan_rsp_len = scan_rsp_len;
    +		adv->scan_rsp_changed = true;
     	}

    +	/* Mark as changed if there are flags which would affect it */
    +	if (((adv->flags & MGMT_ADV_FLAG_APPEARANCE) && hdev->appearance) ||
    +	    adv->flags & MGMT_ADV_FLAG_LOCAL_NAME)
    +		adv->scan_rsp_changed = true;
    +
     	return 0;
     }

    diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
    index 0fa013816a9b..e974a888c0f3 100644
    --- a/net/bluetooth/hci_sync.c
    +++ b/net/bluetooth/hci_sync.c
    @@ -849,26 +849,38 @@ static int hci_set_ext_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance)
     		u8 data[HCI_MAX_EXT_AD_LENGTH];
     	} pdu;
     	u8 len;
    +	struct adv_info *adv = NULL;
    +	int err;

     	memset(&pdu, 0, sizeof(pdu));

    +	if (instance) {
    +		adv = hci_find_adv_instance(hdev, instance);
    +		if (!adv || !adv->scan_rsp_changed)
    +			return 0;
    +	}
    +
     	len = eir_create_scan_rsp(hdev, instance, pdu.data);

    -	if (hdev->scan_rsp_data_len == len &&
    -	    !memcmp(pdu.data, hdev->scan_rsp_data, len))
    -		return 0;
    -
    -	memcpy(hdev->scan_rsp_data, pdu.data, len);
    -	hdev->scan_rsp_data_len = len;
    -
     	pdu.cp.handle = instance;
     	pdu.cp.length = len;
     	pdu.cp.operation = LE_SET_ADV_DATA_OP_COMPLETE;
     	pdu.cp.frag_pref = LE_SET_ADV_DATA_NO_FRAG;

    -	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_RSP_DATA,
    -				     sizeof(pdu.cp) + len, &pdu.cp,
    -				     HCI_CMD_TIMEOUT);
    +	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_RSP_DATA,
    +				    sizeof(pdu.cp) + len, &pdu.cp,
    +				    HCI_CMD_TIMEOUT);
    +	if (err)
    +		return err;
    +
    +	if (adv) {
    +		adv->scan_rsp_changed = false;
    +	} else {
    +		memcpy(hdev->scan_rsp_data, pdu.data, len);
    +		hdev->scan_rsp_data_len = len;
    +	}
    +
    +	return 0;
     }

     static int __hci_set_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance)
    @@ -1119,27 +1131,39 @@ static int hci_set_ext_adv_data_sync(struct hci_dev *hdev, u8 instance)
     		u8 data[HCI_MAX_EXT_AD_LENGTH];
     	} pdu;
     	u8 len;
    +	struct adv_info *adv = NULL;
    +	int err;

     	memset(&pdu, 0, sizeof(pdu));

    +	if (instance) {
    +		adv = hci_find_adv_instance(hdev, instance);
    +		if (!adv || !adv->adv_data_changed)
    +			return 0;
    +	}
    +
     	len = eir_create_adv_data(hdev, instance, pdu.data);

    -	/* There's nothing to do if the data hasn't changed */
    -	if (hdev->adv_data_len == len &&
    -	    memcmp(pdu.data, hdev->adv_data, len) == 0)
    -		return 0;
    -
    -	memcpy(hdev->adv_data, pdu.data, len);
    -	hdev->adv_data_len = len;
    -
     	pdu.cp.length = len;
     	pdu.cp.handle = instance;
     	pdu.cp.operation = LE_SET_ADV_DATA_OP_COMPLETE;
     	pdu.cp.frag_pref = LE_SET_ADV_DATA_NO_FRAG;

    -	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_ADV_DATA,
    -				     sizeof(pdu.cp) + len, &pdu.cp,
    -				     HCI_CMD_TIMEOUT);
    +	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_ADV_DATA,
    +				    sizeof(pdu.cp) + len, &pdu.cp,
    +				    HCI_CMD_TIMEOUT);
    +	if (err)
    +		return err;
    +
    +	/* Update data if the command succeed */
    +	if (adv) {
    +		adv->adv_data_changed = false;
    +	} else {
    +		memcpy(hdev->adv_data, pdu.data, len);
    +		hdev->adv_data_len = len;
    +	}
    +
    +	return 0;
     }

     static int hci_set_adv_data_sync(struct hci_dev *hdev, u8 instance)
    -- 
    2.35.3

Regards,
Tedd Ho-Jeong An