From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: Tedd Ho-Jeong An <hj.tedd.an@gmail.com>
Cc: "linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>,
Tedd Ho-Jeong An <tedd.an@intel.com>
Subject: Re: [RFC PATCH v4 01/11] Bluetooth: Add support hdev to allocate private data
Date: Tue, 27 Jul 2021 17:41:31 -0700 [thread overview]
Message-ID: <CABBYNZJEQ+aqyUx_6zY5db4F_VPV4dPVN0QjoGhrHvpqHrj=3Q@mail.gmail.com> (raw)
In-Reply-To: <20210727235127.173149-2-hj.tedd.an@gmail.com>
Hi Tedd,
On Tue, Jul 27, 2021 at 4:53 PM Tedd Ho-Jeong An <hj.tedd.an@gmail.com> wrote:
>
> From: Tedd Ho-Jeong An <tedd.an@intel.com>
>
> This patch adds support hdev to allocate extra size for private data.
> The size of private data is specified in the hdev_alloc_size(priv_size)
> and the allocated buffer can be accessed with hci_get_priv(hdev).
>
> Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
> ---
> drivers/bluetooth/bfusb.c | 2 +-
> drivers/bluetooth/bluecard_cs.c | 2 +-
> drivers/bluetooth/bpa10x.c | 2 +-
> drivers/bluetooth/bt3c_cs.c | 2 +-
> drivers/bluetooth/btmrvl_main.c | 2 +-
> drivers/bluetooth/btmtksdio.c | 2 +-
> drivers/bluetooth/btmtkuart.c | 2 +-
> drivers/bluetooth/btqcomsmd.c | 2 +-
> drivers/bluetooth/btrsi.c | 2 +-
> drivers/bluetooth/btsdio.c | 2 +-
> drivers/bluetooth/btusb.c | 2 +-
> drivers/bluetooth/dtl1_cs.c | 2 +-
> drivers/bluetooth/hci_ldisc.c | 2 +-
> drivers/bluetooth/hci_serdev.c | 2 +-
> drivers/bluetooth/hci_vhci.c | 2 +-
> drivers/bluetooth/virtio_bt.c | 2 +-
> include/net/bluetooth/hci_core.h | 7 ++++++-
> net/bluetooth/hci_core.c | 11 +++++++++--
> 18 files changed, 31 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
> index 5a321b4076aa..430e230999fa 100644
> --- a/drivers/bluetooth/bfusb.c
> +++ b/drivers/bluetooth/bfusb.c
> @@ -651,7 +651,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
> release_firmware(firmware);
>
> /* Initialize and register HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> goto done;
> diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
> index 36eabf61717f..d62b878aff7e 100644
> --- a/drivers/bluetooth/bluecard_cs.c
> +++ b/drivers/bluetooth/bluecard_cs.c
> @@ -694,7 +694,7 @@ static int bluecard_open(struct bluecard_info *info)
> info->rx_skb = NULL;
>
> /* Initialize HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
> index 1fa58c059cbf..bd670352a336 100644
> --- a/drivers/bluetooth/bpa10x.c
> +++ b/drivers/bluetooth/bpa10x.c
> @@ -380,7 +380,7 @@ static int bpa10x_probe(struct usb_interface *intf,
> init_usb_anchor(&data->tx_anchor);
> init_usb_anchor(&data->rx_anchor);
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev)
> return -ENOMEM;
>
> diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
> index 54713833951a..cd135a736688 100644
> --- a/drivers/bluetooth/bt3c_cs.c
> +++ b/drivers/bluetooth/bt3c_cs.c
> @@ -550,7 +550,7 @@ static int bt3c_open(struct bt3c_info *info)
> info->rx_skb = NULL;
>
> /* Initialize HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
> index 8b9d78ce6bb2..0157fa4ce528 100644
> --- a/drivers/bluetooth/btmrvl_main.c
> +++ b/drivers/bluetooth/btmrvl_main.c
> @@ -680,7 +680,7 @@ int btmrvl_register_hdev(struct btmrvl_private *priv)
> struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
> int ret;
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can not allocate HCI device");
> goto err_hdev;
> diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
> index 9872ef18f9fe..b48aec25c09d 100644
> --- a/drivers/bluetooth/btmtksdio.c
> +++ b/drivers/bluetooth/btmtksdio.c
> @@ -959,7 +959,7 @@ static int btmtksdio_probe(struct sdio_func *func,
> skb_queue_head_init(&bdev->txq);
>
> /* Initialize and register HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> dev_err(&func->dev, "Can't allocate HCI device\n");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c
> index e9d91d7c0db4..96ee364507c5 100644
> --- a/drivers/bluetooth/btmtkuart.c
> +++ b/drivers/bluetooth/btmtkuart.c
> @@ -987,7 +987,7 @@ static int btmtkuart_probe(struct serdev_device *serdev)
> skb_queue_head_init(&bdev->txq);
>
> /* Initialize and register HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> dev_err(&serdev->dev, "Can't allocate HCI device\n");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
> index 2acb719e596f..47aaffceb8c1 100644
> --- a/drivers/bluetooth/btqcomsmd.c
> +++ b/drivers/bluetooth/btqcomsmd.c
> @@ -147,7 +147,7 @@ static int btqcomsmd_probe(struct platform_device *pdev)
> goto destroy_acl_channel;
> }
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> ret = -ENOMEM;
> goto destroy_cmd_channel;
> diff --git a/drivers/bluetooth/btrsi.c b/drivers/bluetooth/btrsi.c
> index 8646b6dd11e9..2f8d186e4807 100644
> --- a/drivers/bluetooth/btrsi.c
> +++ b/drivers/bluetooth/btrsi.c
> @@ -121,7 +121,7 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops)
> ops->set_bt_context(priv, h_adapter);
> h_adapter->proto_ops = ops;
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Failed to alloc HCI device");
> goto err;
> diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
> index 199e8f7d426d..69d2a26ed5db 100644
> --- a/drivers/bluetooth/btsdio.c
> +++ b/drivers/bluetooth/btsdio.c
> @@ -310,7 +310,7 @@ static int btsdio_probe(struct sdio_func *func,
>
> skb_queue_head_init(&data->txq);
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev)
> return -ENOMEM;
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 1876a960b3dc..baf0934657d8 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -4575,7 +4575,7 @@ static int btusb_probe(struct usb_interface *intf,
> data->recv_bulk = btusb_recv_bulk;
> }
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev)
> return -ENOMEM;
>
> diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
> index 2adfe4fade76..f06c8151f0ea 100644
> --- a/drivers/bluetooth/dtl1_cs.c
> +++ b/drivers/bluetooth/dtl1_cs.c
> @@ -449,7 +449,7 @@ static int dtl1_open(struct dtl1_info *info)
> set_bit(XMIT_WAITING, &(info->tx_state));
>
> /* Initialize HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
> index 5ed2cfa7da1d..89eb9d7685ae 100644
> --- a/drivers/bluetooth/hci_ldisc.c
> +++ b/drivers/bluetooth/hci_ldisc.c
> @@ -627,7 +627,7 @@ static int hci_uart_register_dev(struct hci_uart *hu)
> BT_DBG("");
>
> /* Initialize and register HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> return -ENOMEM;
> diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
> index 3b00d82d36cf..327fa2ecc5e7 100644
> --- a/drivers/bluetooth/hci_serdev.c
> +++ b/drivers/bluetooth/hci_serdev.c
> @@ -313,7 +313,7 @@ int hci_uart_register_device(struct hci_uart *hu,
> set_bit(HCI_UART_PROTO_READY, &hu->flags);
>
> /* Initialize and register HCI device */
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> BT_ERR("Can't allocate HCI device");
> err = -ENOMEM;
> diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
> index 8ab26dec5f6e..5486aa3945da 100644
> --- a/drivers/bluetooth/hci_vhci.c
> +++ b/drivers/bluetooth/hci_vhci.c
> @@ -96,7 +96,7 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode)
> if (!skb)
> return -ENOMEM;
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> kfree_skb(skb);
> return -ENOMEM;
> diff --git a/drivers/bluetooth/virtio_bt.c b/drivers/bluetooth/virtio_bt.c
> index 57908ce4fae8..28576ec4860e 100644
> --- a/drivers/bluetooth/virtio_bt.c
> +++ b/drivers/bluetooth/virtio_bt.c
> @@ -283,7 +283,7 @@ static int virtbt_probe(struct virtio_device *vdev)
> if (err)
> return err;
>
> - hdev = hci_alloc_dev();
> + hdev = hci_alloc_dev(0);
> if (!hdev) {
> err = -ENOMEM;
> goto failed;
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index a53e94459ecd..5c689c5dc089 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -1223,10 +1223,15 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
> dev_set_drvdata(&hdev->dev, data);
> }
>
> +static inline void *hci_get_priv(struct hci_dev *hdev)
> +{
> + return (char *)hdev + sizeof(*hdev);
> +}
> +
> struct hci_dev *hci_dev_get(int index);
> struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, u8 src_type);
>
> -struct hci_dev *hci_alloc_dev(void);
> +struct hci_dev *hci_alloc_dev(int sizeof_priv);
Just a minor suggestion here, we could perhaps have an alternative
version of hci_alloc_dev e.g hci_alloc_dev_priv so we don't need to
touch all the drivers like you did above.
> void hci_free_dev(struct hci_dev *hdev);
> int hci_register_dev(struct hci_dev *hdev);
> void hci_unregister_dev(struct hci_dev *hdev);
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 2560ed2f144d..66b72c7efa3d 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -3751,11 +3751,18 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,
> }
>
> /* Alloc HCI device */
> -struct hci_dev *hci_alloc_dev(void)
> +struct hci_dev *hci_alloc_dev(int sizeof_priv)
> {
> struct hci_dev *hdev;
> + unsigned int alloc_size;
>
> - hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);
> + alloc_size = sizeof(*hdev);
> + if (sizeof_priv) {
> + /* Fixme: May need ALIGN-ment? */
> + alloc_size += sizeof_priv;
> + }
> +
> + hdev = kzalloc(alloc_size, GFP_KERNEL);
> if (!hdev)
> return NULL;
>
> --
> 2.26.3
>
--
Luiz Augusto von Dentz
next prev parent reply other threads:[~2021-07-28 0:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 23:51 [RFC PATCH v4 00/11] Bluetooth: btintel: Refactoring setup routines Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 01/11] Bluetooth: Add support hdev to allocate private data Tedd Ho-Jeong An
2021-07-28 0:41 ` Luiz Augusto von Dentz [this message]
2021-07-29 11:39 ` Marcel Holtmann
2021-07-28 2:11 ` Bluetooth: btintel: Refactoring setup routines bluez.test.bot
2021-07-27 23:51 ` [RFC PATCH v4 02/11] Bluetooth: btintel: Add combined setup and shutdown functions Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 03/11] Bluetooth: btintel: Refactoring setup routine for legacy ROM sku Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 04/11] Bluetooth: btintel: Add btintel data struct Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 05/11] Bluetooth: btintel: Fix the first HCI command not work with ROM device Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 06/11] Bluetooth: btintel: Fix the LED is not turning off immediately Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 07/11] Bluetooth: btintel: Add combined set_diag functions Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 08/11] Bluetooth: btintel: Refactoring setup routine for legacy bootloader Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 09/11] Bluetooth: btintel: Refactoring setup routine for TLV based booloader Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 10/11] Bluetooth: btintel: Clean the exported function to static Tedd Ho-Jeong An
2021-07-27 23:51 ` [RFC PATCH v4 11/11] Bluetooth: btintel: Fix the legacy bootloader returns tlv based version Tedd Ho-Jeong An
2021-07-28 0:17 ` [RFC PATCH v4 00/11] Bluetooth: btintel: Refactoring setup routines An, Tedd
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='CABBYNZJEQ+aqyUx_6zY5db4F_VPV4dPVN0QjoGhrHvpqHrj=3Q@mail.gmail.com' \
--to=luiz.dentz@gmail.com \
--cc=hj.tedd.an@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=tedd.an@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.