Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3337-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Mon, 08 Apr 2024 10:32:47 +0300
From: Pauli Virtanen <pav@iki.fi>
To: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH BlueZ 4/5] iso-tester: add test for BT_POLL_ERRQUEUE
User-Agent: K-9 Mail for Android
In-Reply-To: <1a56b2769c23485127587ab245b6b9e84cccdde3.1712503074.git.pav@iki.fi>
References: <cover.1712503073.git.pav@iki.fi> <1a56b2769c23485127587ab245b6b9e84cccdde3.1712503074.git.pav@iki.fi>
Message-ID: <8BB1BAC3-B082-4179-9310-A4DB377A347B@iki.fi>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable


7=2E huhtikuuta 2024 18=2E18=2E37 GMT+03:00 Pauli Virtanen <pav@iki=2Efi> =
kirjoitti:
>Also test BT_POLL_ERRQUEUE is experimental feature=2E
>
>Add test:
>
>ISO Send - TX No Poll Timestamping
>---
> tools/iso-tester=2Ec | 124 ++++++++++++++++++++++++++++++++++++++++++++-
> tools/tester=2Eh     |   3 ++
> 2 files changed, 125 insertions(+), 2 deletions(-)
>
>diff --git a/tools/iso-tester=2Ec b/tools/iso-tester=2Ec
>index c29fedd1d=2E=2E046606068 100644
>--- a/tools/iso-tester=2Ec
>+++ b/tools/iso-tester=2Ec
>@@ -470,7 +470,7 @@ struct test_data {
> 	uint16_t handle;
> 	uint16_t acl_handle;
> 	struct queue *io_queue;
>-	unsigned int io_id[3];
>+	unsigned int io_id[4];
> 	uint8_t client_num;
> 	int step;
> 	bool reconnect;
>@@ -513,6 +513,9 @@ struct iso_client_data {
> 	 * Used for testing TX timestamping OPT_ID=2E
> 	 */
> 	unsigned int repeat_send;
>+
>+	/* Disable BT_POLL_ERRQUEUE before enabling TX timestamping */
>+	bool no_poll_errqueue;
> };
>=20
> typedef bool (*iso_defer_accept_t)(struct test_data *data, GIOChannel *i=
o);
>@@ -648,6 +651,18 @@ static const uint8_t reset_iso_socket_param[] =3D {
> 	0x00,						/* Action - disable */
> };
>=20
>+static const uint8_t set_poll_errqueue_param[] =3D {
>+	0x33, 0x57, 0x7b, 0xb4, 0x21, 0xc0, 0xc1, 0x8b, /* UUID */
>+	0x79, 0x46, 0x9f, 0xb6, 0x4c, 0x8c, 0x51, 0x69,
>+	0x01,						/* Action - enable */
>+};
>+
>+static const uint8_t reset_poll_errqueue_param[] =3D {
>+	0x33, 0x57, 0x7b, 0xb4, 0x21, 0xc0, 0xc1, 0x8b, /* UUID */
>+	0x79, 0x46, 0x9f, 0xb6, 0x4c, 0x8c, 0x51, 0x69,
>+	0x00,						/* Action - disable */
>+};
>+
> static void set_iso_socket_callback(uint8_t status, uint16_t length,
> 					const void *param, void *user_data)
> {
>@@ -659,9 +674,21 @@ static void set_iso_socket_callback(uint8_t status, =
uint16_t length,
> 	tester_print("ISO socket feature is enabled");
> }
>=20
>+static void set_poll_errqueue_callback(uint8_t status, uint16_t length,
>+					const void *param, void *user_data)
>+{
>+	if (status !=3D MGMT_STATUS_SUCCESS) {
>+		tester_print("Poll Errqueue feature could not be enabled");
>+		return;
>+	}
>+
>+	tester_print("Poll Errqueue feature is enabled");
>+}
>+
> static void test_pre_setup(const void *test_data)
> {
> 	struct test_data *data =3D tester_get_data();
>+	const struct iso_client_data *isodata =3D test_data;
>=20
> 	data->mgmt =3D mgmt_new_default();
> 	if (!data->mgmt) {
>@@ -677,6 +704,13 @@ static void test_pre_setup(const void *test_data)
> 		  sizeof(set_iso_socket_param), set_iso_socket_param,
> 		  set_iso_socket_callback, NULL, NULL);
>=20
>+	if (isodata && isodata->no_poll_errqueue) {
>+		mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
>+			  sizeof(set_poll_errqueue_param),
>+			  set_poll_errqueue_param,
>+			  set_poll_errqueue_callback, NULL, NULL);
>+	}
>+
> 	mgmt_send(data->mgmt, MGMT_OP_READ_INDEX_LIST, MGMT_INDEX_NONE, 0, NULL=
,
> 					read_index_list_callback, NULL, NULL);
> }
>@@ -684,11 +718,19 @@ static void test_pre_setup(const void *test_data)
> static void test_post_teardown(const void *test_data)
> {
> 	struct test_data *data =3D tester_get_data();
>+	const struct iso_client_data *isodata =3D test_data;
>=20
> 	mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
> 		  sizeof(reset_iso_socket_param), reset_iso_socket_param,
> 		  NULL, NULL, NULL);
>=20
>+	if (isodata && isodata->no_poll_errqueue) {
>+		mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
>+			  sizeof(reset_poll_errqueue_param),
>+			  reset_poll_errqueue_param,
>+			  NULL, NULL, NULL);
>+	}
>+
> 	hciemu_unref(data->hciemu);
> 	data->hciemu =3D NULL;
> }
>@@ -1044,6 +1086,16 @@ static const struct iso_client_data connect_send_t=
x_cmsg_timestamping =3D {
> 	=2Ecmsg_timestamping =3D true,
> };
>=20
>+static const struct iso_client_data connect_send_tx_no_poll_timestamping=
 =3D {
>+	=2Eqos =3D QOS_16_2_1,
>+	=2Eexpect_err =3D 0,
>+	=2Esend =3D &send_16_2_1,
>+	=2Eso_timestamping =3D (SOF_TIMESTAMPING_SOFTWARE |
>+					SOF_TIMESTAMPING_TX_SOFTWARE),
>+	=2Erepeat_send =3D 1,
>+	=2Eno_poll_errqueue =3D true,
>+};
>+
> static const struct iso_client_data listen_16_2_1_recv =3D {
> 	=2Eqos =3D QOS_16_2_1,
> 	=2Eexpect_err =3D 0,
>@@ -2162,6 +2214,37 @@ static gboolean iso_recv_errqueue(GIOChannel *io, =
GIOCondition cond,
> 	return FALSE;
> }
>=20
>+static gboolean iso_fail_errqueue(GIOChannel *io, GIOCondition cond,
>+							gpointer user_data)
>+{
>+	struct test_data *data =3D user_data;
>+
>+	tester_warn("Unexpected POLLERR");
>+	tester_test_failed();
>+
>+	data->io_id[3] =3D 0;
>+	return FALSE;
>+}
>+
>+static gboolean iso_timer_errqueue(gpointer user_data)
>+{
>+	struct test_data *data =3D user_data;
>+	GIOChannel *io;
>+	gboolean ret;
>+
>+	io =3D queue_peek_head(data->io_queue);
>+	g_assert(io);
>+
>+	ret =3D iso_recv_errqueue(io, G_IO_IN, data);
>+	if (!ret) {
>+		if (data->io_id[3])
>+			g_source_remove(data->io_id[3]);
>+		data->io_id[3] =3D 0;
>+	}
>+
>+	return ret;
>+}
>+
> static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
> {
> 	const struct iso_client_data *isodata =3D data->test_data;
>@@ -2182,7 +2265,39 @@ static void iso_tx_timestamping(struct test_data *=
data, GIOChannel *io)
>=20
> 	sk =3D g_io_channel_unix_get_fd(io);
>=20
>-	data->io_id[2] =3D g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue, data=
);
>+	if (isodata->no_poll_errqueue) {
>+		uint32_t flag =3D 0;
>+
>+		err =3D setsockopt(sk, SOL_BLUETOOTH, BT_POLL_ERRQUEUE,
>+							&flag, sizeof(flag));
>+		if (err < 0) {
>+			tester_warn("setsockopt BT_POLL_ERRQUEUE: %s (%d)",
>+						strerror(errno), errno);
>+			tester_test_failed();
>+			return;
>+		}
>+
>+		if (!data->io_queue)
>+			data->io_queue =3D queue_new();
>+		queue_push_head(data->io_queue, g_io_channel_ref(io));
>+
>+		data->io_id[2] =3D g_timeout_add(100, iso_timer_errqueue, data);
>+		data->io_id[3] =3D g_io_add_watch(io, G_IO_ERR, iso_fail_errqueue,
>+									data);
>+	} else {
>+		uint32_t flag =3D 1;
>+
>+		err =3D setsockopt(sk, SOL_BLUETOOTH, BT_POLL_ERRQUEUE,
>+							&flag, sizeof(flag));
>+		if (err >=3D 0) {
>+			tester_warn("BT_POLL_ERRQUEUE available");
>+			tester_test_failed();
>+			return;
>+		}
>+
>+		data->io_id[2] =3D g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue,
>+									data);
>+	}
>=20
> 	if (isodata->cmsg_timestamping)
> 		so &=3D ~SOF_TIMESTAMPING_TX_RECORD_MASK;
>@@ -3407,6 +3522,11 @@ int main(int argc, char *argv[])
> 			&connect_send_tx_cmsg_timestamping, setup_powered,
> 			test_connect);
>=20
>+	/* Test TX timestamping and disabling POLLERR wakeup */
>+	test_iso("ISO Send - TX No Poll Timestamping",
>+			&connect_send_tx_no_poll_timestamping, setup_powered,
>+			test_connect);
>+
> 	test_iso("ISO Receive - Success", &listen_16_2_1_recv, setup_powered,
> 							test_listen);
>=20
>diff --git a/tools/tester=2Eh b/tools/tester=2Eh
>index 617de842e=2E=2Eb6de084a4 100644
>--- a/tools/tester=2Eh
>+++ b/tools/tester=2Eh
>@@ -89,6 +89,9 @@ static inline int tx_tstamp_recv(struct tx_tstamp_data =
*data, int sk, int len)
>=20
> 	ret =3D recvmsg(sk, &msg, MSG_ERRQUEUE);
> 	if (ret < 0) {
>+		if (ret =3D=3D EAGAIN || ret =3D=3D EWOULDBLOCK)

This should have been errno, not ret=2E

-> v2

>+			return data->count - data->pos;
>+
> 		tester_warn("Failed to read from errqueue: %s (%d)",
> 							strerror(errno), errno);
> 		return -EINVAL;