Date:   Thu, 11 Nov 2021 19:53:51 +0800
In-Reply-To: <20211111195320.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid>
Message-Id: <20211111195320.2.I8f792722c41f0841a0eba7a6782ce80d61b20a14@changeid>
Mime-Version: 1.0
References: <20211111195320.1.Id7366eb14b6f48173fcbf17846ace59479179c7c@changeid>
Subject: [PATCH 2/3] Bluetooth: Add "DONT_CARE" to remote name inquiry
From:   Archie Pusaka <apusaka@google.com>
To:     linux-bluetooth <linux-bluetooth@vger.kernel.org>,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
        Marcel Holtmann <marcel@holtmann.org>
Cc:     CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>,
        Archie Pusaka <apusaka@chromium.org>,
        Miao-chen Chou <mcchou@chromium.org>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Archie Pusaka <apusaka@chromium.org>

With this patch, the user space can specify DONT_CARE when sending
confirm_name MGMT command. The kernel then will not attempt to perform
remote name request. In practice, we will treat them the same as if
the user space specified NAME_KNOWN instead.

Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>

---

 include/net/bluetooth/hci_core.h | 1 +
 include/net/bluetooth/mgmt.h     | 6 +++++-
 net/bluetooth/hci_core.c         | 1 +
 net/bluetooth/mgmt.c             | 5 ++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b5f061882c10..eb08dd502f2a 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -56,6 +56,7 @@ struct inquiry_entry {
 		NAME_NEEDED,
 		NAME_PENDING,
 		NAME_KNOWN,
+		NAME_DONT_CARE,		/* Don't know but don't want to know */
 	} name_state;
 	__u32			timestamp;
 	struct inquiry_data	data;
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 113438f295bf..30d0415c29c9 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -352,10 +352,14 @@ struct mgmt_cp_stop_discovery {
 } __packed;
 #define MGMT_STOP_DISCOVERY_SIZE	1
 
+#define MGMT_CONFIRM_NAME_UNKNOWN	0
+#define MGMT_CONFIRM_NAME_KNOWN		1
+#define MGMT_CONFIRM_NAME_DONT_CARE	2
+
 #define MGMT_OP_CONFIRM_NAME		0x0025
 struct mgmt_cp_confirm_name {
 	struct mgmt_addr_info addr;
-	__u8	name_known;
+	__u8	name_state;
 } __packed;
 #define MGMT_CONFIRM_NAME_SIZE		(MGMT_ADDR_INFO_SIZE + 1)
 struct mgmt_rp_confirm_name {
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index fdc0dcf8ee36..90064dbbba5f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -304,6 +304,7 @@ u32 hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
 
 update:
 	if (name_known && ie->name_state != NAME_KNOWN &&
+	    ie->name_state != NAME_DONT_CARE &&
 	    ie->name_state != NAME_PENDING) {
 		ie->name_state = NAME_KNOWN;
 		list_del(&ie->list);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c1d6fbc19207..e887de6f411e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5531,9 +5531,12 @@ static int confirm_name(struct sock *sk, struct hci_dev *hdev, void *data,
 		goto failed;
 	}
 
-	if (cp->name_known) {
+	if (cp->name_state == MGMT_CONFIRM_NAME_KNOWN) {
 		e->name_state = NAME_KNOWN;
 		list_del(&e->list);
+	} else if (cp->name_state == MGMT_CONFIRM_NAME_DONT_CARE) {
+		e->name_state = NAME_DONT_CARE;
+		list_del(&e->list);
 	} else {
 		e->name_state = NAME_NEEDED;
 		hci_inquiry_cache_update_resolve(hdev, e);
-- 
2.34.0.rc0.344.g81b53c2807-goog