* [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
@ 2024-04-02 16:42 ` Pauli Virtanen
2024-04-02 17:32 ` Luiz Augusto von Dentz
2024-04-02 17:59 ` tests: add TX timestamping tests bluez.test.bot
2024-04-02 16:42 ` [PATCH BlueZ v3 2/8] iso-tester: Add tests for TX timestamping Pauli Virtanen
` (6 subsequent siblings)
7 siblings, 2 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Add new CMSG type used in new kernel TX timestamping support.
Add new socket option.
---
lib/bluetooth.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/bluetooth.h b/lib/bluetooth.h
index 75dc960c8..7c310a69b 100644
--- a/lib/bluetooth.h
+++ b/lib/bluetooth.h
@@ -141,6 +141,7 @@ struct bt_voice {
#define BT_PKT_STATUS 16
#define BT_SCM_PKT_STATUS 0x03
+#define BT_SCM_ERROR 0x04
#define BT_ISO_QOS 17
@@ -239,6 +240,8 @@ enum {
#define BT_ISO_BASE 20
+#define BT_NO_ERRQUEUE_POLL 21
+
/* Byte order conversions */
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define htobs(d) (d)
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL
2024-04-02 16:42 ` [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL Pauli Virtanen
@ 2024-04-02 17:32 ` Luiz Augusto von Dentz
2024-04-02 17:59 ` tests: add TX timestamping tests bluez.test.bot
1 sibling, 0 replies; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-04-02 17:32 UTC (permalink / raw)
To: Pauli Virtanen; +Cc: linux-bluetooth
Hi Pauli,
On Tue, Apr 2, 2024 at 12:43 PM Pauli Virtanen <pav@iki.fi> wrote:
>
> Add new CMSG type used in new kernel TX timestamping support.
>
> Add new socket option.
> ---
> lib/bluetooth.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/lib/bluetooth.h b/lib/bluetooth.h
> index 75dc960c8..7c310a69b 100644
> --- a/lib/bluetooth.h
> +++ b/lib/bluetooth.h
> @@ -141,6 +141,7 @@ struct bt_voice {
> #define BT_PKT_STATUS 16
>
> #define BT_SCM_PKT_STATUS 0x03
> +#define BT_SCM_ERROR 0x04
>
> #define BT_ISO_QOS 17
>
> @@ -239,6 +240,8 @@ enum {
>
> #define BT_ISO_BASE 20
>
> +#define BT_NO_ERRQUEUE_POLL 21
Split this change so I can apply the other patches in advance.
> /* Byte order conversions */
> #if __BYTE_ORDER == __LITTLE_ENDIAN
> #define htobs(d) (d)
> --
> 2.44.0
>
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 12+ messages in thread* RE: tests: add TX timestamping tests
2024-04-02 16:42 ` [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL Pauli Virtanen
2024-04-02 17:32 ` Luiz Augusto von Dentz
@ 2024-04-02 17:59 ` bluez.test.bot
1 sibling, 0 replies; 12+ messages in thread
From: bluez.test.bot @ 2024-04-02 17:59 UTC (permalink / raw)
To: linux-bluetooth, pav
[-- Attachment #1: Type: text/plain, Size: 24031 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=840718
---Test result---
Test Summary:
CheckPatch PASS 4.29 seconds
GitLint PASS 2.30 seconds
BuildEll PASS 24.60 seconds
BluezMake FAIL 50.41 seconds
MakeCheck FAIL 147.79 seconds
MakeDistcheck PASS 176.60 seconds
CheckValgrind FAIL 43.03 seconds
CheckSmatch FAIL 96.04 seconds
bluezmakeextell FAIL 24.69 seconds
IncrementalBuild FAIL 1493.28 seconds
ScanBuild FAIL 583.88 seconds
Details
##############################
Test: BluezMake - FAIL
Desc: Build BlueZ
Output:
tools/l2cap-tester.c: In function ‘l2cap_tx_timestamping’:
tools/l2cap-tester.c:1292:9: error: variable ‘so’ has initializer but incomplete type
1292 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/l2cap-tester.c:1293:4: error: ‘struct so_timestamping’ has no member named ‘flags’
1293 | .flags = l2data->so_timestamping,
| ^~~~~
tools/l2cap-tester.c:1293:12: error: excess elements in struct initializer [-Werror]
1293 | .flags = l2data->so_timestamping,
| ^~~~~~
tools/l2cap-tester.c:1293:12: note: (near initialization for ‘so’)
tools/l2cap-tester.c:1292:25: error: storage size of ‘so’ isn’t known
1292 | struct so_timestamping so = {
| ^~
tools/l2cap-tester.c:1292:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/l2cap-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12721:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12721 | int main(int argc, char *argv[])
| ^~~~
make: *** [Makefile:4649: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
tools/l2cap-tester.c: In function ‘l2cap_tx_timestamping’:
tools/l2cap-tester.c:1292:9: error: variable ‘so’ has initializer but incomplete type
1292 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/l2cap-tester.c:1293:4: error: ‘struct so_timestamping’ has no member named ‘flags’
1293 | .flags = l2data->so_timestamping,
| ^~~~~
tools/l2cap-tester.c:1293:12: error: excess elements in struct initializer [-Werror]
1293 | .flags = l2data->so_timestamping,
| ^~~~~~
tools/l2cap-tester.c:1293:12: note: (near initialization for ‘so’)
tools/l2cap-tester.c:1292:25: error: storage size of ‘so’ isn’t known
1292 | struct so_timestamping so = {
| ^~
tools/l2cap-tester.c:1292:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/l2cap-tester.o] Error 1
make: *** [Makefile:12184: check] Error 2
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:
tools/l2cap-tester.c: In function ‘l2cap_tx_timestamping’:
tools/l2cap-tester.c:1292:9: error: variable ‘so’ has initializer but incomplete type
1292 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/l2cap-tester.c:1293:4: error: ‘struct so_timestamping’ has no member named ‘flags’
1293 | .flags = l2data->so_timestamping,
| ^~~~~
tools/l2cap-tester.c:1293:12: error: excess elements in struct initializer [-Werror]
1293 | .flags = l2data->so_timestamping,
| ^~~~~~
tools/l2cap-tester.c:1293:12: note: (near initialization for ‘so’)
tools/l2cap-tester.c:1292:25: error: storage size of ‘so’ isn’t known
1292 | struct so_timestamping so = {
| ^~
tools/l2cap-tester.c:1292:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/l2cap-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12721:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12721 | int main(int argc, char *argv[])
| ^~~~
make: *** [Makefile:12184: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:621:25: warning: Variable length array is used.
src/shared/gatt-server.c:720:25: warning: Variable length array is used.
src/shared/bap.c:282:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:621:25: warning: Variable length array is used.
src/shared/gatt-server.c:720:25: warning: Variable length array is used.
src/shared/bap.c:282:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
tools/mesh-cfgtest.c:1453:17: warning: unknown escape sequence: '\%'
tools/l2cap-tester.c: In function ‘l2cap_tx_timestamping’:
tools/l2cap-tester.c:1292:9: error: variable ‘so’ has initializer but incomplete type
1292 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/l2cap-tester.c:1293:4: error: ‘struct so_timestamping’ has no member named ‘flags’
1293 | .flags = l2data->so_timestamping,
| ^~~~~
tools/l2cap-tester.c:1293:12: error: excess elements in struct initializer [-Werror]
1293 | .flags = l2data->so_timestamping,
| ^~~~~~
tools/l2cap-tester.c:1293:12: note: (near initialization for ‘so’)
tools/l2cap-tester.c:1292:25: error: storage size of ‘so’ isn’t known
1292 | struct so_timestamping so = {
| ^~
tools/l2cap-tester.c:1292:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/l2cap-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4649: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
tools/l2cap-tester.c: In function ‘l2cap_tx_timestamping’:
tools/l2cap-tester.c:1292:9: error: variable ‘so’ has initializer but incomplete type
1292 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/l2cap-tester.c:1293:4: error: ‘struct so_timestamping’ has no member named ‘flags’
1293 | .flags = l2data->so_timestamping,
| ^~~~~
tools/l2cap-tester.c:1293:12: error: excess elements in struct initializer [-Werror]
1293 | .flags = l2data->so_timestamping,
| ^~~~~~
tools/l2cap-tester.c:1293:12: note: (near initialization for ‘so’)
tools/l2cap-tester.c:1292:25: error: storage size of ‘so’ isn’t known
1292 | struct so_timestamping so = {
| ^~
tools/l2cap-tester.c:1292:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/l2cap-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4649: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[BlueZ,v3,2/8] iso-tester: Add tests for TX timestamping
tools/iso-tester.c: In function ‘iso_tx_timestamping’:
tools/iso-tester.c:2130:9: error: variable ‘so’ has initializer but incomplete type
2130 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/iso-tester.c:2131:4: error: ‘struct so_timestamping’ has no member named ‘flags’
2131 | .flags = isodata->so_timestamping,
| ^~~~~
tools/iso-tester.c:2131:12: error: excess elements in struct initializer [-Werror]
2131 | .flags = isodata->so_timestamping,
| ^~~~~~~
tools/iso-tester.c:2131:12: note: (near initialization for ‘so’)
tools/iso-tester.c:2130:25: error: storage size of ‘so’ isn’t known
2130 | struct so_timestamping so = {
| ^~
tools/iso-tester.c:2130:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/iso-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12721:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12721 | int main(int argc, char *argv[])
| ^~~~
make: *** [Makefile:4649: all] Error 2
##############################
Test: ScanBuild - FAIL
Desc: Run Scan Build
Output:
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:993:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1099:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1291:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1356:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1631:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2140:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2148:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3237:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3259:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1331:13: warning: Access to field 'options' results in a dereference of a null pointer (loaded from variable 'opt')
if (c != opt->options[index - offset].val) {
^~~~~~~~~~~~
1 warning generated.
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:993:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1099:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1291:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1356:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1631:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2140:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2148:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3237:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3259:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1331:13: warning: Access to field 'options' results in a dereference of a null pointer (loaded from variable 'opt')
if (c != opt->options[index - offset].val) {
^~~~~~~~~~~~
1 warning generated.
tools/hciattach.c:816:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:864:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:886:8: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:908:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:929:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:973:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 6)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
6 warnings generated.
src/oui.c:50:2: warning: Value stored to 'hwdb' is never read
hwdb = udev_hwdb_unref(hwdb);
^ ~~~~~~~~~~~~~~~~~~~~~
src/oui.c:53:2: warning: Value stored to 'udev' is never read
udev = udev_unref(udev);
^ ~~~~~~~~~~~~~~~~
2 warnings generated.
tools/hcidump.c:180:9: warning: Potential leak of memory pointed to by 'dp'
if (fds[i].fd == sock)
^~~
tools/hcidump.c:248:17: warning: Assigned value is garbage or undefined
dh->ts_sec = htobl(frm.ts.tv_sec);
^ ~~~~~~~~~~~~~~~~~~~~
tools/hcidump.c:326:9: warning: 1st function call argument is an uninitialized value
if (be32toh(dp.flags) & 0x02) {
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:341:20: warning: 1st function call argument is an uninitialized value
frm.data_len = be32toh(dp.len);
^~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:346:14: warning: 1st function call argument is an uninitialized value
opcode = be32toh(dp.flags) & 0xffff;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:384:17: warning: Assigned value is garbage or undefined
frm.data_len = btohs(dh.len);
^ ~~~~~~~~~~~~~
tools/hcidump.c:394:11: warning: Assigned value is garbage or undefined
frm.len = frm.data_len;
^ ~~~~~~~~~~~~
tools/hcidump.c:398:9: warning: 1st function call argument is an uninitialized value
ts = be64toh(ph.ts);
^~~~~~~~~~~~~~
/usr/include/endian.h:51:22: note: expanded from macro 'be64toh'
# define be64toh(x) __bswap_64 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:403:13: warning: 1st function call argument is an uninitialized value
frm.in = be32toh(dp.flags) & 0x01;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:408:11: warning: Assigned value is garbage or undefined
frm.in = dh.in;
^ ~~~~~
tools/hcidump.c:437:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
fd = open(file, open_flags, 0644);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
11 warnings generated.
tools/rfcomm.c:234:3: warning: Value stored to 'i' is never read
i = execvp(cmdargv[0], cmdargv);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:234:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
i = execvp(cmdargv[0], cmdargv);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:354:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:497:14: warning: Assigned value is garbage or undefined
req.channel = raddr.rc_channel;
^ ~~~~~~~~~~~~~~~~
tools/rfcomm.c:515:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5 warnings generated.
src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
3 warnings generated.
tools/ciptool.c:350:7: warning: 5th function call argument is an uninitialized value
sk = do_connect(ctl, dev_id, &src, &dst, psm, (1 << CMTP_LOOPBACK));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/sdptool.c:941:26: warning: Result of 'malloc' is converted to a pointer of type 'uint32_t', which is incompatible with sizeof operand type 'int'
uint32_t *value_int = malloc(sizeof(int));
~~~~~~~~~~ ^~~~~~ ~~~~~~~~~~~
tools/sdptool.c:980:4: warning: 1st function call argument is an uninitialized value
free(allocArray[i]);
^~~~~~~~~~~~~~~~~~~
tools/sdptool.c:3777:2: warning: Potential leak of memory pointed to by 'si.name'
return add_service(0, &si);
^~~~~~~~~~~~~~~~~~~~~~~~~~
tools/sdptool.c:4112:4: warning: Potential leak of memory pointed to by 'context.svc'
return -1;
^~~~~~~~~
4 warnings generated.
tools/iso-tester.c: In function ‘iso_tx_timestamping’:
tools/iso-tester.c:2130:9: error: variable ‘so’ has initializer but incomplete type
2130 | struct so_timestamping so = {
| ^~~~~~~~~~~~~~~
tools/iso-tester.c:2131:4: error: ‘struct so_timestamping’ has no member named ‘flags’
2131 | .flags = isodata->so_timestamping,
| ^~~~~
tools/iso-tester.c:2131:12: error: excess elements in struct initializer [-Werror]
2131 | .flags = isodata->so_timestamping,
| ^~~~~~~
tools/iso-tester.c:2131:12: note: (near initialization for ‘so’)
tools/iso-tester.c:2130:25: error: storage size of ‘so’ isn’t known
2130 | struct so_timestamping so = {
| ^~
tools/iso-tester.c:2130:25: error: unused variable ‘so’ [-Werror=unused-variable]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:7807: tools/iso-tester.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4649: all] Error 2
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH BlueZ v3 2/8] iso-tester: Add tests for TX timestamping
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
2024-04-02 16:42 ` [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL Pauli Virtanen
@ 2024-04-02 16:42 ` Pauli Virtanen
2024-04-02 18:46 ` Luiz Augusto von Dentz
2024-04-02 16:43 ` [PATCH BlueZ v3 3/8] l2cap-tester: Add test " Pauli Virtanen
` (5 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:42 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Add TX timestamping test utilities in new tester-utils.h, so that they
can be shared between testers.
Add tests:
ISO Send - TX Timestamping
ISO Send - TX Sched Timestamping
ISO Send - TX Msg Timestamping
---
tools/iso-tester.c | 169 ++++++++++++++++++++++++++++++++++++++++---
tools/tester-utils.h | 163 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 322 insertions(+), 10 deletions(-)
create mode 100644 tools/tester-utils.h
diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index 60afef301..c12675a18 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -18,6 +18,9 @@
#include <poll.h>
#include <stdbool.h>
+#include <linux/errqueue.h>
+#include <linux/net_tstamp.h>
+
#include <glib.h>
#include "lib/bluetooth.h"
@@ -34,6 +37,8 @@
#include "src/shared/util.h"
#include "src/shared/queue.h"
+#include "tester-utils.h"
+
#define QOS_IO(_interval, _latency, _sdu, _phy, _rtn) \
{ \
.interval = _interval, \
@@ -462,11 +467,12 @@ struct test_data {
uint16_t handle;
uint16_t acl_handle;
struct queue *io_queue;
- unsigned int io_id[2];
+ unsigned int io_id[3];
uint8_t client_num;
int step;
bool reconnect;
bool suspending;
+ struct tx_tstamp_data tx_ts;
};
struct iso_client_data {
@@ -487,6 +493,10 @@ struct iso_client_data {
size_t base_len;
bool listen_bind;
bool pa_bind;
+ uint32_t so_timestamping;
+ bool msg_timestamping;
+ unsigned int send_extra;
+ unsigned int send_extra_pre_ts;
};
typedef bool (*iso_defer_accept_t)(struct test_data *data, GIOChannel *io);
@@ -677,15 +687,14 @@ static void io_free(void *data)
static void test_data_free(void *test_data)
{
struct test_data *data = test_data;
+ unsigned int i;
if (data->io_queue)
queue_destroy(data->io_queue, io_free);
- if (data->io_id[0] > 0)
- g_source_remove(data->io_id[0]);
-
- if (data->io_id[1] > 0)
- g_source_remove(data->io_id[1]);
+ for (i = 0; i < ARRAY_SIZE(data->io_id); ++i)
+ if (data->io_id[i] > 0)
+ g_source_remove(data->io_id[i]);
free(data);
}
@@ -987,6 +996,38 @@ static const struct iso_client_data connect_16_2_1_send = {
.send = &send_16_2_1,
};
+static const struct iso_client_data connect_send_tx_timestamping = {
+ .qos = QOS_16_2_1,
+ .expect_err = 0,
+ .send = &send_16_2_1,
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_ID |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+ .send_extra = 1,
+ .send_extra_pre_ts = 2,
+};
+
+static const struct iso_client_data connect_send_tx_sched_timestamping = {
+ .qos = QOS_16_2_1,
+ .expect_err = 0,
+ .send = &send_16_2_1,
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_TSONLY |
+ SOF_TIMESTAMPING_TX_SCHED),
+ .send_extra = 1,
+};
+
+static const struct iso_client_data connect_send_tx_msg_timestamping = {
+ .qos = QOS_16_2_1,
+ .expect_err = 0,
+ .send = &send_16_2_1,
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+ .send_extra = 1,
+ .msg_timestamping = true,
+};
+
static const struct iso_client_data listen_16_2_1_recv = {
.qos = QOS_16_2_1,
.expect_err = 0,
@@ -1410,14 +1451,17 @@ static void bthost_recv_data(const void *buf, uint16_t len, void *user_data)
struct test_data *data = user_data;
const struct iso_client_data *isodata = data->test_data;
+ --data->step;
+
tester_print("Client received %u bytes of data", len);
if (isodata->send && (isodata->send->iov_len != len ||
memcmp(isodata->send->iov_base, buf, len))) {
if (!isodata->recv->iov_base)
tester_test_failed();
- } else
+ } else if (!data->step) {
tester_test_passed();
+ }
}
static void bthost_iso_disconnected(void *user_data)
@@ -2058,17 +2102,95 @@ static void iso_recv(struct test_data *data, GIOChannel *io)
data->io_id[0] = g_io_add_watch(io, G_IO_IN, iso_recv_data, data);
}
-static void iso_send(struct test_data *data, GIOChannel *io)
+static gboolean iso_recv_errqueue(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
{
+ struct test_data *data = user_data;
const struct iso_client_data *isodata = data->test_data;
- ssize_t ret;
+ int sk = g_io_channel_unix_get_fd(io);
+ int err;
+
+ data->step--;
+
+ err = tx_tstamp_recv(&data->tx_ts, sk, isodata->send->iov_len);
+ if (err > 0)
+ return TRUE;
+ else if (!err && !data->step)
+ tester_test_passed();
+ else
+ tester_test_failed();
+
+ data->io_id[2] = 0;
+ return FALSE;
+}
+
+static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
+{
+ const struct iso_client_data *isodata = data->test_data;
+ struct so_timestamping so = {
+ .flags = isodata->so_timestamping,
+ };
int sk;
+ int err;
+ unsigned int count;
+
+ if (!(isodata->so_timestamping & SOF_TIMESTAMPING_TX_RECORD_MASK))
+ return;
+
+ tester_print("Enabling TX timestamping");
+
+ tx_tstamp_init(&data->tx_ts, isodata->so_timestamping);
+
+ for (count = 0; count < isodata->send_extra + 1; ++count)
+ data->step += tx_tstamp_expect(&data->tx_ts);
sk = g_io_channel_unix_get_fd(io);
+ data->io_id[2] = g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue, data);
+
+ if (isodata->msg_timestamping)
+ so.flags &= ~SOF_TIMESTAMPING_TX_RECORD_MASK;
+
+ err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
+ if (err < 0) {
+ tester_warn("setsockopt SO_TIMESTAMPING: %s (%d)",
+ strerror(errno), errno);
+ tester_test_failed();
+ return;
+ }
+}
+
+static void iso_send_data(struct test_data *data, GIOChannel *io)
+{
+ const struct iso_client_data *isodata = data->test_data;
+ char control[CMSG_SPACE(sizeof(uint32_t))];
+ struct msghdr msg = {
+ .msg_iov = (struct iovec *)isodata->send,
+ .msg_iovlen = 1,
+ };
+ struct cmsghdr *cmsg;
+ ssize_t ret;
+ int sk;
+
tester_print("Writing %zu bytes of data", isodata->send->iov_len);
- ret = writev(sk, isodata->send, 1);
+ sk = g_io_channel_unix_get_fd(io);
+
+ if (isodata->msg_timestamping) {
+ memset(control, 0, sizeof(control));
+ msg.msg_control = control;
+ msg.msg_controllen = sizeof(control);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SO_TIMESTAMPING;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(uint32_t));
+
+ *((uint32_t *)CMSG_DATA(cmsg)) = (isodata->so_timestamping &
+ SOF_TIMESTAMPING_TX_RECORD_MASK);
+ }
+
+ ret = sendmsg(sk, &msg, 0);
if (ret < 0 || isodata->send->iov_len != (size_t) ret) {
tester_warn("Failed to write %zu bytes: %s (%d)",
isodata->send->iov_len, strerror(errno), errno);
@@ -2076,6 +2198,22 @@ static void iso_send(struct test_data *data, GIOChannel *io)
return;
}
+ data->step++;
+}
+
+static void iso_send(struct test_data *data, GIOChannel *io)
+{
+ const struct iso_client_data *isodata = data->test_data;
+ unsigned int count;
+
+ for (count = 0; count < isodata->send_extra_pre_ts; ++count)
+ iso_send_data(data, io);
+
+ iso_tx_timestamping(data, io);
+
+ for (count = 0; count < isodata->send_extra + 1; ++count)
+ iso_send_data(data, io);
+
if (isodata->bcast) {
tester_test_passed();
return;
@@ -3197,6 +3335,17 @@ int main(int argc, char *argv[])
test_iso("ISO Send - Success", &connect_16_2_1_send, setup_powered,
test_connect);
+ test_iso("ISO Send - TX Timestamping", &connect_send_tx_timestamping,
+ setup_powered, test_connect);
+
+ test_iso("ISO Send - TX Sched Timestamping",
+ &connect_send_tx_sched_timestamping, setup_powered,
+ test_connect);
+
+ test_iso("ISO Send - TX Msg Timestamping",
+ &connect_send_tx_msg_timestamping, setup_powered,
+ test_connect);
+
test_iso("ISO Receive - Success", &listen_16_2_1_recv, setup_powered,
test_listen);
diff --git a/tools/tester-utils.h b/tools/tester-utils.h
new file mode 100644
index 000000000..617de842e
--- /dev/null
+++ b/tools/tester-utils.h
@@ -0,0 +1,163 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2022 Intel Corporation.
+ *
+ */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <time.h>
+#include <sys/socket.h>
+#include <linux/errqueue.h>
+#include <linux/net_tstamp.h>
+
+#include <glib.h>
+
+#define SEC_NSEC(_t) ((_t) * 1000000000LL)
+#define TS_NSEC(_ts) (SEC_NSEC((_ts)->tv_sec) + (_ts)->tv_nsec)
+
+struct tx_tstamp_data {
+ struct {
+ uint32_t id;
+ uint32_t type;
+ } expect[16];
+ unsigned int pos;
+ unsigned int count;
+ unsigned int sent;
+ uint32_t so_timestamping;
+};
+
+static inline void tx_tstamp_init(struct tx_tstamp_data *data,
+ uint32_t so_timestamping)
+{
+ memset(data, 0, sizeof(*data));
+ memset(data->expect, 0xff, sizeof(data->expect));
+
+ data->so_timestamping = so_timestamping;
+}
+
+static inline int tx_tstamp_expect(struct tx_tstamp_data *data)
+{
+ unsigned int pos = data->count;
+ int steps;
+
+ if (data->so_timestamping & SOF_TIMESTAMPING_TX_SCHED) {
+ g_assert(pos < ARRAY_SIZE(data->expect));
+ data->expect[pos].type = SCM_TSTAMP_SCHED;
+ data->expect[pos].id = data->sent;
+ pos++;
+ }
+
+ if (data->so_timestamping & SOF_TIMESTAMPING_TX_SOFTWARE) {
+ g_assert(pos < ARRAY_SIZE(data->expect));
+ data->expect[pos].type = SCM_TSTAMP_SND;
+ data->expect[pos].id = data->sent;
+ pos++;
+ }
+
+ data->sent++;
+
+ steps = pos - data->count;
+ data->count = pos;
+ return steps;
+}
+
+static inline int tx_tstamp_recv(struct tx_tstamp_data *data, int sk, int len)
+{
+ unsigned char control[512];
+ ssize_t ret;
+ char buf[1024];
+ struct msghdr msg;
+ struct iovec iov;
+ struct cmsghdr *cmsg;
+ struct scm_timestamping *tss = NULL;
+ struct sock_extended_err *serr = NULL;
+ struct timespec now;
+
+ iov.iov_base = buf;
+ iov.iov_len = sizeof(buf);
+
+ memset(&msg, 0, sizeof(msg));
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_control = control;
+ msg.msg_controllen = sizeof(control);
+
+ ret = recvmsg(sk, &msg, MSG_ERRQUEUE);
+ if (ret < 0) {
+ tester_warn("Failed to read from errqueue: %s (%d)",
+ strerror(errno), errno);
+ return -EINVAL;
+ }
+
+ if (data->so_timestamping & SOF_TIMESTAMPING_OPT_TSONLY) {
+ if (ret != 0) {
+ tester_warn("Packet copied back to errqueue");
+ return -EINVAL;
+ }
+ } else if (len > ret) {
+ tester_warn("Packet not copied back to errqueue: %zd", ret);
+ return -EINVAL;
+ }
+
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ if (cmsg->cmsg_level == SOL_SOCKET &&
+ cmsg->cmsg_type == SCM_TIMESTAMPING) {
+ tss = (void *)CMSG_DATA(cmsg);
+ } else if (cmsg->cmsg_level == SOL_BLUETOOTH &&
+ cmsg->cmsg_type == BT_SCM_ERROR) {
+ serr = (void *)CMSG_DATA(cmsg);
+ }
+ }
+
+ if (!tss) {
+ tester_warn("SCM_TIMESTAMPING not found");
+ return -EINVAL;
+ }
+
+ if (!serr) {
+ tester_warn("BT_SCM_ERROR not found");
+ return -EINVAL;
+ }
+
+ if (serr->ee_errno != ENOMSG ||
+ serr->ee_origin != SO_EE_ORIGIN_TIMESTAMPING) {
+ tester_warn("BT_SCM_ERROR wrong for timestamping");
+ return -EINVAL;
+ }
+
+ clock_gettime(CLOCK_REALTIME, &now);
+
+ if (TS_NSEC(&now) < TS_NSEC(tss->ts) ||
+ TS_NSEC(&now) > TS_NSEC(tss->ts) + SEC_NSEC(10)) {
+ tester_warn("nonsense in timestamp");
+ return -EINVAL;
+ }
+
+ if (data->pos >= data->count) {
+ tester_warn("Too many timestamps");
+ return -EINVAL;
+ }
+
+ if ((data->so_timestamping & SOF_TIMESTAMPING_OPT_ID) &&
+ serr->ee_data != data->expect[data->pos].id) {
+ tester_warn("Bad timestamp id %u", serr->ee_data);
+ return -EINVAL;
+ }
+
+ if (serr->ee_info != data->expect[data->pos].type) {
+ tester_warn("Bad timestamp type %u", serr->ee_info);
+ return -EINVAL;
+ }
+
+ tester_print("Got valid TX timestamp %u", data->pos);
+
+ ++data->pos;
+
+ return data->count - data->pos;
+}
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH BlueZ v3 2/8] iso-tester: Add tests for TX timestamping
2024-04-02 16:42 ` [PATCH BlueZ v3 2/8] iso-tester: Add tests for TX timestamping Pauli Virtanen
@ 2024-04-02 18:46 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-04-02 18:46 UTC (permalink / raw)
To: Pauli Virtanen; +Cc: linux-bluetooth
Hi Pauli,
On Tue, Apr 2, 2024 at 12:43 PM Pauli Virtanen <pav@iki.fi> wrote:
>
> Add TX timestamping test utilities in new tester-utils.h, so that they
> can be shared between testers.
>
> Add tests:
>
> ISO Send - TX Timestamping
> ISO Send - TX Sched Timestamping
> ISO Send - TX Msg Timestamping
> ---
> tools/iso-tester.c | 169 ++++++++++++++++++++++++++++++++++++++++---
> tools/tester-utils.h | 163 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 322 insertions(+), 10 deletions(-)
> create mode 100644 tools/tester-utils.h
>
> diff --git a/tools/iso-tester.c b/tools/iso-tester.c
> index 60afef301..c12675a18 100644
> --- a/tools/iso-tester.c
> +++ b/tools/iso-tester.c
> @@ -18,6 +18,9 @@
> #include <poll.h>
> #include <stdbool.h>
>
> +#include <linux/errqueue.h>
> +#include <linux/net_tstamp.h>
> +
> #include <glib.h>
>
> #include "lib/bluetooth.h"
> @@ -34,6 +37,8 @@
> #include "src/shared/util.h"
> #include "src/shared/queue.h"
>
> +#include "tester-utils.h"
> +
> #define QOS_IO(_interval, _latency, _sdu, _phy, _rtn) \
> { \
> .interval = _interval, \
> @@ -462,11 +467,12 @@ struct test_data {
> uint16_t handle;
> uint16_t acl_handle;
> struct queue *io_queue;
> - unsigned int io_id[2];
> + unsigned int io_id[3];
> uint8_t client_num;
> int step;
> bool reconnect;
> bool suspending;
> + struct tx_tstamp_data tx_ts;
> };
>
> struct iso_client_data {
> @@ -487,6 +493,10 @@ struct iso_client_data {
> size_t base_len;
> bool listen_bind;
> bool pa_bind;
> + uint32_t so_timestamping;
> + bool msg_timestamping;
> + unsigned int send_extra;
> + unsigned int send_extra_pre_ts;
It is probably a good idea to start documenting what each of these
fields are meant to do, I have no idea what are the last 2 for btw.
> };
>
> typedef bool (*iso_defer_accept_t)(struct test_data *data, GIOChannel *io);
> @@ -677,15 +687,14 @@ static void io_free(void *data)
> static void test_data_free(void *test_data)
> {
> struct test_data *data = test_data;
> + unsigned int i;
>
> if (data->io_queue)
> queue_destroy(data->io_queue, io_free);
>
> - if (data->io_id[0] > 0)
> - g_source_remove(data->io_id[0]);
> -
> - if (data->io_id[1] > 0)
> - g_source_remove(data->io_id[1]);
> + for (i = 0; i < ARRAY_SIZE(data->io_id); ++i)
> + if (data->io_id[i] > 0)
> + g_source_remove(data->io_id[i]);
>
> free(data);
> }
> @@ -987,6 +996,38 @@ static const struct iso_client_data connect_16_2_1_send = {
> .send = &send_16_2_1,
> };
>
> +static const struct iso_client_data connect_send_tx_timestamping = {
> + .qos = QOS_16_2_1,
> + .expect_err = 0,
> + .send = &send_16_2_1,
> + .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
> + SOF_TIMESTAMPING_OPT_ID |
> + SOF_TIMESTAMPING_TX_SOFTWARE),
> + .send_extra = 1,
> + .send_extra_pre_ts = 2,
> +};
> +
> +static const struct iso_client_data connect_send_tx_sched_timestamping = {
> + .qos = QOS_16_2_1,
> + .expect_err = 0,
> + .send = &send_16_2_1,
> + .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
> + SOF_TIMESTAMPING_TX_SOFTWARE |
> + SOF_TIMESTAMPING_OPT_TSONLY |
> + SOF_TIMESTAMPING_TX_SCHED),
> + .send_extra = 1,
> +};
> +
> +static const struct iso_client_data connect_send_tx_msg_timestamping = {
> + .qos = QOS_16_2_1,
> + .expect_err = 0,
> + .send = &send_16_2_1,
> + .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
> + SOF_TIMESTAMPING_TX_SOFTWARE),
> + .send_extra = 1,
> + .msg_timestamping = true,
> +};
> +
> static const struct iso_client_data listen_16_2_1_recv = {
> .qos = QOS_16_2_1,
> .expect_err = 0,
> @@ -1410,14 +1451,17 @@ static void bthost_recv_data(const void *buf, uint16_t len, void *user_data)
> struct test_data *data = user_data;
> const struct iso_client_data *isodata = data->test_data;
>
> + --data->step;
> +
> tester_print("Client received %u bytes of data", len);
>
> if (isodata->send && (isodata->send->iov_len != len ||
> memcmp(isodata->send->iov_base, buf, len))) {
> if (!isodata->recv->iov_base)
> tester_test_failed();
> - } else
> + } else if (!data->step) {
> tester_test_passed();
> + }
> }
>
> static void bthost_iso_disconnected(void *user_data)
> @@ -2058,17 +2102,95 @@ static void iso_recv(struct test_data *data, GIOChannel *io)
> data->io_id[0] = g_io_add_watch(io, G_IO_IN, iso_recv_data, data);
> }
>
> -static void iso_send(struct test_data *data, GIOChannel *io)
> +static gboolean iso_recv_errqueue(GIOChannel *io, GIOCondition cond,
> + gpointer user_data)
> {
> + struct test_data *data = user_data;
> const struct iso_client_data *isodata = data->test_data;
> - ssize_t ret;
> + int sk = g_io_channel_unix_get_fd(io);
> + int err;
> +
> + data->step--;
> +
> + err = tx_tstamp_recv(&data->tx_ts, sk, isodata->send->iov_len);
> + if (err > 0)
> + return TRUE;
> + else if (!err && !data->step)
> + tester_test_passed();
> + else
> + tester_test_failed();
> +
> + data->io_id[2] = 0;
> + return FALSE;
> +}
> +
> +static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
> +{
> + const struct iso_client_data *isodata = data->test_data;
> + struct so_timestamping so = {
> + .flags = isodata->so_timestamping,
> + };
> int sk;
> + int err;
> + unsigned int count;
> +
> + if (!(isodata->so_timestamping & SOF_TIMESTAMPING_TX_RECORD_MASK))
> + return;
> +
> + tester_print("Enabling TX timestamping");
> +
> + tx_tstamp_init(&data->tx_ts, isodata->so_timestamping);
> +
> + for (count = 0; count < isodata->send_extra + 1; ++count)
> + data->step += tx_tstamp_expect(&data->tx_ts);
>
> sk = g_io_channel_unix_get_fd(io);
>
> + data->io_id[2] = g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue, data);
> +
> + if (isodata->msg_timestamping)
> + so.flags &= ~SOF_TIMESTAMPING_TX_RECORD_MASK;
> +
> + err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
> + if (err < 0) {
> + tester_warn("setsockopt SO_TIMESTAMPING: %s (%d)",
> + strerror(errno), errno);
> + tester_test_failed();
> + return;
> + }
> +}
> +
> +static void iso_send_data(struct test_data *data, GIOChannel *io)
> +{
> + const struct iso_client_data *isodata = data->test_data;
> + char control[CMSG_SPACE(sizeof(uint32_t))];
> + struct msghdr msg = {
> + .msg_iov = (struct iovec *)isodata->send,
> + .msg_iovlen = 1,
> + };
> + struct cmsghdr *cmsg;
> + ssize_t ret;
> + int sk;
> +
> tester_print("Writing %zu bytes of data", isodata->send->iov_len);
>
> - ret = writev(sk, isodata->send, 1);
> + sk = g_io_channel_unix_get_fd(io);
> +
> + if (isodata->msg_timestamping) {
> + memset(control, 0, sizeof(control));
> + msg.msg_control = control;
> + msg.msg_controllen = sizeof(control);
> +
> + cmsg = CMSG_FIRSTHDR(&msg);
> + cmsg->cmsg_level = SOL_SOCKET;
> + cmsg->cmsg_type = SO_TIMESTAMPING;
> + cmsg->cmsg_len = CMSG_LEN(sizeof(uint32_t));
> +
> + *((uint32_t *)CMSG_DATA(cmsg)) = (isodata->so_timestamping &
> + SOF_TIMESTAMPING_TX_RECORD_MASK);
> + }
> +
> + ret = sendmsg(sk, &msg, 0);
> if (ret < 0 || isodata->send->iov_len != (size_t) ret) {
> tester_warn("Failed to write %zu bytes: %s (%d)",
> isodata->send->iov_len, strerror(errno), errno);
> @@ -2076,6 +2198,22 @@ static void iso_send(struct test_data *data, GIOChannel *io)
> return;
> }
>
> + data->step++;
> +}
> +
> +static void iso_send(struct test_data *data, GIOChannel *io)
> +{
> + const struct iso_client_data *isodata = data->test_data;
> + unsigned int count;
> +
> + for (count = 0; count < isodata->send_extra_pre_ts; ++count)
> + iso_send_data(data, io);
> +
> + iso_tx_timestamping(data, io);
> +
> + for (count = 0; count < isodata->send_extra + 1; ++count)
> + iso_send_data(data, io);
> +
> if (isodata->bcast) {
> tester_test_passed();
> return;
> @@ -3197,6 +3335,17 @@ int main(int argc, char *argv[])
> test_iso("ISO Send - Success", &connect_16_2_1_send, setup_powered,
> test_connect);
>
> + test_iso("ISO Send - TX Timestamping", &connect_send_tx_timestamping,
> + setup_powered, test_connect);
> +
> + test_iso("ISO Send - TX Sched Timestamping",
> + &connect_send_tx_sched_timestamping, setup_powered,
> + test_connect);
> +
> + test_iso("ISO Send - TX Msg Timestamping",
> + &connect_send_tx_msg_timestamping, setup_powered,
> + test_connect);
Add a comment for each test to describe what they are doing, are these
supposed to test different flags that can be passed on to
SO_TXTIMESTAMP?
> test_iso("ISO Receive - Success", &listen_16_2_1_recv, setup_powered,
> test_listen);
>
> diff --git a/tools/tester-utils.h b/tools/tester-utils.h
Perhaps just have as tools/tester.h
> new file mode 100644
> index 000000000..617de842e
> --- /dev/null
> +++ b/tools/tester-utils.h
> @@ -0,0 +1,163 @@
> +// SPDX-License-Identifier: LGPL-2.1-or-later
> +/*
> + *
> + * BlueZ - Bluetooth protocol stack for Linux
> + *
> + * Copyright (C) 2022 Intel Corporation.
> + *
> + */
> +
> +#include <stdbool.h>
> +#include <stdlib.h>
> +#include <stdint.h>
> +#include <time.h>
> +#include <sys/socket.h>
> +#include <linux/errqueue.h>
> +#include <linux/net_tstamp.h>
> +
> +#include <glib.h>
> +
> +#define SEC_NSEC(_t) ((_t) * 1000000000LL)
> +#define TS_NSEC(_ts) (SEC_NSEC((_ts)->tv_sec) + (_ts)->tv_nsec)
> +
> +struct tx_tstamp_data {
> + struct {
> + uint32_t id;
> + uint32_t type;
> + } expect[16];
> + unsigned int pos;
> + unsigned int count;
> + unsigned int sent;
> + uint32_t so_timestamping;
> +};
> +
> +static inline void tx_tstamp_init(struct tx_tstamp_data *data,
> + uint32_t so_timestamping)
> +{
> + memset(data, 0, sizeof(*data));
> + memset(data->expect, 0xff, sizeof(data->expect));
> +
> + data->so_timestamping = so_timestamping;
> +}
> +
> +static inline int tx_tstamp_expect(struct tx_tstamp_data *data)
> +{
> + unsigned int pos = data->count;
> + int steps;
> +
> + if (data->so_timestamping & SOF_TIMESTAMPING_TX_SCHED) {
> + g_assert(pos < ARRAY_SIZE(data->expect));
> + data->expect[pos].type = SCM_TSTAMP_SCHED;
> + data->expect[pos].id = data->sent;
> + pos++;
> + }
> +
> + if (data->so_timestamping & SOF_TIMESTAMPING_TX_SOFTWARE) {
> + g_assert(pos < ARRAY_SIZE(data->expect));
> + data->expect[pos].type = SCM_TSTAMP_SND;
> + data->expect[pos].id = data->sent;
> + pos++;
> + }
> +
> + data->sent++;
> +
> + steps = pos - data->count;
> + data->count = pos;
> + return steps;
> +}
> +
> +static inline int tx_tstamp_recv(struct tx_tstamp_data *data, int sk, int len)
> +{
> + unsigned char control[512];
> + ssize_t ret;
> + char buf[1024];
> + struct msghdr msg;
> + struct iovec iov;
> + struct cmsghdr *cmsg;
> + struct scm_timestamping *tss = NULL;
> + struct sock_extended_err *serr = NULL;
> + struct timespec now;
> +
> + iov.iov_base = buf;
> + iov.iov_len = sizeof(buf);
> +
> + memset(&msg, 0, sizeof(msg));
> + msg.msg_iov = &iov;
> + msg.msg_iovlen = 1;
> + msg.msg_control = control;
> + msg.msg_controllen = sizeof(control);
> +
> + ret = recvmsg(sk, &msg, MSG_ERRQUEUE);
> + if (ret < 0) {
> + tester_warn("Failed to read from errqueue: %s (%d)",
> + strerror(errno), errno);
> + return -EINVAL;
> + }
> +
> + if (data->so_timestamping & SOF_TIMESTAMPING_OPT_TSONLY) {
> + if (ret != 0) {
> + tester_warn("Packet copied back to errqueue");
> + return -EINVAL;
> + }
> + } else if (len > ret) {
> + tester_warn("Packet not copied back to errqueue: %zd", ret);
> + return -EINVAL;
> + }
> +
> + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
> + cmsg = CMSG_NXTHDR(&msg, cmsg)) {
> + if (cmsg->cmsg_level == SOL_SOCKET &&
> + cmsg->cmsg_type == SCM_TIMESTAMPING) {
> + tss = (void *)CMSG_DATA(cmsg);
> + } else if (cmsg->cmsg_level == SOL_BLUETOOTH &&
> + cmsg->cmsg_type == BT_SCM_ERROR) {
> + serr = (void *)CMSG_DATA(cmsg);
> + }
> + }
> +
> + if (!tss) {
> + tester_warn("SCM_TIMESTAMPING not found");
> + return -EINVAL;
> + }
> +
> + if (!serr) {
> + tester_warn("BT_SCM_ERROR not found");
> + return -EINVAL;
> + }
> +
> + if (serr->ee_errno != ENOMSG ||
> + serr->ee_origin != SO_EE_ORIGIN_TIMESTAMPING) {
> + tester_warn("BT_SCM_ERROR wrong for timestamping");
> + return -EINVAL;
> + }
> +
> + clock_gettime(CLOCK_REALTIME, &now);
> +
> + if (TS_NSEC(&now) < TS_NSEC(tss->ts) ||
> + TS_NSEC(&now) > TS_NSEC(tss->ts) + SEC_NSEC(10)) {
> + tester_warn("nonsense in timestamp");
> + return -EINVAL;
> + }
> +
> + if (data->pos >= data->count) {
> + tester_warn("Too many timestamps");
> + return -EINVAL;
> + }
> +
> + if ((data->so_timestamping & SOF_TIMESTAMPING_OPT_ID) &&
> + serr->ee_data != data->expect[data->pos].id) {
> + tester_warn("Bad timestamp id %u", serr->ee_data);
> + return -EINVAL;
> + }
> +
> + if (serr->ee_info != data->expect[data->pos].type) {
> + tester_warn("Bad timestamp type %u", serr->ee_info);
> + return -EINVAL;
> + }
> +
> + tester_print("Got valid TX timestamp %u", data->pos);
> +
> + ++data->pos;
> +
> + return data->count - data->pos;
> +}
> --
> 2.44.0
>
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH BlueZ v3 3/8] l2cap-tester: Add test for TX timestamping
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
2024-04-02 16:42 ` [PATCH BlueZ v3 1/8] lib: add BT_SCM_ERROR and BT_NO_ERRQUEUE_POLL Pauli Virtanen
2024-04-02 16:42 ` [PATCH BlueZ v3 2/8] iso-tester: Add tests for TX timestamping Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 4/8] btdev: set nonzero SCO mtu & max pkt Pauli Virtanen
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Add test
L2CAP BR/EDR Client - TX Timestamping
---
tools/l2cap-tester.c | 106 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 101 insertions(+), 5 deletions(-)
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c
index 461f2c27c..f990110d9 100644
--- a/tools/l2cap-tester.c
+++ b/tools/l2cap-tester.c
@@ -30,6 +30,9 @@
#include "src/shared/tester.h"
#include "src/shared/mgmt.h"
+#include "src/shared/util.h"
+
+#include "tester-utils.h"
struct test_data {
const void *test_data;
@@ -38,12 +41,15 @@ struct test_data {
struct hciemu *hciemu;
enum hciemu_type hciemu_type;
unsigned int io_id;
+ unsigned int err_io_id;
uint16_t handle;
uint16_t scid;
uint16_t dcid;
int sk;
int sk2;
bool host_disconnected;
+ int step;
+ struct tx_tstamp_data tx_ts;
};
struct l2cap_data {
@@ -86,6 +92,9 @@ struct l2cap_data {
bool defer;
bool shut_sock_wr;
+
+ uint32_t so_timestamping;
+ unsigned int send_extra;
};
static void print_debug(const char *str, void *user_data)
@@ -226,6 +235,11 @@ static void test_post_teardown(const void *test_data)
data->io_id = 0;
}
+ if (data->err_io_id > 0) {
+ g_source_remove(data->err_io_id);
+ data->err_io_id = 0;
+ }
+
hciemu_unref(data->hciemu);
data->hciemu = NULL;
}
@@ -245,6 +259,7 @@ static void test_data_free(void *test_data)
break; \
user->hciemu_type = HCIEMU_TYPE_BREDR; \
user->io_id = 0; \
+ user->err_io_id = 0; \
user->test_data = data; \
tester_add_full(name, data, \
test_pre_setup, setup, func, NULL, \
@@ -259,6 +274,7 @@ static void test_data_free(void *test_data)
break; \
user->hciemu_type = HCIEMU_TYPE_LE; \
user->io_id = 0; \
+ user->err_io_id = 0; \
user->test_data = data; \
tester_add_full(name, data, \
test_pre_setup, setup, func, NULL, \
@@ -321,6 +337,17 @@ static const struct l2cap_data client_connect_write_success_test = {
.data_len = sizeof(l2_data),
};
+static const struct l2cap_data client_connect_tx_timestamping_test = {
+ .client_psm = 0x1001,
+ .server_psm = 0x1001,
+ .write_data = l2_data,
+ .data_len = sizeof(l2_data),
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_ID |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+ .send_extra = 2,
+};
+
static const struct l2cap_data client_connect_shut_wr_success_test = {
.client_psm = 0x1001,
.server_psm = 0x1001,
@@ -1096,6 +1123,8 @@ static void bthost_received_data(const void *buf, uint16_t len,
struct test_data *data = tester_get_data();
const struct l2cap_data *l2data = data->test_data;
+ --data->step;
+
if (len != l2data->data_len) {
tester_test_failed();
return;
@@ -1103,7 +1132,7 @@ static void bthost_received_data(const void *buf, uint16_t len,
if (memcmp(buf, l2data->write_data, l2data->data_len))
tester_test_failed();
- else
+ else if (!data->step)
tester_test_passed();
}
@@ -1207,6 +1236,61 @@ static bool check_mtu(struct test_data *data, int sk)
return true;
}
+static gboolean recv_errqueue(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
+{
+ struct test_data *data = user_data;
+ const struct l2cap_data *l2data = data->test_data;
+ int sk = g_io_channel_unix_get_fd(io);
+ int err;
+
+ data->step--;
+
+ err = tx_tstamp_recv(&data->tx_ts, sk, l2data->data_len);
+ if (err > 0)
+ return TRUE;
+ else if (!err && !data->step)
+ tester_test_passed();
+ else
+ tester_test_failed();
+
+ data->err_io_id = 0;
+ return FALSE;
+}
+
+static void l2cap_tx_timestamping(struct test_data *data, GIOChannel *io)
+{
+ const struct l2cap_data *l2data = data->test_data;
+ struct so_timestamping so = {
+ .flags = l2data->so_timestamping,
+ };
+ int sk;
+ int err;
+ unsigned int count;
+
+ if (!(l2data->so_timestamping & SOF_TIMESTAMPING_TX_RECORD_MASK))
+ return;
+
+ sk = g_io_channel_unix_get_fd(io);
+
+ tester_print("Enabling TX timestamping");
+
+ tx_tstamp_init(&data->tx_ts, l2data->so_timestamping);
+
+ for (count = 0; count < l2data->send_extra + 1; ++count)
+ data->step += tx_tstamp_expect(&data->tx_ts);
+
+ err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
+ if (err < 0) {
+ tester_warn("setsockopt SO_TIMESTAMPING: %s (%d)",
+ strerror(errno), errno);
+ tester_test_failed();
+ return;
+ }
+
+ data->err_io_id = g_io_add_watch(io, G_IO_ERR, recv_errqueue, data);
+}
+
static gboolean l2cap_connect_cb(GIOChannel *io, GIOCondition cond,
gpointer user_data)
{
@@ -1249,15 +1333,23 @@ static gboolean l2cap_connect_cb(GIOChannel *io, GIOCondition cond,
} else if (l2data->write_data) {
struct bthost *bthost;
ssize_t ret;
+ unsigned int count;
+
+ data->step = 0;
bthost = hciemu_client_get_host(data->hciemu);
bthost_add_cid_hook(bthost, data->handle, data->dcid,
bthost_received_data, NULL);
- ret = write(sk, l2data->write_data, l2data->data_len);
- if (ret != l2data->data_len) {
- tester_warn("Unable to write all data");
- tester_test_failed();
+ l2cap_tx_timestamping(data, io);
+
+ for (count = 0; count < l2data->send_extra + 1; ++count) {
+ ret = write(sk, l2data->write_data, l2data->data_len);
+ if (ret != l2data->data_len) {
+ tester_warn("Unable to write all data");
+ tester_test_failed();
+ }
+ ++data->step;
}
return FALSE;
@@ -2280,6 +2372,10 @@ int main(int argc, char *argv[])
&client_connect_write_success_test,
setup_powered_client, test_connect);
+ test_l2cap_bredr("L2CAP BR/EDR Client - TX Timestamping",
+ &client_connect_tx_timestamping_test,
+ setup_powered_client, test_connect);
+
test_l2cap_bredr("L2CAP BR/EDR Client - Invalid PSM 1",
&client_connect_nval_psm_test_1,
setup_powered_client, test_connect);
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH BlueZ v3 4/8] btdev: set nonzero SCO mtu & max pkt
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
` (2 preceding siblings ...)
2024-04-02 16:43 ` [PATCH BlueZ v3 3/8] l2cap-tester: Add test " Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 5/8] sco-tester: add TX timestamping test Pauli Virtanen
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Set nonzero max pkt count, so that kernel can transmit data.
The request & accept/reject flow is not emulated yet.
---
emulator/btdev.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/emulator/btdev.c b/emulator/btdev.c
index 0ad6b2793..a63136fad 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -148,6 +148,8 @@ struct btdev {
uint8_t feat_page_2[8];
uint16_t acl_mtu;
uint16_t acl_max_pkt;
+ uint16_t sco_mtu;
+ uint16_t sco_max_pkt;
uint16_t iso_mtu;
uint16_t iso_max_pkt;
uint8_t country_code;
@@ -653,9 +655,9 @@ static int cmd_read_buffer_size(struct btdev *dev, const void *data,
rsp.status = BT_HCI_ERR_SUCCESS;
rsp.acl_mtu = cpu_to_le16(dev->acl_mtu);
- rsp.sco_mtu = 0;
+ rsp.sco_mtu = cpu_to_le16(dev->sco_mtu);
rsp.acl_max_pkt = cpu_to_le16(dev->acl_max_pkt);
- rsp.sco_max_pkt = cpu_to_le16(0);
+ rsp.sco_max_pkt = cpu_to_le16(dev->sco_max_pkt);
cmd_complete(dev, BT_HCI_CMD_READ_BUFFER_SIZE, &rsp, sizeof(rsp));
@@ -2764,6 +2766,8 @@ static int cmd_enhanced_setup_sync_conn_complete(struct btdev *dev,
goto done;
}
+ /* TODO: HCI_Connection_Request connection flow */
+
cc.status = BT_HCI_ERR_SUCCESS;
memcpy(cc.bdaddr, conn->link->dev->bdaddr, 6);
@@ -7173,6 +7177,9 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id)
btdev->acl_mtu = 192;
btdev->acl_max_pkt = 1;
+ btdev->sco_mtu = 72;
+ btdev->sco_max_pkt = 1;
+
btdev->iso_mtu = 251;
btdev->iso_max_pkt = 1;
btdev->big_handle = 0xff;
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH BlueZ v3 5/8] sco-tester: add TX timestamping test
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
` (3 preceding siblings ...)
2024-04-02 16:43 ` [PATCH BlueZ v3 4/8] btdev: set nonzero SCO mtu & max pkt Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 6/8] bthost: handle client L2CAP conn in LE credit based mode Pauli Virtanen
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Add test:
SCO CVSD Send - TX Timestamping
---
tools/sco-tester.c | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 91 insertions(+), 3 deletions(-)
diff --git a/tools/sco-tester.c b/tools/sco-tester.c
index ecc65e092..8997e86f7 100644
--- a/tools/sco-tester.c
+++ b/tools/sco-tester.c
@@ -31,6 +31,8 @@
#include "src/shared/mgmt.h"
#include "src/shared/util.h"
+#include "tester-utils.h"
+
struct test_data {
const void *test_data;
struct mgmt *mgmt;
@@ -38,15 +40,20 @@ struct test_data {
struct hciemu *hciemu;
enum hciemu_type hciemu_type;
unsigned int io_id;
+ unsigned int err_io_id;
int sk;
bool disable_esco;
bool enable_codecs;
+ int step;
+ struct tx_tstamp_data tx_ts;
};
struct sco_client_data {
int expect_err;
const uint8_t *send_data;
uint16_t data_len;
+ uint32_t so_timestamping;
+ unsigned int send_extra;
};
static void print_debug(const char *str, void *user_data)
@@ -227,8 +234,10 @@ static void test_data_free(void *test_data)
break; \
user->hciemu_type = HCIEMU_TYPE_BREDRLE; \
user->io_id = 0; \
+ user->err_io_id = 0; \
user->sk = -1; \
user->test_data = data; \
+ user->step = 0; \
user->disable_esco = _disable_esco; \
user->enable_codecs = _enable_codecs; \
tester_add_full(name, data, \
@@ -265,6 +274,16 @@ static const struct sco_client_data connect_send_success = {
.send_data = data
};
+static const struct sco_client_data connect_send_tx_timestamping = {
+ .expect_err = 0,
+ .data_len = sizeof(data),
+ .send_data = data,
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_ID |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+ .send_extra = 2,
+};
+
static void client_connectable_complete(uint16_t opcode, uint8_t status,
const void *param, uint8_t len,
void *user_data)
@@ -595,6 +614,61 @@ static int connect_sco_sock(struct test_data *data, int sk)
return 0;
}
+static gboolean recv_errqueue(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
+{
+ struct test_data *data = user_data;
+ const struct sco_client_data *scodata = data->test_data;
+ int sk = g_io_channel_unix_get_fd(io);
+ int err;
+
+ data->step--;
+
+ err = tx_tstamp_recv(&data->tx_ts, sk, scodata->data_len);
+ if (err > 0)
+ return TRUE;
+ else if (!err && !data->step)
+ tester_test_passed();
+ else
+ tester_test_failed();
+
+ data->err_io_id = 0;
+ return FALSE;
+}
+
+static void sco_tx_timestamping(struct test_data *data, GIOChannel *io)
+{
+ const struct sco_client_data *scodata = data->test_data;
+ struct so_timestamping so = {
+ .flags = scodata->so_timestamping,
+ };
+ int sk;
+ int err;
+ unsigned int count;
+
+ if (!(scodata->so_timestamping & SOF_TIMESTAMPING_TX_RECORD_MASK))
+ return;
+
+ sk = g_io_channel_unix_get_fd(io);
+
+ tester_print("Enabling TX timestamping");
+
+ tx_tstamp_init(&data->tx_ts, scodata->so_timestamping);
+
+ for (count = 0; count < scodata->send_extra + 1; ++count)
+ data->step += tx_tstamp_expect(&data->tx_ts);
+
+ err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
+ if (err < 0) {
+ tester_warn("setsockopt SO_TIMESTAMPING: %s (%d)",
+ strerror(errno), errno);
+ tester_test_failed();
+ return;
+ }
+
+ data->err_io_id = g_io_add_watch(io, G_IO_ERR, recv_errqueue, data);
+}
+
static gboolean sco_connect_cb(GIOChannel *io, GIOCondition cond,
gpointer user_data)
{
@@ -619,10 +693,20 @@ static gboolean sco_connect_cb(GIOChannel *io, GIOCondition cond,
if (scodata->send_data) {
ssize_t ret;
+ unsigned int count;
+
+ data->step = 0;
- tester_print("Writing %u bytes of data", scodata->data_len);
+ sco_tx_timestamping(data, io);
- ret = write(sk, scodata->send_data, scodata->data_len);
+ tester_print("Writing %u*%u bytes of data",
+ scodata->send_extra + 1, scodata->data_len);
+
+ for (count = 0; count < scodata->send_extra + 1; ++count) {
+ ret = write(sk, scodata->send_data, scodata->data_len);
+ if (scodata->data_len != ret)
+ break;
+ }
if (scodata->data_len != ret) {
tester_warn("Failed to write %u bytes: %zu %s (%d)",
scodata->data_len, ret, strerror(errno),
@@ -633,7 +717,7 @@ static gboolean sco_connect_cb(GIOChannel *io, GIOCondition cond,
if (-err != scodata->expect_err)
tester_test_failed();
- else
+ else if (!data->step)
tester_test_passed();
return FALSE;
@@ -869,6 +953,10 @@ int main(int argc, char *argv[])
test_sco("SCO CVSD Send - Success", &connect_send_success,
setup_powered, test_connect);
+ test_sco("SCO CVSD Send - TX Timestamping",
+ &connect_send_tx_timestamping,
+ setup_powered, test_connect);
+
test_offload_sco("Basic SCO Get Socket Option - Offload - Success",
NULL, setup_powered, test_codecs_getsockopt);
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH BlueZ v3 6/8] bthost: handle client L2CAP conn in LE credit based mode
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
` (4 preceding siblings ...)
2024-04-02 16:43 ` [PATCH BlueZ v3 5/8] sco-tester: add TX timestamping test Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 7/8] l2cap-tester: add tests for LE Client read/write/tx-timestamping Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 8/8] iso-tester: add test for BT_NO_ERRQUEUE_POLL Pauli Virtanen
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Allow bthost hooks to receive data from L2CAP LE credit based
connections. Handle LE credit header when receiving, and reassemble
received SDU.
Handle L2CAP LE credit header also in bthost_send_cid.
---
emulator/bthost.c | 205 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 180 insertions(+), 25 deletions(-)
diff --git a/emulator/bthost.c b/emulator/bthost.c
index 8c40fce90..8616bf715 100644
--- a/emulator/bthost.c
+++ b/emulator/bthost.c
@@ -162,11 +162,21 @@ struct btconn {
void *recv_data;
};
+enum l2cap_mode {
+ L2CAP_MODE_OTHER,
+ L2CAP_MODE_LE_CRED,
+ L2CAP_MODE_LE_ENH_CRED,
+};
+
struct l2conn {
+ struct l2conn *next;
uint16_t scid;
uint16_t dcid;
uint16_t psm;
- struct l2conn *next;
+ enum l2cap_mode mode;
+ uint16_t data_len;
+ uint16_t recv_len;
+ void *recv_data;
};
struct rcconn {
@@ -275,6 +285,7 @@ struct bthost *bthost_create(void)
static void l2conn_free(struct l2conn *conn)
{
+ free(conn->recv_data);
free(conn);
}
@@ -360,6 +371,7 @@ static struct l2conn *bthost_add_l2cap_conn(struct bthost *bthost,
l2conn->psm = psm;
l2conn->scid = scid;
l2conn->dcid = dcid;
+ l2conn->mode = L2CAP_MODE_OTHER;
l2conn->next = conn->l2conns;
conn->l2conns = l2conn;
@@ -415,6 +427,19 @@ static struct l2conn *btconn_find_l2cap_conn_by_scid(struct btconn *conn,
return NULL;
}
+static struct l2conn *btconn_find_l2cap_conn_by_dcid(struct btconn *conn,
+ uint16_t dcid)
+{
+ struct l2conn *l2conn;
+
+ for (l2conn = conn->l2conns; l2conn != NULL; l2conn = l2conn->next) {
+ if (l2conn->dcid == dcid)
+ return l2conn;
+ }
+
+ return NULL;
+}
+
static struct l2cap_conn_cb_data *bthost_find_l2cap_cb_by_psm(
struct bthost *bthost, uint16_t psm)
{
@@ -609,14 +634,24 @@ static void send_iov(struct bthost *bthost, uint16_t handle, uint16_t cid,
}
static void send_acl(struct bthost *bthost, uint16_t handle, uint16_t cid,
- const void *data, uint16_t len)
+ bool sdu_hdr, const void *data, uint16_t len)
{
- struct iovec iov;
+ struct iovec iov[2];
+ uint16_t sdu;
+ int num = 0;
+
+ if (sdu_hdr) {
+ sdu = cpu_to_le16(len);
+ iov[num].iov_base = &sdu;
+ iov[num].iov_len = sizeof(sdu);
+ num++;
+ }
- iov.iov_base = (void *) data;
- iov.iov_len = len;
+ iov[num].iov_base = (void *) data;
+ iov[num].iov_len = len;
+ num++;
- send_iov(bthost, handle, cid, &iov, 1);
+ send_iov(bthost, handle, cid, iov, num);
}
static uint8_t l2cap_sig_send(struct bthost *bthost, struct btconn *conn,
@@ -711,12 +746,19 @@ void bthost_send_cid(struct bthost *bthost, uint16_t handle, uint16_t cid,
const void *data, uint16_t len)
{
struct btconn *conn;
+ struct l2conn *l2conn;
+ bool sdu_hdr = false;
conn = bthost_find_conn(bthost, handle);
if (!conn)
return;
- send_acl(bthost, handle, cid, data, len);
+ l2conn = btconn_find_l2cap_conn_by_dcid(conn, cid);
+ if (l2conn && (l2conn->mode == L2CAP_MODE_LE_CRED ||
+ l2conn->mode == L2CAP_MODE_LE_ENH_CRED))
+ sdu_hdr = true;
+
+ send_acl(bthost, handle, cid, sdu_hdr, data, len);
}
void bthost_send_cid_v(struct bthost *bthost, uint16_t handle, uint16_t cid,
@@ -1779,7 +1821,7 @@ static void rfcomm_sabm_send(struct bthost *bthost, struct btconn *conn,
cmd.length = RFCOMM_LEN8(0);
cmd.fcs = rfcomm_fcs2((uint8_t *)&cmd);
- send_acl(bthost, conn->handle, l2conn->dcid, &cmd, sizeof(cmd));
+ send_acl(bthost, conn->handle, l2conn->dcid, false, &cmd, sizeof(cmd));
}
static bool l2cap_conn_rsp(struct bthost *bthost, struct btconn *conn,
@@ -2110,6 +2152,7 @@ static bool l2cap_le_conn_req(struct bthost *bthost, struct btconn *conn,
uint8_t ident, const void *data, uint16_t len)
{
const struct bt_l2cap_pdu_le_conn_req *req = data;
+ struct l2cap_conn_cb_data *cb_data;
struct bt_l2cap_pdu_le_conn_rsp rsp;
uint16_t psm;
@@ -2124,7 +2167,8 @@ static bool l2cap_le_conn_req(struct bthost *bthost, struct btconn *conn,
rsp.mps = 23;
rsp.credits = 1;
- if (bthost_find_l2cap_cb_by_psm(bthost, psm))
+ cb_data = bthost_find_l2cap_cb_by_psm(bthost, psm);
+ if (cb_data)
rsp.dcid = cpu_to_le16(conn->next_cid++);
else
rsp.result = cpu_to_le16(0x0002); /* PSM Not Supported */
@@ -2132,6 +2176,20 @@ static bool l2cap_le_conn_req(struct bthost *bthost, struct btconn *conn,
l2cap_sig_send(bthost, conn, BT_L2CAP_PDU_LE_CONN_RSP, ident, &rsp,
sizeof(rsp));
+ if (!rsp.result) {
+ struct l2conn *l2conn;
+
+ l2conn = bthost_add_l2cap_conn(bthost, conn,
+ le16_to_cpu(rsp.dcid),
+ le16_to_cpu(req->scid),
+ le16_to_cpu(psm));
+ l2conn->mode = L2CAP_MODE_LE_CRED;
+
+ if (cb_data && l2conn->psm == cb_data->psm && cb_data->func)
+ cb_data->func(conn->handle, l2conn->dcid,
+ cb_data->user_data);
+ }
+
return true;
}
@@ -2139,11 +2197,14 @@ static bool l2cap_le_conn_rsp(struct bthost *bthost, struct btconn *conn,
uint8_t ident, const void *data, uint16_t len)
{
const struct bt_l2cap_pdu_le_conn_rsp *rsp = data;
+ struct l2conn *l2conn;
if (len < sizeof(*rsp))
return false;
/* TODO add L2CAP connection before with proper PSM */
- bthost_add_l2cap_conn(bthost, conn, 0, le16_to_cpu(rsp->dcid), 0);
+ l2conn = bthost_add_l2cap_conn(bthost, conn, 0,
+ le16_to_cpu(rsp->dcid), 0);
+ l2conn->mode = L2CAP_MODE_LE_CRED;
return true;
}
@@ -2196,16 +2257,19 @@ static bool l2cap_ecred_conn_rsp(struct bthost *bthost, struct btconn *conn,
uint16_t scid[5];
} __attribute__ ((packed)) *rsp = data;
int num_scid, i;
+ struct l2conn *l2conn;
if (len < sizeof(*rsp))
return false;
num_scid = len / sizeof(*rsp->scid);
- for (i = 0; i < num_scid; i++)
+ for (i = 0; i < num_scid; i++) {
/* TODO add L2CAP connection before with proper PSM */
- bthost_add_l2cap_conn(bthost, conn, 0,
+ l2conn = bthost_add_l2cap_conn(bthost, conn, 0,
le16_to_cpu(rsp->scid[i]), 0);
+ l2conn->mode = L2CAP_MODE_LE_ENH_CRED;
+ }
return true;
@@ -2333,7 +2397,7 @@ static void rfcomm_ua_send(struct bthost *bthost, struct btconn *conn,
cmd.length = RFCOMM_LEN8(0);
cmd.fcs = rfcomm_fcs2((uint8_t *)&cmd);
- send_acl(bthost, conn->handle, l2conn->dcid, &cmd, sizeof(cmd));
+ send_acl(bthost, conn->handle, l2conn->dcid, false, &cmd, sizeof(cmd));
}
static void rfcomm_dm_send(struct bthost *bthost, struct btconn *conn,
@@ -2347,7 +2411,7 @@ static void rfcomm_dm_send(struct bthost *bthost, struct btconn *conn,
cmd.length = RFCOMM_LEN8(0);
cmd.fcs = rfcomm_fcs2((uint8_t *)&cmd);
- send_acl(bthost, conn->handle, l2conn->dcid, &cmd, sizeof(cmd));
+ send_acl(bthost, conn->handle, l2conn->dcid, false, &cmd, sizeof(cmd));
}
static void rfcomm_sabm_recv(struct bthost *bthost, struct btconn *conn,
@@ -2636,12 +2700,97 @@ static void process_rfcomm(struct bthost *bthost, struct btconn *conn,
}
}
+static void append_l2conn_data(struct bthost *bthost, struct l2conn *conn,
+ const void *data, uint16_t len)
+{
+ if (!conn->recv_data) {
+ bthost_debug(bthost, "Unexpected L2CAP SDU data: sCID 0x%4.4x ",
+ conn->scid);
+ return;
+ }
+
+ if (conn->recv_len + len > conn->data_len) {
+ bthost_debug(bthost, "Unexpected L2CAP SDU data: sCID 0x%4.4x ",
+ conn->scid);
+ return;
+ }
+
+ memcpy(conn->recv_data + conn->recv_len, data, len);
+ conn->recv_len += len;
+
+ bthost_debug(bthost, "L2CAP SDU data: %u/%u bytes", conn->recv_len,
+ conn->data_len);
+}
+
+static void free_l2conn_data(struct l2conn *conn)
+{
+ free(conn->recv_data);
+ conn->recv_data = NULL;
+ conn->recv_len = 0;
+ conn->data_len = 0;
+}
+
+static void new_l2conn_data(struct bthost *bthost, struct l2conn *conn,
+ uint16_t len)
+{
+ free(conn->recv_data);
+ conn->recv_data = malloc(len);
+ conn->recv_len = 0;
+ conn->data_len = len;
+}
+
+static bool process_l2cap_conn(struct bthost *bthost, struct btconn *conn,
+ struct l2conn *l2conn, struct iovec *data)
+{
+ struct bt_l2cap_pdu_le_flowctl_creds creds;
+ uint16_t sdu;
+
+ if (!l2conn)
+ return true;
+
+ switch (l2conn->mode) {
+ case L2CAP_MODE_LE_CRED:
+ case L2CAP_MODE_LE_ENH_CRED:
+ break;
+ case L2CAP_MODE_OTHER:
+ return true;
+ }
+
+ /* Credit-based flow control */
+
+ creds.cid = cpu_to_le16(l2conn->scid);
+ creds.credits = cpu_to_le16(1);
+ l2cap_sig_send(bthost, conn, BT_L2CAP_PDU_LE_FLOWCTL_CREDS, 0,
+ &creds, sizeof(creds));
+
+ if (!l2conn->data_len) {
+ if (!util_iov_pull_le16(data, &sdu)) {
+ free_l2conn_data(l2conn);
+ bthost_debug(bthost, "L2CAP invalid SDU");
+ return false;
+ }
+ new_l2conn_data(bthost, l2conn, sdu);
+ }
+
+ append_l2conn_data(bthost, l2conn, data->iov_base, data->iov_len);
+
+ if (l2conn->recv_len < l2conn->data_len)
+ return false; /* SDU incomplete */
+
+ l2conn->data_len = 0;
+ data->iov_base = l2conn->recv_data;
+ data->iov_len = l2conn->recv_len;
+
+ return true;
+}
+
static void process_l2cap(struct bthost *bthost, struct btconn *conn,
- const void *data, uint16_t len)
+ const void *buf, uint16_t len)
{
- const struct bt_l2cap_hdr *l2_hdr = data;
+ const struct bt_l2cap_hdr *l2_hdr = buf;
struct cid_hook *hook;
struct l2conn *l2conn;
+ struct iovec data;
uint16_t cid, l2_len;
l2_len = le16_to_cpu(l2_hdr->len);
@@ -2654,31 +2803,37 @@ static void process_l2cap(struct bthost *bthost, struct btconn *conn,
bthost_debug(bthost, "L2CAP data: %u bytes", l2_len);
cid = le16_to_cpu(l2_hdr->cid);
+ l2conn = btconn_find_l2cap_conn_by_scid(conn, cid);
+
+ data.iov_base = (void *)l2_hdr->data;
+ data.iov_len = l2_len;
+
+ if (!process_l2cap_conn(bthost, conn, l2conn, &data))
+ return;
hook = find_cid_hook(conn, cid);
if (hook) {
- hook->func(l2_hdr->data, l2_len, hook->user_data);
+ hook->func(data.iov_base, data.iov_len, hook->user_data);
return;
}
switch (cid) {
case 0x0001:
- l2cap_sig(bthost, conn, l2_hdr->data, l2_len);
+ l2cap_sig(bthost, conn, data.iov_base, data.iov_len);
break;
case 0x0005:
- l2cap_le_sig(bthost, conn, l2_hdr->data, l2_len);
+ l2cap_le_sig(bthost, conn, data.iov_base, data.iov_len);
break;
case 0x0006:
- smp_data(conn->smp_data, l2_hdr->data, l2_len);
+ smp_data(conn->smp_data, data.iov_base, data.iov_len);
break;
case 0x0007:
- smp_bredr_data(conn->smp_data, l2_hdr->data, l2_len);
+ smp_bredr_data(conn->smp_data, data.iov_base, data.iov_len);
break;
default:
- l2conn = btconn_find_l2cap_conn_by_scid(conn, cid);
if (l2conn && l2conn->psm == 0x0003)
- process_rfcomm(bthost, conn, l2conn, l2_hdr->data,
- l2_len);
+ process_rfcomm(bthost, conn, l2conn, data.iov_base,
+ data.iov_len);
else
bthost_debug(bthost,
"Packet for unknown CID 0x%04x (%u)",
@@ -3494,7 +3649,7 @@ void bthost_send_rfcomm_data(struct bthost *bthost, uint16_t handle,
}
uih_frame[uih_len - 1] = rfcomm_fcs((void *)hdr);
- send_acl(bthost, handle, rcconn->scid, uih_frame, uih_len);
+ send_acl(bthost, handle, rcconn->scid, false, uih_frame, uih_len);
free(uih_frame);
}
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH BlueZ v3 7/8] l2cap-tester: add tests for LE Client read/write/tx-timestamping
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
` (5 preceding siblings ...)
2024-04-02 16:43 ` [PATCH BlueZ v3 6/8] bthost: handle client L2CAP conn in LE credit based mode Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
2024-04-02 16:43 ` [PATCH BlueZ v3 8/8] iso-tester: add test for BT_NO_ERRQUEUE_POLL Pauli Virtanen
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Add tests:
L2CAP LE Client - Read Success
L2CAP LE Client - Write Success
L2CAP LE Client - TX Timestamping
---
tools/l2cap-tester.c | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c
index f990110d9..d7f2e481a 100644
--- a/tools/l2cap-tester.c
+++ b/tools/l2cap-tester.c
@@ -484,6 +484,30 @@ static const struct l2cap_data le_client_connect_timeout_test_1 = {
.timeout = 1,
};
+static const struct l2cap_data le_client_connect_read_success_test = {
+ .client_psm = 0x0080,
+ .server_psm = 0x0080,
+ .read_data = l2_data,
+ .data_len = sizeof(l2_data),
+};
+
+static const struct l2cap_data le_client_connect_write_success_test = {
+ .client_psm = 0x0080,
+ .server_psm = 0x0080,
+ .write_data = l2_data,
+ .data_len = sizeof(l2_data),
+};
+
+static const struct l2cap_data le_client_connect_tx_timestamping_test = {
+ .client_psm = 0x0080,
+ .server_psm = 0x0080,
+ .write_data = l2_data,
+ .data_len = sizeof(l2_data),
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_ID |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+};
+
static const struct l2cap_data le_client_connect_adv_success_test_1 = {
.client_psm = 0x0080,
.server_psm = 0x0080,
@@ -1079,6 +1103,8 @@ static gboolean client_received_data(GIOChannel *io, GIOCondition cond,
char buf[1024];
int sk;
+ tester_debug("Client received data");
+
sk = g_io_channel_unix_get_fd(io);
if (read(sk, buf, l2data->data_len) != l2data->data_len) {
tester_warn("Unable to read %u bytes", l2data->data_len);
@@ -1123,6 +1149,8 @@ static void bthost_received_data(const void *buf, uint16_t len,
struct test_data *data = tester_get_data();
const struct l2cap_data *l2data = data->test_data;
+ tester_debug("BTHost received data: %u bytes", len);
+
--data->step;
if (len != l2data->data_len) {
@@ -1313,7 +1341,7 @@ static gboolean l2cap_connect_cb(GIOChannel *io, GIOCondition cond,
goto failed;
}
- tester_print("Successfully connected");
+ tester_print("Successfully connected to CID 0x%04x", data->dcid);
if (!check_mtu(data, sk)) {
tester_test_failed();
@@ -1505,6 +1533,8 @@ static void client_l2cap_connect_cb(uint16_t handle, uint16_t cid,
{
struct test_data *data = user_data;
+ tester_debug("Client connect CID 0x%04x handle 0x%04x", cid, handle);
+
data->dcid = cid;
data->handle = handle;
}
@@ -2430,6 +2460,15 @@ int main(int argc, char *argv[])
test_l2cap_le("L2CAP LE Client - Timeout",
&le_client_connect_timeout_test_1,
setup_powered_client, test_connect_timeout);
+ test_l2cap_le("L2CAP LE Client - Read Success",
+ &le_client_connect_read_success_test,
+ setup_powered_client, test_connect);
+ test_l2cap_le("L2CAP LE Client - Write Success",
+ &le_client_connect_write_success_test,
+ setup_powered_client, test_connect);
+ test_l2cap_le("L2CAP LE Client - TX Timestamping",
+ &le_client_connect_tx_timestamping_test,
+ setup_powered_client, test_connect);
test_l2cap_le("L2CAP LE Client, Direct Advertising - Success",
&le_client_connect_adv_success_test_1,
setup_powered_client, test_connect);
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH BlueZ v3 8/8] iso-tester: add test for BT_NO_ERRQUEUE_POLL
2024-04-02 16:42 [PATCH BlueZ v3 0/8] tests: add TX timestamping tests Pauli Virtanen
` (6 preceding siblings ...)
2024-04-02 16:43 ` [PATCH BlueZ v3 7/8] l2cap-tester: add tests for LE Client read/write/tx-timestamping Pauli Virtanen
@ 2024-04-02 16:43 ` Pauli Virtanen
7 siblings, 0 replies; 12+ messages in thread
From: Pauli Virtanen @ 2024-04-02 16:43 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Pauli Virtanen
Also test BT_NO_ERRQUEUE_POLL is experimental feature.
Add test:
ISO Send - TX No Poll Timestamping
---
tools/iso-tester.c | 121 ++++++++++++++++++++++++++++++++++++++++++-
tools/tester-utils.h | 3 ++
2 files changed, 122 insertions(+), 2 deletions(-)
diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index c12675a18..9e2877a37 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -467,7 +467,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;
@@ -497,6 +497,7 @@ struct iso_client_data {
bool msg_timestamping;
unsigned int send_extra;
unsigned int send_extra_pre_ts;
+ bool no_errqueue_poll;
};
typedef bool (*iso_defer_accept_t)(struct test_data *data, GIOChannel *io);
@@ -632,6 +633,18 @@ static const uint8_t reset_iso_socket_param[] = {
0x00, /* Action - disable */
};
+static const uint8_t set_no_errqueue_poll_param[] = {
+ 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_no_errqueue_poll_param[] = {
+ 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)
{
@@ -643,9 +656,21 @@ static void set_iso_socket_callback(uint8_t status, uint16_t length,
tester_print("ISO socket feature is enabled");
}
+static void set_no_errqueue_poll_callback(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+{
+ if (status != MGMT_STATUS_SUCCESS) {
+ tester_print("No Errqueue Poll feature could not be enabled");
+ return;
+ }
+
+ tester_print("No Errqueue Poll feature is enabled");
+}
+
static void test_pre_setup(const void *test_data)
{
struct test_data *data = tester_get_data();
+ const struct iso_client_data *isodata = test_data;
data->mgmt = mgmt_new_default();
if (!data->mgmt) {
@@ -661,6 +686,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);
+ if (isodata && isodata->no_errqueue_poll) {
+ mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
+ sizeof(set_no_errqueue_poll_param),
+ set_no_errqueue_poll_param,
+ set_no_errqueue_poll_callback, NULL, NULL);
+ }
+
mgmt_send(data->mgmt, MGMT_OP_READ_INDEX_LIST, MGMT_INDEX_NONE, 0, NULL,
read_index_list_callback, NULL, NULL);
}
@@ -668,11 +700,19 @@ static void test_pre_setup(const void *test_data)
static void test_post_teardown(const void *test_data)
{
struct test_data *data = tester_get_data();
+ const struct iso_client_data *isodata = test_data;
mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
sizeof(reset_iso_socket_param), reset_iso_socket_param,
NULL, NULL, NULL);
+ if (isodata && isodata->no_errqueue_poll) {
+ mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE, MGMT_INDEX_NONE,
+ sizeof(reset_no_errqueue_poll_param),
+ reset_no_errqueue_poll_param,
+ NULL, NULL, NULL);
+ }
+
hciemu_unref(data->hciemu);
data->hciemu = NULL;
}
@@ -1028,6 +1068,16 @@ static const struct iso_client_data connect_send_tx_msg_timestamping = {
.msg_timestamping = true,
};
+static const struct iso_client_data connect_send_tx_no_poll_timestamping = {
+ .qos = QOS_16_2_1,
+ .expect_err = 0,
+ .send = &send_16_2_1,
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_TX_SOFTWARE),
+ .send_extra = 1,
+ .no_errqueue_poll = true,
+};
+
static const struct iso_client_data listen_16_2_1_recv = {
.qos = QOS_16_2_1,
.expect_err = 0,
@@ -2124,6 +2174,37 @@ static gboolean iso_recv_errqueue(GIOChannel *io, GIOCondition cond,
return FALSE;
}
+static gboolean iso_fail_errqueue(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
+{
+ struct test_data *data = user_data;
+
+ tester_warn("Unexpected POLLERR");
+ tester_test_failed();
+
+ data->io_id[3] = 0;
+ return FALSE;
+}
+
+static gboolean iso_timer_errqueue(gpointer user_data)
+{
+ struct test_data *data = user_data;
+ GIOChannel *io;
+ gboolean ret;
+
+ io = queue_peek_head(data->io_queue);
+ g_assert(io);
+
+ ret = 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] = 0;
+ }
+
+ return ret;
+}
+
static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
{
const struct iso_client_data *isodata = data->test_data;
@@ -2146,7 +2227,39 @@ static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
sk = g_io_channel_unix_get_fd(io);
- data->io_id[2] = g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue, data);
+ if (isodata->no_errqueue_poll) {
+ uint32_t flag = 1;
+
+ err = setsockopt(sk, SOL_BLUETOOTH, BT_NO_ERRQUEUE_POLL,
+ &flag, sizeof(flag));
+ if (err < 0) {
+ tester_warn("setsockopt BT_NO_ERRQUEUE_POLL: %s (%d)",
+ strerror(errno), errno);
+ tester_test_failed();
+ return;
+ }
+
+ if (!data->io_queue)
+ data->io_queue = queue_new();
+ queue_push_head(data->io_queue, g_io_channel_ref(io));
+
+ data->io_id[2] = g_timeout_add(100, iso_timer_errqueue, data);
+ data->io_id[3] = g_io_add_watch(io, G_IO_ERR, iso_fail_errqueue,
+ data);
+ } else {
+ uint32_t flag = 0;
+
+ err = setsockopt(sk, SOL_BLUETOOTH, BT_NO_ERRQUEUE_POLL,
+ &flag, sizeof(flag));
+ if (err >= 0) {
+ tester_warn("BT_NO_ERRQUEUE_POLL available");
+ tester_test_failed();
+ return;
+ }
+
+ data->io_id[2] = g_io_add_watch(io, G_IO_ERR, iso_recv_errqueue,
+ data);
+ }
if (isodata->msg_timestamping)
so.flags &= ~SOF_TIMESTAMPING_TX_RECORD_MASK;
@@ -3346,6 +3459,10 @@ int main(int argc, char *argv[])
&connect_send_tx_msg_timestamping, setup_powered,
test_connect);
+ 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);
diff --git a/tools/tester-utils.h b/tools/tester-utils.h
index 617de842e..b6de084a4 100644
--- a/tools/tester-utils.h
+++ b/tools/tester-utils.h
@@ -89,6 +89,9 @@ static inline int tx_tstamp_recv(struct tx_tstamp_data *data, int sk, int len)
ret = recvmsg(sk, &msg, MSG_ERRQUEUE);
if (ret < 0) {
+ if (ret == EAGAIN || ret == EWOULDBLOCK)
+ return data->count - data->pos;
+
tester_warn("Failed to read from errqueue: %s (%d)",
strerror(errno), errno);
return -EINVAL;
--
2.44.0
^ permalink raw reply related [flat|nested] 12+ messages in thread