From patchwork Mon Nov 15 09:17:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12619137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 765C3C433F5 for ; Mon, 15 Nov 2021 09:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41C6D61B2B for ; Mon, 15 Nov 2021 09:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbhKOJVy (ORCPT ); Mon, 15 Nov 2021 04:21:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbhKOJVT (ORCPT ); Mon, 15 Nov 2021 04:21:19 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 069A7C061766 for ; Mon, 15 Nov 2021 01:18:24 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id g25-20020a25b119000000b005c5e52a0574so26077462ybj.5 for ; Mon, 15 Nov 2021 01:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=kCy6lJ3Y6mrf9EnZDJoiQgWHaGA5tu6NQzDrMR4H1Xs=; b=kRLc8y+sIBebqXEZ+zGfkmLRlIQMXeAH0opUhShqdQZzVF224kGZzw83Q1bbxljK2R rCtYkVSN1MwC5GMi0kMY5xXzonHErnKMWNNISXoRE6bh8HBs8jqYB+AZ4V8LZDRZUW26 BmW29/w2y+kQg0btU2npeU954OPokgNV0uuoDaxyjnbjHaay2TYpLlNwdN9zTAChyKBv 8yNgy8adqNqHau3hVEJniDJdu+EGJnEXJ/taH7uLw0QZMMvn+wd+TlPPvop3krbMpyOD qCy6Azhlv5sYqBYAorHdfOJVKZ8htHGnEzSQWihXzeFVEqX4IiehyjNieDH5srTKkMkC BZVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=kCy6lJ3Y6mrf9EnZDJoiQgWHaGA5tu6NQzDrMR4H1Xs=; b=ObnsqCLFGZKRx/wEmiNADsaXz8HEEcPxII3lXA4IP4iGDLGuzj1CnvXBDtqeVXMb3o O2tSHXWdM9jgcD86l3X4wmmNj/v3T9mdoZrrBhjK9EHqAfYeEcjy0rUkzk91XoS1t5R6 BH2QWqqEby3MYU4v1Klwq5N/k81h2QQp2WvDp0vwxBF4A9/L32BqcP1SiuFE1L4qYnY6 /JidQ7MCGoyvIWfzNspJlNh0FL2WLprYpmWavnRH3XXXE7QsXhqnyNAlOoM6JTuuQQpX UF+Clv3fgkX1NIcIv0dFFxPRRSwCFUib4+E68r4EeyHgwGVQx3QvIImU8ffwpp/P3vSk SsnA== X-Gm-Message-State: AOAM533W426TJkamaFM7ZpOR/esnpP7wpr5X6zrwSsto5PuqmGvS6Lei X5O2FhGi5j/0QRUF221T1BeF/Pu0r+1QLhD0wduE2bAYekzhgHsJwMUvnSaEhsHlDrK1RrkAFDx Hn+U0yuIfEEd79+un5uQCgat9UKE4u6S16qBgCMv485Bxou6DBlsNWUgGVZxtYwL2LTCEtkA5Dh Cw X-Google-Smtp-Source: ABdhPJz82POTNoWkDhIG9zoITHgI0U3gzcom5MUNCPWabksJwKXm4XOEHcXbQgMohmkj0AqtdSuPf/PBoyBP X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:5c8f:7191:e5ca:14fb]) (user=apusaka job=sendgmr) by 2002:a05:6902:1201:: with SMTP id s1mr36546890ybu.248.1636967902948; Mon, 15 Nov 2021 01:18:22 -0800 (PST) Date: Mon, 15 Nov 2021 17:17:49 +0800 Message-Id: <20211115171726.v2.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog Subject: [PATCH v2 1/2] Bluetooth: Send device found event on name resolve failure From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz , Marcel Holtmann Cc: CrosBT Upstreaming , Archie Pusaka , Miao-chen Chou , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Introducing CONFIRM_NAME_FAILED flag that will be sent together with device found event on name resolve failure. This will provide the userspace with an information so it can decide not to resolve the name for these devices in the future. Signed-off-by: Archie Pusaka Reviewed-by: Miao-chen Chou --- Hi maintainers, This is the patch series for remote name request as was discussed here. https://patchwork.kernel.org/project/bluetooth/patch/20211028191805.1.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid/ Please also review the corresponding userspace change. Thanks, Archie Changes in v2: * Remove the part which accepts DONT_CARE flag in MGMT_OP_CONFIRM_NAME * Rename MGMT constant to conform with the docs include/net/bluetooth/mgmt.h | 1 + net/bluetooth/hci_event.c | 11 ++++------- net/bluetooth/mgmt.c | 11 ++++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 23a0524061b7..3cda081ed6d0 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -940,6 +940,7 @@ struct mgmt_ev_auth_failed { #define MGMT_DEV_FOUND_LEGACY_PAIRING 0x02 #define MGMT_DEV_FOUND_NOT_CONNECTABLE 0x04 #define MGMT_DEV_FOUND_INITIATED_CONN 0x08 +#define MGMT_DEV_FOUND_NAME_REQUEST_FAILED 0x10 #define MGMT_EV_DEVICE_FOUND 0x0012 struct mgmt_ev_device_found { diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index d4b75a6cfeee..2de3080659f9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2175,13 +2175,10 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, return; list_del(&e->list); - if (name) { - e->name_state = NAME_KNOWN; - mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, - e->data.rssi, name, name_len); - } else { - e->name_state = NAME_NOT_KNOWN; - } + + e->name_state = name ? NAME_KNOWN : NAME_NOT_KNOWN; + mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, e->data.rssi, + name, name_len); if (hci_resolve_next_name(hdev)) return; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 06384d761928..0d77c010b391 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -9615,7 +9615,8 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, { struct mgmt_ev_device_found *ev; char buf[sizeof(*ev) + HCI_MAX_NAME_LENGTH + 2]; - u16 eir_len; + u16 eir_len = 0; + u32 flags = 0; ev = (struct mgmt_ev_device_found *) buf; @@ -9625,10 +9626,14 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, ev->addr.type = link_to_bdaddr(link_type, addr_type); ev->rssi = rssi; - eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name, - name_len); + if (name) + eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name, + name_len); + else + flags |= MGMT_DEV_FOUND_NAME_REQUEST_FAILED; ev->eir_len = cpu_to_le16(eir_len); + ev->flags = cpu_to_le32(flags); mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL); } From patchwork Mon Nov 15 09:17:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12619139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3014DC43219 for ; Mon, 15 Nov 2021 09:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11A2263211 for ; Mon, 15 Nov 2021 09:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236127AbhKOJWO (ORCPT ); Mon, 15 Nov 2021 04:22:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230316AbhKOJV1 (ORCPT ); Mon, 15 Nov 2021 04:21:27 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD70C061767 for ; Mon, 15 Nov 2021 01:18:29 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id w132-20020a25c78a000000b005c27f083240so25605727ybe.16 for ; Mon, 15 Nov 2021 01:18:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=DDF7rvzqvHmq625R5p02Vn6Now2KuXQQZ3he1Jdx/98=; b=gvItqONCSe9Lgo0mVcfxcD8u0ADitEl1DmjGuV057JIir+gsRFGNefA+DeS86rjXgB 9+TPeytX80zHkBMkpbCS8jsY7kilYBfniHGbcingyrkN4p4ACNYz6oYzgWZHTIxXIDjD QgrbfTTwgOvF0a3FeFSoiQqrGpqr/c6K6Jgo2yAYEv6T9AstCy4Lfac2VeCyzAP69wtr npZcw1CpiWiztpvE27CkVhH0PA4FAfG9ITRw3Lpjfo41QrncpFn5h8S/MXN8q6Vayerw TiDQUkRybXtYl/ZL5vpf04wnKJKVUnBeAFjFmKWgZtxpg+/jQfrqXs3BXtwdTEnP83uI R/lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=DDF7rvzqvHmq625R5p02Vn6Now2KuXQQZ3he1Jdx/98=; b=6SzVtUpY+2FxDx84v0CV70G1Ake3ETR70EKjsq1tGr2TUXtQqDPV2GgUHWxhIK9jze VlbsxIbVabKNaLZSogg1aSyttA3OtQwB7SYyk9FYe6pirefU0+K6N2TfHRG6wgCAWldd 7Ef9+1jZubT+Eme6fvkijAx+WigF43wE103CZ2eHDN8E4umUy21omU7MI/23a3K7ZvjA msgYEczkk9J3lF2JomAdnMfesPsZzGG74RSA+qJQ6fwXtB4IAvqh4ThDk/ncDgvpct7G jMGdICWfVjjPv1+jgfXGZwXF49bS6CX0Kj+PvArozCUFDhwMZ/Vjo6yJBQY3/0yDBsMi zJEA== X-Gm-Message-State: AOAM532h3XbP5TVI6FNGTUS0yy7skXApJ676vZzlHtou6f57P3R3QBD/ SYNmG+im0wPe8b7hfYabue1kwL4hDHhPTrfIENTxrg38y/f9OJgRJqP6vWb/OE8iYNNu7XwPkQo rC2fPY12b9E+2taixNxpZJd9cq3JdffDjl9OPIS/bMSAAJShr82EZICetiPRWWXlmCYcnGINXJq L/ X-Google-Smtp-Source: ABdhPJwgMN9sgvk0dg1l0x1FK4aZj77ai6ObMDU8GM0xv7Bs8/XrJHodlMYejoqmmXXHWMa2aJBmvYbbtzxC X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:5c8f:7191:e5ca:14fb]) (user=apusaka job=sendgmr) by 2002:a25:8408:: with SMTP id u8mr41624153ybk.258.1636967908407; Mon, 15 Nov 2021 01:18:28 -0800 (PST) Date: Mon, 15 Nov 2021 17:17:50 +0800 In-Reply-To: <20211115171726.v2.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid> Message-Id: <20211115171726.v2.2.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid> Mime-Version: 1.0 References: <20211115171726.v2.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid> X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog Subject: [PATCH v2 2/2] Bluetooth: Limit duration of Remote Name Resolve From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz , Marcel Holtmann Cc: CrosBT Upstreaming , Archie Pusaka , Miao-chen Chou , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka 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. Signed-off-by: Archie Pusaka Reviewed-by: Miao-chen Chou --- (no changes since v1) include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_event.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index b5f061882c10..4112907bb49d 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -88,6 +88,7 @@ struct discovery_state { u8 (*uuids)[16]; unsigned long scan_start; unsigned long scan_duration; + unsigned long name_resolve_timeout; }; #define SUSPEND_NOTIFIER_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ @@ -1762,6 +1763,8 @@ void hci_mgmt_chan_unregister(struct hci_mgmt_chan *c); #define DISCOV_LE_FAST_ADV_INT_MIN 0x00A0 /* 100 msec */ #define DISCOV_LE_FAST_ADV_INT_MAX 0x00F0 /* 150 msec */ +#define NAME_RESOLVE_DURATION msecs_to_jiffies(10240) /* msec */ + void mgmt_fill_version_info(void *ver); int mgmt_new_settings(struct hci_dev *hdev); void mgmt_index_added(struct hci_dev *hdev); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 2de3080659f9..6180ab0e8b8d 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2129,6 +2129,12 @@ 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. */ + if (time_after(jiffies, discov->name_resolve_timeout)) { + bt_dev_dbg(hdev, "Name resolve takes too long, stopping."); + return false; + } + e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); if (!e) return false; @@ -2716,6 +2722,7 @@ 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 + NAME_RESOLVE_DURATION; } else { /* When BR/EDR inquiry is active and no LE scanning is in * progress, then change discovery state to indicate completion.