[V2,13/16] src/locktest: Add lease testing for basic signal reception
diff mbox series

Message ID 20190923175336.2287-14-ira.weiny@intel.com
State New
Headers show
Series
  • Fix locktest and add lease testing to it
Related show

Commit Message

Ira Weiny Sept. 23, 2019, 5:53 p.m. UTC
From: Ira Weiny <ira.weiny@intel.com>

	/* 5 */"Read lease gets SIGIO on write open",
	/* 6 */"Write lease gets SIGIO on read open",
	/* 7 */"Read lease does _not_ get SIGIO on read open",
	/* 8 */"Read lease gets SIGIO on write open",

Signed-off-by: Ira Weiny <ira.weiny@intel.com>

---
Changes from V1:
	Tests are now a separate array and are run with '-L' option.

 src/locktest.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 135 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/src/locktest.c b/src/locktest.c
index 2147acc67ef7..9f8a892a21a0 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -27,6 +27,8 @@ 
 #include <byteswap.h>
 #include <errno.h>
 #include <string.h>
+#include <signal.h>
+
 #define     HEX_2_ASC(x)    ((x) > 9) ? (x)-10+'a' : (x)+'0'
 #define 	FILE_SIZE	1024
 #define PLATFORM_INIT()     /*no-op*/
@@ -83,6 +85,7 @@  static int	server = 1;
 static int	port = 0;
 static int 	testnumber = -1;
 static int	saved_errno = 0;
+static int      got_sigio = 0;
 
 static SOCKET	s_fd = -1;              /* listen socket    */
 static SOCKET	c_fd = -1;	        /* IPC socket       */
@@ -97,6 +100,8 @@  static HANDLE	f_fd = INVALID_HANDLE;	/* shared file      */
 #define		CMD_RDTEST	6
 #define 	CMD_SETLEASE	7
 #define 	CMD_GETLEASE	8
+#define		CMD_SIGIO	9
+#define		CMD_WAIT_SIGIO	10
 
 #define		PASS 	1
 #define		FAIL	0
@@ -112,6 +117,7 @@  static HANDLE	f_fd = INVALID_HANDLE;	/* shared file      */
 #define		WHO		5
 #define		FLAGS		2 /* index 2 is also used for do_open() flag, see below */
 #define		ARG		FLAGS /* Arguments for Lease operations */
+#define		TIME		FLAGS /* Time for waiting on sigio */
 
 static char *get_cmd_str(int cmd)
 {
@@ -125,6 +131,8 @@  static char *get_cmd_str(int cmd)
 		case CMD_RDTEST: return "Truncate"; break;
 		case CMD_SETLEASE: return "Set Lease"; break;
 		case CMD_GETLEASE: return "Get Lease"; break;
+		case CMD_SIGIO:    return "Setup SIGIO"; break;
+		case CMD_WAIT_SIGIO: return "Wait for SIGIO"; break;
 	}
 	return "unknown";
 }
@@ -562,10 +570,15 @@  char *lease_descriptions[] = {
     /*  2 */"Take Write Lease",
     /*  3 */"Fail Write Lease if file is open somewhere else",
     /*  4 */"Fail Read Lease if opened with write permissions",
+    /*  5 */"Read lease gets SIGIO on write open",
+    /*  6 */"Write lease gets SIGIO on read open",
+    /*  7 */"Read lease does _not_ get SIGIO on read open",
+    /*  8 */"Read lease gets SIGIO on write open",
 };
 
 static int64_t lease_tests[][6] =
 	/*	test #	Action	[offset|flags|arg]	length		expected	server/client */
+	/*			[sigio_wait_time]						*/
 	{
 	/* Various tests to exercise leases */
 
@@ -600,6 +613,47 @@  static int64_t lease_tests[][6] =
 		{4,	CMD_GETLEASE,	F_RDLCK,	0,	FAIL,		SERVER	},
 		{4,	CMD_CLOSE,	0,		0,	PASS,		SERVER	},
 
+/* SECTION 2: Proper SIGIO notifications */
+	/* Get SIGIO when read lease is broken by write */
+		{5,	CMD_OPEN,	O_RDONLY,	0,	PASS,		CLIENT	},
+		{5,	CMD_SETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{5,	CMD_GETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{5,	CMD_SIGIO,	0,		0,	PASS,		CLIENT	},
+		{5,	CMD_OPEN,	O_RDWR,		0,	PASS,		SERVER	},
+		{5,	CMD_WAIT_SIGIO,	5,		0,	PASS,		CLIENT	},
+		{5,	CMD_CLOSE,	0,		0,	PASS,		SERVER	},
+		{5,	CMD_CLOSE,	0,		0,	PASS,		CLIENT	},
+
+	/* Get SIGIO when write lease is broken by read */
+		{6,	CMD_OPEN,	O_RDWR,		0,	PASS,		CLIENT	},
+		{6,	CMD_SETLEASE,	F_WRLCK,	0,	PASS,		CLIENT	},
+		{6,	CMD_GETLEASE,	F_WRLCK,	0,	PASS,		CLIENT	},
+		{6,	CMD_SIGIO,	0,		0,	PASS,		CLIENT	},
+		{6,	CMD_OPEN,	O_RDONLY,	0,	PASS,		SERVER	},
+		{6,	CMD_WAIT_SIGIO,	5,		0,	PASS,		CLIENT	},
+		{6,	CMD_CLOSE,	0,		0,	PASS,		SERVER	},
+		{6,	CMD_CLOSE,	0,		0,	PASS,		CLIENT	},
+
+	/* Don't get SIGIO when read lease is taken by read */
+		{7,	CMD_OPEN,	O_RDONLY,	0,	PASS,		CLIENT	},
+		{7,	CMD_SETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{7,	CMD_GETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{7,	CMD_SIGIO,	0,		0,	PASS,		CLIENT	},
+		{7,	CMD_OPEN,	O_RDONLY,	0,	PASS,		SERVER	},
+		{7,	CMD_WAIT_SIGIO,	5,		0,	FAIL,		CLIENT	},
+		{7,	CMD_CLOSE,	0,		0,	PASS,		SERVER	},
+		{7,	CMD_CLOSE,	0,		0,	PASS,		CLIENT	},
+
+	/* Get SIGIO when Read lease is broken by Write */
+		{8,	CMD_OPEN,	O_RDONLY,	0,	PASS,		CLIENT	},
+		{8,	CMD_SETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{8,	CMD_GETLEASE,	F_RDLCK,	0,	PASS,		CLIENT	},
+		{8,	CMD_SIGIO,	0,		0,	PASS,		CLIENT	},
+		{8,	CMD_OPEN,	O_RDWR,		0,	PASS,		SERVER	},
+		{8,	CMD_WAIT_SIGIO,	5,		0,	PASS,		CLIENT	},
+		{8,	CMD_CLOSE,	0,		0,	PASS,		SERVER	},
+		{8,	CMD_CLOSE,	0,		0,	PASS,		CLIENT	},
+
 	/* indicate end of array */
 		{0,0,0,0,0,SERVER},
 		{0,0,0,0,0,CLIENT}
@@ -663,6 +717,70 @@  initialize(HANDLE fd)
     }
 }
 
+void release_lease(int fd)
+{
+	int rc;
+
+	rc = fcntl(fd, F_SETLEASE, F_UNLCK);
+	if (rc != 0)
+		fprintf(stderr, "%s Failed to remove lease %d : %d %s\n",
+			__FILE__, rc, errno, strerror(errno));
+}
+
+void lease_break(int sig, siginfo_t *info, void *p)
+{
+    if (debug)
+	fprintf(stderr, "lease break %d %p fd %d\n",
+		sig, info, info->si_fd);
+    got_sigio = 1;
+    release_lease(f_fd);
+}
+
+struct sigaction lease_break_action = {
+	.sa_sigaction = lease_break,
+	.sa_flags = SA_SIGINFO,
+};
+
+int do_setup_sigio(int fd)
+{
+	int rc;
+
+	got_sigio = 0;
+
+	rc = sigaction(SIGIO, &lease_break_action, NULL);
+	if (rc != 0) {
+		fprintf(stderr, "%s Set '%s' sigaction failed %d\n",
+			__FILE__, strsignal(SIGIO), rc);
+		return FAIL;
+	}
+
+	if (debug)
+		fprintf(stderr, "Set '%s' sigaction on %d\n",
+			strsignal(SIGIO), fd);
+
+	rc = fcntl(fd, F_SETSIG, SIGIO);
+	if (rc)
+		fprintf(stderr, "%s Set '%s' sigaction failed %d\n",
+			__FILE__, strsignal(SIGIO), rc);
+
+	return (rc == 0 ? PASS : FAIL);
+}
+
+int do_wait_sigio(int32_t time)
+{
+    if (time <= 0)
+	return FAIL;
+
+    while (!got_sigio && time--) {
+	sleep(1);
+    }
+
+    if (debug > 1 && !got_sigio)
+	fprintf(stderr, "%s failed to get sigio\n",
+		__FILE__);
+
+    return (got_sigio ? PASS: FAIL);
+}
 
 int do_open(int flag)
 {
@@ -807,10 +925,13 @@  void recv_ctl(void)
 {
     int         nread;
 
+again:
     if ((nread = SOCKET_READ(c_fd, (char*)&ctl, sizeof(ctl))) != sizeof(ctl)) {
-        if (nread < 0)
+        if (nread < 0) {
+	    if (errno == EINTR)
+		goto again;
             perror("recv_ctl: read");
-        else {
+        } else {
             fprintf(stderr, "recv_ctl[%d]: read() returns %d, not %zu as expected\n", 
                     ctl.test, nread, sizeof(ctl));
 	    fprintf(stderr, "socket might has been closed by other locktest\n");
@@ -1118,6 +1239,12 @@  int run(int64_t tests[][6], char *descriptions[])
 			case CMD_GETLEASE:
 			    result = do_lease(F_GETLEASE, tests[index][ARG], tests[index][ARG]);
 			    break;
+			case CMD_SIGIO:
+			    result = do_setup_sigio(f_fd);
+			    break;
+			case CMD_WAIT_SIGIO:
+			    result = do_wait_sigio(tests[index][TIME]);
+			    break;
 		    }
 		    if( result != tests[index][RESULT]) {
 			fail_flag++;
@@ -1223,6 +1350,12 @@  int run(int64_t tests[][6], char *descriptions[])
 		case CMD_GETLEASE:
 		    result = do_lease(F_GETLEASE, ctl.offset, ctl.offset);
 		    break;
+		case CMD_SIGIO:
+		    result = do_setup_sigio(f_fd);
+		    break;
+		case CMD_WAIT_SIGIO:
+		    result = do_wait_sigio(ctl.offset);
+		    break;
 	    }
 	    if( result != ctl.result ) {
 		fprintf(stderr,"Failure in %d:%s\n",