* [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
@ 2024-02-27 15:15 Luiz Augusto von Dentz
2024-02-27 15:15 ` [PATCH v5 2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan Luiz Augusto von Dentz
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2024-02-27 15:15 UTC (permalink / raw
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
If HCI_PA_SYNC flag is set it means there is a Periodic Advertising
Synchronization pending, so this attempts to locate the address passed
to HCI_OP_LE_PA_CREATE_SYNC and program it in the accept list so only
reports with that address are processed.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
net/bluetooth/hci_sync.c | 45 +++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 669099cf9b1a..ab609089ac4c 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2566,6 +2566,16 @@ static struct conn_params *conn_params_copy(struct list_head *list, size_t *n)
return p;
}
+/* Clear LE Accept List */
+static int hci_le_clear_accept_list_sync(struct hci_dev *hdev)
+{
+ if (!(hdev->commands[26] & 0x80))
+ return 0;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL,
+ HCI_CMD_TIMEOUT);
+}
+
/* Device must not be scanning when updating the accept list.
*
* Update is done using the following sequence:
@@ -2614,6 +2624,31 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
goto done;
}
+ /* Force address filtering if PA Sync is in progress */
+ if (hci_dev_test_flag(hdev, HCI_PA_SYNC)) {
+ struct hci_cp_le_pa_create_sync *sent;
+
+ sent = hci_sent_cmd_data(hdev, HCI_OP_LE_PA_CREATE_SYNC);
+ if (sent) {
+ struct conn_params pa;
+
+ memset(&pa, 0, sizeof(pa));
+
+ bacpy(&pa.addr, &sent->addr);
+ pa.addr_type = sent->addr_type;
+
+ /* Clear first since there could be addresses left
+ * behind.
+ */
+ hci_le_clear_accept_list_sync(hdev);
+
+ num_entries = 1;
+ err = hci_le_add_accept_list_sync(hdev, &pa,
+ &num_entries);
+ goto done;
+ }
+ }
+
/* Go through the current accept list programmed into the
* controller one by one and check if that address is connected or is
* still in the list of pending connections or list of devices to
@@ -4220,16 +4255,6 @@ static int hci_le_read_accept_list_size_sync(struct hci_dev *hdev)
0, NULL, HCI_CMD_TIMEOUT);
}
-/* Clear LE Accept List */
-static int hci_le_clear_accept_list_sync(struct hci_dev *hdev)
-{
- if (!(hdev->commands[26] & 0x80))
- return 0;
-
- return __hci_cmd_sync_status(hdev, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL,
- HCI_CMD_TIMEOUT);
-}
-
/* Read LE Resolving List Size */
static int hci_le_read_resolv_list_size_sync(struct hci_dev *hdev)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan
2024-02-27 15:15 [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set Luiz Augusto von Dentz
@ 2024-02-27 15:15 ` Luiz Augusto von Dentz
2024-02-27 15:59 ` [v5,1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set bluez.test.bot
2024-02-27 16:30 ` [PATCH v5 1/2] " patchwork-bot+bluetooth
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2024-02-27 15:15 UTC (permalink / raw
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This used the hci_conn QoS to determine which PHY to scan when creating
a PA Sync.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
net/bluetooth/hci_sync.c | 66 +++++++++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 11 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index ab609089ac4c..6e16ebde854d 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2758,6 +2758,14 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
return filter_policy;
}
+static void hci_le_scan_phy_params(struct hci_cp_le_scan_phy_params *cp,
+ u8 type, u16 interval, u16 window)
+{
+ cp->type = type;
+ cp->interval = cpu_to_le16(interval);
+ cp->window = cpu_to_le16(window);
+}
+
static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,
u16 interval, u16 window,
u8 own_addr_type, u8 filter_policy)
@@ -2765,7 +2773,7 @@ static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,
struct hci_cp_le_set_ext_scan_params *cp;
struct hci_cp_le_scan_phy_params *phy;
u8 data[sizeof(*cp) + sizeof(*phy) * 2];
- u8 num_phy = 0;
+ u8 num_phy = 0x00;
cp = (void *)data;
phy = (void *)cp->data;
@@ -2775,28 +2783,64 @@ static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,
cp->own_addr_type = own_addr_type;
cp->filter_policy = filter_policy;
+ /* Check if PA Sync is in progress then select the PHY based on the
+ * hci_conn.iso_qos.
+ */
+ if (hci_dev_test_flag(hdev, HCI_PA_SYNC)) {
+ struct hci_cp_le_add_to_accept_list *sent;
+
+ sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);
+ if (sent) {
+ struct hci_conn *conn;
+
+ conn = hci_conn_hash_lookup_ba(hdev, ISO_LINK,
+ &sent->bdaddr);
+ if (conn) {
+ struct bt_iso_qos *qos = &conn->iso_qos;
+
+ if (qos->bcast.in.phy & BT_ISO_PHY_1M ||
+ qos->bcast.in.phy & BT_ISO_PHY_2M) {
+ cp->scanning_phys |= LE_SCAN_PHY_1M;
+ hci_le_scan_phy_params(phy, type,
+ interval,
+ window);
+ num_phy++;
+ phy++;
+ }
+
+ if (qos->bcast.in.phy & BT_ISO_PHY_CODED) {
+ cp->scanning_phys |= LE_SCAN_PHY_CODED;
+ hci_le_scan_phy_params(phy, type,
+ interval,
+ window);
+ num_phy++;
+ phy++;
+ }
+
+ if (num_phy)
+ goto done;
+ }
+ }
+ }
+
if (scan_1m(hdev) || scan_2m(hdev)) {
cp->scanning_phys |= LE_SCAN_PHY_1M;
-
- phy->type = type;
- phy->interval = cpu_to_le16(interval);
- phy->window = cpu_to_le16(window);
-
+ hci_le_scan_phy_params(phy, type, interval, window);
num_phy++;
phy++;
}
if (scan_coded(hdev)) {
cp->scanning_phys |= LE_SCAN_PHY_CODED;
-
- phy->type = type;
- phy->interval = cpu_to_le16(interval);
- phy->window = cpu_to_le16(window);
-
+ hci_le_scan_phy_params(phy, type, interval, window);
num_phy++;
phy++;
}
+done:
+ if (!num_phy)
+ return -EINVAL;
+
return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EXT_SCAN_PARAMS,
sizeof(*cp) + sizeof(*phy) * num_phy,
data, HCI_CMD_TIMEOUT);
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [v5,1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
2024-02-27 15:15 [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set Luiz Augusto von Dentz
2024-02-27 15:15 ` [PATCH v5 2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan Luiz Augusto von Dentz
@ 2024-02-27 15:59 ` bluez.test.bot
2024-02-27 16:30 ` [PATCH v5 1/2] " patchwork-bot+bluetooth
2 siblings, 0 replies; 4+ messages in thread
From: bluez.test.bot @ 2024-02-27 15:59 UTC (permalink / raw
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 1698 bytes --]
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=830316
---Test result---
Test Summary:
CheckPatch PASS 1.34 seconds
GitLint PASS 0.62 seconds
SubjectPrefix PASS 0.24 seconds
BuildKernel PASS 27.74 seconds
CheckAllWarning PASS 30.40 seconds
CheckSparse PASS 36.39 seconds
CheckSmatch PASS 101.69 seconds
BuildKernel32 PASS 26.94 seconds
TestRunnerSetup PASS 498.06 seconds
TestRunner_l2cap-tester FAIL 25.74 seconds
TestRunner_iso-tester PASS 129.50 seconds
TestRunner_bnep-tester PASS 4.82 seconds
TestRunner_mgmt-tester PASS 116.94 seconds
TestRunner_rfcomm-tester PASS 7.40 seconds
TestRunner_sco-tester PASS 10.95 seconds
TestRunner_ioctl-tester PASS 7.79 seconds
TestRunner_mesh-tester PASS 5.88 seconds
TestRunner_smp-tester PASS 6.83 seconds
TestRunner_userchan-tester PASS 4.96 seconds
IncrementalBuild PASS 31.59 seconds
Details
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:
Total: 51, Passed: 50 (98.0%), Failed: 1, Not Run: 0
Failed Test Cases
L2CAP LE Client - Close socket 2 Timed out 2.172 seconds
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
2024-02-27 15:15 [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set Luiz Augusto von Dentz
2024-02-27 15:15 ` [PATCH v5 2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan Luiz Augusto von Dentz
2024-02-27 15:59 ` [v5,1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set bluez.test.bot
@ 2024-02-27 16:30 ` patchwork-bot+bluetooth
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+bluetooth @ 2024-02-27 16:30 UTC (permalink / raw
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hello:
This series was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:
On Tue, 27 Feb 2024 10:15:36 -0500 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> If HCI_PA_SYNC flag is set it means there is a Periodic Advertising
> Synchronization pending, so this attempts to locate the address passed
> to HCI_OP_LE_PA_CREATE_SYNC and program it in the accept list so only
> reports with that address are processed.
>
> [...]
Here is the summary with links:
- [v5,1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
https://git.kernel.org/bluetooth/bluetooth-next/c/7e2b80470c5a
- [v5,2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan
https://git.kernel.org/bluetooth/bluetooth-next/c/715b938b3a0f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-27 16:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-27 15:15 [PATCH v5 1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set Luiz Augusto von Dentz
2024-02-27 15:15 ` [PATCH v5 2/2] Bluetooth: hci_sync: Use QoS to determine which PHY to scan Luiz Augusto von Dentz
2024-02-27 15:59 ` [v5,1/2] Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set bluez.test.bot
2024-02-27 16:30 ` [PATCH v5 1/2] " patchwork-bot+bluetooth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).