diff mbox series

Bluetooth: hci_sync: Fix BLE devices were unable to disable the wakeup function

Message ID 20240105025625.125895-1-clancy_shang@163.com (mailing list archive)
State New, archived
Headers show
Series Bluetooth: hci_sync: Fix BLE devices were unable to disable the wakeup function | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/SubjectPrefix success Gitlint PASS
tedd_an/BuildKernel success BuildKernel PASS
tedd_an/CheckAllWarning success CheckAllWarning PASS
tedd_an/CheckSparse success CheckSparse PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/BuildKernel32 success BuildKernel32 PASS
tedd_an/TestRunnerSetup success TestRunnerSetup PASS
tedd_an/TestRunner_l2cap-tester success TestRunner PASS
tedd_an/TestRunner_iso-tester success TestRunner PASS
tedd_an/TestRunner_bnep-tester success TestRunner PASS
tedd_an/TestRunner_mgmt-tester success TestRunner PASS
tedd_an/TestRunner_rfcomm-tester success TestRunner PASS
tedd_an/TestRunner_sco-tester success TestRunner PASS
tedd_an/TestRunner_ioctl-tester success TestRunner PASS
tedd_an/TestRunner_mesh-tester success TestRunner PASS
tedd_an/TestRunner_smp-tester success TestRunner PASS
tedd_an/TestRunner_userchan-tester success TestRunner PASS
tedd_an/IncrementalBuild success Incremental Build PASS

Commit Message

clancy_shang@163.com Jan. 5, 2024, 2:56 a.m. UTC 
From: Clancy Shang <clancy.shang@quectel.com>

when BLE master enter suspend,  it does not delete the peripheral that
in acceptlist. so if disable the wakeup function, the BLE master scans with
basic filter next time, the peripheral can be scanned which is unexpected

Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
---
 net/bluetooth/hci_sync.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

bluez.test.bot@gmail.com Jan. 5, 2024, 3:33 a.m. UTC | #1 
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=814541

---Test result---

Test Summary:
CheckPatch                    PASS      0.63 seconds
GitLint                       PASS      0.33 seconds
SubjectPrefix                 PASS      0.13 seconds
BuildKernel                   PASS      27.78 seconds
CheckAllWarning               PASS      30.53 seconds
CheckSparse                   PASS      38.59 seconds
CheckSmatch                   PASS      100.43 seconds
BuildKernel32                 PASS      26.97 seconds
TestRunnerSetup               PASS      434.01 seconds
TestRunner_l2cap-tester       PASS      23.08 seconds
TestRunner_iso-tester         PASS      49.83 seconds
TestRunner_bnep-tester        PASS      6.82 seconds
TestRunner_mgmt-tester        PASS      162.98 seconds
TestRunner_rfcomm-tester      PASS      10.76 seconds
TestRunner_sco-tester         PASS      14.54 seconds
TestRunner_ioctl-tester       PASS      11.95 seconds
TestRunner_mesh-tester        PASS      8.73 seconds
TestRunner_smp-tester         PASS      9.76 seconds
TestRunner_userchan-tester    PASS      7.24 seconds
IncrementalBuild              PASS      26.13 seconds



---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz Jan. 5, 2024, 3:21 p.m. UTC | #2 
Hi Clancy,

On Thu, Jan 4, 2024 at 9:56 PM <clancy_shang@163.com> wrote:
>
> From: Clancy Shang <clancy.shang@quectel.com>
>
> when BLE master enter suspend,  it does not delete the peripheral that
> in acceptlist. so if disable the wakeup function, the BLE master scans with
> basic filter next time, the peripheral can be scanned which is unexpected
>
> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
> ---
>  net/bluetooth/hci_sync.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> index d85a7091a116..abc7f614da5f 100644
> --- a/net/bluetooth/hci_sync.c
> +++ b/net/bluetooth/hci_sync.c
> @@ -2533,6 +2533,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
>         struct bdaddr_list *b, *t;
>         u8 num_entries = 0;
>         bool pend_conn, pend_report;
> +       struct hci_conn_params *conn_params;
>         u8 filter_policy;
>         size_t i, n;
>         int err;
> @@ -2585,6 +2586,15 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
>                         continue;
>                 }
>
> +               conn_params = hci_conn_params_lookup(hdev, &b->bdaddr, b->bdaddr_type);
> +               /* During suspend, only wakeable devices can be in acceptlist */
> +               if (conn_params && hdev->suspended &&
> +                   !(conn_params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
> +                       hci_le_del_accept_list_sync(hdev, &b->bdaddr,
> +                                                   b->bdaddr_type);
> +                       continue;
> +               }

This might require a lock since that is not a copy of the conn_params
which can be updated concurrently, so perhaps something like the
following is might be safer:

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index b3141e3f9cf6..eeb73a54fd26 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2206,8 +2206,11 @@ static int hci_le_add_accept_list_sync(struct
hci_dev *hdev,

        /* During suspend, only wakeable devices can be in acceptlist */
        if (hdev->suspended &&
-           !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP))
+           !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
+               hci_le_del_accept_list_sync(hdev, &params->bdaddr,
+                                           params->bdaddr_type);
                return 0;
+       }

        /* Select filter policy to accept all advertising */
        if (*num_entries >= hdev->le_accept_list_size)

>                 num_entries++;
>         }
>
> --
> 2.25.1
>
Luiz Augusto von Dentz Jan. 9, 2024, 1:41 p.m. UTC | #3 
Hi Clancy,

On Tue, Jan 9, 2024 at 4:26 AM clancy_shang <clancy_shang@163.com> wrote:
>
> Hi Luiz Augusto von Dentz,
>
> Thanks for you suggestions. is the patch has been accepted? or need me modify as your suggested and resend to you?

It has been applied already:

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=0bcd317e8b31833d36cd9843902905aafbd70017

> Kind regards,
>
> Clancy
>
>
>
>
>
>
>
> At 2024-01-05 23:21:59, "Luiz Augusto von Dentz" <luiz.dentz@gmail.com> wrote:
> >Hi Clancy,
> >
> >On Thu, Jan 4, 2024 at 9:56 PM <clancy_shang@163.com> wrote:
> >>
> >> From: Clancy Shang <clancy.shang@quectel.com>
> >>
> >> when BLE master enter suspend,  it does not delete the peripheral that
> >> in acceptlist. so if disable the wakeup function, the BLE master scans with
> >> basic filter next time, the peripheral can be scanned which is unexpected
> >>
> >> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
> >> ---
> >>  net/bluetooth/hci_sync.c | 10 ++++++++++
> >>  1 file changed, 10 insertions(+)
> >>
> >> diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> >> index d85a7091a116..abc7f614da5f 100644
> >> --- a/net/bluetooth/hci_sync.c
> >> +++ b/net/bluetooth/hci_sync.c
> >> @@ -2533,6 +2533,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
> >>         struct bdaddr_list *b, *t;
> >>         u8 num_entries = 0;
> >>         bool pend_conn, pend_report;
> >> +       struct hci_conn_params *conn_params;
> >>         u8 filter_policy;
> >>         size_t i, n;
> >>         int err;
> >> @@ -2585,6 +2586,15 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
> >>                         continue;
> >>                 }
> >>
> >> +               conn_params = hci_conn_params_lookup(hdev, &b->bdaddr, b->bdaddr_type);
> >> +               /* During suspend, only wakeable devices can be in acceptlist */
> >> +               if (conn_params && hdev->suspended &&
> >> +                   !(conn_params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
> >> +                       hci_le_del_accept_list_sync(hdev, &b->bdaddr,
> >> +                                                   b->bdaddr_type);
> >> +                       continue;
> >> +               }
> >
> >This might require a lock since that is not a copy of the conn_params
> >which can be updated concurrently, so perhaps something like the
> >following is might be safer:
> >
> >diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> >index b3141e3f9cf6..eeb73a54fd26 100644
> >--- a/net/bluetooth/hci_sync.c
> >+++ b/net/bluetooth/hci_sync.c
> >@@ -2206,8 +2206,11 @@ static int hci_le_add_accept_list_sync(struct
> >hci_dev *hdev,
> >
> >        /* During suspend, only wakeable devices can be in acceptlist */
> >        if (hdev->suspended &&
> >-           !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP))
> >+           !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
> >+               hci_le_del_accept_list_sync(hdev, &params->bdaddr,
> >+                                           params->bdaddr_type);
> >                return 0;
> >+       }
> >
> >        /* Select filter policy to accept all advertising */
> >        if (*num_entries >= hdev->le_accept_list_size)
> >
> >>                 num_entries++;
> >>         }
> >>
> >> --
> >> 2.25.1
> >>
> >
> >
> >--
> >Luiz Augusto von Dentz
diff mbox series

Patch

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index d85a7091a116..abc7f614da5f 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2533,6 +2533,7 @@  static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
 	struct bdaddr_list *b, *t;
 	u8 num_entries = 0;
 	bool pend_conn, pend_report;
+	struct hci_conn_params *conn_params;
 	u8 filter_policy;
 	size_t i, n;
 	int err;
@@ -2585,6 +2586,15 @@  static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
 			continue;
 		}
 
+		conn_params = hci_conn_params_lookup(hdev, &b->bdaddr, b->bdaddr_type);
+		/* During suspend, only wakeable devices can be in acceptlist */
+		if (conn_params && hdev->suspended &&
+		    !(conn_params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
+			hci_le_del_accept_list_sync(hdev, &b->bdaddr,
+						    b->bdaddr_type);
+			continue;
+		}
+
 		num_entries++;
 	}