Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3078-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <20240402113931.3164-1-iulia.tanasescu@nxp.com> <20240402113931.3164-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20240402113931.3164-2-iulia.tanasescu@nxp.com>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Tue, 2 Apr 2024 11:43:56 -0400
Message-ID: <CABBYNZKSjjpU48COeTz3H6i+WKFr=Zb3D9Eudp5r_puiuaj=dg@mail.gmail.com>
Subject: Re: [PATCH 1/2] Bluetooth: ISO: Make iso_get_sock_listen generic
To: Iulia Tanasescu <iulia.tanasescu@nxp.com>
Cc: linux-bluetooth@vger.kernel.org, claudia.rosu@nxp.com, 
	mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, 
	vlad.pruteanu@nxp.com, andrei.istodorescu@nxp.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Iulia,

On Tue, Apr 2, 2024 at 7:39=E2=80=AFAM Iulia Tanasescu <iulia.tanasescu@nxp=
.com> wrote:
>
> This makes iso_get_sock_listen more generic, to return matching socket
> in the state provided as argument.
>
> Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
> ---
>  net/bluetooth/iso.c | 75 +++++++++++++++++++++++++--------------------
>  1 file changed, 42 insertions(+), 33 deletions(-)
>
> diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
> index 42b4495e019e..3fcaef506bde 100644
> --- a/net/bluetooth/iso.c
> +++ b/net/bluetooth/iso.c
> @@ -85,8 +85,9 @@ static void iso_sock_disconn(struct sock *sk);
>
>  typedef bool (*iso_sock_match_t)(struct sock *sk, void *data);
>
> -static struct sock *iso_get_sock_listen(bdaddr_t *src, bdaddr_t *dst,
> -                                       iso_sock_match_t match, void *dat=
a);
> +static struct sock *iso_get_sock(bdaddr_t *src, bdaddr_t *dst,
> +                                unsigned char state,

Lets add a name to the enum in bluetooth.h when the socket states are
defined then we can use it here instead of passing as unsigned char.

> +                                iso_sock_match_t match, void *data);
>
>  /* ---- ISO timers ---- */
>  #define ISO_CONN_TIMEOUT       (HZ * 40)
> @@ -233,10 +234,11 @@ static void iso_conn_del(struct hci_conn *hcon, int=
 err)
>                  * terminated are not processed anymore.
>                  */
>                 if (test_bit(BT_SK_PA_SYNC, &iso_pi(sk)->flags)) {
> -                       parent =3D iso_get_sock_listen(&hcon->src,
> -                                                    &hcon->dst,
> -                                                    iso_match_conn_sync_=
handle,
> -                                                    hcon);
> +                       parent =3D iso_get_sock(&hcon->src,
> +                                             &hcon->dst,
> +                                             BT_LISTEN,
> +                                             iso_match_conn_sync_handle,
> +                                             hcon);
>
>                         if (parent) {
>                                 set_bit(BT_SK_PA_SYNC_TERM,
> @@ -584,22 +586,23 @@ static struct sock *__iso_get_sock_listen_by_sid(bd=
addr_t *ba, bdaddr_t *bc,
>         return NULL;
>  }
>
> -/* Find socket listening:
> +/* Find socket in given state:
>   * source bdaddr (Unicast)
>   * destination bdaddr (Broadcast only)
>   * match func - pass NULL to ignore
>   * match func data - pass -1 to ignore
>   * Returns closest match.
>   */
> -static struct sock *iso_get_sock_listen(bdaddr_t *src, bdaddr_t *dst,
> -                                       iso_sock_match_t match, void *dat=
a)
> +static struct sock *iso_get_sock(bdaddr_t *src, bdaddr_t *dst,
> +                                unsigned char state,
> +                                iso_sock_match_t match, void *data)
>  {
>         struct sock *sk =3D NULL, *sk1 =3D NULL;
>
>         read_lock(&iso_sk_list.lock);
>
>         sk_for_each(sk, &iso_sk_list.head) {
> -               if (sk->sk_state !=3D BT_LISTEN)
> +               if (sk->sk_state !=3D state)
>                         continue;
>
>                 /* Match Broadcast destination */
> @@ -1805,32 +1808,37 @@ static void iso_conn_ready(struct iso_conn *conn)
>                                                  HCI_EVT_LE_BIG_SYNC_ESTA=
BILISHED);
>
>                         /* Get reference to PA sync parent socket, if it =
exists */
> -                       parent =3D iso_get_sock_listen(&hcon->src,
> -                                                    &hcon->dst,
> -                                                    iso_match_pa_sync_fl=
ag, NULL);
> +                       parent =3D iso_get_sock(&hcon->src, &hcon->dst,
> +                                             BT_LISTEN,
> +                                             iso_match_pa_sync_flag,
> +                                             NULL);
>                         if (!parent && ev)
> -                               parent =3D iso_get_sock_listen(&hcon->src=
,
> -                                                            &hcon->dst,
> -                                                            iso_match_bi=
g, ev);
> +                               parent =3D iso_get_sock(&hcon->src,
> +                                                     &hcon->dst,
> +                                                     BT_LISTEN,
> +                                                     iso_match_big, ev);
>                 } else if (test_bit(HCI_CONN_PA_SYNC_FAILED, &hcon->flags=
)) {
>                         ev2 =3D hci_recv_event_data(hcon->hdev,
>                                                   HCI_EV_LE_PA_SYNC_ESTAB=
LISHED);
>                         if (ev2)
> -                               parent =3D iso_get_sock_listen(&hcon->src=
,
> -                                                            &hcon->dst,
> -                                                            iso_match_si=
d, ev2);
> +                               parent =3D iso_get_sock(&hcon->src,
> +                                                     &hcon->dst,
> +                                                     BT_LISTEN,
> +                                                     iso_match_sid, ev2)=
;
>                 } else if (test_bit(HCI_CONN_PA_SYNC, &hcon->flags)) {
>                         ev3 =3D hci_recv_event_data(hcon->hdev,
>                                                   HCI_EVT_LE_BIG_INFO_ADV=
_REPORT);
>                         if (ev3)
> -                               parent =3D iso_get_sock_listen(&hcon->src=
,
> -                                                            &hcon->dst,
> -                                                            iso_match_sy=
nc_handle, ev3);
> +                               parent =3D iso_get_sock(&hcon->src,
> +                                                     &hcon->dst,
> +                                                     BT_LISTEN,
> +                                                     iso_match_sync_hand=
le,
> +                                                     ev3);
>                 }
>
>                 if (!parent)
> -                       parent =3D iso_get_sock_listen(&hcon->src,
> -                                                       BDADDR_ANY, NULL,=
 NULL);
> +                       parent =3D iso_get_sock(&hcon->src, BDADDR_ANY,
> +                                             BT_LISTEN, NULL, NULL);
>
>                 if (!parent)
>                         return;
> @@ -1951,8 +1959,8 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t =
*bdaddr, __u8 *flags)
>          */
>         ev1 =3D hci_recv_event_data(hdev, HCI_EV_LE_PA_SYNC_ESTABLISHED);
>         if (ev1) {
> -               sk =3D iso_get_sock_listen(&hdev->bdaddr, bdaddr, iso_mat=
ch_sid,
> -                                        ev1);
> +               sk =3D iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
> +                                 iso_match_sid, ev1);
>                 if (sk && !ev1->status)
>                         iso_pi(sk)->sync_handle =3D le16_to_cpu(ev1->hand=
le);
>
> @@ -1962,12 +1970,12 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_=
t *bdaddr, __u8 *flags)
>         ev2 =3D hci_recv_event_data(hdev, HCI_EVT_LE_BIG_INFO_ADV_REPORT)=
;
>         if (ev2) {
>                 /* Try to get PA sync listening socket, if it exists */
> -               sk =3D iso_get_sock_listen(&hdev->bdaddr, bdaddr,
> -                                               iso_match_pa_sync_flag, N=
ULL);
> +               sk =3D iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
> +                                 iso_match_pa_sync_flag, NULL);
>
>                 if (!sk) {
> -                       sk =3D iso_get_sock_listen(&hdev->bdaddr, bdaddr,
> -                                                iso_match_sync_handle, e=
v2);
> +                       sk =3D iso_get_sock(&hdev->bdaddr, bdaddr, BT_LIS=
TEN,
> +                                         iso_match_sync_handle, ev2);
>
>                         /* If PA Sync is in process of terminating,
>                          * do not handle any more BIGInfo adv reports.
> @@ -2007,8 +2015,8 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t =
*bdaddr, __u8 *flags)
>                 u8 *base;
>                 struct hci_conn *hcon;
>
> -               sk =3D iso_get_sock_listen(&hdev->bdaddr, bdaddr,
> -                                        iso_match_sync_handle_pa_report,=
 ev3);
> +               sk =3D iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
> +                                 iso_match_sync_handle_pa_report, ev3);
>                 if (!sk)
>                         goto done;
>
> @@ -2057,7 +2065,8 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t =
*bdaddr, __u8 *flags)
>                         hcon->le_per_adv_data_len =3D 0;
>                 }
>         } else {
> -               sk =3D iso_get_sock_listen(&hdev->bdaddr, BDADDR_ANY, NUL=
L, NULL);
> +               sk =3D iso_get_sock(&hdev->bdaddr, BDADDR_ANY,
> +                                 BT_LISTEN, NULL, NULL);
>         }
>
>  done:
> --
> 2.39.2
>


--=20
Luiz Augusto von Dentz