[CRIU] [PATCH 5/6] test: Check that inherited flocks work
Pavel Emelyanov
xemul at parallels.com
Tue Aug 26 10:31:12 PDT 2014
Inherited flock is the one that a task got from its parent.
In case parent closes the corresponding fd, the /proc/locks
still shows the parent pid, while the lock is owned by child.
Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
test/zdtm.sh | 1 +
test/zdtm/live/static/Makefile | 1 +
test/zdtm/live/static/file_locks03.c | 101 ++++++++++++++++++++++++++++++++
test/zdtm/live/static/file_locks03.opts | 1 +
4 files changed, 104 insertions(+)
create mode 100644 test/zdtm/live/static/file_locks03.c
create mode 100644 test/zdtm/live/static/file_locks03.opts
diff --git a/test/zdtm.sh b/test/zdtm.sh
index 2cd03b2..2935245 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -116,6 +116,7 @@ static/fdt_shared
static/file_locks00
static/file_locks01
static/file_locks02
+static/file_locks03
static/sigpending
static/sigaltstack
static/sk-netlink
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 5c74473..fb3d9c0 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -150,6 +150,7 @@ TST_FILE = \
file_locks00 \
file_locks01 \
file_locks02 \
+ file_locks03 \
netns-nf \
maps_file_prot \
diff --git a/test/zdtm/live/static/file_locks03.c b/test/zdtm/live/static/file_locks03.c
new file mode 100644
index 0000000..db2c549
--- /dev/null
+++ b/test/zdtm/live/static/file_locks03.c
@@ -0,0 +1,101 @@
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/file.h>
+#include <string.h>
+#include <sys/wait.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that 'inherited' flocks work";
+const char *test_author = "Pavel Emelyanov <xemul at parallels.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "file name", 1);
+
+static int check_file_locks(int alt_pid)
+{
+ FILE *fp_locks = NULL;
+ char buf[100], fl_flag[16], fl_type[16], fl_option[16];
+ pid_t pid = getpid();
+ int found = 0, num, fl_owner;
+
+ fp_locks = fopen("/proc/locks", "r");
+ if (!fp_locks)
+ return -1;
+
+ while (fgets(buf, sizeof(buf), fp_locks)) {
+ if (strstr(buf, "->"))
+ continue;
+
+ num = sscanf(buf,
+ "%*d:%s %s %s %d %*02x:%*02x:%*d %*d %*s",
+ fl_flag, fl_type, fl_option, &fl_owner);
+
+ if (num < 4) {
+ err("Invalid lock info.\n");
+ break;
+ }
+
+ if (fl_owner != pid && fl_owner != alt_pid)
+ continue;
+
+ if (!strcmp(fl_flag, "FLOCK") &&
+ !strcmp(fl_type, "ADVISORY") &&
+ !strcmp(fl_option, "WRITE"))
+ found++;
+
+ memset(fl_flag, 0, sizeof(fl_flag));
+ memset(fl_type, 0, sizeof(fl_type));
+ memset(fl_option, 0, sizeof(fl_option));
+ }
+
+ fclose(fp_locks);
+
+ return found == 1;
+}
+
+int main(int argc, char **argv)
+{
+ int fd, pf[2], pid;
+
+ test_init(argc, argv);
+
+ pipe(pf);
+
+ fd = open(filename, O_CREAT | O_RDWR, 0600);
+ if (fd < 0) {
+ err("No file");
+ return -1;
+ }
+
+ flock(fd, LOCK_EX);
+
+ pid = fork();
+ if (pid == 0) {
+ close(pf[1]);
+ read(pf[0], &pid, sizeof(pid));
+ exit(0);
+ }
+
+ close(pf[0]);
+ close(fd);
+
+ test_daemon();
+ test_waitsig();
+
+ if (check_file_locks(pid))
+ pass();
+ else
+ fail("Flock file locks check failed");
+
+ close(pf[1]);
+ waitpid(pid, NULL, 0);
+ close(fd);
+ unlink(filename);
+
+ return 0;
+}
diff --git a/test/zdtm/live/static/file_locks03.opts b/test/zdtm/live/static/file_locks03.opts
new file mode 100644
index 0000000..738083a
--- /dev/null
+++ b/test/zdtm/live/static/file_locks03.opts
@@ -0,0 +1 @@
+--file-locks
--
1.8.4.2
More information about the CRIU
mailing list