From patchwork Mon Apr 5 23:33:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Winkler X-Patchwork-Id: 12183851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D07B6C43460 for ; Mon, 5 Apr 2021 23:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C9316121E for ; Mon, 5 Apr 2021 23:33:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241759AbhDEXdf (ORCPT ); Mon, 5 Apr 2021 19:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241707AbhDEXde (ORCPT ); Mon, 5 Apr 2021 19:33:34 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED404C061788 for ; Mon, 5 Apr 2021 16:33:26 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id p12so6706050plw.0 for ; Mon, 05 Apr 2021 16:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=HPTI6CO+kSdi1thvqgPehfBWso2sQojBqpZVVccLYlA=; b=C7eJ3y6GPJ+S35NBKbS5DakcYR2ahrZCstmTJPcKVifURHE/CgGFEc86NbKipBmCSL dA6toN44nlCfvF5Iq3YPR//L0ZHwOIHQuwPmfmyOhPflVZeWT3D4PPpqt4XGx0fSjXyf /IOnTqYGD+xBC9k/PyhB4UWZ4dHALex2G+LXx5smKMES4ltU0n4mEorovDNIotAxShmD zwUNK58RzoxrTvZZGhVeCB1D7ZQOUkfogDlxEfDQ4LTXn8UOCVACsaAIS9M82V9uEGP6 S6f0DRBQVTYs564cyxfQn2s70GsGiO4ggI86zgScEY0/J8FJjNEKZBNOIby4Pd7k/wrv BJ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=HPTI6CO+kSdi1thvqgPehfBWso2sQojBqpZVVccLYlA=; b=DI9FSKEVmwzYfTBPlWMhHzEpzq31qX0fv2JBQhyhEU58D1MUOu/wHele3RUKL2NV9r D6/QIP1x9eqmEohtxPe/ELoLuF4R8aiqT+pbr17wrMJQmPCzFmtBJh1mQvmKvmOR1j2i Sh7gJSZs/ZwR7MUn4q4nkpR4McOZG16dhMFWTJbQtOITlZ37lLQzJn1BiI+5NPuBjDaK MaceBRbPB4JEe5rmbQFisRMbKggXo9wBnwODVD6UXaybYQjtlOA+0zHYrQG9oGNxfX74 4+ltzM4gPJ1ARv2tlvUyTfjJGaMI65xbOL2gqMuqVaqfy2oOmllwkkv41jUa4AGFP3Y0 ccHQ== X-Gm-Message-State: AOAM5301LmJ48JvfCaoDQxY0bszKDUpSHW8J860D0nEIG1M+natVc+VA pBsDQGeFw85bionv+g1blf4mRMP2kle+ZCbsZOjS X-Google-Smtp-Source: ABdhPJy7yHGGqIVq9CL3HofU8vyHA6j9u/fhZ9DDqOZz4wzB7nBbLJwv9LS94A5oHwi8syBe2hqao59WdoyFg6kvM+yV X-Received: from danielwinkler-linux.mtv.corp.google.com ([2620:15c:202:201:1cb3:ad22:2ed6:7c62]) (user=danielwinkler job=sendgmr) by 2002:a17:902:7585:b029:e6:cc10:61fe with SMTP id j5-20020a1709027585b02900e6cc1061femr26020769pll.23.1617665606465; Mon, 05 Apr 2021 16:33:26 -0700 (PDT) Date: Mon, 5 Apr 2021 16:33:04 -0700 In-Reply-To: <20210405233305.92431-1-danielwinkler@google.com> Message-Id: <20210405162905.1.I3c9905e2c5aa4d2e6c894b5cd18ce62350b8af4a@changeid> Mime-Version: 1.0 References: <20210405233305.92431-1-danielwinkler@google.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0-goog Subject: [PATCH 1/2] Bluetooth: Use ext adv handle from requests in CCs From: Daniel Winkler To: marcel@holtmann.org, linux-bluetooth@vger.kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, Daniel Winkler , Miao-chen Chou , "David S. Miller" , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Some extended advertising hci command complete events are still using hdev->cur_adv_instance to map the request to the correct advertisement handle. However, with extended advertising, "current instance" doesn't make sense as we can have multiple concurrent advertisements. This change switches these command complete handlers to use the advertising handle from the request/event, to ensure we will always use the correct advertising handle regardless of the state of hdev->cur_adv_instance. This change is tested on hatch and kefka chromebooks and run through single- and multi-advertising automated tests to confirm callbacks report tx power to the correct advertising handle, etc. Reviewed-by: Miao-chen Chou Signed-off-by: Daniel Winkler --- net/bluetooth/hci_event.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 593eafa282e31a..016b2999f21957 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1212,12 +1212,11 @@ static void hci_cc_le_set_adv_set_random_addr(struct hci_dev *hdev, hci_dev_lock(hdev); - if (!hdev->cur_adv_instance) { + if (!cp->handle) { /* Store in hdev for instance 0 (Set adv and Directed advs) */ bacpy(&hdev->random_addr, &cp->bdaddr); } else { - adv_instance = hci_find_adv_instance(hdev, - hdev->cur_adv_instance); + adv_instance = hci_find_adv_instance(hdev, cp->handle); if (adv_instance) bacpy(&adv_instance->random_addr, &cp->bdaddr); } @@ -1778,17 +1777,16 @@ static void hci_cc_set_ext_adv_param(struct hci_dev *hdev, struct sk_buff *skb) hci_dev_lock(hdev); hdev->adv_addr_type = cp->own_addr_type; - if (!hdev->cur_adv_instance) { + if (!cp->handle) { /* Store in hdev for instance 0 */ hdev->adv_tx_power = rp->tx_power; } else { - adv_instance = hci_find_adv_instance(hdev, - hdev->cur_adv_instance); + adv_instance = hci_find_adv_instance(hdev, cp->handle); if (adv_instance) adv_instance->tx_power = rp->tx_power; } /* Update adv data as tx power is known now */ - hci_req_update_adv_data(hdev, hdev->cur_adv_instance); + hci_req_update_adv_data(hdev, cp->handle); hci_dev_unlock(hdev); } @@ -5308,12 +5306,12 @@ static void hci_le_ext_adv_term_evt(struct hci_dev *hdev, struct sk_buff *skb) if (hdev->adv_addr_type != ADDR_LE_DEV_RANDOM) return; - if (!hdev->cur_adv_instance) { + if (!ev->handle) { bacpy(&conn->resp_addr, &hdev->random_addr); return; } - adv_instance = hci_find_adv_instance(hdev, hdev->cur_adv_instance); + adv_instance = hci_find_adv_instance(hdev, ev->handle); if (adv_instance) bacpy(&conn->resp_addr, &adv_instance->random_addr); } From patchwork Mon Apr 5 23:33:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Winkler X-Patchwork-Id: 12183853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F849C433B4 for ; Mon, 5 Apr 2021 23:33:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17665613DB for ; Mon, 5 Apr 2021 23:33:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241795AbhDEXdh (ORCPT ); Mon, 5 Apr 2021 19:33:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241776AbhDEXdg (ORCPT ); Mon, 5 Apr 2021 19:33:36 -0400 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 1E0F7C06174A for ; Mon, 5 Apr 2021 16:33:29 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id f75so18483826yba.8 for ; Mon, 05 Apr 2021 16:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=to6Vxja+Arjc3jgF2y75CIMjsTw24v2WgNqXzBAN2G4=; b=jEYZqFK4qYXZjXqxm8kJnUCJ/HGf/4pQIRB3IfRcS9nSXWq37L5cg4Hi2cjXeoec+Y QnyrSCmtSZLs/Wo+mR1kcl0lYR1DdUH485SifgpfypYPOhxj9SOOkLl5fZZ4tsAIQ9Qf rDIgDY5ZuSYQt3oPjxqLelVRZdVuEfncudKq9I++0cqVs9dEy1LV5rCOV698B0jjw4J5 CI39vHBdXuePVt9HTbWvUfu/6q6I4jfkGC/jm8Hx/STZPVNilKzwWk3DvjDaHzxLqAEX emx3YEzYVMaedIFqzd3/NrmWhZNUOa/AQb1U60F1GLzo9Bfpp6VOWQ8til8ccyzxFDBD woDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=to6Vxja+Arjc3jgF2y75CIMjsTw24v2WgNqXzBAN2G4=; b=PByaCQugq5r6Il2q4vvZTra61OMZjlNj1gkQtI1+c9otmIYCmvHEYsEUpFsVf1sHo/ iAIgXMru3M0gHb43Zesgaxk8i/mot75+ntoB7IaDlxj9iN0P5BwFbEPKBNyTVRhg39Vx r8+Rfd1cHbZXEAcA7vJsLaw4c6qF6+MZCqXyyVMy9uexlU9UyenCVjaoEHruc//h1d0s lcpzwfzRnZWzDl7BeSf1UNsuL/ZJ+YohXswm5I0e8BOVKMfdPGRP8ZuYRU7n9y1Dk93X EkrbFuuHbsuPsQarEREbtg49kcnTbH3Vgg4k+L8PCQ5DWK4XwMTF21n+9peQE1su4WgZ 6ntw== X-Gm-Message-State: AOAM533Ed6d7/B5MkygbyFU3AUHOU9UeoZZD7O0Pe5eLGUW9Y+JOClDY BZyMND8ACyjwVG1nlnK6ocDbOCdyIomx7SLdAls4 X-Google-Smtp-Source: ABdhPJxACUkz/6Pr+kJuu/6e3/KOIdlQcw8bE7vaqlYhTWwjONXYmo90PEfWYGytXsD0uf87TrfxIxGk2snIXjvSmRN5 X-Received: from danielwinkler-linux.mtv.corp.google.com ([2620:15c:202:201:1cb3:ad22:2ed6:7c62]) (user=danielwinkler job=sendgmr) by 2002:a5b:448:: with SMTP id s8mr37252543ybp.363.1617665608348; Mon, 05 Apr 2021 16:33:28 -0700 (PDT) Date: Mon, 5 Apr 2021 16:33:05 -0700 In-Reply-To: <20210405233305.92431-1-danielwinkler@google.com> Message-Id: <20210405162905.2.Iaac4fb40841e46f9ab815bffee439c91e44f0639@changeid> Mime-Version: 1.0 References: <20210405233305.92431-1-danielwinkler@google.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0-goog Subject: [PATCH 2/2] Bluetooth: Do not set cur_adv_instance in adv param MGMT request From: Daniel Winkler To: marcel@holtmann.org, linux-bluetooth@vger.kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, Daniel Winkler , Miao-chen Chou , "David S. Miller" , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org We set hdev->cur_adv_instance in the adv param MGMT request to allow the callback to the hci param request to set the tx power to the correct instance. Now that the callbacks use the advertising handle from the hci request (as they should), this workaround is no longer necessary. Furthermore, this change resolves a race condition that is more prevalent when using the extended advertising MGMT calls - if hdev->cur_adv_instance is set in the params request, then when the data request is called, we believe our new instance is already active. This treats it as an update and immediately schedules the instance with the controller, which has a potential race with the software rotation adv update. By not setting hdev->cur_adv_instance too early, the new instance is queued as it should be, to be used when the rotation comes around again. This change is tested on harrison peak to confirm that it resolves the race condition on registration, and that there is no regression in single- and multi-advertising automated tests. Reviewed-by: Miao-chen Chou Signed-off-by: Daniel Winkler --- net/bluetooth/mgmt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 09e099c419f251..59f8016c486626 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -7979,7 +7979,6 @@ static int add_ext_adv_params(struct sock *sk, struct hci_dev *hdev, goto unlock; } - hdev->cur_adv_instance = cp->instance; /* Submit request for advertising params if ext adv available */ if (ext_adv_capable(hdev)) { hci_req_init(&req, hdev);