Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "K, Kiran" <kiran.k@intel.com>
To:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
CC:     "Srivatsa, Ravishankar" <ravishankar.srivatsa@intel.com>,
        "Tumkur Narayan, Chethan" <chethan.tumkur.narayan@intel.com>,
        "Von Dentz, Luiz" <luiz.von.dentz@intel.com>
Subject: RE: [PATCH v1 1/7] Bluetooth: Refactor code to read supported codecs
 in getsockopt
Thread-Topic: [PATCH v1 1/7] Bluetooth: Refactor code to read supported codecs
 in getsockopt
Thread-Index: AQHXvEvgPLkpkrywmUiAP7IhY0tF86vJIJkw
Date:   Fri, 8 Oct 2021 14:00:12 +0000
Message-ID: <DM8PR11MB55739EB4DA05AA8E4F16DF63F5B29@DM8PR11MB5573.namprd11.prod.outlook.com>
References: <20211008135853.8604-1-kiran.k@intel.com>
In-Reply-To: <20211008135853.8604-1-kiran.k@intel.com>
Accept-Language: en-US
Content-Language: en-US
dlp-reaction: no-action
dlp-version: 11.6.200.16
dlp-product: dlpe-windows
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?7XPR86wL1W4dOEO6y7iMnMnPxApXUAakRPWeNWawYUQBusJNt346Q+vNqZCP?=
 =?us-ascii?Q?z5oqOElHN7ygyhjFQHFvCX5ld1vRllFJvOu13xmogFH8FqJASc1X+Rv+YFOz?=
 =?us-ascii?Q?FX4/Yv9TS82udK1PJS8pxUHvhmlYMTEBh3ph6C1T7HU+EgUv1j2D79AvLhAN?=
 =?us-ascii?Q?Jokgl2n1vLfeY5wQu0rDJjPuM9O49mUH0ThP9ipuKDyyvqFcsTGJbszbW3H4?=
 =?us-ascii?Q?nEmQXhyaYJ8c7UyBWBTdD9Qx53CNVLFSfSARuOX8buqNmaYUJ8tKyQYZsE49?=
 =?us-ascii?Q?zpBzymtwx/aX+0SPxInHComb6evBFOeDr2SZf73XxCQznByik8QLz82Jrtok?=
 =?us-ascii?Q?R+wlpoHd3Unwup1L548H2Sozfk6VamWnIkvF4cbj7fW0KMes72Pu7O79zt+R?=
 =?us-ascii?Q?U3Krlhn6one/pKtfCZR7HSotLpgQcAsvFjNsnpNh5wj2EzEURo9FpIMmaeWK?=
 =?us-ascii?Q?H9lAWSj4eMU9/k55n8vSBPy+QdI5HZmhuOSac2qyQkFCZyy0Ki1GVi/oOW+7?=
 =?us-ascii?Q?yNtD+Fkoa94GvKTO0+REjkzKsaXj0sMP4jxip+FxLdtIiOOyBf6IevecocLW?=
 =?us-ascii?Q?Fc5NLWM26HzoeP5tTvEY3OsTEwRzTy3ggvKKyz4r0SBWE3DfdcqTVhi8s0Jl?=
 =?us-ascii?Q?NBjNJCTQhYFqunmOxsfQiMdONMGoLSWQGz6CLFenooc4SuqlhTsHpGPXaj3P?=
 =?us-ascii?Q?GL63I3fLyaTqvddielZOBH21tUHmmRamRid01fn3zdnc3GLwPKqZdqgZ/JBW?=
 =?us-ascii?Q?g2YMBKKbjluBtS+IITENlk0OH7OPTBjND8ZOMltSoaDcR3Yx52OpOaMMu5YZ?=
 =?us-ascii?Q?7AtOBNlOfuPEXglG+5HaHauIE/0kpCBNXwrzdafHn9vIfv5iU5bHz8/bANEm?=
 =?us-ascii?Q?mgKgoL/kjZuOii4AW2aUF0BYMAF21uiaG9boruzieyHqu3bHzY7l+B7ugNYs?=
 =?us-ascii?Q?kvgOANDlp6bUATmp0B1NdWcU2Tx1evM6IrUw20/uL/c7euO2aKReg548F0Uz?=
 =?us-ascii?Q?qVJxTVK2NtBVQjltQhQ6JnOayhsNDoSi+IXqqpxF6YJ+MQQdYlgPC/VnXKL6?=
 =?us-ascii?Q?Ks3Lkok17u/hIoKU1Lqb3Va4ftS5+3BJOjZdjD0bfy0oI4lq/8D+6M1X4LCg?=
 =?us-ascii?Q?q9MXGXr6iOs/SfUSUnVG6sUitbBmgjMpCBTbguGOgrroONeC5lWkMPkrfd2Y?=
 =?us-ascii?Q?NkJQdZJzJzAOgPdWbggDC1iBsKoQcQHylOxhAzAxJzt6SBorme6UJ/M6xQ44?=
 =?us-ascii?Q?zHFTk5AlK9QI18yGeIsE6mvgA7y+zSrOpOezKvy3W7YesjVhbR7kDZx3Vqpt?=
 =?us-ascii?Q?r20=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cffc94d9-4e27-429d-528c-08d98a63f291
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2021 14:00:12.4695
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 6AR9mpor2B3uyYC95rK0FkFoy4a8xrO+RDhrfS86pOChPNdYw6yURMjSx/UvbH6PUW/Xn3ZoLHQOccjA9DaHvw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5605
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Please ignore this v1 patchset.  Need to remove ChangeId  in commit message=
 in patches. I will send update v2 version.

Thanks,
Kiran


> -----Original Message-----
> From: K, Kiran <kiran.k@intel.com>
> Sent: Friday, October 8, 2021 7:29 PM
> To: linux-bluetooth@vger.kernel.org
> Cc: Srivatsa, Ravishankar <ravishankar.srivatsa@intel.com>; Tumkur
> Narayan, Chethan <chethan.tumkur.narayan@intel.com>; Von Dentz, Luiz
> <luiz.von.dentz@intel.com>; K, Kiran <kiran.k@intel.com>
> Subject: [PATCH v1 1/7] Bluetooth: Refactor code to read supported codecs
> in getsockopt
>=20
> This patch moves reading of supported codecs from cache to a new function
> to reuse over L2CAP sockets to be used in a2dp offload use case.
>=20
> Signed-off-by: Kiran K <kiran.k@intel.com>
> Change-Id: I080ed7ca8abd824d3af10859afd808bad28ee86d
> ---
>  net/bluetooth/hci_codec.c | 88 +++++++++++++++++++++++++++++++++++
>  net/bluetooth/hci_codec.h |  2 +
>  net/bluetooth/sco.c       | 98 +++------------------------------------
>  3 files changed, 96 insertions(+), 92 deletions(-)
>=20
> diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c index
> 38201532f58e..f4d8d3a253d8 100644
> --- a/net/bluetooth/hci_codec.c
> +++ b/net/bluetooth/hci_codec.c
> @@ -250,3 +250,91 @@ void hci_read_supported_codecs_v2(struct hci_dev
> *hdev)
>  error:
>  	kfree_skb(skb);
>  }
> +
> +int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user
> *optval,
> +			     int __user *optlen, int len)
> +{
> +	int n =3D 0, buf_len =3D 0, err =3D 0;
> +	struct hci_codec_caps *caps;
> +	struct bt_codec codec;
> +	u8 num_codecs =3D 0, i, __user *ptr;
> +	struct codec_list *c;
> +
> +	if (!hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED)) {
> +		err =3D -EOPNOTSUPP;
> +		goto error;
> +	}
> +
> +	if (!hdev->get_data_path_id) {
> +		err =3D -EOPNOTSUPP;
> +		goto error;
> +	}
> +
> +	/* find total buffer size required to copy codec + capabilities */
> +	hci_dev_lock(hdev);
> +	list_for_each_entry(c, &hdev->local_codecs, list) {
> +		if (c->transport !=3D type)
> +			continue;
> +		num_codecs++;
> +		for (i =3D 0, caps =3D c->caps; i < c->num_caps; i++) {
> +			buf_len +=3D 1 + caps->len;
> +			caps =3D (void *)&caps->data[caps->len];
> +		}
> +		buf_len +=3D sizeof(struct bt_codec);
> +	}
> +	hci_dev_unlock(hdev);
> +
> +	buf_len +=3D sizeof(struct bt_codecs);
> +	if (buf_len > len) {
> +		err =3D -ENOBUFS;
> +		goto error;
> +	}
> +	ptr =3D optval;
> +
> +	if (put_user(num_codecs, ptr)) {
> +		err =3D -EFAULT;
> +		goto error;
> +	}
> +	ptr +=3D sizeof(num_codecs);
> +
> +	/* Iterate over all the codecs on required transport */
> +	hci_dev_lock(hdev);
> +	list_for_each_entry(c, &hdev->local_codecs, list) {
> +		if (c->transport !=3D type)
> +			continue;
> +
> +		codec.id =3D c->id;
> +		codec.cid =3D c->cid;
> +		codec.vid =3D c->vid;
> +		err =3D hdev->get_data_path_id(hdev, &codec.data_path);
> +		if (err < 0)
> +			break;
> +		codec.num_caps =3D c->num_caps;
> +		if (copy_to_user(ptr, &codec, sizeof(codec))) {
> +			err =3D -EFAULT;
> +			break;
> +		}
> +		ptr +=3D sizeof(codec);
> +
> +		/* find codec capabilities data length */
> +		n =3D 0;
> +		for (i =3D 0, caps =3D c->caps; i < c->num_caps; i++) {
> +			n +=3D 1 + caps->len;
> +			caps =3D (void *)&caps->data[caps->len];
> +		}
> +
> +		/* copy codec capabilities data */
> +		if (n && copy_to_user(ptr, c->caps, n)) {
> +			err =3D -EFAULT;
> +			break;
> +		}
> +		ptr +=3D n;
> +	}
> +	hci_dev_unlock(hdev);
> +
> +	if (!err && put_user(buf_len, optlen))
> +		err =3D -EFAULT;
> +
> +error:
> +	return err;
> +}
> diff --git a/net/bluetooth/hci_codec.h b/net/bluetooth/hci_codec.h index
> a2751930f123..6e849c7d75b9 100644
> --- a/net/bluetooth/hci_codec.h
> +++ b/net/bluetooth/hci_codec.h
> @@ -5,3 +5,5 @@
>  void hci_read_supported_codecs(struct hci_dev *hdev);  void
> hci_read_supported_codecs_v2(struct hci_dev *hdev);  void
> hci_codec_list_clear(struct list_head *codec_list);
> +int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user
> *optval,
> +			     int __user *optlen, int len);
> diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index
> 8eabf41b2993..0af814c13b5f 100644
> --- a/net/bluetooth/sco.c
> +++ b/net/bluetooth/sco.c
> @@ -33,6 +33,8 @@
>  #include <net/bluetooth/hci_core.h>
>  #include <net/bluetooth/sco.h>
>=20
> +#include "hci_codec.h"
> +
>  static bool disable_esco;
>=20
>  static const struct proto_ops sco_sock_ops; @@ -1032,12 +1034,7 @@ stati=
c
> int sco_sock_getsockopt(struct socket *sock, int level, int optname,
>  	struct bt_voice voice;
>  	u32 phys;
>  	int pkt_status;
> -	int buf_len;
> -	struct codec_list *c;
> -	u8 num_codecs, i, __user *ptr;
>  	struct hci_dev *hdev;
> -	struct hci_codec_caps *caps;
> -	struct bt_codec codec;
>=20
>  	BT_DBG("sk %p", sk);
>=20
> @@ -1103,98 +1100,15 @@ static int sco_sock_getsockopt(struct socket
> *sock, int level, int optname,
>  		break;
>=20
>  	case BT_CODEC:
> -		num_codecs =3D 0;
> -		buf_len =3D 0;
> -
> -		hdev =3D hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src,
> BDADDR_BREDR);
> +		hdev =3D hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src,
> +				     BDADDR_BREDR);
>  		if (!hdev) {
>  			err =3D -EBADFD;
>  			break;
>  		}
> -
> -		if (!hci_dev_test_flag(hdev,
> HCI_OFFLOAD_CODECS_ENABLED)) {
> -			hci_dev_put(hdev);
> -			err =3D -EOPNOTSUPP;
> -			break;
> -		}
> -
> -		if (!hdev->get_data_path_id) {
> -			hci_dev_put(hdev);
> -			err =3D -EOPNOTSUPP;
> -			break;
> -		}
> -
> -		/* find total buffer size required to copy codec + caps */
> -		hci_dev_lock(hdev);
> -		list_for_each_entry(c, &hdev->local_codecs, list) {
> -			if (c->transport !=3D HCI_TRANSPORT_SCO_ESCO)
> -				continue;
> -			num_codecs++;
> -			for (i =3D 0, caps =3D c->caps; i < c->num_caps; i++) {
> -				buf_len +=3D 1 + caps->len;
> -				caps =3D (void *)&caps->data[caps->len];
> -			}
> -			buf_len +=3D sizeof(struct bt_codec);
> -		}
> -		hci_dev_unlock(hdev);
> -
> -		buf_len +=3D sizeof(struct bt_codecs);
> -		if (buf_len > len) {
> -			hci_dev_put(hdev);
> -			err =3D -ENOBUFS;
> -			break;
> -		}
> -		ptr =3D optval;
> -
> -		if (put_user(num_codecs, ptr)) {
> -			hci_dev_put(hdev);
> -			err =3D -EFAULT;
> -			break;
> -		}
> -		ptr +=3D sizeof(num_codecs);
> -
> -		/* Iterate all the codecs supported over SCO and populate
> -		 * codec data
> -		 */
> -		hci_dev_lock(hdev);
> -		list_for_each_entry(c, &hdev->local_codecs, list) {
> -			if (c->transport !=3D HCI_TRANSPORT_SCO_ESCO)
> -				continue;
> -
> -			codec.id =3D c->id;
> -			codec.cid =3D c->cid;
> -			codec.vid =3D c->vid;
> -			err =3D hdev->get_data_path_id(hdev,
> &codec.data_path);
> -			if (err < 0)
> -				break;
> -			codec.num_caps =3D c->num_caps;
> -			if (copy_to_user(ptr, &codec, sizeof(codec))) {
> -				err =3D -EFAULT;
> -				break;
> -			}
> -			ptr +=3D sizeof(codec);
> -
> -			/* find codec capabilities data length */
> -			len =3D 0;
> -			for (i =3D 0, caps =3D c->caps; i < c->num_caps; i++) {
> -				len +=3D 1 + caps->len;
> -				caps =3D (void *)&caps->data[caps->len];
> -			}
> -
> -			/* copy codec capabilities data */
> -			if (len && copy_to_user(ptr, c->caps, len)) {
> -				err =3D -EFAULT;
> -				break;
> -			}
> -			ptr +=3D len;
> -		}
> -
> -		if (!err && put_user(buf_len, optlen))
> -			err =3D -EFAULT;
> -
> -		hci_dev_unlock(hdev);
> +		err =3D hci_get_supported_codecs(hdev,
> HCI_TRANSPORT_SCO_ESCO,
> +					       optval, optlen, len);
>  		hci_dev_put(hdev);
> -
>  		break;
>=20
>  	default:
> --
> 2.17.1