From patchwork Wed Aug 10 08:47:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12940361 X-Patchwork-Delegate: kuba@kernel.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 1952DC25B08 for ; Wed, 10 Aug 2022 08:47:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231782AbiHJIrq (ORCPT ); Wed, 10 Aug 2022 04:47:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230506AbiHJIrp (ORCPT ); Wed, 10 Aug 2022 04:47:45 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E16F0642E1 for ; Wed, 10 Aug 2022 01:47:43 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id kb4-20020a17090ae7c400b001f783657496so861561pjb.6 for ; Wed, 10 Aug 2022 01:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc; bh=IkO2qbmRcFc6UxfvSrEn8JNuo3OleMYGP7m+9m5YUGE=; b=GRzr0X8Bvqmio2LDXmGRaknTkzJlz6XYPdUWa3HK+1BbpqjUTnoRv59n9Z8kmIe9eE k4B7qwLn6g9b335FI1FmJ+y5nY4jWh0smsFLZmnN85oQd6c0NHziYC2zSVFvisEPcwo9 hJcKKfKbZk3azdWtI/Hc0FD/u9yIpTUj+6D+8g5WRalUtXpjHa2VYFY1MPlk/a0cX9Pd /vB1Q/24aJIeFqn2hDcPipxpph02wVS892JseyWiRtsZO5s/TonCf7vXFjTgKKzyL/VR +QqmiB/lJIziPqkT8mV9YpGNDQs4hNggQ10nYi0NdPevOA405NCFybuUCGZhDnH2DiNi O7Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc; bh=IkO2qbmRcFc6UxfvSrEn8JNuo3OleMYGP7m+9m5YUGE=; b=r9N1gGogPb8cHfvoDmmaZhWLygjVoAE6hKkV0W1kc/l15B7PIqdspO9Liqc9W9K0Rl EZmvmrsoM4pdcYqOJJ4pWwQK9FOjDLG6IR6GPWLvmcKn7m129Ba9V+9SZPCbHJt9ovLG e72+uXANbJj/PNQ3B2haB68rlGWr1wQiS1ylwfu/mtnWgXovqg5tIrpzP2HSlTTQXIoJ aQUkuodF5SusM4Iff2H4XcTYcamHosf3Aes/NSKsCCHWsI1uCWaOlPU2fXhn2AFjfwc/ M19vpDctSzUb2y+1QZ85XW+YfQmkO2BtEn10p63hdEf9Z1NIY6k2SbM7F40sYW/AeUbw zckA== X-Gm-Message-State: ACgBeo230GHWei19BrAVqxrzx6H6vOItLCXJ6rT/og4FvF7fn7HsMlbv RaIXtlVbKRAuOBFBzgim7RtrRe0HoaQ4 X-Google-Smtp-Source: AA6agR5HfTknbxKKBNTihyGsEeT4IzJR7ci36ymQ75F6+56l8RT3V41NgytngbB2802N/PnwLcTHdOtXFTJP X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:17:babf:73ba:88f:89e]) (user=apusaka job=sendgmr) by 2002:a62:38d8:0:b0:52d:1496:6775 with SMTP id f207-20020a6238d8000000b0052d14966775mr26377140pfa.15.1660121263438; Wed, 10 Aug 2022 01:47:43 -0700 (PDT) Date: Wed, 10 Aug 2022 16:47:36 +0800 Message-Id: <20220810164627.1.Id730b98f188a504d9835b96ddcbc83d49a70bb36@changeid> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH] Bluetooth: Honor name resolve evt regardless of discov state From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz , Marcel Holtmann Cc: CrosBT Upstreaming , Archie Pusaka , Ying Hsu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johan Hedberg , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Archie Pusaka Currently, we don't update the name resolving cache when receiving a name resolve event if the discovery phase is not in the resolving stage. However, if the user connect to a device while we are still resolving remote name for another device, discovery will be stopped, and because we are no longer in the discovery resolving phase, the corresponding remote name event will be ignored, and thus the device being resolved will stuck in NAME_PENDING state. If discovery is then restarted and then stopped, this will cause us to try cancelling the name resolve of the same device again, which is incorrect and might upset the controller. Signed-off-by: Archie Pusaka Reviewed-by: Ying Hsu --- The following steps are performed: (1) Prepare 2 classic peer devices that needs RNR. Put device A closer to DUT and device B (much) farther from DUT. (2) Remove all cache and previous connection from DUT (3) Put both peers into pairing mode, then start scanning on DUT (4) After ~8 sec, turn off peer B. *This is done so DUT can discover peer B (discovery time is 10s), but it hasn't started RNR. Peer is turned off to buy us the max time in the RNR phase (5s). (5) Immediately as device A is shown on UI, click to connect. *We thus know that the DUT is in the RNR phase and trying to resolve the name of peer B when we initiate connection to peer A. (6) Forget peer A. (7) Restart scan and stop scan. *Before the CL, stop scan is broken because we will try to cancel a nonexistent RNR (8) Restart scan again. Observe DUT can scan normally. net/bluetooth/hci_event.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 395c6479456f..95e145e278c9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2453,6 +2453,16 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) mgmt_device_connected(hdev, conn, name, name_len); + e = hci_inquiry_cache_lookup_resolve(hdev, bdaddr, NAME_PENDING); + + if (e) { + list_del(&e->list); + + e->name_state = name ? NAME_KNOWN : NAME_NOT_KNOWN; + mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, e->data.rssi, + name, name_len); + } + if (discov->state == DISCOVERY_STOPPED) return; @@ -2462,7 +2472,6 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, if (discov->state != DISCOVERY_RESOLVING) return; - e = hci_inquiry_cache_lookup_resolve(hdev, bdaddr, NAME_PENDING); /* If the device was not found in a list of found devices names of which * are pending. there is no need to continue resolving a next name as it * will be done upon receiving another Remote Name Request Complete @@ -2470,12 +2479,6 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, if (!e) return; - list_del(&e->list); - - 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;