Skip to contentSkip to conversation

ioctl: take use of TST_RETRY_FN* macro

PATCH Superseded Li Wang 2 participants 3 messages Sep 9, 2020 – Sep 10, 2020

lore
Share & tools
lore

Li Wang

author
#0 lore raw

PATCH v2 1/1 ioctl: take use of TST_RETRY_FN* macro

To avoid of race with udev, let's use TST_RETRY_FN* macro to loop access() function for more times.

---Errors---
ioctl_loop01.c:59: PASS: /sys/block/loop0/loop/partscan = 1 ioctl_loop01.c:60: PASS: /sys/block/loop0/loop/autoclear = 0 ioctl_loop01.c:71: FAIL: access /dev/loop0p1 fails ioctl_loop01.c:77: FAIL: access /sys/block/loop0/loop0p1 fails

ioctl09.c:41: PASS: access /sys/block/loop0/loop0p1 succeeds ioctl09.c:52: FAIL: access /dev/loop0p1 fails

Fixes #718
Cc Yang Xu <[email protected]>
Cc Jan Stancek <[email protected]>
---
 testcases/kernel/syscalls/ioctl/ioctl09.c      | 7 +++++--
 testcases/kernel/syscalls/ioctl/ioctl_loop01.c | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/ioctl/ioctl09.c +5 -2
index 151618df4..9728ecb9c 100644
@@ -15,6 +15,9 @@
 #include "lapi/loop.h"
 #include "tst_test.h"
 
+#define RETVAL_CHECK(x) \
+       ({ value ? TST_RETVAL_EQ0(x) : TST_RETVAL_NOTNULL(x); })
+
 static char dev_path[1024];
 static int dev_num, attach_flag, dev_fd;
 static char loop_partpath[1026], sys_loop_partpath[1026];
@@ -36,7 +39,7 @@ static void check_partition(int part_num, bool value)
 		dev_num, dev_num, part_num);
 	sprintf(loop_partpath, "%sp%d", dev_path, part_num);
 
-	ret = access(sys_loop_partpath, F_OK);
+	ret = TST_RETRY_FN_EXP_BACKOFF(access(sys_loop_partpath, F_OK), RETVAL_CHECK, 30);
 	if (ret == 0)
 		tst_res(value ? TPASS : TFAIL, "access %s succeeds",
 			sys_loop_partpath);
@@ -44,7 +47,7 @@ static void check_partition(int part_num, bool value)
 		tst_res(value ? TFAIL : TPASS, "access %s fails",
 			sys_loop_partpath);
 
-	ret = access(loop_partpath, F_OK);
+	ret = TST_RETRY_FN_EXP_BACKOFF(access(loop_partpath, F_OK), RETVAL_CHECK, 30);
 	if (ret == 0)
 		tst_res(value ? TPASS : TFAIL, "access %s succeeds",
 			loop_partpath);
testcases/kernel/syscalls/ioctl/ioctl_loop01.c +2 -2
index 845a1399b..cf71184b4 100644
@@ -64,13 +64,13 @@ static void check_loop_value(int set_flag, int get_flag, int autoclear_field)
 		return;
 	}
 
-	ret = access(loop_partpath, F_OK);
+	ret = TST_RETRY_FN_EXP_BACKOFF(access(loop_partpath, F_OK), TST_RETVAL_EQ0, 30);
 	if (ret == 0)
 		tst_res(TPASS, "access %s succeeds", loop_partpath);
 	else
 		tst_res(TFAIL, "access %s fails", loop_partpath);
 
-	ret = access(sys_loop_partpath, F_OK);
+	ret = TST_RETRY_FN_EXP_BACKOFF(access(sys_loop_partpath, F_OK), TST_RETVAL_EQ0, 30);
 	if (ret == 0)
 		tst_res(TPASS, "access %s succeeds", sys_loop_partpath);
 	else
Signature · 1 line
2.21.1
#1 lore raw

PATCH v2 1/1 ioctl: take use of TST_RETRY_FN* macro

----- Original Message -----

Quoted 9 lines

To avoid of race with udev, let's use TST_RETRY_FN* macro to loop access() function for more times.

---Errors---
ioctl_loop01.c:59: PASS: /sys/block/loop0/loop/partscan = 1 ioctl_loop01.c:60: PASS: /sys/block/loop0/loop/autoclear = 0 ioctl_loop01.c:71: FAIL: access /dev/loop0p1 fails ioctl_loop01.c:77: FAIL: access /sys/block/loop0/loop0p1 fails

Quoted 8 lines

ioctl09.c:41: PASS: access /sys/block/loop0/loop0p1 succeeds ioctl09.c:52: FAIL: access /dev/loop0p1 fails

Fixes #718
Cc Yang Xu <[email protected]>
Cc Jan Stancek <[email protected]>
author
#2 lore raw

PATCH v2 1/1 ioctl: take use of TST_RETRY_FN* macro

Quoted 1 line

Pushed, thanks for the review.

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200910/9fd2c756/attachment-0001.htm>