Skip to contentSkip to conversation

lseek: functional SEEK_HOLE and SEEK_DATA test

PATCH New Zorro Lang 2 participants 5 messages Mar 23, 2017 – Mar 28, 2017

lore
Share & tools
lore

Zorro Lang

author
#0 lore raw

PATCH 1/1 lseek: functional SEEK_HOLE and SEEK_DATA test

This case does functional SEEK_HOLE and SEEK_DATA of lseek(2) testing.

Since version 3.1, Linux supports the following additional values for whence:

SEEK_DATA
Adjust the file offset to the next location in the file greater than or equal to offset containing data. If offset points to data, then the file offset is set to offset.

SEEK_HOLE
Adjust the file offset to the next hole in the file greater than or equal to offset. If offset points into the middle of a hole, then the file offset is set to offset. If there is no hole past offset, then the file offset is adjusted to the end of the file (i.e., there is an implicit hole at the end of any file).

This case will cover above description.

---

Ping, about 3 weeks passed, I still haven't gotten any review for this patch. So send it again.

Thanks,
Zorro

 runtest/ltplite                           |   1 +
 runtest/stress.part3                      |   1 +
 runtest/syscalls                          |   1 +
 testcases/kernel/syscalls/.gitignore      |   1 +
 testcases/kernel/syscalls/lseek/lseek11.c | 226 ++++++++++++++++++++++++++++++
 5 files changed, 230 insertions(+)
 create mode 100644 testcases/kernel/syscalls/lseek/lseek11.c
runtest/ltplite +1 -0
index d4580ad..e895b93 100644
@@ -415,6 +415,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/stress.part3 +1 -0
index 41f8b25..bd84752 100644
@@ -341,6 +341,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/syscalls +1 -0
index 48f6492..7ac022c 100644
@@ -548,6 +548,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01A_64 symlink01 -T lstat01_64
testcases/kernel/syscalls/.gitignore +1 -0
index bebaa89..60f13df 100644
@@ -500,6 +500,7 @@
 /lseek/lseek08
 /lseek/lseek09
 /lseek/lseek10
+/lseek/lseek11
 /lstat/lstat01
 /lstat/lstat01_64
 /lstat/lstat02
testcases/kernel/syscalls/lseek/lseek11.c new file +226 -0

226 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 lseek: functional SEEK_HOLE and SEEK_DATA test

Hi!

Quoted 199 lines

This case does functional SEEK_HOLE and SEEK_DATA of lseek(2) testing.

Since version 3.1, Linux supports the following additional values for whence:

SEEK_DATA
Adjust the file offset to the next location in the file greater than or equal to offset containing data. If offset points to data, then the file offset is set to offset.

SEEK_HOLE
Adjust the file offset to the next hole in the file greater than or equal to offset. If offset points into the middle of a hole, then the file offset is set to offset. If there is no hole past offset, then the file offset is adjusted to the end of the file (i.e., there is an implicit hole at the end of any file).

This case will cover above description.

---

Ping, about 3 weeks passed, I still haven't gotten any review for this patch. So send it again.

Thanks,
Zorro

 runtest/ltplite                           |   1 +
 runtest/stress.part3                      |   1 +
 runtest/syscalls                          |   1 +
 testcases/kernel/syscalls/.gitignore      |   1 +
 testcases/kernel/syscalls/lseek/lseek11.c | 226 ++++++++++++++++++++++++++++++
 5 files changed, 230 insertions(+)
 create mode 100644 testcases/kernel/syscalls/lseek/lseek11.c
runtest/ltplite +1 -0
index d4580ad..e895b93 100644
@@ -415,6 +415,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/stress.part3 +1 -0
index 41f8b25..bd84752 100644
@@ -341,6 +341,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/syscalls +1 -0
index 48f6492..7ac022c 100644
@@ -548,6 +548,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01A_64 symlink01 -T lstat01_64
testcases/kernel/syscalls/.gitignore +1 -0
index bebaa89..60f13df 100644
@@ -500,6 +500,7 @@
 /lseek/lseek08
 /lseek/lseek09
 /lseek/lseek10
+/lseek/lseek11
 /lstat/lstat01
 /lstat/lstat01_64
 /lstat/lstat02
testcases/kernel/syscalls/lseek/lseek11.c new file +108 -0
new file mode 100644
index 0000000..d45999d
@@ -0,0 +1,226 @@
+/*
+ *   Copyright (C) 2017 Red Hat, Inc.  All rights reserved.
+ *
+ *   The contents of this file may be used under the terms of the GNU
+ *   General Public License version 2 (the "GPL")
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *   AUTHOR: Zorro Lang <[email protected]>
+ *
+ *   DESCRIPTION
+ *     This case does functional SEEK_HOLE and SEEK_DATA of lseek(2) testing.
+ *
+ *     Since version 3.1, Linux supports the following additional values for
+ *     whence:
+ *
+ *     SEEK_DATA
+ *         Adjust the file offset to the next location in the file greater than
+ *         or  equal  to  offset  containing data.  If offset points to data,
+ *         then the file offset is set to offset.
+ *
+ *     SEEK_HOLE
+ *         Adjust the file offset to the next hole in the file greater than or
+ *         equal to offset.  If offset points into the middle of a hole, then
+ *         the file offset is set to offset. If there is no hole past offset,
+ *         then the file offset is adjusted to the end of the file (i.e., there
+ *         is an implicit hole at the end of any file).
+ */
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "tst_test.h"
+
+/*
+ * This case create 3 holes and 4 data fields, every (data) is 12 bytes,
+ * every UNIT has UNIT_BLOCKS * block_size bytes. The structure as below:
+ *
+ * ----------------------------------------------------------------------------------------------
+ * data01suffix      (hole)      data02suffix      (hole)       data03suffix  (hole)  data04sufix
+ * ----------------------------------------------------------------------------------------------
+ * |<--- UNIT_BLOCKS blocks --->||<--- UNIT_BLOCKS blocks  --->||<---  UNIT_BLOCKS blocks   --->|
+ *
+ */
+#define UNIT_COUNT   3
+#define UNIT_BLOCKS  10
+#define FILE_BLOCKS  (UNIT_BLOCKS * UNIT_COUNT)
+
+static int fd;
+static size_t block_size;
+
+/*
+ * SEEK from "startblock * block_size - offset", "whence" as the directive
+ * whence.
+ * startblock * block_size - offset: as offset of lseek()
+ * whence: as whence of lseek()
+ * data: as the expected result read from file offset. NULL means expect
+ *       the end of file.
+ * count: as the count read from file
+ */
+static struct tparam {
+	off_t  startblock;
+	off_t  offset;
+	int    whence;
+	char   *data;
+	size_t count;
+} tparams[] = {
+	{0,               0,    SEEK_DATA, "data01",   6},    /* SEEK_DATA from starting of file*/
+	{0,               4,    SEEK_DATA, "01suffix", 8},    /* SEEK_DATA from maddle of the first data */
+	{0,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from starting of file */
+	{0,               4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first data */
+	{1,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the first hole */
+	{1,               128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first hole */
+	{1,               0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the first hole */
+	{UNIT_BLOCKS,     -1,   SEEK_DATA, "data02",   6},    /* SEEK_DATA from the tail of the first hole */
+	{UNIT_BLOCKS,     0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the second data */
+	{UNIT_BLOCKS,     4,    SEEK_DATA, "02suffix", 8},    /* SEEK_DATA from middle of the second data */
+	{UNIT_BLOCKS,     0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the second data */
+	{UNIT_BLOCKS,     4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second data */
+	{UNIT_BLOCKS + 1, 128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second hole */
+	{UNIT_BLOCKS + 1, 128,  SEEK_DATA, "data03",   6},    /* SEEK_DATA from middle of the second hole */
+	{FILE_BLOCKS,    -128,  SEEK_HOLE, NULL,       0},    /* SEEK_HOLE from no hole pass offset*/
+};
+
+static void cleanup(void)
+{
+	SAFE_CLOSE(fd);
+}
+
+static void get_blocksize(void)
+{
+	/* truncate to a big enough size, bigger than any fs block size */

testcases/kernel/syscalls/lseek/lseek11.c line 118

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+	SAFE_FTRUNCATE(fd, 1024*1024*1024);
+	/* write 1 byte, then the first block will be taken */
+	SAFE_WRITE(1, fd, "a", 1);
+	syncfs(fd);
+	/* seek the first hole will jump over the first block */
+	block_size = SAFE_LSEEK(fd, 0, SEEK_HOLE);
+
+	/* reset to the original state */
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+	SAFE_FTRUNCATE(fd, 0);

Can't we get this information from stat() or from sysfs?

We are testing the SEEK_HOLE here, it would make sense to obtain it from a different source...

testcases/kernel/syscalls/lseek/lseek11.c line 128

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+}
+
+static int write_data(int fd, int num)
+{
+	char buf[64];
+	size_t count;
+	ssize_t rc = -1;
+	char *p = buf;
+
+	memset(buf, 0, sizeof(buf));

This should be useless, since the sprintf() will include the terminating null character when filling the buf.

testcases/kernel/syscalls/lseek/lseek11.c line 141

Quoted 13 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +13 -0
+	sprintf(buf, "data%02dsuffix", num);
+	count = strlen(buf);
+
+	/* make sure all data can be written */
+	while (count > 0) {
+		rc = write(fd, p, count);
+		if (rc < 0) {
+			tst_brk(TBROK | TERRNO, "write failed");
+			break;
+		}
+		p += rc;
+		count -= rc;
+	}

Are you sure that the write for that short string could actually write only part of the data? Cannot we rather use the SAFE_WRITE() and expect it to be written in one write() call?

Quoted 20 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +20 -0
+	return rc;
+}
+
+static void setup(void)
+{
+	int i;
+	off_t offset = 0;
+	char fname[255];
+
+	memset(fname, 0, sizeof(fname));
+	sprintf(fname, "tfile_lseek_%d", getpid());
+
+	fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0666);
+
+	get_blocksize();
+	tst_res(TINFO, "The block size is %lu", block_size);
+
+	/*
+	 * truncate to the expected file size directly, to keep away the effect
+	 * of speculative preallocation of some filesystems (e.g. XFS)

testcases/kernel/syscalls/lseek/lseek11.c line 173

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+	 */
+	SAFE_FTRUNCATE(fd, FILE_BLOCKS * block_size);
+
+	for (i = 0; i < UNIT_COUNT; i++) {
+		offset = UNIT_BLOCKS * block_size * i;
+		SAFE_LSEEK(fd, offset, SEEK_SET);
+		write_data(fd, i + 1);
+	}
+
+	SAFE_LSEEK(fd, -128, SEEK_END);

Why don't we just seek to the end of the file and write?

Then the file would have much more predictable content, as it is the last group of blocks will be different from the rest...

Quoted 19 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +19 -0
+	write_data(fd, i + 1);
+
+	syncfs(fd);
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+}
+
+#if (!defined SEEK_DATA) || (!defined SEEK_HOLE)
+static void test_lseek(void)
+{
+	tst_brk(TCONF, "SEEK_DATA or SEEK_HOLE is not defined.");
+}
+#else
+static void test_lseek(unsigned int n)
+{
+	struct tparam *tp = &tparams[n];
+	off_t offset;
+	char buf[1024];
+	int rc = 0;
+

testcases/kernel/syscalls/lseek/lseek11.c line 202

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+	memset(buf, 0, sizeof(buf));
+	offset = (tp->startblock * block_size) + tp->offset;
+	offset = SAFE_LSEEK(fd, offset, tp->whence);
+	if (tp->data) {
+		SAFE_READ(1, fd, buf, tp->count);
+		rc = strcmp(buf, tp->data);
+	} else {
+		if (offset != SAFE_LSEEK(fd, 0, SEEK_END)) {
+			rc = 1;
+		}

Shouldn't we check here that read fills the buffer with zeroes?

testcases/kernel/syscalls/lseek/lseek11.c line 211

Quoted 9 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +9 -0
+	}
+
+	if (rc != 0) {
+		tst_res(TFAIL,
+		        "The %uth test failed, expect \'%s\', but get \'%s\'",
+		        n, tp->data, buf);
+	} else {
+		tst_res(TPASS, "The %uth test passed", n);
+	}

Can we print some info about the test case in the PASS and FAIL message instead of it's number, something as "SEEK_DATA to block %i offset %i returned %s" or something?

Quoted 5 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +5 -0
+}
+#endif
+
+static struct tst_test test = {
+	.tid          = "lseek11",

testcases/kernel/syscalls/lseek/lseek11.c line 226

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+#if (!defined SEEK_DATA) || (!defined SEEK_HOLE)
+	.test_all     = test_lseek,
+#else
+	.tcnt         = ARRAY_SIZE(tparams),
+	.test         = test_lseek,
+	.setup        = setup,
+	.cleanup      = cleanup,
+	.needs_tmpdir = 1,
+#endif
+};

We already have SEEK_HOLE in lapi/fallocate.h, what about adding SEEK_DATA to the lapi headers as well and including it here. Then we should handle EINVAL from lseek() as TCONF in case that it's not implemented and we can drop all the ifdefs from here.

Signature · 2 lines
Cyril Hrubis
[email protected]
author
#2 lore raw

PATCH 1/1 lseek: functional SEEK_HOLE and SEEK_DATA test

Quoted 204 lines · Cyril Hrubis

Hi!

Quoted 203 lines

This case does functional SEEK_HOLE and SEEK_DATA of lseek(2) testing.

Since version 3.1, Linux supports the following additional values for whence:

SEEK_DATA
Adjust the file offset to the next location in the file greater than or equal to offset containing data. If offset points to data, then the file offset is set to offset.

SEEK_HOLE
Adjust the file offset to the next hole in the file greater than or equal to offset. If offset points into the middle of a hole, then the file offset is set to offset. If there is no hole past offset, then the file offset is adjusted to the end of the file (i.e., there is an implicit hole at the end of any file).

This case will cover above description.

---

Ping, about 3 weeks passed, I still haven't gotten any review for this patch. So send it again.

Thanks,
Zorro

 runtest/ltplite                           |   1 +
 runtest/stress.part3                      |   1 +
 runtest/syscalls                          |   1 +
 testcases/kernel/syscalls/.gitignore      |   1 +
 testcases/kernel/syscalls/lseek/lseek11.c | 226 ++++++++++++++++++++++++++++++
 5 files changed, 230 insertions(+)
 create mode 100644 testcases/kernel/syscalls/lseek/lseek11.c
runtest/ltplite +1 -0
index d4580ad..e895b93 100644
@@ -415,6 +415,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/stress.part3 +1 -0
index 41f8b25..bd84752 100644
@@ -341,6 +341,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01 lstat01
runtest/syscalls +1 -0
index 48f6492..7ac022c 100644
@@ -548,6 +548,7 @@ lseek07 lseek07
 lseek08 lseek08
 lseek09 lseek09
 lseek10 lseek10
+lseek11 lseek11
 
 lstat01A symlink01 -T lstat01
 lstat01A_64 symlink01 -T lstat01_64
testcases/kernel/syscalls/.gitignore +1 -0
index bebaa89..60f13df 100644
@@ -500,6 +500,7 @@
 /lseek/lseek08
 /lseek/lseek09
 /lseek/lseek10
+/lseek/lseek11
 /lstat/lstat01
 /lstat/lstat01_64
 /lstat/lstat02
testcases/kernel/syscalls/lseek/lseek11.c new file +112 -0
new file mode 100644
index 0000000..d45999d
@@ -0,0 +1,226 @@
+/*
+ *   Copyright (C) 2017 Red Hat, Inc.  All rights reserved.
+ *
+ *   The contents of this file may be used under the terms of the GNU
+ *   General Public License version 2 (the "GPL")
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *   AUTHOR: Zorro Lang <[email protected]>
+ *
+ *   DESCRIPTION
+ *     This case does functional SEEK_HOLE and SEEK_DATA of lseek(2) testing.
+ *
+ *     Since version 3.1, Linux supports the following additional values for
+ *     whence:
+ *
+ *     SEEK_DATA
+ *         Adjust the file offset to the next location in the file greater than
+ *         or  equal  to  offset  containing data.  If offset points to data,
+ *         then the file offset is set to offset.
+ *
+ *     SEEK_HOLE
+ *         Adjust the file offset to the next hole in the file greater than or
+ *         equal to offset.  If offset points into the middle of a hole, then
+ *         the file offset is set to offset. If there is no hole past offset,
+ *         then the file offset is adjusted to the end of the file (i.e., there
+ *         is an implicit hole at the end of any file).
+ */
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "tst_test.h"
+
+/*
+ * This case create 3 holes and 4 data fields, every (data) is 12 bytes,
+ * every UNIT has UNIT_BLOCKS * block_size bytes. The structure as below:
+ *
+ * ----------------------------------------------------------------------------------------------
+ * data01suffix      (hole)      data02suffix      (hole)       data03suffix  (hole)  data04sufix
+ * ----------------------------------------------------------------------------------------------
+ * |<--- UNIT_BLOCKS blocks --->||<--- UNIT_BLOCKS blocks  --->||<---  UNIT_BLOCKS blocks   --->|
+ *
+ */
+#define UNIT_COUNT   3
+#define UNIT_BLOCKS  10
+#define FILE_BLOCKS  (UNIT_BLOCKS * UNIT_COUNT)
+
+static int fd;
+static size_t block_size;
+
+/*
+ * SEEK from "startblock * block_size - offset", "whence" as the directive
+ * whence.
+ * startblock * block_size - offset: as offset of lseek()
+ * whence: as whence of lseek()
+ * data: as the expected result read from file offset. NULL means expect
+ *       the end of file.
+ * count: as the count read from file
+ */
+static struct tparam {
+	off_t  startblock;
+	off_t  offset;
+	int    whence;
+	char   *data;
+	size_t count;
+} tparams[] = {
+	{0,               0,    SEEK_DATA, "data01",   6},    /* SEEK_DATA from starting of file*/
+	{0,               4,    SEEK_DATA, "01suffix", 8},    /* SEEK_DATA from maddle of the first data */
+	{0,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from starting of file */
+	{0,               4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first data */
+	{1,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the first hole */
+	{1,               128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first hole */
+	{1,               0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the first hole */
+	{UNIT_BLOCKS,     -1,   SEEK_DATA, "data02",   6},    /* SEEK_DATA from the tail of the first hole */
+	{UNIT_BLOCKS,     0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the second data */
+	{UNIT_BLOCKS,     4,    SEEK_DATA, "02suffix", 8},    /* SEEK_DATA from middle of the second data */
+	{UNIT_BLOCKS,     0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the second data */
+	{UNIT_BLOCKS,     4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second data */
+	{UNIT_BLOCKS + 1, 128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second hole */
+	{UNIT_BLOCKS + 1, 128,  SEEK_DATA, "data03",   6},    /* SEEK_DATA from middle of the second hole */
+	{FILE_BLOCKS,    -128,  SEEK_HOLE, NULL,       0},    /* SEEK_HOLE from no hole pass offset*/
+};
+
+static void cleanup(void)
+{
+	SAFE_CLOSE(fd);
+}
+
+static void get_blocksize(void)
+{
+	/* truncate to a big enough size, bigger than any fs block size */
+	SAFE_FTRUNCATE(fd, 1024*1024*1024);
+	/* write 1 byte, then the first block will be taken */
+	SAFE_WRITE(1, fd, "a", 1);
+	syncfs(fd);
Quoted 9 lines

testcases/kernel/syscalls/lseek/lseek11.c line 118

Quoted 6 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +6 -0
+	/* seek the first hole will jump over the first block */
+	block_size = SAFE_LSEEK(fd, 0, SEEK_HOLE);
+
+	/* reset to the original state */
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+	SAFE_FTRUNCATE(fd, 0);

Can't we get this information from stat() or from sysfs?

No, we can't make sure always get a real block size from stat(). For XFS, it can. But when I get on some un-local filesystem, e.g: glusterfs. stat return 1M for st_blksize, but the truth is not.

The st_blksize field gives the "preferred" blocksize for efficient filesystem I/O. Not real filesystem block size to allocate space.

I want to have a better method than what I used above too :)

Quoted 2 lines

We are testing the SEEK_HOLE here, it would make sense to obtain it from a different source...

Do you mean move this function to common function?

Quoted 14 lines

testcases/kernel/syscalls/lseek/lseek11.c line 128

Quoted 11 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+}
+
+static int write_data(int fd, int num)
+{
+	char buf[64];
+	size_t count;
+	ssize_t rc = -1;
+	char *p = buf;
+
+	memset(buf, 0, sizeof(buf));

This should be useless, since the sprintf() will include the terminating null character when filling the buf.

OK

Quoted 10 lines
Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +9 -0
+	sprintf(buf, "data%02dsuffix", num);
+	count = strlen(buf);
+
+	/* make sure all data can be written */
+	while (count > 0) {
+		rc = write(fd, p, count);
+		if (rc < 0) {
+			tst_brk(TBROK | TERRNO, "write failed");
+			break;
Quoted 8 lines

testcases/kernel/syscalls/lseek/lseek11.c line 141

Quoted 4 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +4 -0
+		}
+		p += rc;
+		count -= rc;
+	}

Are you sure that the write for that short string could actually write only part of the data? Cannot we rather use the SAFE_WRITE() and expect it to be written in one write() call?

OK, I prefer to use a common function.

I think 99.99% rate one write() can write all data into file, but I can't make sure about that, because the (man 2 write) said:

"On success, the number of bytes written is returned (zero indicates nothing was written). It is not an error if this number is smaller than the number of bytes requested; this may happen for example because the disk device was filled."

As our test results, SAFE_WRITE sometimes failed likes:

growfiles(gf17): 5347 growfiles.c/2249: 14671 tlibio.c/744 write(6, buf, 5000) returned=4096

I haven't looked into it, so I can't be sure if it's SAFE_WRITE's bug.

Quoted 34 lines
Quoted 21 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +20 -0
+	return rc;
+}
+
+static void setup(void)
+{
+	int i;
+	off_t offset = 0;
+	char fname[255];
+
+	memset(fname, 0, sizeof(fname));
+	sprintf(fname, "tfile_lseek_%d", getpid());
+
+	fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0666);
+
+	get_blocksize();
+	tst_res(TINFO, "The block size is %lu", block_size);
+
+	/*
+	 * truncate to the expected file size directly, to keep away the effect
+	 * of speculative preallocation of some filesystems (e.g. XFS)

testcases/kernel/syscalls/lseek/lseek11.c line 173

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+	 */
+	SAFE_FTRUNCATE(fd, FILE_BLOCKS * block_size);
+
+	for (i = 0; i < UNIT_COUNT; i++) {
+		offset = UNIT_BLOCKS * block_size * i;
+		SAFE_LSEEK(fd, offset, SEEK_SET);
+		write_data(fd, i + 1);
+	}
+
+	SAFE_LSEEK(fd, -128, SEEK_END);

Why don't we just seek to the end of the file and write?

Quoted 2 lines

Then the file would have much more predictable content, as it is the last group of blocks will be different from the rest...

I think it's nothing serious. I only want to write in "truncated field" to make sure some filesystem speculative preallocation won't affect the blocks allocating I expect.

Quoted 25 lines
Quoted 25 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +24 -0
+	write_data(fd, i + 1);
+
+	syncfs(fd);
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+}
+
+#if (!defined SEEK_DATA) || (!defined SEEK_HOLE)
+static void test_lseek(void)
+{
+	tst_brk(TCONF, "SEEK_DATA or SEEK_HOLE is not defined.");
+}
+#else
+static void test_lseek(unsigned int n)
+{
+	struct tparam *tp = &tparams[n];
+	off_t offset;
+	char buf[1024];
+	int rc = 0;
+
+	memset(buf, 0, sizeof(buf));
+	offset = (tp->startblock * block_size) + tp->offset;
+	offset = SAFE_LSEEK(fd, offset, tp->whence);
+	if (tp->data) {
+		SAFE_READ(1, fd, buf, tp->count);
Quoted 8 lines

testcases/kernel/syscalls/lseek/lseek11.c line 202

Quoted 5 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +5 -0
+		rc = strcmp(buf, tp->data);
+	} else {
+		if (offset != SAFE_LSEEK(fd, 0, SEEK_END)) {
+			rc = 1;
+		}

Shouldn't we check here that read fills the buffer with zeroes?

I did this check "if (offset != SAFE_LSEEK(fd, 0, SEEK_END))" according
to:
"If there is no hole past offset, then the file offset is adjusted to the end of the file" in lseek(2) manpage. I don't think test reading from the end of file is necessary in this case.

Quoted 5 lines
Quoted 5 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +5 -0
+	}
+
+	if (rc != 0) {
+		tst_res(TFAIL,
+		        "The %uth test failed, expect \'%s\', but get \'%s\'",
Quoted 8 lines

testcases/kernel/syscalls/lseek/lseek11.c line 211

Quoted 4 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +4 -0
+		        n, tp->data, buf);
+	} else {
+		tst_res(TPASS, "The %uth test passed", n);
+	}

Can we print some info about the test case in the PASS and FAIL message instead of it's number, something as "SEEK_DATA to block %i offset %i returned %s" or something?

Sure, I can print that. Print the number we can check the details from the source code:

} tparams[] = {

        {0,               0,    SEEK_DATA, "data01",   6},    /* SEEK_DATA from starting of file*/
        {0,               4,    SEEK_DATA, "01suffix", 8},    /* SEEK_DATA from maddle of the first data */
        {0,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from starting of file */
        {0,               4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first data */
        {1,               0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the first hole */
        {1,               128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from maddle of the first hole */
        {1,               0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the first hole */
        {UNIT_BLOCKS,     -1,   SEEK_DATA, "data02",   6},    /* SEEK_DATA from the tail of the first hole */
        {UNIT_BLOCKS,     0,    SEEK_DATA, "data02",   6},    /* SEEK_DATA from the starting of the second data */
        {UNIT_BLOCKS,     4,    SEEK_DATA, "02suffix", 8},    /* SEEK_DATA from middle of the second data */
        {UNIT_BLOCKS,     0,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from the starting of the second data */
        {UNIT_BLOCKS,     4,    SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second data */
        {UNIT_BLOCKS + 1, 128,  SEEK_HOLE, "",         1023}, /* SEEK_HOLE from middle of the second hole */
        {UNIT_BLOCKS + 1, 128,  SEEK_DATA, "data03",   6},    /* SEEK_DATA from middle of the second hole */
        {FILE_BLOCKS,    -128,  SEEK_HOLE, NULL,       0},    /* SEEK_HOLE from no hole pass offset*/

};

to know which sub-case in this case is failed. We still need back to check, if print more informations :)

Thanks,
Zorro

Quoted 25 lines
Quoted 6 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +5 -0
+}
+#endif
+
+static struct tst_test test = {
+	.tid          = "lseek11",

testcases/kernel/syscalls/lseek/lseek11.c line 226

Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +10 -0
+#if (!defined SEEK_DATA) || (!defined SEEK_HOLE)
+	.test_all     = test_lseek,
+#else
+	.tcnt         = ARRAY_SIZE(tparams),
+	.test         = test_lseek,
+	.setup        = setup,
+	.cleanup      = cleanup,
+	.needs_tmpdir = 1,
+#endif
+};

We already have SEEK_HOLE in lapi/fallocate.h, what about adding SEEK_DATA to the lapi headers as well and including it here. Then we should handle EINVAL from lseek() as TCONF in case that it's not implemented and we can drop all the ifdefs from here.

Signature · 2 lines
Cyril Hrubis
[email protected]
#3 lore raw

PATCH 1/1 lseek: functional SEEK_HOLE and SEEK_DATA test

Hi!

Quoted 14 lines
Quoted 6 lines

testcases/kernel/syscalls/lseek/lseek11.c line 118

Quoted 3 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +3 -0
+	/* reset to the original state */
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+	SAFE_FTRUNCATE(fd, 0);

Can't we get this information from stat() or from sysfs?

No, we can't make sure always get a real block size from stat(). For XFS, it can. But when I get on some un-local filesystem, e.g: glusterfs. stat return 1M for st_blksize, but the truth is not.

The st_blksize field gives the "preferred" blocksize for efficient filesystem I/O. Not real filesystem block size to allocate space.

Quoted 6 lines

I want to have a better method than what I used above too :)

Quoted 2 lines

We are testing the SEEK_HOLE here, it would make sense to obtain it from a different source...

Do you mean move this function to common function?

I meant from a different kernel interface, but if that is not possible, we don't have a choice.

Have you tried asking kernel fs devs if this information is exported somewhere?

Quoted 28 lines
Quoted 9 lines
Quoted 9 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +9 -0
+	sprintf(buf, "data%02dsuffix", num);
+	count = strlen(buf);
+
+	/* make sure all data can be written */
+	while (count > 0) {
+		rc = write(fd, p, count);
+		if (rc < 0) {
+			tst_brk(TBROK | TERRNO, "write failed");
+			break;
Quoted 8 lines

testcases/kernel/syscalls/lseek/lseek11.c line 141

Quoted 4 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +4 -0
+		}
+		p += rc;
+		count -= rc;
+	}

Are you sure that the write for that short string could actually write only part of the data? Cannot we rather use the SAFE_WRITE() and expect it to be written in one write() call?

OK, I prefer to use a common function.

I think 99.99% rate one write() can write all data into file, but I can't make sure about that, because the (man 2 write) said:

"On success, the number of bytes written is returned (zero indicates nothing was written). It is not an error if this number is smaller than the number of bytes requested; this may happen for example because the disk device was filled."

Quoted 5 lines

As our test results, SAFE_WRITE sometimes failed likes:

growfiles(gf17): 5347 growfiles.c/2249: 14671 tlibio.c/744 write(6, buf, 5000) returned=4096

I haven't looked into it, so I can't be sure if it's SAFE_WRITE's bug.

I would expect that write smaller than certain size will never do a partial write to a file and 12 bytes looks small enough to me.

Signature · 2 lines
Cyril Hrubis
[email protected]
author
#4 lore raw

PATCH 1/1 lseek: functional SEEK_HOLE and SEEK_DATA test

Quoted 20 lines · Cyril Hrubis

Hi!

Quoted 19 lines
Quoted 6 lines

testcases/kernel/syscalls/lseek/lseek11.c line 118

Quoted 3 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +3 -0
+	/* reset to the original state */
+	SAFE_LSEEK(fd, 0, SEEK_SET);
+	SAFE_FTRUNCATE(fd, 0);

Can't we get this information from stat() or from sysfs?

No, we can't make sure always get a real block size from stat(). For XFS, it can. But when I get on some un-local filesystem, e.g: glusterfs. stat return 1M for st_blksize, but the truth is not.

The st_blksize field gives the "preferred" blocksize for efficient filesystem I/O. Not real filesystem block size to allocate space.

I want to have a better method than what I used above too :)

Quoted 2 lines

We are testing the SEEK_HOLE here, it would make sense to obtain it from a different source...

Quoted 7 lines
Quoted 1 line

Do you mean move this function to common function?

I meant from a different kernel interface, but if that is not possible, we don't have a choice.

Have you tried asking kernel fs devs if this information is exported somewhere?

I think there're some ways to get the information, for local fs it's not so hard. But for un-local fs maybe more trouble than this function. e.g.

On server:

# mount /dev/mapper/testvg-testdev /mnt/test
# mkdir /mnt/test/glusterdir
# service glusterd start
# gluster volume create testvol $IP_ADDR:/mnt/test/glusterdir
# gluster volume start testvol

Then on client:

# mount -t glusterfs $IP_ADDR:/testvol /mnt/glustermnt
# runltp -d /mnt/glustermnt -f syscalls -s lseek11

I think it's hard to explore the real block size (MIN bytes to allocate) for this situation or something others fs like that.

I'll try to talk about this with fs developers. If I can get a better idea, I'll update :)

Quoted 29 lines
Quoted 29 lines
Quoted 10 lines
Quoted 10 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +9 -0
+	sprintf(buf, "data%02dsuffix", num);
+	count = strlen(buf);
+
+	/* make sure all data can be written */
+	while (count > 0) {
+		rc = write(fd, p, count);
+		if (rc < 0) {
+			tst_brk(TBROK | TERRNO, "write failed");
+			break;
Quoted 8 lines

testcases/kernel/syscalls/lseek/lseek11.c line 141

Quoted 4 lines
testcases/kernel/syscalls/lseek/lseek11.c new file +4 -0
+		}
+		p += rc;
+		count -= rc;
+	}

Are you sure that the write for that short string could actually write only part of the data? Cannot we rather use the SAFE_WRITE() and expect it to be written in one write() call?

OK, I prefer to use a common function.

I think 99.99% rate one write() can write all data into file, but I can't make sure about that, because the (man 2 write) said:

"On success, the number of bytes written is returned (zero indicates nothing was written). It is not an error if this number is smaller than the number of bytes requested; this may happen for example because the disk device was filled."

Quoted 8 lines
Quoted 5 lines

As our test results, SAFE_WRITE sometimes failed likes:

growfiles(gf17): 5347 growfiles.c/2249: 14671 tlibio.c/744 write(6, buf, 5000) returned=4096

I haven't looked into it, so I can't be sure if it's SAFE_WRITE's bug.

I would expect that write smaller than certain size will never do a partial write to a file and 12 bytes looks small enough to me.

Hmm, OK, that write loop is a little picky. I think use SAFE_WRITE is enough. I will turn to use it :)

Thanks,
Zorro

Quoted 4 lines
Signature · 3 lines
-- 
Cyril Hrubis
[email protected]