| Message ID | 20211028191805.1.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Bluetooth: Limit duration of Remote Name Resolve | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Single patches do not need cover letters |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 33 this patch: 33 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 47 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 33 this patch: 33 |
| netdev/header_inline | success | No static functions without inline keyword in header files |
Hi Archie, > When doing remote name request, we cannot scan. In the normal case it's > OK since we can expect it to finish within a short amount of time. > However, there is a possibility to scan lots of devices that > (1) requires Remote Name Resolve > (2) is unresponsive to Remote Name Resolve > When this happens, we are stuck to do Remote Name Resolve until all is > done before continue scanning. > > This patch adds a time limit to stop us spending too long on remote > name request. The limit is increased for every iteration where we fail > to complete the RNR in order to eventually solve all names. > > Signed-off-by: Archie Pusaka <apusaka@chromium.org> > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > > --- > Hi maintainers, we found one instance where a test device spends ~90 > seconds to do Remote Name Resolving, hence this patch. > I think it's better if we reset the time limit to the default value > at some point, but I don't have a good proposal where to do that, so > in the end I didn't. do you have a btmon trace for this as well? The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. > include/net/bluetooth/hci_core.h | 5 +++++ > net/bluetooth/hci_event.c | 12 ++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index dd8840e70e25..df9ffedf1d29 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -87,6 +87,8 @@ struct discovery_state { > u8 (*uuids)[16]; > unsigned long scan_start; > unsigned long scan_duration; > + unsigned long name_resolve_timeout; > + unsigned long name_resolve_duration; > }; > > #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ > @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) > #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ > #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ > > +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ > + > static inline void discovery_init(struct hci_dev *hdev) > { > hdev->discovery.state = DISCOVERY_STOPPED; > @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) > INIT_LIST_HEAD(&hdev->discovery.resolve); > hdev->discovery.report_invalid_rssi = true; > hdev->discovery.rssi = HCI_RSSI_INVALID; > + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; > } > > static inline void hci_discovery_filter_clear(struct hci_dev *hdev) > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 3cba2bbefcd6..104a1308f454 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) > if (list_empty(&discov->resolve)) > return false; > > + /* We should stop if we already spent too much time resolving names. > + * However, double the name resolve duration for the next iterations. > + */ > + if (time_after(jiffies, discov->name_resolve_timeout)) { > + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); > + discov->name_resolve_duration *= 2; > + return false; > + } > + > e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); > if (!e) > return false; > @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) > if (e && hci_resolve_name(hdev, e) == 0) { > e->name_state = NAME_PENDING; > hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); > + > + discov->name_resolve_timeout = jiffies + > + msecs_to_jiffies(discov->name_resolve_duration); So if this is really caused by a device with page scan disabled and inquiry scan enabled, then this fix is just a paper over hole approach. If you have more devices requiring name resolving, you end up penalizing them and make the discovery procedure worse up to the extend that no names are resolved. So I wouldn’t be in favor of this. What LE scan window/interval is actually working against what configured BR/EDR page timeout here? The discovery procedure is something that a user triggers so we always had that one take higher priority since the user is expecting results. This means any tweaking needs to be considered carefully since it is an immediate user impact if the name is missing. Is this a LE background scan you are worried about or an LE active scan that runs in parallel during discovery? Regards Marcel
Hi Marcel, On Thu, Oct 28, 2021 at 6:30 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Archie, > > > When doing remote name request, we cannot scan. In the normal case it's > > OK since we can expect it to finish within a short amount of time. > > However, there is a possibility to scan lots of devices that > > (1) requires Remote Name Resolve > > (2) is unresponsive to Remote Name Resolve > > When this happens, we are stuck to do Remote Name Resolve until all is > > done before continue scanning. > > > > This patch adds a time limit to stop us spending too long on remote > > name request. The limit is increased for every iteration where we fail > > to complete the RNR in order to eventually solve all names. > > > > Signed-off-by: Archie Pusaka <apusaka@chromium.org> > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > > > > --- > > Hi maintainers, we found one instance where a test device spends ~90 > > seconds to do Remote Name Resolving, hence this patch. > > I think it's better if we reset the time limit to the default value > > at some point, but I don't have a good proposal where to do that, so > > in the end I didn't. > > do you have a btmon trace for this as well? > > The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. I wonder what does the remote sets as Page_Scan_Repetition_Mode in the Inquiry Result, it seems quite weird that the specs allows such stage but it doesn't have a value to represent in the inquiry result, anyway I guess changing that now wouldn't really make any different given such device is probably never gonna update. > That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. If I recall this correctly we used to have something like that back in the days the daemon had control over the discovery, the logic was that each round of discovery including the name resolving had a fixed time e.g. 10 sec, so if not all device found had their name resolved we would stop and proceed to the next round that way we avoid this problem of devices not resolving and nothing being discovered either. Luckily today there might not be many devices around without EIR including their names but still I think it would be better to limit the amount time we spend resolving names, also it looks like it sets NAME_NOT_KNOWN when RNR fails and it never proceeds to request the name again so I wonder why would it be waiting ~90 seconds, we don't seem to change the page timeout so it should be using the default which is 5.12s so I think there is something else at play. Or perhaps it is finally time to drop legacy name resolution? At this point they should be very rare and those keeping some ancient device around will just have to deal with the address directly so we can get rid of paging devices while discovery which is quite a big burden I'd say. > > > include/net/bluetooth/hci_core.h | 5 +++++ > > net/bluetooth/hci_event.c | 12 ++++++++++++ > > 2 files changed, 17 insertions(+) > > > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > > index dd8840e70e25..df9ffedf1d29 100644 > > --- a/include/net/bluetooth/hci_core.h > > +++ b/include/net/bluetooth/hci_core.h > > @@ -87,6 +87,8 @@ struct discovery_state { > > u8 (*uuids)[16]; > > unsigned long scan_start; > > unsigned long scan_duration; > > + unsigned long name_resolve_timeout; > > + unsigned long name_resolve_duration; > > }; > > > > #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ > > @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) > > #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ > > #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ > > > > +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ > > + > > static inline void discovery_init(struct hci_dev *hdev) > > { > > hdev->discovery.state = DISCOVERY_STOPPED; > > @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) > > INIT_LIST_HEAD(&hdev->discovery.resolve); > > hdev->discovery.report_invalid_rssi = true; > > hdev->discovery.rssi = HCI_RSSI_INVALID; > > + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; > > } > > > > static inline void hci_discovery_filter_clear(struct hci_dev *hdev) > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > > index 3cba2bbefcd6..104a1308f454 100644 > > --- a/net/bluetooth/hci_event.c > > +++ b/net/bluetooth/hci_event.c > > @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) > > if (list_empty(&discov->resolve)) > > return false; > > > > + /* We should stop if we already spent too much time resolving names. > > + * However, double the name resolve duration for the next iterations. > > + */ > > + if (time_after(jiffies, discov->name_resolve_timeout)) { > > + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); > > + discov->name_resolve_duration *= 2; > > + return false; > > + } > > + > > e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); > > if (!e) > > return false; > > @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) > > if (e && hci_resolve_name(hdev, e) == 0) { > > e->name_state = NAME_PENDING; > > hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); > > + > > + discov->name_resolve_timeout = jiffies + > > + msecs_to_jiffies(discov->name_resolve_duration); > > So if this is really caused by a device with page scan disabled and inquiry scan enabled, then this fix is just a paper over hole approach. If you have more devices requiring name resolving, you end up penalizing them and make the discovery procedure worse up to the extend that no names are resolved. So I wouldn’t be in favor of this. > > What LE scan window/interval is actually working against what configured BR/EDR page timeout here? The discovery procedure is something that a user triggers so we always had that one take higher priority since the user is expecting results. This means any tweaking needs to be considered carefully since it is an immediate user impact if the name is missing. > > Is this a LE background scan you are worried about or an LE active scan that runs in parallel during discovery? > > Regards > > Marcel >
Hi Marcel, Luiz, On Fri, 29 Oct 2021 at 07:41, Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Marcel, > > On Thu, Oct 28, 2021 at 6:30 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > > > Hi Archie, > > > > > When doing remote name request, we cannot scan. In the normal case it's > > > OK since we can expect it to finish within a short amount of time. > > > However, there is a possibility to scan lots of devices that > > > (1) requires Remote Name Resolve > > > (2) is unresponsive to Remote Name Resolve > > > When this happens, we are stuck to do Remote Name Resolve until all is > > > done before continue scanning. > > > > > > This patch adds a time limit to stop us spending too long on remote > > > name request. The limit is increased for every iteration where we fail > > > to complete the RNR in order to eventually solve all names. > > > > > > Signed-off-by: Archie Pusaka <apusaka@chromium.org> > > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > > > > > > --- > > > Hi maintainers, we found one instance where a test device spends ~90 > > > seconds to do Remote Name Resolving, hence this patch. > > > I think it's better if we reset the time limit to the default value > > > at some point, but I don't have a good proposal where to do that, so > > > in the end I didn't. > > > > do you have a btmon trace for this as well? > > Yes, but only from the scanning device side. It's all lined up with your expectation (e.g. receiving Page Timeout in RNR Complete event). > > The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. > It might be the case. I don't know the peer device, but it looks like the user has a lot of these exact peer devices sitting in the same room. Or another possibility would be the user just turned bluetooth off for these devices just after we scan them, such that they don't answer the RNR. > I wonder what does the remote sets as Page_Scan_Repetition_Mode in the > Inquiry Result, it seems quite weird that the specs allows such stage > but it doesn't have a value to represent in the inquiry result, anyway > I guess changing that now wouldn't really make any different given > such device is probably never gonna update. > The page scan repetition mode is R1 > > That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. > > If I recall this correctly we used to have something like that back in > the days the daemon had control over the discovery, the logic was that > each round of discovery including the name resolving had a fixed time > e.g. 10 sec, so if not all device found had their name resolved we > would stop and proceed to the next round that way we avoid this > problem of devices not resolving and nothing being discovered either. > Luckily today there might not be many devices around without EIR > including their names but still I think it would be better to limit > the amount time we spend resolving names, also it looks like it sets > NAME_NOT_KNOWN when RNR fails and it never proceeds to request the > name again so I wonder why would it be waiting ~90 seconds, we don't > seem to change the page timeout so it should be using the default > which is 5.12s so I think there is something else at play. > Yeah, we received the Page Timeout after 5s, but then we proceed to continue RNR the next device, which takes another 5s, and so on. A couple of these devices can push waiting time over 90s. Looking at this, I don't think cancelling RNR would help much. This patch would like to reintroduce the time limit, but I decided to make the time limit grow, otherwise the bad RNR might take the whole time limit and we can't resolve any names. > Or perhaps it is finally time to drop legacy name resolution? At this > point they should be very rare and those keeping some ancient device > around will just have to deal with the address directly so we can get > rid of paging devices while discovery which is quite a big burden I'd > say. > > > > > > include/net/bluetooth/hci_core.h | 5 +++++ > > > net/bluetooth/hci_event.c | 12 ++++++++++++ > > > 2 files changed, 17 insertions(+) > > > > > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > > > index dd8840e70e25..df9ffedf1d29 100644 > > > --- a/include/net/bluetooth/hci_core.h > > > +++ b/include/net/bluetooth/hci_core.h > > > @@ -87,6 +87,8 @@ struct discovery_state { > > > u8 (*uuids)[16]; > > > unsigned long scan_start; > > > unsigned long scan_duration; > > > + unsigned long name_resolve_timeout; > > > + unsigned long name_resolve_duration; > > > }; > > > > > > #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ > > > @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) > > > #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ > > > #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ > > > > > > +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ > > > + > > > static inline void discovery_init(struct hci_dev *hdev) > > > { > > > hdev->discovery.state = DISCOVERY_STOPPED; > > > @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) > > > INIT_LIST_HEAD(&hdev->discovery.resolve); > > > hdev->discovery.report_invalid_rssi = true; > > > hdev->discovery.rssi = HCI_RSSI_INVALID; > > > + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; > > > } > > > > > > static inline void hci_discovery_filter_clear(struct hci_dev *hdev) > > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > > > index 3cba2bbefcd6..104a1308f454 100644 > > > --- a/net/bluetooth/hci_event.c > > > +++ b/net/bluetooth/hci_event.c > > > @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) > > > if (list_empty(&discov->resolve)) > > > return false; > > > > > > + /* We should stop if we already spent too much time resolving names. > > > + * However, double the name resolve duration for the next iterations. > > > + */ > > > + if (time_after(jiffies, discov->name_resolve_timeout)) { > > > + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); > > > + discov->name_resolve_duration *= 2; > > > + return false; > > > + } > > > + > > > e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); > > > if (!e) > > > return false; > > > @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) > > > if (e && hci_resolve_name(hdev, e) == 0) { > > > e->name_state = NAME_PENDING; > > > hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); > > > + > > > + discov->name_resolve_timeout = jiffies + > > > + msecs_to_jiffies(discov->name_resolve_duration); > > > > So if this is really caused by a device with page scan disabled and inquiry scan enabled, then this fix is just a paper over hole approach. If you have more devices requiring name resolving, you end up penalizing them and make the discovery procedure worse up to the extend that no names are resolved. So I wouldn’t be in favor of this. > > I agree this could potentially penalize good devices that require name resolving. However, this wouldn't worsen the procedure to the extent where no names are resolved, since the time limit is growing, so at some point all names (from good devices) are bound to be resolved. Also, I expect the user would bring the target peer devices closer, therefore hopefully increasing the RSSI and making them appear sooner in the next iteration of RNR, since we order the requests by RSSI. So, this change might also reward good devices by giving them a chance to 'cut the RNR queue'. > > What LE scan window/interval is actually working against what configured BR/EDR page timeout here? The discovery procedure is something that a user triggers so we always had that one take higher priority since the user is expecting results. This means any tweaking needs to be considered carefully since it is an immediate user impact if the name is missing. > > > > Is this a LE background scan you are worried about or an LE active scan that runs in parallel during discovery? > > This doesn't need to be related to LE. I believe what the user experienced is: (1) The user activates scanning on the host device (2) The host device scans lots of bad peers. After 10 seconds, the host device stop scanning and begin RNR. (3) The user put the target peer device into discoverable mode (4) The host device spends 90 seconds doing RNR, before eventually successfully discovering the target peer device. Of course, step (3) could be performed earlier but by luck the host fails to discover the target peer in 10 seconds. > > Regards > > > > Marcel > > > > > -- > Luiz Augusto von Dentz Thanks, Archie
Hi Archie, >>>> When doing remote name request, we cannot scan. In the normal case it's >>>> OK since we can expect it to finish within a short amount of time. >>>> However, there is a possibility to scan lots of devices that >>>> (1) requires Remote Name Resolve >>>> (2) is unresponsive to Remote Name Resolve >>>> When this happens, we are stuck to do Remote Name Resolve until all is >>>> done before continue scanning. >>>> >>>> This patch adds a time limit to stop us spending too long on remote >>>> name request. The limit is increased for every iteration where we fail >>>> to complete the RNR in order to eventually solve all names. >>>> >>>> Signed-off-by: Archie Pusaka <apusaka@chromium.org> >>>> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> >>>> >>>> --- >>>> Hi maintainers, we found one instance where a test device spends ~90 >>>> seconds to do Remote Name Resolving, hence this patch. >>>> I think it's better if we reset the time limit to the default value >>>> at some point, but I don't have a good proposal where to do that, so >>>> in the end I didn't. >>> >>> do you have a btmon trace for this as well? >>> > Yes, but only from the scanning device side. It's all lined up with > your expectation (e.g. receiving Page Timeout in RNR Complete event). > >>> The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. >> > It might be the case. I don't know the peer device, but it looks like > the user has a lot of these exact peer devices sitting in the same > room. > Or another possibility would be the user just turned bluetooth off for > these devices just after we scan them, such that they don't answer the > RNR. > >> I wonder what does the remote sets as Page_Scan_Repetition_Mode in the >> Inquiry Result, it seems quite weird that the specs allows such stage >> but it doesn't have a value to represent in the inquiry result, anyway >> I guess changing that now wouldn't really make any different given >> such device is probably never gonna update. >> > The page scan repetition mode is R1 not sure if this actually matters if your clock drifted too much apart. >>> That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. >> >> If I recall this correctly we used to have something like that back in >> the days the daemon had control over the discovery, the logic was that >> each round of discovery including the name resolving had a fixed time >> e.g. 10 sec, so if not all device found had their name resolved we >> would stop and proceed to the next round that way we avoid this >> problem of devices not resolving and nothing being discovered either. >> Luckily today there might not be many devices around without EIR >> including their names but still I think it would be better to limit >> the amount time we spend resolving names, also it looks like it sets >> NAME_NOT_KNOWN when RNR fails and it never proceeds to request the >> name again so I wonder why would it be waiting ~90 seconds, we don't >> seem to change the page timeout so it should be using the default >> which is 5.12s so I think there is something else at play. >> > Yeah, we received the Page Timeout after 5s, but then we proceed to > continue RNR the next device, which takes another 5s, and so on. > A couple of these devices can push waiting time over 90s. > Looking at this, I don't think cancelling RNR would help much. > This patch would like to reintroduce the time limit, but I decided to > make the time limit grow, otherwise the bad RNR might take the whole > time limit and we can't resolve any names. I am wondering if we should add a new flag to Device Found that will indicate Name Resolving Failed after the first Page Timeout and then bluetoothd can decide via Confirm Name mgmt command to trigger the resolving or not. We can even add a 0x02 for Don’t Care About The Name. The one thing that I have a bit of a problem with is what time value we are going to pick for the resolving stage. Lets say we actually limit the time we spent there, then sure lets do that and pick a time. I wouldn’t be bothering with increasing it based on faulty devices. Just pick a time and that is what the kernel is allowed to spent on this. And it will abort. So we should be using a timer for this. That is just the fair thing to do and then you get an expected behavior every time. If we do the above extensions of mgmt, then bluetoothd can put a device back into the list if it really feels the kernel should keep trying to resolve the name. >> Or perhaps it is finally time to drop legacy name resolution? At this >> point they should be very rare and those keeping some ancient device >> around will just have to deal with the address directly so we can get >> rid of paging devices while discovery which is quite a big burden I'd >> say. I rather not do that. There are still 2.0 device out there. >>>> include/net/bluetooth/hci_core.h | 5 +++++ >>>> net/bluetooth/hci_event.c | 12 ++++++++++++ >>>> 2 files changed, 17 insertions(+) >>>> >>>> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h >>>> index dd8840e70e25..df9ffedf1d29 100644 >>>> --- a/include/net/bluetooth/hci_core.h >>>> +++ b/include/net/bluetooth/hci_core.h >>>> @@ -87,6 +87,8 @@ struct discovery_state { >>>> u8 (*uuids)[16]; >>>> unsigned long scan_start; >>>> unsigned long scan_duration; >>>> + unsigned long name_resolve_timeout; >>>> + unsigned long name_resolve_duration; >>>> }; >>>> >>>> #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ >>>> @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) >>>> #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ >>>> #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ >>>> >>>> +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ >>>> + >>>> static inline void discovery_init(struct hci_dev *hdev) >>>> { >>>> hdev->discovery.state = DISCOVERY_STOPPED; >>>> @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) >>>> INIT_LIST_HEAD(&hdev->discovery.resolve); >>>> hdev->discovery.report_invalid_rssi = true; >>>> hdev->discovery.rssi = HCI_RSSI_INVALID; >>>> + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; >>>> } >>>> >>>> static inline void hci_discovery_filter_clear(struct hci_dev *hdev) >>>> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c >>>> index 3cba2bbefcd6..104a1308f454 100644 >>>> --- a/net/bluetooth/hci_event.c >>>> +++ b/net/bluetooth/hci_event.c >>>> @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) >>>> if (list_empty(&discov->resolve)) >>>> return false; >>>> >>>> + /* We should stop if we already spent too much time resolving names. >>>> + * However, double the name resolve duration for the next iterations. >>>> + */ >>>> + if (time_after(jiffies, discov->name_resolve_timeout)) { >>>> + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); >>>> + discov->name_resolve_duration *= 2; >>>> + return false; >>>> + } >>>> + >>>> e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); >>>> if (!e) >>>> return false; >>>> @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) >>>> if (e && hci_resolve_name(hdev, e) == 0) { >>>> e->name_state = NAME_PENDING; >>>> hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); >>>> + >>>> + discov->name_resolve_timeout = jiffies + >>>> + msecs_to_jiffies(discov->name_resolve_duration); >>> >>> So if this is really caused by a device with page scan disabled and inquiry scan enabled, then this fix is just a paper over hole approach. If you have more devices requiring name resolving, you end up penalizing them and make the discovery procedure worse up to the extend that no names are resolved. So I wouldn’t be in favor of this. >>> > I agree this could potentially penalize good devices that require name > resolving. However, this wouldn't worsen the procedure to the extent > where no names are resolved, since the time limit is growing, so at > some point all names (from good devices) are bound to be resolved. > Also, I expect the user would bring the target peer devices closer, > therefore hopefully increasing the RSSI and making them appear sooner > in the next iteration of RNR, since we order the requests by RSSI. > So, this change might also reward good devices by giving them a chance > to 'cut the RNR queue'. > >>> What LE scan window/interval is actually working against what configured BR/EDR page timeout here? The discovery procedure is something that a user triggers so we always had that one take higher priority since the user is expecting results. This means any tweaking needs to be considered carefully since it is an immediate user impact if the name is missing. >>> >>> Is this a LE background scan you are worried about or an LE active scan that runs in parallel during discovery? >>> > This doesn't need to be related to LE. I believe what the user experienced is: > (1) The user activates scanning on the host device > (2) The host device scans lots of bad peers. After 10 seconds, the > host device stop scanning and begin RNR. > (3) The user put the target peer device into discoverable mode > (4) The host device spends 90 seconds doing RNR, before eventually > successfully discovering the target peer device. > > Of course, step (3) could be performed earlier but by luck the host > fails to discover the target peer in 10 seconds. I agree that the 90 seconds is just insane. Keep in mind that this code is roughly running in devices since 2015. So it couldn’t have been all that bad. Nevertheless, you encountered a case where this needs improvement. Regards Marcel
Hi Marcel, On Fri, 29 Oct 2021 at 16:19, Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Archie, > > >>>> When doing remote name request, we cannot scan. In the normal case it's > >>>> OK since we can expect it to finish within a short amount of time. > >>>> However, there is a possibility to scan lots of devices that > >>>> (1) requires Remote Name Resolve > >>>> (2) is unresponsive to Remote Name Resolve > >>>> When this happens, we are stuck to do Remote Name Resolve until all is > >>>> done before continue scanning. > >>>> > >>>> This patch adds a time limit to stop us spending too long on remote > >>>> name request. The limit is increased for every iteration where we fail > >>>> to complete the RNR in order to eventually solve all names. > >>>> > >>>> Signed-off-by: Archie Pusaka <apusaka@chromium.org> > >>>> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > >>>> > >>>> --- > >>>> Hi maintainers, we found one instance where a test device spends ~90 > >>>> seconds to do Remote Name Resolving, hence this patch. > >>>> I think it's better if we reset the time limit to the default value > >>>> at some point, but I don't have a good proposal where to do that, so > >>>> in the end I didn't. > >>> > >>> do you have a btmon trace for this as well? > >>> > > Yes, but only from the scanning device side. It's all lined up with > > your expectation (e.g. receiving Page Timeout in RNR Complete event). > > > >>> The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. > >> > > It might be the case. I don't know the peer device, but it looks like > > the user has a lot of these exact peer devices sitting in the same > > room. > > Or another possibility would be the user just turned bluetooth off for > > these devices just after we scan them, such that they don't answer the > > RNR. > > > >> I wonder what does the remote sets as Page_Scan_Repetition_Mode in the > >> Inquiry Result, it seems quite weird that the specs allows such stage > >> but it doesn't have a value to represent in the inquiry result, anyway > >> I guess changing that now wouldn't really make any different given > >> such device is probably never gonna update. > >> > > The page scan repetition mode is R1 > > not sure if this actually matters if your clock drifted too much apart. > > >>> That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. > >> > >> If I recall this correctly we used to have something like that back in > >> the days the daemon had control over the discovery, the logic was that > >> each round of discovery including the name resolving had a fixed time > >> e.g. 10 sec, so if not all device found had their name resolved we > >> would stop and proceed to the next round that way we avoid this > >> problem of devices not resolving and nothing being discovered either. > >> Luckily today there might not be many devices around without EIR > >> including their names but still I think it would be better to limit > >> the amount time we spend resolving names, also it looks like it sets > >> NAME_NOT_KNOWN when RNR fails and it never proceeds to request the > >> name again so I wonder why would it be waiting ~90 seconds, we don't > >> seem to change the page timeout so it should be using the default > >> which is 5.12s so I think there is something else at play. > >> > > Yeah, we received the Page Timeout after 5s, but then we proceed to > > continue RNR the next device, which takes another 5s, and so on. > > A couple of these devices can push waiting time over 90s. > > Looking at this, I don't think cancelling RNR would help much. > > This patch would like to reintroduce the time limit, but I decided to > > make the time limit grow, otherwise the bad RNR might take the whole > > time limit and we can't resolve any names. > > I am wondering if we should add a new flag to Device Found that will indicate Name Resolving Failed after the first Page Timeout and then bluetoothd can decide via Confirm Name mgmt command to trigger the resolving or not. We can even add a 0x02 for Don’t Care About The Name. > This is a great idea. However I checked that we remove the discovered device cache after every scan iteration. While I am not clear about the purpose of the cache cleanup, I had assumed that keeping a list of devices with bad RNR record would go against the intention of cleaning up the cache. If we are to bookkeep the list of bad devices, we might as well take this record into account when sorting the RNR queue, so the bad devices will be sent to the back of the queue regardless how good the RSSI is. > The one thing that I have a bit of a problem with is what time value we are going to pick for the resolving stage. Lets say we actually limit the time we spent there, then sure lets do that and pick a time. I wouldn’t be bothering with increasing it based on faulty devices. Just pick a time and that is what the kernel is allowed to spent on this. And it will abort. So we should be using a timer for this. That is just the fair thing to do and then you get an expected behavior every time. If we do the above extensions of mgmt, then bluetoothd can put a device back into the list if it really feels the kernel should keep trying to resolve the name. > > >> Or perhaps it is finally time to drop legacy name resolution? At this > >> point they should be very rare and those keeping some ancient device > >> around will just have to deal with the address directly so we can get > >> rid of paging devices while discovery which is quite a big burden I'd > >> say. > > I rather not do that. There are still 2.0 device out there. > > >>>> include/net/bluetooth/hci_core.h | 5 +++++ > >>>> net/bluetooth/hci_event.c | 12 ++++++++++++ > >>>> 2 files changed, 17 insertions(+) > >>>> > >>>> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > >>>> index dd8840e70e25..df9ffedf1d29 100644 > >>>> --- a/include/net/bluetooth/hci_core.h > >>>> +++ b/include/net/bluetooth/hci_core.h > >>>> @@ -87,6 +87,8 @@ struct discovery_state { > >>>> u8 (*uuids)[16]; > >>>> unsigned long scan_start; > >>>> unsigned long scan_duration; > >>>> + unsigned long name_resolve_timeout; > >>>> + unsigned long name_resolve_duration; > >>>> }; > >>>> > >>>> #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ > >>>> @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) > >>>> #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ > >>>> #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ > >>>> > >>>> +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ > >>>> + > >>>> static inline void discovery_init(struct hci_dev *hdev) > >>>> { > >>>> hdev->discovery.state = DISCOVERY_STOPPED; > >>>> @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) > >>>> INIT_LIST_HEAD(&hdev->discovery.resolve); > >>>> hdev->discovery.report_invalid_rssi = true; > >>>> hdev->discovery.rssi = HCI_RSSI_INVALID; > >>>> + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; > >>>> } > >>>> > >>>> static inline void hci_discovery_filter_clear(struct hci_dev *hdev) > >>>> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > >>>> index 3cba2bbefcd6..104a1308f454 100644 > >>>> --- a/net/bluetooth/hci_event.c > >>>> +++ b/net/bluetooth/hci_event.c > >>>> @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) > >>>> if (list_empty(&discov->resolve)) > >>>> return false; > >>>> > >>>> + /* We should stop if we already spent too much time resolving names. > >>>> + * However, double the name resolve duration for the next iterations. > >>>> + */ > >>>> + if (time_after(jiffies, discov->name_resolve_timeout)) { > >>>> + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); > >>>> + discov->name_resolve_duration *= 2; > >>>> + return false; > >>>> + } > >>>> + > >>>> e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); > >>>> if (!e) > >>>> return false; > >>>> @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) > >>>> if (e && hci_resolve_name(hdev, e) == 0) { > >>>> e->name_state = NAME_PENDING; > >>>> hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); > >>>> + > >>>> + discov->name_resolve_timeout = jiffies + > >>>> + msecs_to_jiffies(discov->name_resolve_duration); > >>> > >>> So if this is really caused by a device with page scan disabled and inquiry scan enabled, then this fix is just a paper over hole approach. If you have more devices requiring name resolving, you end up penalizing them and make the discovery procedure worse up to the extend that no names are resolved. So I wouldn’t be in favor of this. > >>> > > I agree this could potentially penalize good devices that require name > > resolving. However, this wouldn't worsen the procedure to the extent > > where no names are resolved, since the time limit is growing, so at > > some point all names (from good devices) are bound to be resolved. > > Also, I expect the user would bring the target peer devices closer, > > therefore hopefully increasing the RSSI and making them appear sooner > > in the next iteration of RNR, since we order the requests by RSSI. > > So, this change might also reward good devices by giving them a chance > > to 'cut the RNR queue'. > > > >>> What LE scan window/interval is actually working against what configured BR/EDR page timeout here? The discovery procedure is something that a user triggers so we always had that one take higher priority since the user is expecting results. This means any tweaking needs to be considered carefully since it is an immediate user impact if the name is missing. > >>> > >>> Is this a LE background scan you are worried about or an LE active scan that runs in parallel during discovery? > >>> > > This doesn't need to be related to LE. I believe what the user experienced is: > > (1) The user activates scanning on the host device > > (2) The host device scans lots of bad peers. After 10 seconds, the > > host device stop scanning and begin RNR. > > (3) The user put the target peer device into discoverable mode > > (4) The host device spends 90 seconds doing RNR, before eventually > > successfully discovering the target peer device. > > > > Of course, step (3) could be performed earlier but by luck the host > > fails to discover the target peer in 10 seconds. > > I agree that the 90 seconds is just insane. Keep in mind that this code is roughly running in devices since 2015. So it couldn’t have been all that bad. Nevertheless, you encountered a case where this needs improvement. > > Regards > > Marcel > Thanks, Archie
Hi Archie, >>>>>> When doing remote name request, we cannot scan. In the normal case it's >>>>>> OK since we can expect it to finish within a short amount of time. >>>>>> However, there is a possibility to scan lots of devices that >>>>>> (1) requires Remote Name Resolve >>>>>> (2) is unresponsive to Remote Name Resolve >>>>>> When this happens, we are stuck to do Remote Name Resolve until all is >>>>>> done before continue scanning. >>>>>> >>>>>> This patch adds a time limit to stop us spending too long on remote >>>>>> name request. The limit is increased for every iteration where we fail >>>>>> to complete the RNR in order to eventually solve all names. >>>>>> >>>>>> Signed-off-by: Archie Pusaka <apusaka@chromium.org> >>>>>> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> >>>>>> >>>>>> --- >>>>>> Hi maintainers, we found one instance where a test device spends ~90 >>>>>> seconds to do Remote Name Resolving, hence this patch. >>>>>> I think it's better if we reset the time limit to the default value >>>>>> at some point, but I don't have a good proposal where to do that, so >>>>>> in the end I didn't. >>>>> >>>>> do you have a btmon trace for this as well? >>>>> >>> Yes, but only from the scanning device side. It's all lined up with >>> your expectation (e.g. receiving Page Timeout in RNR Complete event). >>> >>>>> The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. >>>> >>> It might be the case. I don't know the peer device, but it looks like >>> the user has a lot of these exact peer devices sitting in the same >>> room. >>> Or another possibility would be the user just turned bluetooth off for >>> these devices just after we scan them, such that they don't answer the >>> RNR. >>> >>>> I wonder what does the remote sets as Page_Scan_Repetition_Mode in the >>>> Inquiry Result, it seems quite weird that the specs allows such stage >>>> but it doesn't have a value to represent in the inquiry result, anyway >>>> I guess changing that now wouldn't really make any different given >>>> such device is probably never gonna update. >>>> >>> The page scan repetition mode is R1 >> >> not sure if this actually matters if your clock drifted too much apart. >> >>>>> That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. >>>> >>>> If I recall this correctly we used to have something like that back in >>>> the days the daemon had control over the discovery, the logic was that >>>> each round of discovery including the name resolving had a fixed time >>>> e.g. 10 sec, so if not all device found had their name resolved we >>>> would stop and proceed to the next round that way we avoid this >>>> problem of devices not resolving and nothing being discovered either. >>>> Luckily today there might not be many devices around without EIR >>>> including their names but still I think it would be better to limit >>>> the amount time we spend resolving names, also it looks like it sets >>>> NAME_NOT_KNOWN when RNR fails and it never proceeds to request the >>>> name again so I wonder why would it be waiting ~90 seconds, we don't >>>> seem to change the page timeout so it should be using the default >>>> which is 5.12s so I think there is something else at play. >>>> >>> Yeah, we received the Page Timeout after 5s, but then we proceed to >>> continue RNR the next device, which takes another 5s, and so on. >>> A couple of these devices can push waiting time over 90s. >>> Looking at this, I don't think cancelling RNR would help much. >>> This patch would like to reintroduce the time limit, but I decided to >>> make the time limit grow, otherwise the bad RNR might take the whole >>> time limit and we can't resolve any names. >> >> I am wondering if we should add a new flag to Device Found that will indicate Name Resolving Failed after the first Page Timeout and then bluetoothd can decide via Confirm Name mgmt command to trigger the resolving or not. We can even add a 0x02 for Don’t Care About The Name. >> > This is a great idea. > However I checked that we remove the discovered device cache after > every scan iteration. > While I am not clear about the purpose of the cache cleanup, I had > assumed that keeping a list of devices with bad RNR record would go > against the intention of cleaning up the cache. > > If we are to bookkeep the list of bad devices, we might as well take > this record into account when sorting the RNR queue, so the bad > devices will be sent to the back of the queue regardless how good the > RSSI is. the inquiry cache is solely for name resolving and connection request so that you are able to fill in the right values to speed up the paging. I think it is just enough to include a flag hinting the resolving failure into the Device Found message. We are sending two Device Found anyway on success. So now we get one on failure as well. And then lets bluetoothd do all the caching if it wants to. Regards Marcel
Hi Marcel, On Fri, 29 Oct 2021 at 18:11, Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Archie, > > >>>>>> When doing remote name request, we cannot scan. In the normal case it's > >>>>>> OK since we can expect it to finish within a short amount of time. > >>>>>> However, there is a possibility to scan lots of devices that > >>>>>> (1) requires Remote Name Resolve > >>>>>> (2) is unresponsive to Remote Name Resolve > >>>>>> When this happens, we are stuck to do Remote Name Resolve until all is > >>>>>> done before continue scanning. > >>>>>> > >>>>>> This patch adds a time limit to stop us spending too long on remote > >>>>>> name request. The limit is increased for every iteration where we fail > >>>>>> to complete the RNR in order to eventually solve all names. > >>>>>> > >>>>>> Signed-off-by: Archie Pusaka <apusaka@chromium.org> > >>>>>> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > >>>>>> > >>>>>> --- > >>>>>> Hi maintainers, we found one instance where a test device spends ~90 > >>>>>> seconds to do Remote Name Resolving, hence this patch. > >>>>>> I think it's better if we reset the time limit to the default value > >>>>>> at some point, but I don't have a good proposal where to do that, so > >>>>>> in the end I didn't. > >>>>> > >>>>> do you have a btmon trace for this as well? > >>>>> > >>> Yes, but only from the scanning device side. It's all lined up with > >>> your expectation (e.g. receiving Page Timeout in RNR Complete event). > >>> > >>>>> The HCI Remote Name Request is essentially a paging procedure and then a few LMP messages. It is fundamentally a connection request inside BR/EDR and if you have a remote device that has page scan disabled, but inquiry scan enabled, then you get into this funky situation. Sadly, the BR/EDR parts don’t give you any hint on this weird combination. You can't configure BlueZ that way since it is really stupid setup and I remember that GAP doesn’t have this case either, but it can happen. So we might want to check if that is what happens. And of course it needs to be a Bluetooth 2.0 device or a device that doesn’t support Secure Simple Pairing. There is a chance of really bad radio interference, but that is then just bad luck and is only going to happen every once in a blue moon. > >>>> > >>> It might be the case. I don't know the peer device, but it looks like > >>> the user has a lot of these exact peer devices sitting in the same > >>> room. > >>> Or another possibility would be the user just turned bluetooth off for > >>> these devices just after we scan them, such that they don't answer the > >>> RNR. > >>> > >>>> I wonder what does the remote sets as Page_Scan_Repetition_Mode in the > >>>> Inquiry Result, it seems quite weird that the specs allows such stage > >>>> but it doesn't have a value to represent in the inquiry result, anyway > >>>> I guess changing that now wouldn't really make any different given > >>>> such device is probably never gonna update. > >>>> > >>> The page scan repetition mode is R1 > >> > >> not sure if this actually matters if your clock drifted too much apart. > >> > >>>>> That said, you should receive a Page Timeout in the Remote Name Request Complete event for what you describe. Or you just use HCI Remote Name Request Cancel to abort the paging. If I remember correctly then the setting for Page Timeout is also applied to Remote Name resolving procedure. So we could tweak that value. Actually once we get the “sync” work merged, we could configure different Page Timeout for connection requests and name resolving if that would help. Not sure if this is worth it, since we could as simple just cancel the request. > >>>> > >>>> If I recall this correctly we used to have something like that back in > >>>> the days the daemon had control over the discovery, the logic was that > >>>> each round of discovery including the name resolving had a fixed time > >>>> e.g. 10 sec, so if not all device found had their name resolved we > >>>> would stop and proceed to the next round that way we avoid this > >>>> problem of devices not resolving and nothing being discovered either. > >>>> Luckily today there might not be many devices around without EIR > >>>> including their names but still I think it would be better to limit > >>>> the amount time we spend resolving names, also it looks like it sets > >>>> NAME_NOT_KNOWN when RNR fails and it never proceeds to request the > >>>> name again so I wonder why would it be waiting ~90 seconds, we don't > >>>> seem to change the page timeout so it should be using the default > >>>> which is 5.12s so I think there is something else at play. > >>>> > >>> Yeah, we received the Page Timeout after 5s, but then we proceed to > >>> continue RNR the next device, which takes another 5s, and so on. > >>> A couple of these devices can push waiting time over 90s. > >>> Looking at this, I don't think cancelling RNR would help much. > >>> This patch would like to reintroduce the time limit, but I decided to > >>> make the time limit grow, otherwise the bad RNR might take the whole > >>> time limit and we can't resolve any names. > >> > >> I am wondering if we should add a new flag to Device Found that will indicate Name Resolving Failed after the first Page Timeout and then bluetoothd can decide via Confirm Name mgmt command to trigger the resolving or not. We can even add a 0x02 for Don’t Care About The Name. > >> > > This is a great idea. > > However I checked that we remove the discovered device cache after > > every scan iteration. > > While I am not clear about the purpose of the cache cleanup, I had > > assumed that keeping a list of devices with bad RNR record would go > > against the intention of cleaning up the cache. > > > > If we are to bookkeep the list of bad devices, we might as well take > > this record into account when sorting the RNR queue, so the bad > > devices will be sent to the back of the queue regardless how good the > > RSSI is. > > the inquiry cache is solely for name resolving and connection request so that you are able to fill in the right values to speed up the paging. > > I think it is just enough to include a flag hinting the resolving failure into the Device Found message. We are sending two Device Found anyway on success. So now we get one on failure as well. And then lets bluetoothd do all the caching if it wants to. > Oh, I see what you mean. Then I shall implement this solution. > Regards > > Marcel > Thanks, Archie
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index dd8840e70e25..df9ffedf1d29 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -87,6 +87,8 @@ struct discovery_state { u8 (*uuids)[16]; unsigned long scan_start; unsigned long scan_duration; + unsigned long name_resolve_timeout; + unsigned long name_resolve_duration; }; #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ @@ -805,6 +807,8 @@ static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ +#define NAME_RESOLVE_INIT_DURATION 5120 /* msec */ + static inline void discovery_init(struct hci_dev *hdev) { hdev->discovery.state = DISCOVERY_STOPPED; @@ -813,6 +817,7 @@ static inline void discovery_init(struct hci_dev *hdev) INIT_LIST_HEAD(&hdev->discovery.resolve); hdev->discovery.report_invalid_rssi = true; hdev->discovery.rssi = HCI_RSSI_INVALID; + hdev->discovery.name_resolve_duration = NAME_RESOLVE_INIT_DURATION; } static inline void hci_discovery_filter_clear(struct hci_dev *hdev) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 3cba2bbefcd6..104a1308f454 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2086,6 +2086,15 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) if (list_empty(&discov->resolve)) return false; + /* We should stop if we already spent too much time resolving names. + * However, double the name resolve duration for the next iterations. + */ + if (time_after(jiffies, discov->name_resolve_timeout)) { + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); + discov->name_resolve_duration *= 2; + return false; + } + e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); if (!e) return false; @@ -2634,6 +2643,9 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) if (e && hci_resolve_name(hdev, e) == 0) { e->name_state = NAME_PENDING; hci_discovery_set_state(hdev, DISCOVERY_RESOLVING); + + discov->name_resolve_timeout = jiffies + + msecs_to_jiffies(discov->name_resolve_duration); } else { /* When BR/EDR inquiry is active and no LE scanning is in * progress, then change discovery state to indicate completion.