[LTP] [PATCH 1/3] syscalls/preadv02.c: add specific error

[LTP] [PATCH 1/3] syscalls/preadv02.c: add specific error

[Xiao Yang]

1) preadv(2) fails when fd refers to a directory and
   set errno to EISDIR.
2) preadv(2) fails if fd is associated with a pipe and
   set errno to ESPIPE.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 testcases/kernel/syscalls/preadv/preadv02.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/preadv/preadv02.c b/testcases/kernel/syscalls/preadv/preadv02.c
index f2f3af7..ae9fa6e 100644
--- a/testcases/kernel/syscalls/preadv/preadv02.c
+++ b/testcases/kernel/syscalls/preadv/preadv02.c
@@ -24,6 +24,8 @@
 * 4) preadv(2) fails when attempts to read into a invalid address.
 * 5) preadv(2) fails if file descriptor is invalid.
 * 6) preadv(2) fails if file descriptor is not open for reading.
+* 7) preadv(2) fails when fd refers to a directory.
+* 8) preadv(2) fails if fd is associated with a pipe.
 *
 * Expected Result:
 * 1) preadv(2) should return -1 and set errno to EINVAL.
@@ -32,6 +34,8 @@
 * 4) preadv(2) should return -1 and set errno to EFAULT.
 * 5) preadv(2) should return -1 and set errno to EBADF.
 * 6) preadv(2) should return -1 and set errno to EBADF.
+* 7) preadv(2) should return -1 and set errno to EISDIR.
+* 8) preadv(2) should return -1 and set errno to ESPIPE.
 */
 
 #include <sys/uio.h>
@@ -43,6 +47,9 @@
 static int fd1;
 static int fd2;
 static int fd3 = -1;
+static int fd4;
+static int fd5[2];
+
 static char buf[CHUNK];
 
 static struct iovec rd_iovec1[] = {
@@ -66,7 +73,9 @@ static struct tcase {
 	{&fd1, rd_iovec2, 1, -1, EINVAL},
 	{&fd1, rd_iovec2, 2, 0, EFAULT},
 	{&fd3, rd_iovec2, 1, 0, EBADF},
-	{&fd2, rd_iovec2, 1, 0, EBADF}
+	{&fd2, rd_iovec2, 1, 0, EBADF},
+	{&fd4, rd_iovec2, 1, 0, EISDIR},
+	{&fd5[0], rd_iovec2, 1, 0, ESPIPE}
 };
 
 static void verify_preadv(unsigned int n)
@@ -93,6 +102,8 @@ static void setup(void)
 {
 	fd1 = SAFE_OPEN("file1", O_RDWR | O_CREAT, 0644);
 	fd2 = SAFE_OPEN("file2", O_WRONLY | O_CREAT, 0644);
+	fd4 = SAFE_OPEN(".", O_RDONLY);
+	SAFE_PIPE(fd5);
 }
 
 static void cleanup(void)
@@ -102,6 +113,15 @@ static void cleanup(void)
 
 	if (fd2 > 0 && close(fd2))
 		tst_res(TWARN | TERRNO, "failed to close file");
+
+	if (fd4 > 0 && close(fd4))
+		tst_res(TWARN | TERRNO, "failed to close file");
+
+	if (fd5[0] > 0 && close(fd5[0]))
+		tst_res(TWARN | TERRNO, "failed to close file");
+
+	if (fd5[1] > 0 && close(fd5[1]))
+		tst_res(TWARN | TERRNO, "failed to close file");
 }
 
 static struct tst_test test = {
-- 
1.8.3.1

[LTP] [PATCH 2/3] syscalls/pwritev01: convert to new test API

[Xiao Yang]

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 testcases/kernel/syscalls/pwritev/pwritev.h   |  2 +-
 testcases/kernel/syscalls/pwritev/pwritev01.c | 89 +++++++++------------------
 2 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/testcases/kernel/syscalls/pwritev/pwritev.h b/testcases/kernel/syscalls/pwritev/pwritev.h
index ae9d999..4970036 100644
--- a/testcases/kernel/syscalls/pwritev/pwritev.h
+++ b/testcases/kernel/syscalls/pwritev/pwritev.h
@@ -24,7 +24,7 @@
 #if !defined(HAVE_PWRITEV)
 int pwritev(int fd, const struct iovec *iov, int iovcnt, off_t offset)
 {
-	return ltp_syscall(__NR_pwritev, fd, iov, iovcnt, offset);
+	return tst_syscall(__NR_pwritev, fd, iov, iovcnt, offset);
 }
 #endif
 
diff --git a/testcases/kernel/syscalls/pwritev/pwritev01.c b/testcases/kernel/syscalls/pwritev/pwritev01.c
index 1cb35cb..4d3b7a3 100644
--- a/testcases/kernel/syscalls/pwritev/pwritev01.c
+++ b/testcases/kernel/syscalls/pwritev/pwritev01.c
@@ -23,11 +23,10 @@
 * and after writing the file, the file offset is not changed.
 */
 
-#include <errno.h>
-
-#include "test.h"
+#include <string.h>
+#include <sys/uio.h>
+#include "tst_test.h"
 #include "pwritev.h"
-#include "safe_macros.h"
 
 #define	CHUNK		64
 
@@ -41,68 +40,43 @@ static struct iovec wr_iovec[] = {
 	{NULL, 0},
 };
 
-static struct test_case_t {
+static struct tcase {
 	int count;
 	off_t offset;
 	ssize_t size;
-} tc[] = {
+} tcases[] = {
 	{1, 0, CHUNK},
 	{2, 0, CHUNK},
 	{1, CHUNK/2, CHUNK},
 };
 
-void verify_pwritev(struct test_case_t *);
-void setup(void);
-void cleanup(void);
-
-char *TCID = "pwritev01";
-int TST_TOTAL =  ARRAY_SIZE(tc);
-
-int main(int ac, char **av)
-{
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++)
-			verify_pwritev(&tc[i]);
-	}
-	cleanup();
-	tst_exit();
-}
-
-void verify_pwritev(struct test_case_t *tc)
+static void verify_pwritev(unsigned int n)
 {
 	int i;
+	struct tcase *tc = &tcases[n];
 
-	SAFE_PWRITE(cleanup, 1, fd, initbuf, sizeof(initbuf), 0);
+	SAFE_PWRITE(1, fd, initbuf, sizeof(initbuf), 0);
 
-	SAFE_LSEEK(cleanup, fd, 0, SEEK_SET);
+	SAFE_LSEEK(fd, 0, SEEK_SET);
 
 	TEST(pwritev(fd, wr_iovec, tc->count, tc->offset));
 	if (TEST_RETURN < 0) {
-		tst_resm(TFAIL | TTERRNO, "Pwritev(2) failed");
+		tst_res(TFAIL | TERRNO, "pwritev() failed");
 		return;
 	}
 
 	if (TEST_RETURN != tc->size) {
-		tst_resm(TFAIL, "Pwritev(2) write %li bytes, expected %li",
+		tst_res(TFAIL, "pwritev() wrote %li bytes, expected %li",
 			 TEST_RETURN, tc->size);
 		return;
 	}
 
-	if (SAFE_LSEEK(cleanup, fd, 0, SEEK_CUR) != 0) {
-		tst_resm(TFAIL, "Pwritev(2) has changed file offset");
+	if (SAFE_LSEEK(fd, 0, SEEK_CUR) != 0) {
+		tst_res(TFAIL, "pwritev() had changed file offset");
 		return;
 	}
 
-	SAFE_PREAD(cleanup, 1, fd, preadbuf, tc->size, tc->offset);
+	SAFE_PREAD(1, fd, preadbuf, tc->size, tc->offset);
 
 	for (i = 0; i < tc->size; i++) {
 		if (preadbuf[i] != 0x61)
@@ -110,37 +84,34 @@ void verify_pwritev(struct test_case_t *tc)
 	}
 
 	if (i != tc->size) {
-		tst_resm(TFAIL, "Buffer wrong at %i have %02x expected 61",
+		tst_res(TFAIL, "buffer wrong at %i have %02x expected 61",
 			 i, preadbuf[i]);
 		return;
 	}
 
-	tst_resm(TPASS, "Pwritev(2) write %li bytes successfully "
+	tst_res(TPASS, "writev() wrote %li bytes successfully "
 		 "with content 'a' expectedly ", tc->size);
 }
 
-void setup(void)
+static void setup(void)
 {
-	if ((tst_kvercmp(2, 6, 30)) < 0) {
-		tst_brkm(TCONF, NULL, "This test can only run on kernels "
-			"that are 2.6.30 and higher");
-	}
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
 	memset(&buf, 0x61, CHUNK);
 
-	fd = SAFE_OPEN(cleanup, "file", O_RDWR | O_CREAT, 0644);
+	fd = SAFE_OPEN("file", O_RDWR | O_CREAT, 0644);
 }
 
-void cleanup(void)
+static void cleanup(void)
 {
 	if (fd > 0 && close(fd))
-		tst_resm(TWARN | TERRNO, "Failed to close file");
-
-	tst_rmdir();
+		tst_res(TWARN | TERRNO, "failed to close file");
 }
+
+static struct tst_test test = {
+	.tid = "pwritev01",
+	.tcnt = ARRAY_SIZE(tcases),
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = verify_pwritev,
+	.min_kver = "2.6.30",
+	.needs_tmpdir = 1,
+};
-- 
1.8.3.1

[LTP] [PATCH 3/3] syscalls/pwritev02.c: add specific error && convert to new test API

[Xiao Yang]

1) pwritev(2) fails if fd is associated with a pipe and
   set errno to ESPIPE.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 testcases/kernel/syscalls/pwritev/pwritev02.c | 107 ++++++++++----------------
 1 file changed, 41 insertions(+), 66 deletions(-)

diff --git a/testcases/kernel/syscalls/pwritev/pwritev02.c b/testcases/kernel/syscalls/pwritev/pwritev02.c
index 6e8b7ea..d7ca105 100644
--- a/testcases/kernel/syscalls/pwritev/pwritev02.c
+++ b/testcases/kernel/syscalls/pwritev/pwritev02.c
@@ -24,6 +24,7 @@
 * 4) pwritev(2) fails when attempts to write from a invalid address
 * 5) pwritev(2) fails if file descriptor is invalid.
 * 6) pwritev(2) fails if file descriptor is not open for writing.
+* 7) pwritev(2) fails if fd is associated with a pipe.
 *
 * Expected Result:
 * 1) pwritev(2) should return -1 and set errno to EINVAL.
@@ -32,20 +33,20 @@
 * 4) pwritev(2) should return -1 and set errno to EFAULT.
 * 5) pwritev(2) should return -1 and set errno to EBADF.
 * 6) pwritev(2) should return -1 and set errno to EBADF.
+* 7) pwritev(2) should return -1 and set errno to ESPIPE.
 */
 
-#include <errno.h>
 #include <sys/uio.h>
-
-#include "test.h"
+#include "tst_test.h"
 #include "pwritev.h"
-#include "safe_macros.h"
 
 #define CHUNK           64
 
 static int fd1;
 static int fd2;
 static int fd3 = -1;
+static int fd4[2];
+
 static char buf[CHUNK];
 
 static struct iovec wr_iovec1[] = {
@@ -57,95 +58,69 @@ static struct iovec wr_iovec2[] = {
 	{(char *)-1, CHUNK},
 };
 
-static struct test_case_t {
+static struct tcase {
 	int *fd;
 	struct iovec *name;
 	int count;
 	off_t offset;
 	int exp_err;
-} tc[] = {
-	/* test1 */
+} tcases[] = {
 	{&fd1, wr_iovec1, 1, 0, EINVAL},
-	/* test2 */
 	{&fd1, wr_iovec2, -1, 0, EINVAL},
-	/* test3 */
 	{&fd1, wr_iovec2, 1, -1, EINVAL},
-	/* test4 */
 	{&fd1, wr_iovec2, 2, 0, EFAULT},
-	/* test5 */
 	{&fd3, wr_iovec2, 1, 0, EBADF},
-	/* test6 */
-	{&fd2, wr_iovec2, 1, 0, EBADF}
+	{&fd2, wr_iovec2, 1, 0, EBADF},
+	{&fd4[1], wr_iovec2, 1, 0, ESPIPE}
 };
 
-static void verify_pwritev(struct test_case_t *tc);
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "pwritev02";
-int TST_TOTAL = ARRAY_SIZE(tc);
-
-int main(int ac, char **av)
+static void verify_pwritev(unsigned int n)
 {
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
+	struct tcase *tc = &tcases[n];
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-		for (i = 0; i < TST_TOTAL; i++)
-			verify_pwritev(&tc[i]);
-	}
-
-	cleanup();
-	tst_exit();
-}
-
-static void verify_pwritev(struct test_case_t *tc)
-{
 	TEST(pwritev(*tc->fd, tc->name, tc->count, tc->offset));
 	if (TEST_RETURN == 0) {
-		tst_resm(TFAIL, "pwritev() succeeded unexpectedly");
-	} else {
-		if (TEST_ERRNO == tc->exp_err) {
-			tst_resm(TPASS | TTERRNO,
-				 "pwritev() failed as expected");
-		} else {
-			tst_resm(TFAIL | TTERRNO,
-				 "pwritev() failed unexpectedly, expected"
-				 " errno is %s", tst_strerrno(tc->exp_err));
-		}
+		tst_res(TFAIL, "pwritev() succeeded unexpectedly");
+		return;
 	}
-}
 
-static void setup(void)
-{
-	if ((tst_kvercmp(2, 6, 30)) < 0) {
-		tst_brkm(TCONF, NULL, "This test can only run on kernels"
-			 " that are 2.6.30 or higher.");
+	if (TEST_ERRNO == tc->exp_err) {
+		tst_res(TPASS | TTERRNO, "pwritev() failed as expected");
+		return;
 	}
 
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	fd1 = SAFE_OPEN(cleanup, "file", O_RDWR | O_CREAT, 0644);
+	tst_res(TFAIL | TTERRNO, "pwritev() failed unexpectedly, expected %s",
+		tst_strerrno(tc->exp_err));
+}
 
-	fd2 = SAFE_OPEN(cleanup, "file", O_RDONLY | O_CREAT, 0644);
+static void setup(void)
+{
+	fd1 = SAFE_OPEN("file", O_RDWR | O_CREAT, 0644);
+	fd2 = SAFE_OPEN("file", O_RDONLY | O_CREAT, 0644);
+	SAFE_PIPE(fd4);
 }
 
 static void cleanup(void)
 {
 	if (fd1 > 0 && close(fd1))
-		tst_resm(TWARN | TERRNO, "failed to close file");
+		tst_res(TWARN | TERRNO, "failed to close file");
 
 	if (fd2 > 0 && close(fd2))
-		tst_resm(TWARN | TERRNO, "failed to close file");
+		tst_res(TWARN | TERRNO, "failed to close file");
+
+	if (fd4[0] > 0 && close(fd4[0]))
+		tst_res(TWARN | TERRNO, "failed to close file");
 
-	tst_rmdir();
+	if (fd4[1] > 0 && close(fd4[1]))
+		tst_res(TWARN | TERRNO, "failed to close file");
 }
+
+static struct tst_test test = {
+	.tid = "pwritev02",
+	.tcnt = ARRAY_SIZE(tcases),
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = verify_pwritev,
+	.min_kver = "2.6.30",
+	.needs_tmpdir = 1,
+};
-- 
1.8.3.1

[LTP] [PATCH 2/3] syscalls/pwritev01: convert to new test API

[Cyril Hrubis]

Hi!
>  	TEST(pwritev(fd, wr_iovec, tc->count, tc->offset));
>  	if (TEST_RETURN < 0) {
> -		tst_resm(TFAIL | TTERRNO, "Pwritev(2) failed");
> +		tst_res(TFAIL | TERRNO, "pwritev() failed");
                                 ^
				 I've changed this back to TTERRNO
				 since we use the TEST() macro here.

And also merged this patch with the next one to avoid failures when the
fallback from pwritev.h is used with the new macro in the old library
and pushed. Thanks.

-- 
Cyril Hrubis
chrubis@suse.cz