Revert "Bluetooth: Update resolving list when updating whitelist"
Subsystems (4)
PATCH 1/1 Revert "Bluetooth: Update resolving list when updating whitelist"
This reverts commit 0eee35bdfa3b472cc986ecc6ad76293fdcda59e2 as it breaks all bluetooth connections on my machine.
--- net/bluetooth/hci_request.c | 41 ++----------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-)
This has been bugging me for since 5.9-rc1, when all bluetooth devices stopped working on my desktop system. I finally got the time to do bisection today, and it came down to this patch. Reverting it on top of 5.9-rc7 restored bluetooth devices and now my input devices properly work.
As it's almost 5.9-final, any chance this can be merged now to fix the issue?
net/bluetooth/hci_request.c +2 -39
@@ -697,21 +697,6 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); - -if (use_ll_privacy (req->hdev)) { -struct smp_irk *irk; - - irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); -if (irk) { -struct hci_cp_le_del_from_resolv_list cp; - - cp.bdaddr_type = bdaddr_type; -bacpy (&cp.bdaddr, bdaddr); - -hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , -sizeof (cp), &cp); - } - } }/* Adds connection to white list if needed. On error, returns -1. */
@@ -732,7 +717,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && !use_ll_privacy (hdev) && +if (!allow_rpa &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }
@@ -750,28 +735,6 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); -if (use_ll_privacy (hdev)) { -struct smp_irk *irk; - - irk =hci_find_irk_by_addr (hdev, ¶ms->addr, - params->addr_type); -if (irk) { -struct hci_cp_le_add_to_resolv_list cp; - - cp.bdaddr_type = params->addr_type; -bacpy (&cp.bdaddr, ¶ms->addr); -memcpy (cp.peer_irk, irk->val,16 ); - -if (hci_dev_test_flag (hdev,HCI_PRIVACY )) -memcpy (cp.local_irk, hdev->irk,16 ); -else -memset (cp.local_irk,0 ,16 ); - -hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , -sizeof (cp), &cp); - } - } -return 0 ; }
@@ -812,7 +775,7 @@ static u8 update_white_list(struct hci_request *req) }/* White list can not be used with RPAs */ -if (!allow_rpa && !use_ll_privacy (hdev) && +if (!allow_rpa &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; }
Signature · 1 line
2.28.0
Marcel Holtmann
maintainerHi Greg,
Quoted 11 lines
This reverts commit
0eee35bdfa3b472cc986ecc6ad76293fdcda59e2as it breaks all bluetooth connections on my machine.Cc Marcel Holtmann <[email protected]>Cc Sathish Narsimman <[email protected]>Fixes 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")Signed-off-by Greg Kroah-Hartman <[email protected]>---
net/bluetooth/hci_request.c| 41 ++-----------------------------------1 file changed, 2 insertions(+), 39 deletions(-)
Quoted 8 lines
This has been bugging me for since 5.9-rc1, when all bluetooth devices stopped working on my desktop system. I finally got the time to do bisection today, and it came down to this patch. Reverting it on top of 5.9-rc7 restored bluetooth devices and now my input devices properly work.
As it's almost 5.9-final, any chance this can be merged now to fix the issue?
can you be specific what breaks since our guys and I also think the ChromeOS guys have been testing these series of patches heavily.
When you run btmon does it indicate any errors?
Do you have a chance to test net-next and see the LL Privacy there might have addressed this?
Regards
Marcel
Quoted 19 lines · Marcel Holtmann
Hi Greg,
Quoted 17 lines
This reverts commit
0eee35bdfa3b472cc986ecc6ad76293fdcda59e2as it breaks all bluetooth connections on my machine.Cc Marcel Holtmann <[email protected]>Cc Sathish Narsimman <[email protected]>Fixes 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")Signed-off-by Greg Kroah-Hartman <[email protected]>---
net/bluetooth/hci_request.c| 41 ++-----------------------------------1 file changed, 2 insertions(+), 39 deletions(-)This has been bugging me for since 5.9-rc1, when all bluetooth devices stopped working on my desktop system. I finally got the time to do bisection today, and it came down to this patch. Reverting it on top of 5.9-rc7 restored bluetooth devices and now my input devices properly work.
Quoted 5 lines
Quoted 2 lines
As it's almost 5.9-final, any chance this can be merged now to fix the issue?
can you be specific what breaks since our guys and I also think the ChromeOS guys have been testing these series of patches heavily.
My bluetooth trackball does not connect at all. With this reverted, it all "just works".
Same I think for a Bluetooth headset, can check that again if you really need me to, but the trackball is reliable here.
Quoted 1 line
When you run btmon does it indicate any errors?
How do I run it and where are the errors displayed?
Quoted 1 line
Do you have a chance to test net-next and see the LL Privacy there might have addressed this?
Have a specific set of patches I can test? It wouldn't be good to have 5.9-final go out with this not working at all.
thanks,
greg k-h
Marcel Holtmann
maintainerHi Greg,
Quoted 26 lines
Quoted 17 lines
Quoted 17 lines
This reverts commit
0eee35bdfa3b472cc986ecc6ad76293fdcda59e2as it breaks all bluetooth connections on my machine.Cc Marcel Holtmann <[email protected]>Cc Sathish Narsimman <[email protected]>Fixes 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")Signed-off-by Greg Kroah-Hartman <[email protected]>---
net/bluetooth/hci_request.c| 41 ++-----------------------------------1 file changed, 2 insertions(+), 39 deletions(-)This has been bugging me for since 5.9-rc1, when all bluetooth devices stopped working on my desktop system. I finally got the time to do bisection today, and it came down to this patch. Reverting it on top of 5.9-rc7 restored bluetooth devices and now my input devices properly work.
Quoted 5 lines
Quoted 2 lines
As it's almost 5.9-final, any chance this can be merged now to fix the issue?
can you be specific what breaks since our guys and I also think the ChromeOS guys have been testing these series of patches heavily.
My bluetooth trackball does not connect at all. With this reverted, it all "just works".
Quoted 6 lines
Same I think for a Bluetooth headset, can check that again if you really need me to, but the trackball is reliable here.
Quoted 1 line
When you run btmon does it indicate any errors?
How do I run it and where are the errors displayed?
you can do btmon -w trace.log and just let it run like tcdpump.
Quoted 4 lines
Quoted 1 line
Do you have a chance to test net-next and see the LL Privacy there might have addressed this?
Have a specific set of patches I can test? It wouldn't be good to have 5.9-final go out with this not working at all.
Of course not, but so far you are the only one reported a problem. Maybe you have some funky hardware in your machine that needs a quirk.
Regards
Marcel
Quoted 28 lines · Marcel Holtmann
Hi Greg,
Quoted 26 lines
Quoted 17 lines
Quoted 17 lines
This reverts commit
0eee35bdfa3b472cc986ecc6ad76293fdcda59e2as it breaks all bluetooth connections on my machine.Cc Marcel Holtmann <[email protected]>Cc Sathish Narsimman <[email protected]>Fixes 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")Signed-off-by Greg Kroah-Hartman <[email protected]>---
net/bluetooth/hci_request.c| 41 ++-----------------------------------1 file changed, 2 insertions(+), 39 deletions(-)This has been bugging me for since 5.9-rc1, when all bluetooth devices stopped working on my desktop system. I finally got the time to do bisection today, and it came down to this patch. Reverting it on top of 5.9-rc7 restored bluetooth devices and now my input devices properly work.
Quoted 5 lines
Quoted 2 lines
As it's almost 5.9-final, any chance this can be merged now to fix the issue?
can you be specific what breaks since our guys and I also think the ChromeOS guys have been testing these series of patches heavily.
My bluetooth trackball does not connect at all. With this reverted, it all "just works".
Quoted 8 lines
Quoted 6 lines
Same I think for a Bluetooth headset, can check that again if you really need me to, but the trackball is reliable here.
Quoted 1 line
When you run btmon does it indicate any errors?
How do I run it and where are the errors displayed?
you can do btmon -w trace.log and just let it run like tcdpump.
Ok, attached.
The device is not connecting, and then I open the gnome bluetooth dialog and it scans for devices in the area, but does not connect to my existing devices at all.
Any ideas?
thanks,
greg k-h
btsnoop � 5 5�� ⎉,~�Linux version 5.9.0-rc7-00004-g0216685bdd99 (x86_64) ! !�� ⎉,~�Bluetooth subsystem version 2.22 ⎉,~� pe���Phci0 ⎉,~�