Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp4938601ioo; Tue, 31 May 2022 15:31:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxILF3qpeMQCfHIOovcVR2zKouP+5RhQH6dVcqmURS35TjJj5XPF7TuEHQGMGXzWD62oatb X-Received: by 2002:a17:902:8ecb:b0:162:bc8:9361 with SMTP id x11-20020a1709028ecb00b001620bc89361mr50734404plo.25.1654036297546; Tue, 31 May 2022 15:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654036297; cv=none; d=google.com; s=arc-20160816; b=0VqaXBj+wpfVVNEv5DsfxS8IQkb69x/OauSiU9quS2z6hCf8/JnflH4dkGw5uOQdDW IzY8DHGFdUvWK6DTlZuNtN+t/H6GJaTUBHQ96lC3JI8+TJnuaEherUZugeqsa/55T6cw Nz1zHtU9C2qz44n/g/D0k033P3kbhKqUvhhSkw+1H7JfLcsi7cOwkpCTfx+62HQiW99S GOhhhK5EuknwsRAwGeEN8ndVGakZV2wBzxGYCEfuvUdCbDWhiChWbSdOsqRCz5g++Idi 5KGxMDofvGTDd/qpvOW6wbQG6PtLN3tw6QxNAESmZtBmLc/eclJpKRqmWWvvTV15SPAm PVog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=YKNIi+JJNFpB5c8FibagFvimWDoQmqfc+PiXRkA6zQQ=; b=G4m+IPd48LzkDt1G3VFPuDxK8V4sPc+BbwubhjP99it+fVEeOLMJQNyi7Osv37MTOs kEGLBs5r9y1KF2wygxgUe73SohFZGAFus8b3P+hp5LXO6RcAmov5n/IvB7rrHkwQv0UE WavezXXacNpIINrb9stzJsWj/KFDksq7fVIDD2g+zk1Qb3jXQIVUsbrrKTL6O0SkXYHs 7ckosYdibmvqFRtXvPkXBrSotTXUN5+O3w4uCd4esHIFfgvLKWGZbrx+ONyvYJSK4bs3 nzksF8tEQBCEu5NSsvRnb/YrHLM4lipGrZLBTa98iCyiOwX/FB7ZlXmKwjXu3idlh/l6 25zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cefTrwD1; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il16-20020a17090b165000b001dc3db49225si57403pjb.114.2022.05.31.15.31.09; Tue, 31 May 2022 15:31:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cefTrwD1; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243212AbiE3VAb (ORCPT + 99 others); Mon, 30 May 2022 17:00:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242725AbiE3VA0 (ORCPT ); Mon, 30 May 2022 17:00:26 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D06491561; Mon, 30 May 2022 14:00:24 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id d12-20020a17090abf8c00b001e2eb431ce4so336959pjs.1; Mon, 30 May 2022 14:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=YKNIi+JJNFpB5c8FibagFvimWDoQmqfc+PiXRkA6zQQ=; b=cefTrwD1GeSTD+veHUXRFHwtqAc2OQ8kphS8ty2wwQqnS7d7mXTGZZIX3HHHP7USos zb+I1WPj0E4D36xZcIj3NS/wAIbkTiylSqxCjpyuUl7ixS4H/KhHLV3hAT2xcQ5K+K+O TSOqL3R2cJHNxZJ/iJjb6Wso+4PoD1yZSaWiIeJlzlxJPK4q63hRkcyMt+U+VmiXhYtM i4bYvwDA+uam2Vf7TIaCMzB63kkaP+BH/vKUVB9nxjztUPOdugE+/ImUlFp3qlYCwiu8 uvW47WCjyq7UdRuyqjcoVwehLxjMdVpZLN5E5UvcTdZt93gM/S/EvbY1pTcRr/mOY82u eb6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=YKNIi+JJNFpB5c8FibagFvimWDoQmqfc+PiXRkA6zQQ=; b=sJq4VaxW847iJ1uE+HQVgg7CA/lXERtpHhN1pKu4z2oATjVlN/QGlc+a6qs1tge0De znIaWnaVny9fKhqVyXwR+ZvmnrBSa/qxOV5TiA84sgEY2R1n9D2HYJWWy2X6mMxQQxOa nLRfYGJ4AinlMtD5FhlrV8vq4SjjCDrAigTX9oyUYQgNjpkLm8YeQrjp6CtMzeflbsrg e6+Cbl670N4bgkdNAl1paK1bca9dEWR18teb4qnSXZYRewkHuDBxCsek6vtnafcqfebp S5+giCBC1V3Oh7DmBDQuV8/qKAfIW22u1w53fp5scD2UZ/mPx+IA6oO/LVfCrR3wizW+ cecg== X-Gm-Message-State: AOAM531o3Nfi72LEM14AxdH2GCwcPREKX0QgSldQ/vpUq6QBr45zik9m dFK5WaqYy2IQFsnyQaSog4bK6SITHBtwEBaqOPo= X-Received: by 2002:a17:90b:3506:b0:1e0:51a1:a8ee with SMTP id ls6-20020a17090b350600b001e051a1a8eemr24551551pjb.112.1653944423477; Mon, 30 May 2022 14:00:23 -0700 (PDT) MIME-Version: 1.0 References: <20220526112135.2486883-1-josephsih@chromium.org> <20220526192047.v6.2.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> In-Reply-To: From: Luiz Augusto von Dentz Date: Mon, 30 May 2022 14:00:11 -0700 Message-ID: Subject: Re: [PATCH v6 2/5] Bluetooth: aosp: surface AOSP quality report through mgmt To: Joseph Hwang Cc: "linux-bluetooth@vger.kernel.org" , Marcel Holtmann , =?UTF-8?Q?Pali_Roh=C3=A1r?= , ChromeOS Bluetooth Upstreaming , kernel test robot , Archie Pusaka , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johan Hedberg , Paolo Abeni , Linux Kernel Mailing List , "open list:NETWORKING [GENERAL]" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Hi Joseph, On Thu, May 26, 2022 at 9:37 PM Joseph Hwang wrote: > > Hi Luiz: > > Thanks for your review! The get_ext_vendor_prefix() in the table > provides a *unique* extended vendor prefix ( =3D vendor prefix + 1-octet > subcode) that can uniquely identify a vendor event. I am not aware of > any situation that might cause an event to be incorrectly matched with > an extended vendor prefix. Maybe I am missing something? > > On the other hand, in your comment, to let a driver confirm whether it > is the vendor event structure it uses might be a bit risky. For > example, assume that we pass a vendor event to > msft.c:msft_vendor_evt() to determine whether it is a MSFT event. The > current implementation of msft_vendor_evt() is to call skb_pull_data() > to pull the event prefix for comparison with the dynamic MSFT event > prefix. No matter whether the event matches or not, the event skb has > been modified already and would cause bad behavior if we pass the > event skb to other vendor drivers/functions. How can we generally make > sure that every such vendor drivers/functions are implemented in a > read-only way that does not modify the skb when comparing the prefix? > In this patch, we propose to use get_ext_vendor_prefix() which is > guaranteed not to modify the skb in any possible way. > > Please also note that the mechanism here also takes care of older > controllers that might not support some of the vendor specifications. > For example, if an older controller does not support the MSFT spec, > the msft_get_ext_prefix() would return NULL as its prefix. And hence a > vendor event would not accidentally match the MSFT spec on the older > controller. Similarly, in the following patch =E2=80=9Cbtintel: setup > vendor_get_prefix and vendor_evt=E2=80=9D, on an older Intel controller t= hat > does not support Intel telemetry events, the btintel driver would > *not* set up > > hdev->vendor_get_ext_prefix =3D btintel_get_ext_prefix; I see, while this does indeed prevent events to be misinterpreted, this locks us on only supporting vendor commands which use vendor prefixes, but perhaps that is fine since I assume there is probably no better way to create vendor opcodes in the first place. > such that an event would not match as an Intel vendor event in any way. > > Please let me know if I have any misunderstanding. > > Thanks and regards, > Joseph > > > On Fri, May 27, 2022 at 4:25 AM Luiz Augusto von Dentz > wrote: > > > > Hi Joseph, > > > > On Thu, May 26, 2022 at 4:21 AM Joseph Hwang w= rote: > > > > > > When receiving a HCI vendor event, the kernel checks if it is an > > > AOSP bluetooth quality report. If yes, the event is sent to bluez > > > user space through the mgmt socket. > > > > > > Reported-by: kernel test robot > > > > > > Signed-off-by: Joseph Hwang > > > Reviewed-by: Archie Pusaka > > > --- > > > > > > Changes in v6: > > > - Fixed a sparse check warning about using static for evt_prefixes. > > > > > > Changes in v5: > > > - Define "struct ext_vendor_prefix" to replace "struct vendor_prefix" > > > so that extended vendor prefix =3D prefix + 1-octet subcode > > > - Define aosp_ext_prefix to provide AOSP extended prefix which is > > > returned by aosp_get_ext_prefix(). > > > - Redefine struct ext_vendor_event_prefix such that > > > . it uses get_ext_vendor_prefix to get prefix and subcodes where > > > the prefix and the prefix length may be variable and are not > > > unknown until run time; > > > . it uses vendor_func to handle a vendor event > > > This table handles vendor events in a generic way. > > > - Rewrite hci_vendor_evt() so that it compares both vendor prefix > > > and subcode to match a vendor event. > > > - Define set_ext_prefix() to create MSFT extended vendor prefix > > > which is returned by msft_get_ext_prefix(). > > > - Do not EXPORT_SYMBOL(mgmt_quality_report). > > > - Keep msft_get_ext_prefix in msft instead of hci_dev since it is > > > not used by any drivers. > > > > > > Changes in v3: > > > - Rebase to resolve the code conflict. > > > - Move aosp_quality_report_evt() from hci_event.c to aosp.c. > > > - A new patch (3/3) is added to enable the quality report feature. > > > > > > Changes in v2: > > > - Scrap the two structures defined in aosp.c and use constants for > > > size check. > > > - Do a basic size check about the quality report event. Do not pull > > > data from the event in which the kernel has no interest. > > > - Define vendor event prefixes with which vendor events of distinct > > > vendor specifications can be clearly differentiated. > > > - Use mgmt helpers to add the header and data to a mgmt skb. > > > > > > include/net/bluetooth/hci_core.h | 12 +++++++ > > > include/net/bluetooth/mgmt.h | 7 +++++ > > > net/bluetooth/aosp.c | 50 +++++++++++++++++++++++++++++ > > > net/bluetooth/aosp.h | 18 +++++++++++ > > > net/bluetooth/hci_event.c | 54 ++++++++++++++++++++++++++++++= +- > > > net/bluetooth/mgmt.c | 19 +++++++++++ > > > net/bluetooth/msft.c | 28 ++++++++++++++++- > > > net/bluetooth/msft.h | 12 +++++-- > > > 8 files changed, 195 insertions(+), 5 deletions(-) > > > > > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth= /hci_core.h > > > index 64d3a63759a8..f89738c6b973 100644 > > > --- a/include/net/bluetooth/hci_core.h > > > +++ b/include/net/bluetooth/hci_core.h > > > @@ -328,6 +328,13 @@ struct amp_assoc { > > > > > > #define HCI_MAX_PAGES 3 > > > > > > +struct ext_vendor_prefix { > > > + __u8 *prefix; > > > + __u8 prefix_len; > > > + __u8 *subcodes; > > > + __u8 subcodes_len; > > > +}; > > > + > > > struct hci_dev { > > > struct list_head list; > > > struct mutex lock; > > > @@ -1876,6 +1883,8 @@ int mgmt_add_adv_patterns_monitor_complete(stru= ct hci_dev *hdev, u8 status); > > > int mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status= ); > > > void mgmt_adv_monitor_device_lost(struct hci_dev *hdev, u16 handle, > > > bdaddr_t *bdaddr, u8 addr_type); > > > +int mgmt_quality_report(struct hci_dev *hdev, void *data, u32 data_l= en, > > > + u8 quality_spec); > > > > > > u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 l= atency, > > > u16 to_multiplier); > > > @@ -1894,4 +1903,7 @@ void hci_copy_identity_address(struct hci_dev *= hdev, bdaddr_t *bdaddr, > > > > > > #define TRANSPORT_TYPE_MAX 0x04 > > > > > > +#define QUALITY_SPEC_AOSP_BQR 0x0 > > > +#define QUALITY_SPEC_INTEL_TELEMETRY 0x1 > > > + > > > #endif /* __HCI_CORE_H */ > > > diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgm= t.h > > > index c1c2fd72d9e3..6ccd0067c295 100644 > > > --- a/include/net/bluetooth/mgmt.h > > > +++ b/include/net/bluetooth/mgmt.h > > > @@ -1127,3 +1127,10 @@ struct mgmt_ev_adv_monitor_device_lost { > > > __le16 monitor_handle; > > > struct mgmt_addr_info addr; > > > } __packed; > > > + > > > +#define MGMT_EV_QUALITY_REPORT 0x0031 > > > +struct mgmt_ev_quality_report { > > > + __u8 quality_spec; > > > + __u32 data_len; > > > + __u8 data[]; > > > +} __packed; > > > diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c > > > index 432ae3aac9e3..94faa15b1ea0 100644 > > > --- a/net/bluetooth/aosp.c > > > +++ b/net/bluetooth/aosp.c > > > @@ -199,3 +199,53 @@ int aosp_set_quality_report(struct hci_dev *hdev= , bool enable) > > > else > > > return disable_quality_report(hdev); > > > } > > > + > > > +/* The following LEN =3D 1-byte Sub-event code + 48-byte Sub-event P= arameters */ > > > +#define BLUETOOTH_QUALITY_REPORT_LEN 49 > > > + > > > +bool aosp_check_quality_report_len(struct sk_buff *skb) > > > +{ > > > + /* skb->len is allowed to be larger than BLUETOOTH_QUALITY_RE= PORT_LEN > > > + * to accommodate an additional Vendor Specific Parameter (vs= p) field. > > > + */ > > > + if (skb->len < BLUETOOTH_QUALITY_REPORT_LEN) { > > > + BT_ERR("AOSP evt data len %d too short (%u expected)"= , > > > + skb->len, BLUETOOTH_QUALITY_REPORT_LEN); > > > + return false; > > > + } > > > + > > > + return true; > > > +} > > > + > > > +/* AOSP HCI Requirements use 0x54 and up as sub-event codes without > > > + * actually defining a vendor prefix. Refer to > > > + * https://source.android.com/devices/bluetooth/hci_requirements > > > + * Hence, the other vendor event prefixes should not use the same > > > + * space to avoid collision. > > > + * Since the AOSP does not define a prefix, its prefix is NULL > > > + * and prefix_len is 0. > > > + * While there are a number of subcodes in AOSP, only interested in > > > + * Bluetooth Quality Report (0x58) for now. > > > + */ > > > +#define AOSP_EV_QUALITY_REPORT 0x58 > > > + > > > +static unsigned char AOSP_SUBCODES[] =3D { AOSP_EV_QUALITY_REPORT }; > > > + > > > +static struct ext_vendor_prefix aosp_ext_prefix =3D { > > > + .prefix =3D NULL, > > > + .prefix_len =3D 0, > > > + .subcodes =3D AOSP_SUBCODES, > > > + .subcodes_len =3D sizeof(AOSP_SUBCODES), > > > +}; > > > + > > > +struct ext_vendor_prefix *aosp_get_ext_prefix(struct hci_dev *hdev) > > > +{ > > > + return &aosp_ext_prefix; > > > +} > > > + > > > +void aosp_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb) > > > +{ > > > + if (aosp_has_quality_report(hdev) && aosp_check_quality_repor= t_len(skb)) > > > + mgmt_quality_report(hdev, skb->data, skb->len, > > > + QUALITY_SPEC_AOSP_BQR); > > > +} > > > diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h > > > index 2fd8886d51b2..8208e01fffed 100644 > > > --- a/net/bluetooth/aosp.h > > > +++ b/net/bluetooth/aosp.h > > > @@ -10,6 +10,9 @@ void aosp_do_close(struct hci_dev *hdev); > > > > > > bool aosp_has_quality_report(struct hci_dev *hdev); > > > int aosp_set_quality_report(struct hci_dev *hdev, bool enable); > > > +bool aosp_check_quality_report_len(struct sk_buff *skb); > > > +struct ext_vendor_prefix *aosp_get_ext_prefix(struct hci_dev *hdev); > > > +void aosp_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb); > > > > > > #else > > > > > > @@ -26,4 +29,19 @@ static inline int aosp_set_quality_report(struct h= ci_dev *hdev, bool enable) > > > return -EOPNOTSUPP; > > > } > > > > > > +static inline bool aosp_check_quality_report_len(struct sk_buff *skb= ) > > > +{ > > > + return false; > > > +} > > > + > > > +static inline struct ext_vendor_prefix * > > > +aosp_get_ext_prefix(struct hci_dev *hdev) > > > +{ > > > + return NULL; > > > +} > > > + > > > +static inline void aosp_vendor_evt(struct hci_dev *hdev, struct sk_b= uff *skb) > > > +{ > > > +} > > > + > > > #endif > > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > > > index 0270e597c285..8398971eddf4 100644 > > > --- a/net/bluetooth/hci_event.c > > > +++ b/net/bluetooth/hci_event.c > > > @@ -37,6 +37,7 @@ > > > #include "smp.h" > > > #include "msft.h" > > > #include "eir.h" > > > +#include "aosp.h" > > > > > > #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \ > > > "\x00\x00\x00\x00\x00\x00\x00\x00" > > > @@ -4259,6 +4260,57 @@ static void hci_num_comp_blocks_evt(struct hci= _dev *hdev, void *data, > > > queue_work(hdev->workqueue, &hdev->tx_work); > > > } > > > > > > +/* Every distinct vendor specification must have a well-defined vend= or > > > + * event prefix to determine if a vendor event meets the specificati= on. > > > + * Some vendor prefixes are fixed values while some other vendor pre= fixes > > > + * are only available at run time. > > > + */ > > > +static struct ext_vendor_event_prefix { > > > + /* Some vendor prefixes are variable length. For convenience, > > > + * the prefix in struct ext_vendor_prefix is in little endian= . > > > + */ > > > + struct ext_vendor_prefix * > > > + (*get_ext_vendor_prefix)(struct hci_dev *hdev); > > > + void (*vendor_func)(struct hci_dev *hdev, struct sk_buff *skb= ); > > > +} evt_prefixes[] =3D { > > > + { aosp_get_ext_prefix, aosp_vendor_evt }, > > > + { msft_get_ext_prefix, msft_vendor_evt }, > > > + > > > + /* end with a null entry */ > > > + {}, > > > +}; > > > + > > > +static void hci_vendor_evt(struct hci_dev *hdev, void *data, > > > + struct sk_buff *skb) > > > +{ > > > + int i, j; > > > + struct ext_vendor_prefix *vnd; > > > + __u8 subcode; > > > + > > > + for (i =3D 0; evt_prefixes[i].get_ext_vendor_prefix; i++) { > > > + vnd =3D evt_prefixes[i].get_ext_vendor_prefix(hdev); > > > + if (!vnd) > > > + continue; > > > + > > > + /* Compare the raw prefix data in little endian direc= tly. */ > > > + if (memcmp(vnd->prefix, skb->data, vnd->prefix_len)) > > > + continue; > > > + > > > + /* Make sure that there are more data after prefix. *= / > > > + if (skb->len <=3D vnd->prefix_len) > > > + continue; > > > + > > > + /* The subcode is the single octet following the pref= ix. */ > > > + subcode =3D skb->data[vnd->prefix_len]; > > > + for (j =3D 0; j < vnd->subcodes_len; j++) { > > > + if (vnd->subcodes[j] =3D=3D subcode) { > > > + evt_prefixes[i].vendor_func(hdev, skb= ); > > > + break; > > > + } > > > + } > > > + } > > > +} > > > > I recall saying that having such matching logic applied without the > > driver confirming that is the structure it using to be a bad idea > > since it could actually cause an event to misinterpret and cause bad > > behavior, instead we probably need a callback that gets populated by > > the driver e.g.(hdev->vendor_evt) then the driver can either populate > > with hci_vendor_evt if it does use prefixes or its own specialized > > function or NULL if it doesn't use vendor events, specially for old > > controllers Id leave it as NULL. > > > > > static void hci_mode_change_evt(struct hci_dev *hdev, void *data, > > > struct sk_buff *skb) > > > { > > > @@ -6879,7 +6931,7 @@ static const struct hci_ev { > > > HCI_EV(HCI_EV_NUM_COMP_BLOCKS, hci_num_comp_blocks_evt, > > > sizeof(struct hci_ev_num_comp_blocks)), > > > /* [0xff =3D HCI_EV_VENDOR] */ > > > - HCI_EV_VL(HCI_EV_VENDOR, msft_vendor_evt, 0, HCI_MAX_EVENT_SI= ZE), > > > + HCI_EV_VL(HCI_EV_VENDOR, hci_vendor_evt, 0, HCI_MAX_EVENT_SIZ= E), > > > }; > > > > > > static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk= _buff *skb, > > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > > > index 1ad84f34097f..9d3666bdd07c 100644 > > > --- a/net/bluetooth/mgmt.c > > > +++ b/net/bluetooth/mgmt.c > > > @@ -4332,6 +4332,25 @@ static int set_exp_feature(struct sock *sk, st= ruct hci_dev *hdev, > > > MGMT_STATUS_NOT_SUPPORTED); > > > } > > > > > > +int mgmt_quality_report(struct hci_dev *hdev, void *data, u32 data_l= en, > > > + u8 quality_spec) > > > +{ > > > + struct mgmt_ev_quality_report *ev; > > > + struct sk_buff *skb; > > > + > > > + skb =3D mgmt_alloc_skb(hdev, MGMT_EV_QUALITY_REPORT, > > > + sizeof(*ev) + data_len); > > > + if (!skb) > > > + return -ENOMEM; > > > + > > > + ev =3D skb_put(skb, sizeof(*ev)); > > > + ev->quality_spec =3D quality_spec; > > > + ev->data_len =3D data_len; > > > + skb_put_data(skb, data, data_len); > > > + > > > + return mgmt_event_skb(skb, NULL); > > > +} > > > + > > > static int get_device_flags(struct sock *sk, struct hci_dev *hdev, v= oid *data, > > > u16 data_len) > > > { > > > diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c > > > index f43994523b1f..c003e94faccd 100644 > > > --- a/net/bluetooth/msft.c > > > +++ b/net/bluetooth/msft.c > > > @@ -116,6 +116,20 @@ bool msft_monitor_supported(struct hci_dev *hdev= ) > > > return !!(msft_get_features(hdev) & MSFT_FEATURE_MASK_LE_ADV_= MONITOR); > > > } > > > > > > +/* Add the MSFT vendor event subcodes into MSFT_SUBCODES which > > > + * msft_vendor_evt() is interested in handling. > > > + */ > > > +static unsigned char MSFT_SUBCODES[] =3D { MSFT_EV_LE_MONITOR_DEVICE= }; > > > +static struct ext_vendor_prefix msft_ext_prefix =3D { 0 }; > > > + > > > +static void set_ext_prefix(struct msft_data *msft) > > > +{ > > > + msft_ext_prefix.prefix =3D msft->evt_prefix; > > > + msft_ext_prefix.prefix_len =3D msft->evt_prefix_len; > > > + msft_ext_prefix.subcodes =3D MSFT_SUBCODES; > > > + msft_ext_prefix.subcodes_len =3D sizeof(MSFT_SUBCODES); > > > +} > > > + > > > static bool read_supported_features(struct hci_dev *hdev, > > > struct msft_data *msft) > > > { > > > @@ -156,6 +170,8 @@ static bool read_supported_features(struct hci_de= v *hdev, > > > if (msft->features & MSFT_FEATURE_MASK_CURVE_VALIDITY) > > > hdev->msft_curve_validity =3D true; > > > > > > + set_ext_prefix(msft); > > > + > > > kfree_skb(skb); > > > return true; > > > > > > @@ -742,7 +758,17 @@ static void msft_monitor_device_evt(struct hci_d= ev *hdev, struct sk_buff *skb) > > > handle_data->mgmt_handle); > > > } > > > > > > -void msft_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buf= f *skb) > > > +struct ext_vendor_prefix *msft_get_ext_prefix(struct hci_dev *hdev) > > > +{ > > > + struct msft_data *msft =3D hdev->msft_data; > > > + > > > + if (!msft) > > > + return NULL; > > > + > > > + return &msft_ext_prefix; > > > +} > > > + > > > +void msft_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb) > > > { > > > struct msft_data *msft =3D hdev->msft_data; > > > u8 *evt_prefix; > > > diff --git a/net/bluetooth/msft.h b/net/bluetooth/msft.h > > > index afcaf7d3b1cb..1515ae06c628 100644 > > > --- a/net/bluetooth/msft.h > > > +++ b/net/bluetooth/msft.h > > > @@ -17,7 +17,7 @@ void msft_register(struct hci_dev *hdev); > > > void msft_unregister(struct hci_dev *hdev); > > > void msft_do_open(struct hci_dev *hdev); > > > void msft_do_close(struct hci_dev *hdev); > > > -void msft_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buf= f *skb); > > > +void msft_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb); > > > __u64 msft_get_features(struct hci_dev *hdev); > > > int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monito= r *monitor); > > > int msft_remove_monitor(struct hci_dev *hdev, struct adv_monitor *mo= nitor, > > > @@ -27,6 +27,7 @@ int msft_set_filter_enable(struct hci_dev *hdev, bo= ol enable); > > > int msft_suspend_sync(struct hci_dev *hdev); > > > int msft_resume_sync(struct hci_dev *hdev); > > > bool msft_curve_validity(struct hci_dev *hdev); > > > +struct ext_vendor_prefix *msft_get_ext_prefix(struct hci_dev *hdev); > > > > > > #else > > > > > > @@ -39,8 +40,7 @@ static inline void msft_register(struct hci_dev *hd= ev) {} > > > static inline void msft_unregister(struct hci_dev *hdev) {} > > > static inline void msft_do_open(struct hci_dev *hdev) {} > > > static inline void msft_do_close(struct hci_dev *hdev) {} > > > -static inline void msft_vendor_evt(struct hci_dev *hdev, void *data, > > > - struct sk_buff *skb) {} > > > +static inline void msft_vendor_evt(struct hci_dev *hdev, struct sk_b= uff *skb) {} > > > static inline __u64 msft_get_features(struct hci_dev *hdev) { return= 0; } > > > static inline int msft_add_monitor_pattern(struct hci_dev *hdev, > > > struct adv_monitor *monito= r) > > > @@ -77,4 +77,10 @@ static inline bool msft_curve_validity(struct hci_= dev *hdev) > > > return false; > > > } > > > > > > +static inline struct ext_vendor_prefix * > > > +msft_get_ext_prefix(struct hci_dev *hdev) > > > +{ > > > + return NULL; > > > +} > > > + > > > #endif > > > -- > > > 2.36.1.124.g0e6072fb45-goog > > > > > > > > > -- > > Luiz Augusto von Dentz > > > > -- > > Joseph Shyh-In Hwang > Email: josephsih@google.com --=20 Luiz Augusto von Dentz