Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3069-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Iulia Tanasescu <iulia.tanasescu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: claudia.rosu@nxp.com,
	mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	vlad.pruteanu@nxp.com,
	andrei.istodorescu@nxp.com,
	luiz.dentz@gmail.com,
	Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH 1/2] Bluetooth: ISO: Make iso_get_sock_listen generic
Date: Tue,  2 Apr 2024 14:39:30 +0300
Message-Id: <20240402113931.3164-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20240402113931.3164-1-iulia.tanasescu@nxp.com>
References: <20240402113931.3164-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?OQAdN/j4h4W3oOofHPM/DJmhHj700ZUi3TsbrPhKLuLGCiLtVI/I356f7MKd?=
 =?us-ascii?Q?oXqCUUA7/xM35GvnvVdKXzoZZKWliOCpHDk0NryX2ZAuTumY/gMmxX70p3JE?=
 =?us-ascii?Q?rI2+XlEkEu9c+7V+VE+JhijgmJg/sAn8COTFqfWXqFs49gdC1041p1rzpUty?=
 =?us-ascii?Q?G4tVsXDPKXDkuLhMsXMRedqdCKS4CmR02NqyDSY82PMPhf799tQo+riEtymL?=
 =?us-ascii?Q?SXlEo9iQajpm+6+gupG51Bke6HDdRf9ID1EaTicAYnN+UNUCRgJPgTk4HVfF?=
 =?us-ascii?Q?lqh3pueWx3cwZu/e3NFTDWnPvc9pM88T3leAIC7T+zpRVlHBFnV2Fp0eAN+O?=
 =?us-ascii?Q?Pdpj4bbCkwoLp70Gs89KMHC036097mhoLtiazC5ZE2S3fhwea8y/tayYiAMz?=
 =?us-ascii?Q?Xvu1mBAvQsaiqB7GxM3KaF0cLOXS7WFtDPdsV0gstL/ITPKYARvQdCXUDFrj?=
 =?us-ascii?Q?qVwyLtJq/HgWG0ZdQjVgQ8T87J3N368i8osZtj0oxJkCj5D03e2bt4ixap50?=
 =?us-ascii?Q?5KHuaDx0FmEvUrUu/han9IqNrJOtlqVSQJ1xupBqwJQ52eR0hRxkL4SE/AAh?=
 =?us-ascii?Q?NsSi+MMfhmzr4xcA7Ny8a+fdWIvxzatDzgN8gf6CmDvzTImlIc9uJvKdBv8o?=
 =?us-ascii?Q?TuMpLXBfHsAYcucIgsvYbMRUR4G3jpPVlMmKr508gpeoDECH8GQL28EOk5Or?=
 =?us-ascii?Q?x++w8K0WIKnXXzh7q8NdqNX7yghBsop1g+WD9H/ZhmU8Uxroyr+GsRDmm8XJ?=
 =?us-ascii?Q?PNihZfpLSnhcRDjW3idTY/LRhCQEUVJNiWHd0wFLgZ+s8lOGb+xB6w5SzMOo?=
 =?us-ascii?Q?sCSvq76wkIg/Ei9XwnWXn8G+RCfoPwt7pCWHp7bbTysAE3hGDJl+Od/VS17b?=
 =?us-ascii?Q?vGjgbeN7nr34RzHMQDthASkUyx+t3U8nW+PUso+ztC3aGO+8CI0TLXPEHRXe?=
 =?us-ascii?Q?M3DUKpGWaAJZq4syeqwrVKNAl3DnkClFOodGJa6mJdoHwmLr49tfgNaR/+G/?=
 =?us-ascii?Q?l3iGY4eR+1slJc6W3IhgYVFTHRy+zDT6l/WpRsYtN+Hb20VnaJC5QIH0yObQ?=
 =?us-ascii?Q?QCRwN2Z9Cw/awgKxIdhS1jHE0S5HeKMn6y//C+zDmrMILu0E2k0RONUEEWJb?=
 =?us-ascii?Q?eoQiDMoCV7ngnyaWWh5QErXmQzGAI9xXHoPO/r9EUxk2wX8bycxyf3VAhQxE?=
 =?us-ascii?Q?w2WRqFPDtxiEwOmE+ZdvTrPieX/zxXLLcT6TdbDOZ+/o1t8VAn7oqFd7IBDg?=
 =?us-ascii?Q?hDdL+EiMiKtKvsrMUXxwRNPshdiUJEDP9gy49A00+dFRfrEXrKvmk+WaoC6y?=
 =?us-ascii?Q?Lu+bVbN/bgMveyikHNWC4YAB8X3nIU7Mpl32LVG+L/OhV13KPbGti23gxXUO?=
 =?us-ascii?Q?iQ+MmItCax3Y3GqD/MLVRkhTv+ttJb1jrFcVyzHy8AwUEU7V8WtVn6UbExHx?=
 =?us-ascii?Q?VBnUqR9H5ukn8SOP3UKvLaamN/cr8BnGi4IDIp1Xn9lihqisDpuUcqU8swMV?=
 =?us-ascii?Q?416iogfT1vTCUNuosf+wC7bB8AI2kGawosJ8wnIYcKswyBCeGNrgHjFDUBs3?=
 =?us-ascii?Q?dIt2MUgJ60rZPQpMpblFblwgQo5FHDvIrveipAHPFCRDupe0PbmTPpHyDC8a?=
 =?us-ascii?Q?fg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 04904f23-8e5b-4ca7-c71d-08dc53099468
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 11:39:39.0615
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /9rO4wE7l5Bof9c12CLhj7GVyJzkJucmX/6mKCsFnTdZ+2k0gOYymhP3pjBtZ36c0a6XTnai1kLeacpHWkXiPw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7271

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 *data);
+static struct sock *iso_get_sock(bdaddr_t *src, bdaddr_t *dst,
+				 unsigned char state,
+				 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 = iso_get_sock_listen(&hcon->src,
-						     &hcon->dst,
-						     iso_match_conn_sync_handle,
-						     hcon);
+			parent = 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(bdaddr_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 *data)
+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 = NULL, *sk1 = NULL;
 
 	read_lock(&iso_sk_list.lock);
 
 	sk_for_each(sk, &iso_sk_list.head) {
-		if (sk->sk_state != BT_LISTEN)
+		if (sk->sk_state != state)
 			continue;
 
 		/* Match Broadcast destination */
@@ -1805,32 +1808,37 @@ static void iso_conn_ready(struct iso_conn *conn)
 						 HCI_EVT_LE_BIG_SYNC_ESTABILISHED);
 
 			/* Get reference to PA sync parent socket, if it exists */
-			parent = iso_get_sock_listen(&hcon->src,
-						     &hcon->dst,
-						     iso_match_pa_sync_flag, NULL);
+			parent = iso_get_sock(&hcon->src, &hcon->dst,
+					      BT_LISTEN,
+					      iso_match_pa_sync_flag,
+					      NULL);
 			if (!parent && ev)
-				parent = iso_get_sock_listen(&hcon->src,
-							     &hcon->dst,
-							     iso_match_big, ev);
+				parent = 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 = hci_recv_event_data(hcon->hdev,
 						  HCI_EV_LE_PA_SYNC_ESTABLISHED);
 			if (ev2)
-				parent = iso_get_sock_listen(&hcon->src,
-							     &hcon->dst,
-							     iso_match_sid, ev2);
+				parent = iso_get_sock(&hcon->src,
+						      &hcon->dst,
+						      BT_LISTEN,
+						      iso_match_sid, ev2);
 		} else if (test_bit(HCI_CONN_PA_SYNC, &hcon->flags)) {
 			ev3 = hci_recv_event_data(hcon->hdev,
 						  HCI_EVT_LE_BIG_INFO_ADV_REPORT);
 			if (ev3)
-				parent = iso_get_sock_listen(&hcon->src,
-							     &hcon->dst,
-							     iso_match_sync_handle, ev3);
+				parent = iso_get_sock(&hcon->src,
+						      &hcon->dst,
+						      BT_LISTEN,
+						      iso_match_sync_handle,
+						      ev3);
 		}
 
 		if (!parent)
-			parent = iso_get_sock_listen(&hcon->src,
-							BDADDR_ANY, NULL, NULL);
+			parent = 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 = hci_recv_event_data(hdev, HCI_EV_LE_PA_SYNC_ESTABLISHED);
 	if (ev1) {
-		sk = iso_get_sock_listen(&hdev->bdaddr, bdaddr, iso_match_sid,
-					 ev1);
+		sk = iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
+				  iso_match_sid, ev1);
 		if (sk && !ev1->status)
 			iso_pi(sk)->sync_handle = le16_to_cpu(ev1->handle);
 
@@ -1962,12 +1970,12 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
 	ev2 = 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 = iso_get_sock_listen(&hdev->bdaddr, bdaddr,
-						iso_match_pa_sync_flag, NULL);
+		sk = iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
+				  iso_match_pa_sync_flag, NULL);
 
 		if (!sk) {
-			sk = iso_get_sock_listen(&hdev->bdaddr, bdaddr,
-						 iso_match_sync_handle, ev2);
+			sk = iso_get_sock(&hdev->bdaddr, bdaddr, BT_LISTEN,
+					  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 = iso_get_sock_listen(&hdev->bdaddr, bdaddr,
-					 iso_match_sync_handle_pa_report, ev3);
+		sk = 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 = 0;
 		}
 	} else {
-		sk = iso_get_sock_listen(&hdev->bdaddr, BDADDR_ANY, NULL, NULL);
+		sk = iso_get_sock(&hdev->bdaddr, BDADDR_ANY,
+				  BT_LISTEN, NULL, NULL);
 	}
 
 done:
-- 
2.39.2