From patchwork Thu Nov 25 07:04:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12638507 X-Patchwork-Delegate: marcel@holtmann.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEE34C433EF for ; Thu, 25 Nov 2021 07:06:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353137AbhKYHKG (ORCPT ); Thu, 25 Nov 2021 02:10:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349270AbhKYHID (ORCPT ); Thu, 25 Nov 2021 02:08:03 -0500 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D96EC061758 for ; Wed, 24 Nov 2021 23:04:53 -0800 (PST) Received: by mail-qk1-x749.google.com with SMTP id c1-20020a05620a0ce100b00468060d41ecso5298678qkj.19 for ; Wed, 24 Nov 2021 23:04:53 -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=LOjoYmrd2S6QYfeGuru3HSevSjNWgVFTXSpO3QT/YXg=; b=FGL2CkoLOg+R2jSXT1T3bOqmdf3/3Y8avkIV20Y8yUu4PUzZ7ij1opTrjlAAfVYjRK 07oX0qAi45Oitv5n3nYLPThHHtpAfIBnXzVXYBOpjuhu0BOvD+WAqxC3vgYgXFQyliEV JM+rlMrqyfyCW1BsiXD6hqe1QlsL7wqb2Imgzk595dwCUPC73ZsTBTspbZEEGVnQicAw /DZ1qu1DDcV2IShuNlHi4HMDRM12kleg357yihx68lKsNTzAR+g1aKUCOTcEiqR7U4Uq iLqEyRoCEOJEasMSAtp1x3D9d405S3LtQB8YsuxzraWTtf5UtgLW3a7hBOsyF7DHbXtR 65hw== 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=LOjoYmrd2S6QYfeGuru3HSevSjNWgVFTXSpO3QT/YXg=; b=MVQ6qzur0WlKE+BAzP9mLg41ZM+abjkODrsTMG/8gyWvzUVGjmosGu0NugFtwtszcG zibP/at42raiBMSncSxnhfzy5rwzxcNlegrrIFnpeIyBXA6MnVkrb7eyjhUA5XFQgqvz CdIYiUEDyHgwplDABpHf/f7Z79IK37lFD2Jou7VnkzKGxgwGyT0VjsiqQQIpmzxXo7j2 mWQgbHVhkNW8hPVNsB2WLsBi8bXKOjClrk7AbqKWXp4FJxDbFtHWlAS/bws2sE1QMqZS ta5iAwsFPhs/A7WxvZ0Xl26j+kJi0Nycux6v+FBt8DEnLcORoSgBbMWD0fAyrJgJjuDH uqdQ== X-Gm-Message-State: AOAM530plFZhQCOCrTpYMDT97yHx3F1QD9WKbluvhjRMF552rlDU1tDK /PC12hh55xp9dInfa8bdVrG9jBFQQpQYSTSgPWoejxQXXh/InOWB5zaEuUwCyMZQrBmxnbFduoy GPsJnXWWUsIKxfk+yZEcxADvqA6yHDyCmbVV1226xSE4/yQVkwVmuwPxfqYtfOt9jWmQ1VKqcR8 2G X-Google-Smtp-Source: ABdhPJxrZkvFBF8UzSG087ddSILKyfHI0bTUOavkbLwrv0kJQXY20qxGd/pf3GIjeaM25NHjRTGxvQoMMq9M X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:a5d9:6769:9abb:6b2]) (user=apusaka job=sendgmr) by 2002:ac8:5b90:: with SMTP id a16mr14348096qta.300.1637823892177; Wed, 24 Nov 2021 23:04:52 -0800 (PST) Date: Thu, 25 Nov 2021 15:04:37 +0800 In-Reply-To: <20211125150430.v3.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid> Message-Id: <20211125150430.v3.2.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid> Mime-Version: 1.0 References: <20211125150430.v3.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog Subject: [PATCH v3 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 --- Changes in v3: * Add units in comment * change debug log to warn 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 2560cfe80db8..742cde106ae3 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 */ @@ -1759,6 +1760,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) /* 10.24 sec */ + 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 bb4c04aecccf..779c70b21039 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_warn_ratelimited(hdev, "Name resolve takes too long."); + 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.