| Message ID | 20200312100754.3445-3-sathish.narasimman@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Marcel Holtmann |
| Headers | show |
| Series | LE LL Priavcy support enabled | expand |
Hi, On Thursday, 12 March 2020 11:07:49 CET Sathish Narsimman wrote: > The Patch is used to add the device to resolving list. The patch > will look for the local IRK list and if the device is present in > the local resolving list it will be updated and the same updated > w.r.t to BT controller by first deleting the existing and adding > the new IRK w.r.t bd_addr. > > Signed-off-by: Sathish Narsimman <sathish.narasimman@intel.com> > Signed-off-by: Joy Shermin <shermin.joy@intel.com> > --- > include/net/bluetooth/hci_core.h | 2 + > net/bluetooth/hci_request.c | 80 ++++++++++++++++++++++++++++++++ > 2 files changed, 82 insertions(+) > > diff --git a/include/net/bluetooth/hci_core.h > b/include/net/bluetooth/hci_core.h index 5f04ef88da35..e5e09d530ce7 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -1657,6 +1657,8 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 > ediv, __le64 rand, > > void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, > u8 *bdaddr_type); > +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 addr_type, > + bdaddr_t *bdaddr, u8 irk[16]); > void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, > bdaddr_t *bdaddr); > > diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c > index f4bbd3b79210..88225a9ca1f8 100644 > --- a/net/bluetooth/hci_request.c > +++ b/net/bluetooth/hci_request.c > @@ -885,6 +885,86 @@ static void hci_req_start_scan(struct hci_request *req, > u8 type, u16 interval, } > } > > +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 type, bdaddr_t > *bdaddr, + u8 irk_val[16]) > +{ > + struct hci_request req; > + struct hci_cp_le_add_to_resolv_list cp; > + struct bdaddr_list_with_irk *irk; > + u8 entries; > + > + BT_DBG(""); > + > + /* Nothing to be done if LL privacy is not supported */ > + if ( !(hdev->le_features[0] & HCI_LE_LL_PRIVACY) ) > + return -EPROTONOSUPPORT; > + > + /* Resolving List cannot be updated if address resolution > + * in the controller is enabled and advertisement or scanning > + * or create connection command is ongoing. > + */ > + if ( !hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION) && > + ( hci_dev_test_flag(hdev, HCI_LE_ADV) || > + hci_dev_test_flag(hdev, HCI_LE_SCAN) || > + hci_lookup_le_connect(hdev) ) ) > + return -EINVAL; > + > + hci_req_init(&req, hdev); > + > + irk = hci_bdaddr_list_lookup_with_irk(&hdev->le_resolv_list, bdaddr, > type); + if (irk) { > + /* Device is present in resolving list.*/ > + if (memcmp(irk->peer_irk, irk_val, 16) == 0) { > + /* Device present in resolving list with same IRK. > + * No HCI communication is required.Sort the > + * Kernel list. > + */ > + hci_bdaddr_list_add_with_irk(&irk->list, bdaddr, type, irk_val, NULL); > + return 0; > + > + } > + /* IRK has changed for the device in resolving list > + * Queue up commands to delete the existing entry and > + * add new one. Sorting will be done when command complete > + * for add command is receieved. > + */ > + goto remote; > + } > + /* Device is not present in resolving list.If resolving list > + * is not full add the device to resolving list. > + */ > + entries = 0; > + list_for_each_entry(irk, &hdev->le_resolv_list, list) { > + entries++; > + } > + > + if (entries < hdev->le_resolv_list_size) > + goto add; > + > + /* If the resolving list is full, queue up HCI command to delete > + * the entry that was used least recently to make space for the > + * new device. Kernel list will be updated when command complete > + * is received. > + */ > + irk = list_first_entry_or_null(&hdev->le_resolv_list, struct > bdaddr_list_with_irk, list); + > + if (!irk) > + return -1; I'm not sure about this... we should have some fallback mechanism when HW RL is full. Maybe some rotation of devies on list or simply disable address resolution in controller? Otherwise we won't be able to connect to some of paired devices. > + > +remote: > + hci_req_del_from_resolving_list(hdev, irk->bdaddr_type, &irk- >bdaddr); > + > +add: > + cp.bdaddr_type = type; > + bacpy(&cp.bdaddr, bdaddr); > + memcpy(cp.peer_irk, irk_val, 16); > + memcpy(cp.local_irk, hdev->irk, 16); > + > + hci_req_add(&req, HCI_OP_LE_ADD_TO_RESOLV_LIST, sizeof(cp), &cp); > + hci_req_run(&req, NULL); > + return 0; > +} > + > void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, > bdaddr_t *bdaddr) { > struct hci_cp_le_del_from_resolv_list cp;
Hi Szymon, On Wed, Mar 18, 2020 at 3:00 PM Szymon Janc <szymon.janc@codecoup.pl> wrote: > > Hi, > > On Thursday, 12 March 2020 11:07:49 CET Sathish Narsimman wrote: > > The Patch is used to add the device to resolving list. The patch > > will look for the local IRK list and if the device is present in > > the local resolving list it will be updated and the same updated > > w.r.t to BT controller by first deleting the existing and adding > > the new IRK w.r.t bd_addr. > > > > Signed-off-by: Sathish Narsimman <sathish.narasimman@intel.com> > > Signed-off-by: Joy Shermin <shermin.joy@intel.com> > > --- > > include/net/bluetooth/hci_core.h | 2 + > > net/bluetooth/hci_request.c | 80 ++++++++++++++++++++++++++++++++ > > 2 files changed, 82 insertions(+) > > > > diff --git a/include/net/bluetooth/hci_core.h > > b/include/net/bluetooth/hci_core.h index 5f04ef88da35..e5e09d530ce7 100644 > > --- a/include/net/bluetooth/hci_core.h > > +++ b/include/net/bluetooth/hci_core.h > > @@ -1657,6 +1657,8 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 > > ediv, __le64 rand, > > > > void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, > > u8 *bdaddr_type); > > +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 addr_type, > > + bdaddr_t *bdaddr, u8 irk[16]); > > void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, > > bdaddr_t *bdaddr); > > > > diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c > > index f4bbd3b79210..88225a9ca1f8 100644 > > --- a/net/bluetooth/hci_request.c > > +++ b/net/bluetooth/hci_request.c > > @@ -885,6 +885,86 @@ static void hci_req_start_scan(struct hci_request *req, > > u8 type, u16 interval, } > > } > > > > +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 type, bdaddr_t > > *bdaddr, + u8 irk_val[16]) > > +{ > > + struct hci_request req; > > + struct hci_cp_le_add_to_resolv_list cp; > > + struct bdaddr_list_with_irk *irk; > > + u8 entries; > > + > > + BT_DBG(""); > > + > > + /* Nothing to be done if LL privacy is not supported */ > > + if ( !(hdev->le_features[0] & HCI_LE_LL_PRIVACY) ) > > + return -EPROTONOSUPPORT; > > + > > + /* Resolving List cannot be updated if address resolution > > + * in the controller is enabled and advertisement or scanning > > + * or create connection command is ongoing. > > + */ > > + if ( !hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION) && > > + ( hci_dev_test_flag(hdev, HCI_LE_ADV) || > > + hci_dev_test_flag(hdev, HCI_LE_SCAN) || > > + hci_lookup_le_connect(hdev) ) ) > > + return -EINVAL; > > + > > + hci_req_init(&req, hdev); > > + > > + irk = hci_bdaddr_list_lookup_with_irk(&hdev->le_resolv_list, bdaddr, > > type); + if (irk) { > > + /* Device is present in resolving list.*/ > > + if (memcmp(irk->peer_irk, irk_val, 16) == 0) { > > + /* Device present in resolving list with same > IRK. > > + * No HCI communication is required.Sort the > > + * Kernel list. > > + */ > > + hci_bdaddr_list_add_with_irk(&irk->list, bdaddr, > type, irk_val, NULL); > > + return 0; > > + > > + } > > + /* IRK has changed for the device in resolving list > > + * Queue up commands to delete the existing entry and > > + * add new one. Sorting will be done when command complete > > + * for add command is receieved. > > + */ > > + goto remote; > > + } > > + /* Device is not present in resolving list.If resolving list > > + * is not full add the device to resolving list. > > + */ > > + entries = 0; > > + list_for_each_entry(irk, &hdev->le_resolv_list, list) { > > + entries++; > > + } > > + > > + if (entries < hdev->le_resolv_list_size) > > + goto add; > > + > > + /* If the resolving list is full, queue up HCI command to delete > > + * the entry that was used least recently to make space for the > > + * new device. Kernel list will be updated when command complete > > + * is received. > > + */ > > + irk = list_first_entry_or_null(&hdev->le_resolv_list, struct > > bdaddr_list_with_irk, list); + > > + if (!irk) > > + return -1; > > I'm not sure about this... we should have some fallback mechanism when HW RL > is full. Maybe some rotation of devies on list or simply disable address > resolution in controller? Otherwise we won't be able to connect to some of > paired devices. What I understood was if (HW RL is full) { don't delete the device from the kernel resolving list. delete the device from HW RL list(least used) but we have to use a method to denote that it is deleted from HW RL list. } from the above method at what scenario we need to add the deleted device back to the HW RL list? And yes disabling HW RL list much simpler. > > > + > > +remote: > > + hci_req_del_from_resolving_list(hdev, irk->bdaddr_type, &irk- > >bdaddr); > > + > > +add: > > + cp.bdaddr_type = type; > > + bacpy(&cp.bdaddr, bdaddr); > > + memcpy(cp.peer_irk, irk_val, 16); > > + memcpy(cp.local_irk, hdev->irk, 16); > > + > > + hci_req_add(&req, HCI_OP_LE_ADD_TO_RESOLV_LIST, sizeof(cp), &cp); > > + hci_req_run(&req, NULL); > > + return 0; > > +} > > + > > void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, > > bdaddr_t *bdaddr) { > > struct hci_cp_le_del_from_resolv_list cp; > > > -- > pozdrawiam > Szymon Janc > > Regards Sathish N
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5f04ef88da35..e5e09d530ce7 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1657,6 +1657,8 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *bdaddr_type); +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 addr_type, + bdaddr_t *bdaddr, u8 irk[16]); void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, bdaddr_t *bdaddr); diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index f4bbd3b79210..88225a9ca1f8 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -885,6 +885,86 @@ static void hci_req_start_scan(struct hci_request *req, u8 type, u16 interval, } } +int hci_req_update_resolving_list(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, + u8 irk_val[16]) +{ + struct hci_request req; + struct hci_cp_le_add_to_resolv_list cp; + struct bdaddr_list_with_irk *irk; + u8 entries; + + BT_DBG(""); + + /* Nothing to be done if LL privacy is not supported */ + if ( !(hdev->le_features[0] & HCI_LE_LL_PRIVACY) ) + return -EPROTONOSUPPORT; + + /* Resolving List cannot be updated if address resolution + * in the controller is enabled and advertisement or scanning + * or create connection command is ongoing. + */ + if ( !hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION) && + ( hci_dev_test_flag(hdev, HCI_LE_ADV) || + hci_dev_test_flag(hdev, HCI_LE_SCAN) || + hci_lookup_le_connect(hdev) ) ) + return -EINVAL; + + hci_req_init(&req, hdev); + + irk = hci_bdaddr_list_lookup_with_irk(&hdev->le_resolv_list, bdaddr, type); + if (irk) { + /* Device is present in resolving list.*/ + if (memcmp(irk->peer_irk, irk_val, 16) == 0) { + /* Device present in resolving list with same IRK. + * No HCI communication is required.Sort the + * Kernel list. + */ + hci_bdaddr_list_add_with_irk(&irk->list, bdaddr, type, irk_val, NULL); + return 0; + + } + /* IRK has changed for the device in resolving list + * Queue up commands to delete the existing entry and + * add new one. Sorting will be done when command complete + * for add command is receieved. + */ + goto remote; + } + /* Device is not present in resolving list.If resolving list + * is not full add the device to resolving list. + */ + entries = 0; + list_for_each_entry(irk, &hdev->le_resolv_list, list) { + entries++; + } + + if (entries < hdev->le_resolv_list_size) + goto add; + + /* If the resolving list is full, queue up HCI command to delete + * the entry that was used least recently to make space for the + * new device. Kernel list will be updated when command complete + * is received. + */ + irk = list_first_entry_or_null(&hdev->le_resolv_list, struct bdaddr_list_with_irk, list); + + if (!irk) + return -1; + +remote: + hci_req_del_from_resolving_list(hdev, irk->bdaddr_type, &irk->bdaddr); + +add: + cp.bdaddr_type = type; + bacpy(&cp.bdaddr, bdaddr); + memcpy(cp.peer_irk, irk_val, 16); + memcpy(cp.local_irk, hdev->irk, 16); + + hci_req_add(&req, HCI_OP_LE_ADD_TO_RESOLV_LIST, sizeof(cp), &cp); + hci_req_run(&req, NULL); + return 0; +} + void hci_req_del_from_resolving_list(struct hci_dev *hdev, u8 addr_type, bdaddr_t *bdaddr) { struct hci_cp_le_del_from_resolv_list cp;