From: Miao-chen Chou <mcchou@chromium.org>
To: Bluetooth Kernel Mailing List <linux-bluetooth@vger.kernel.org>
Cc: Alain Michaud <alainm@chromium.org>,
Archie Pusaka <apusaka@chromium.org>,
Luiz Augusto von Dentz <luiz.von.dentz@intel.com>,
Marcel Holtmann <marcel@holtmann.org>,
Miao-chen Chou <mcchou@chromium.org>,
Abhishek Pandit-Subedi <abhishekpandit@chromium.org>,
"David S. Miller" <davem@davemloft.net>,
Johan Hedberg <johan.hedberg@gmail.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v4] Bluetooth: Keep MSFT ext info throughout a hci_dev's life cycle
Date: Wed, 27 Jan 2021 09:17:07 -0800 [thread overview]
Message-ID: <20210127091600.v4.1.Id9bc5434114de07512661f002cdc0ada8b3d6d02@changeid> (raw)
This moves msft_do_close() from hci_dev_do_close() to
hci_unregister_dev() to avoid clearing MSFT extension info. This also
re-reads MSFT info upon every msft_do_open() even if MSFT extension has
been initialized.
The following test steps were performed.
(1) boot the test device and verify the MSFT support debug log in syslog
(2) restart bluetoothd and verify msft_do_close() doesn't get invoked
and msft_do_open re-reads the MSFT support.
Signed-off-by: Miao-chen Chou <mcchou@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Alain Michaud <alainm@chromium.org>
---
Changes in v4:
- Re-read the MSFT data instead of skipping if it's initiated already
Changes in v3:
- Remove the accepted commits from the series
net/bluetooth/hci_core.c | 4 ++--
net/bluetooth/msft.c | 21 ++++++++++++++++++---
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index eeafed2efc0da..8056f0d4ae172 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1764,8 +1764,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
hci_sock_dev_event(hdev, HCI_DEV_DOWN);
- msft_do_close(hdev);
-
if (hdev->flush)
hdev->flush(hdev);
@@ -3844,6 +3842,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
unregister_pm_notifier(&hdev->suspend_notifier);
cancel_work_sync(&hdev->suspend_prepare);
+ msft_do_close(hdev);
+
hci_dev_do_close(hdev);
if (!test_bit(HCI_INIT, &hdev->flags) &&
diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c
index 8579bfeb28364..4465d018280eb 100644
--- a/net/bluetooth/msft.c
+++ b/net/bluetooth/msft.c
@@ -73,16 +73,31 @@ static bool read_supported_features(struct hci_dev *hdev,
void msft_do_open(struct hci_dev *hdev)
{
- struct msft_data *msft;
+ struct msft_data *msft = NULL;
if (hdev->msft_opcode == HCI_OP_NOP)
return;
bt_dev_dbg(hdev, "Initialize MSFT extension");
- msft = kzalloc(sizeof(*msft), GFP_KERNEL);
- if (!msft)
+ /* If MSFT data exists, reset its members */
+ if (hdev->msft_data) {
+ msft = hdev->msft_data;
+ hdev->msft_data = NULL;
+
+ msft->features = 0;
+ kfree(msft->evt_prefix);
+ msft->evt_prefix = NULL;
+ msft->evt_prefix_len = 0;
+
+ } else {
+ msft = kzalloc(sizeof(*msft), GFP_KERNEL);
+ }
+
+ if (!msft) {
+ bt_dev_err(hdev, "Failed to init MSFT extension");
return;
+ }
if (!read_supported_features(hdev, msft)) {
kfree(msft);
--
2.30.0.280.ga3ce27912f-goog
next reply other threads:[~2021-01-27 17:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 17:17 Miao-chen Chou [this message]
2021-01-27 17:45 ` [v4] Bluetooth: Keep MSFT ext info throughout a hci_dev's life cycle bluez.test.bot
2021-01-27 22:10 ` bluez.test.bot
2021-02-12 1:32 ` [PATCH v4] " Miao-chen Chou
2021-02-26 20:23 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210127091600.v4.1.Id9bc5434114de07512661f002cdc0ada8b3d6d02@changeid \
--to=mcchou@chromium.org \
--cc=abhishekpandit@chromium.org \
--cc=alainm@chromium.org \
--cc=apusaka@chromium.org \
--cc=davem@davemloft.net \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.von.dentz@intel.com \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).