From patchwork Tue Jan 9 15:30:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 761147 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E19D39FDC for ; Tue, 9 Jan 2024 15:30:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m1RhDLTS" Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-5955a4a9b23so1750909eaf.1 for ; Tue, 09 Jan 2024 07:30:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704814243; x=1705419043; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Kaj4o1EzoBBTs91Tj2r6bhonyRaITOo+z7z+2TSNj40=; b=m1RhDLTSl6JppRUernqodu023+OJnu4XGrL07PrhS1zxGBiJshdZwEZHUpDoOg/LTO M8YcNjbCL1fiFkhuyN/O0sDGQ8e4erOlo4ZwPSjU6EgE7LdZBD6/pvp5DLTBK4apQ837 CcRKnI4Mk4EG3wRZhQhHoZ0oSdULu2vJ/2EhLsP5MlA6Cu8kCOQd/dEsAYW+aEIVlbFO r0FNG42HTX4WOZYygqW1t8YpwpQuc4kiIm0/cCVW+KMMk1So/RRu1qETO8jZnJaqGZke Lt2Dlm+ENyKZRP/ZBoI5ZuLf9lO1TvrI3JXWsoOfChij9cIzepnvANtvAiZ6pIzob9HD faWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704814243; x=1705419043; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kaj4o1EzoBBTs91Tj2r6bhonyRaITOo+z7z+2TSNj40=; b=GTInyRPKpdaP3uSKbKxnh6T1eoMq8BXA0FOM2+mHQE2OKxDHPUuEa83OE7kYsWT9qG YBokvqdJ2RBdwpIaqkoSKg0kcbKlEua/P4dVpiOPQVwRcE/cK/MbKwROXvGeDWZV+fk8 kZsnmaqpxdORFXwIlvaWuQB6bRCwuM0QnpfgeGQ7vC2Omlnon+bIGOl82TVnHSb11Yl8 sdoChijCt52o92AjRxT9dInEluiXKAVuG6ZiyeK26wYrlRB008ha3fYC/t1sWz/T5EIv Bf9CeHipK/hraQ36AuYyaOBuDUt1idj5MeGHyfLPJGRXl4sInUuq+BrJXwwDCL9v+hee hhWw== X-Gm-Message-State: AOJu0YxFKoOGWPubQbFSsnJb3Id/5fEjJ2WBumE9M0cQ5UHMRIGg9ynF tYr40XyDBDRfmKaaECe3m5bTBFjxZDE= X-Google-Smtp-Source: AGHT+IFqSr164eUsCzBDD2nc2jvEoL89GaduOf15bG3KpGAEL0D6NzJXQ06oj/+KbVdmGu/yUMue9g== X-Received: by 2002:a05:6358:6f10:b0:172:c06c:fce3 with SMTP id r16-20020a0563586f1000b00172c06cfce3mr4144681rwn.58.1704814242955; Tue, 09 Jan 2024 07:30:42 -0800 (PST) Received: from lvondent-mobl4.. (071-047-239-151.res.spectrum.com. [71.47.239.151]) by smtp.gmail.com with ESMTPSA id ha11-20020a05622a2b0b00b00428031ba343sm947530qtb.37.2024.01.09.07.30.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 07:30:42 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [RFC] Bluetooth: hci_event: Rework hci_store_wake_reason Date: Tue, 9 Jan 2024 10:30:41 -0500 Message-ID: <20240109153041.403337-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Luiz Augusto von Dentz This reworks the hci_store_wake_reason so it doesn't attempt to parse the events inline and instead just become a helper for event callbacks to call to when they are considered a valid event to wakeup. Signed-off-by: Luiz Augusto von Dentz --- net/bluetooth/hci_event.c | 101 +++++++++++--------------------------- 1 file changed, 29 insertions(+), 72 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 22b22c264c2a..92e673903582 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3135,6 +3135,26 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, void *edata, hci_dev_unlock(hdev); } +static void hci_wakeup(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type) +{ + /* If we are currently suspended and this is the first BT event seen, + * save the wake reason associated with the event. + */ + if (!hdev->suspended || hdev->wake_reason) + return; + + /* Default to remote wake. Values for wake_reason are documented in the + * Bluez mgmt api docs. + */ + if (addr) { + hdev->wake_reason = MGMT_WAKE_REASON_REMOTE_WAKE; + bacpy(&hdev->wake_addr, addr); + hdev->wake_addr_type = addr_type; + } else { + hdev->wake_reason = MGMT_WAKE_REASON_UNEXPECTED; + } +} + static void hci_conn_complete_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb) { @@ -3146,6 +3166,8 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, void *data, hci_dev_lock(hdev); + hci_wakeup(hdev, &ev->bdaddr, BDADDR_BREDR); + conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); if (!conn) { /* In case of error status and there is no connection pending @@ -3306,6 +3328,8 @@ static void hci_conn_request_evt(struct hci_dev *hdev, void *data, hci_dev_lock(hdev); + hci_wakeup(hdev, &ev->bdaddr, BDADDR_BREDR); + if (hci_bdaddr_list_lookup(&hdev->reject_list, &ev->bdaddr, BDADDR_BREDR)) { hci_reject_conn(hdev, &ev->bdaddr); @@ -6266,6 +6290,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, u32 flags; u8 *ptr; + hci_wakeup(hdev, bdaddr, bdaddr_type); + switch (type) { case LE_ADV_IND: case LE_ADV_DIRECT_IND: @@ -7393,75 +7419,6 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode, return true; } -static void hci_store_wake_reason(struct hci_dev *hdev, u8 event, - struct sk_buff *skb) -{ - struct hci_ev_le_advertising_info *adv; - struct hci_ev_le_direct_adv_info *direct_adv; - struct hci_ev_le_ext_adv_info *ext_adv; - const struct hci_ev_conn_complete *conn_complete = (void *)skb->data; - const struct hci_ev_conn_request *conn_request = (void *)skb->data; - - hci_dev_lock(hdev); - - /* If we are currently suspended and this is the first BT event seen, - * save the wake reason associated with the event. - */ - if (!hdev->suspended || hdev->wake_reason) - goto unlock; - - /* Default to remote wake. Values for wake_reason are documented in the - * Bluez mgmt api docs. - */ - hdev->wake_reason = MGMT_WAKE_REASON_REMOTE_WAKE; - - /* Once configured for remote wakeup, we should only wake up for - * reconnections. It's useful to see which device is waking us up so - * keep track of the bdaddr of the connection event that woke us up. - */ - if (event == HCI_EV_CONN_REQUEST) { - bacpy(&hdev->wake_addr, &conn_request->bdaddr); - hdev->wake_addr_type = BDADDR_BREDR; - } else if (event == HCI_EV_CONN_COMPLETE) { - bacpy(&hdev->wake_addr, &conn_complete->bdaddr); - hdev->wake_addr_type = BDADDR_BREDR; - } else if (event == HCI_EV_LE_META) { - struct hci_ev_le_meta *le_ev = (void *)skb->data; - u8 subevent = le_ev->subevent; - u8 *ptr = &skb->data[sizeof(*le_ev)]; - u8 num_reports = *ptr; - - if ((subevent == HCI_EV_LE_ADVERTISING_REPORT || - subevent == HCI_EV_LE_DIRECT_ADV_REPORT || - subevent == HCI_EV_LE_EXT_ADV_REPORT) && - num_reports) { - adv = (void *)(ptr + 1); - direct_adv = (void *)(ptr + 1); - ext_adv = (void *)(ptr + 1); - - switch (subevent) { - case HCI_EV_LE_ADVERTISING_REPORT: - bacpy(&hdev->wake_addr, &adv->bdaddr); - hdev->wake_addr_type = adv->bdaddr_type; - break; - case HCI_EV_LE_DIRECT_ADV_REPORT: - bacpy(&hdev->wake_addr, &direct_adv->bdaddr); - hdev->wake_addr_type = direct_adv->bdaddr_type; - break; - case HCI_EV_LE_EXT_ADV_REPORT: - bacpy(&hdev->wake_addr, &ext_adv->bdaddr); - hdev->wake_addr_type = ext_adv->bdaddr_type; - break; - } - } - } else { - hdev->wake_reason = MGMT_WAKE_REASON_UNEXPECTED; - } - -unlock: - hci_dev_unlock(hdev); -} - #define HCI_EV_VL(_op, _func, _min_len, _max_len) \ [_op] = { \ .req = false, \ @@ -7726,14 +7683,14 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) skb_pull(skb, HCI_EVENT_HDR_SIZE); - /* Store wake reason if we're suspended */ - hci_store_wake_reason(hdev, event, skb); - bt_dev_dbg(hdev, "event 0x%2.2x", event); hci_event_func(hdev, event, skb, &opcode, &status, &req_complete, &req_complete_skb); + /* Force hci_wakeup with NULL addr if no event callback had called it */ + hci_wakeup(hdev, NULL, 0); + if (req_complete) { req_complete(hdev, status, opcode); } else if (req_complete_skb) {