syscalls/write06: Add new test
PATCH 1/1 syscalls/write06: Add new test
Like pwrite04.c, test the write() system call with O_APPEND.
--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 94 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 testcases/kernel/syscalls/write/write06.c
runtest/syscalls +1 -0
@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02
testcases/kernel/syscalls/write/.gitignore +1 -0
@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06
testcases/kernel/syscalls/write/write06.c new file +94 -0
94 lines not on this page · raw message
Signature · 5 lines
1.8.3.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 74 lines
Signed-off-by Dai Shili <[email protected]>--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 94 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 testcases/kernel/syscalls/write/write06.cruntest/syscalls +1
-0@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02testcases/kernel/syscalls/write/.gitignore +1
-0@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06testcases/kernel/syscalls/write/write06.c new file +39
-0@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Dai Shili <[email protected]> +*/ + +/*\ +* [Description] +* +* Test the write() system call with O_APPEND. +* +* Writing 2k data to the file, close it and reopen it with O_APPEND. +* Verify that the file size is 3k and offset is moved to the end of the file. +*/ + +#include <stdlib.h> +#include <inttypes.h> +#include "tst_test.h" +#include "tst_safe_prw.h" + +#define K1 1024 +#define K2 (K1 * 2) +#define K3 (K1 * 3) +#define DATA_FILE "write06_file" + +static int fd =-1 ; +static char *write_buf[2 ]; + +static void l_seek (int fdesc,off_t offset,int whence,off_t checkoff) +{ +off_t offloc; + + offloc =SAFE_LSEEK (fdesc, offset, whence); +if (offloc != checkoff) { +tst_res (TFAIL ,"%" PRId64" = lseek(%d, %" PRId64", %d) != %" PRId64, + (int64_t )offloc, fdesc, (int64_t )offset, whence, (int64_t )checkoff); + } +} +
testcases/kernel/syscalls/write/write06.c line 49
Quoted 10 lines
testcases/kernel/syscalls/write/write06.c new file +10
-0+static void verify_write (void ) +{ +int fail =0 ; +struct stat statbuf; + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_CREAT |O_TRUNC ,0666 ); +SAFE_WRITE (1 , fd, write_buf[0 ],K2 ); +SAFE_CLOSE (fd); + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_APPEND ,0666 );
^
No need to pass mode without O_CREAT
testcases/kernel/syscalls/write/write06.c line 56
Quoted 7 lines
testcases/kernel/syscalls/write/write06.c new file +7
-0+SAFE_FSTAT (fd, &statbuf); +if (statbuf.st_size !=K2 ) { + fail++; +tst_res (TFAIL ,"file size is %ld != K2" , statbuf.st_size); + } + +l_seek (fd,K1 ,SEEK_SET ,K1 );
Why do we do the seek here?
Wouldn't it make much more sense just to write the write_buf[1] then check that the st_size is K3?
That way we would check that O_APPEND opened file has correct position associated with the file descriptor.
testcases/kernel/syscalls/write/write06.c line 58
Quoted 2 lines
testcases/kernel/syscalls/write/write06.c new file +2
-0+SAFE_WRITE (1 , fd, write_buf[1 ],K1 ); +l_seek (fd,0 ,SEEK_CUR ,K3 );
And here as well, why the seek? This is actually the place that increases the size not the write() as it should have been.
testcases/kernel/syscalls/write/write06.c line 63
Quoted 5 lines
testcases/kernel/syscalls/write/write06.c new file +5
-0+SAFE_FSTAT (fd, &statbuf); +if (statbuf.st_size !=K3 ) { + fail++; +tst_res (TFAIL ,"file size is %ld != K3" , statbuf.st_size); + }
Really the whole test should do:
open(FILE, O_RDWR | O_CREAT | O_TRUNC, 0666) write() close() open(FILE, O_RDWR | O_APPEND) check size write() check size close() open(FILE, O_RDONLY); read() verify data close()
testcases/kernel/syscalls/write/write06.c line 75
Quoted 11 lines
testcases/kernel/syscalls/write/write06.c new file +11
-0+if (!fail) +tst_res (TPASS ,"O_APPEND test passed." ); +SAFE_CLOSE (fd); +} + +static void setup (void ) +{ + write_buf[0 ] =SAFE_MALLOC (K2 ); +memset (write_buf[0 ],0 ,K2 ); + write_buf[1 ] =SAFE_MALLOC (K1 ); +memset (write_buf[0 ],1 ,K1 );
^ 1
Also can you please switch these two buffers to a guarded buffers?
See:
https://github.com/linux-test-project/ltp/wiki/C-Test-API#131-guarded-buffers
testcases/kernel/syscalls/write/write06.c line 83
Quoted 8 lines
testcases/kernel/syscalls/write/write06.c new file +8
-0+} + +static void cleanup (void ) +{ +free (write_buf[0 ]); +free (write_buf[1 ]); + +if (fd >-1 )
Probably fd != -1 would be a bit clearer.
Quoted 17 lines
testcases/kernel/syscalls/write/write06.c new file +11
-0+SAFE_CLOSE (fd); + +SAFE_UNLINK (DATA_FILE ); +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_write, +};Signature · 5 lines
1.8.3.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Cyril
Quoted 81 lines · Cyril Hrubis
Hi!
Quoted 80 lines
Signed-off-by Dai Shili <[email protected]>--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 94 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+)create mode 100644
testcases/kernel/syscalls/write/write06.cruntest/syscalls +1
-0@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02testcases/kernel/syscalls/write/.gitignore +1
-0@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06testcases/kernel/syscalls/write/write06.c new file +45
-0@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Dai Shili <[email protected]> +*/ + +/*\ +* [Description] +* +* Test the write() system call with O_APPEND. +* +* Writing 2k data to the file, close it and reopen it with O_APPEND. +* Verify that the file size is 3k and offset is moved to the end of the file. +*/ + +#include <stdlib.h> +#include <inttypes.h> +#include "tst_test.h" +#include "tst_safe_prw.h" + +#define K1 1024 +#define K2 (K1 * 2) +#define K3 (K1 * 3) +#define DATA_FILE "write06_file" + +static int fd =-1 ; +static char *write_buf[2 ]; + +static void l_seek (int fdesc,off_t offset,int whence,off_t checkoff) +{ +off_t offloc; + + offloc =SAFE_LSEEK (fdesc, offset, whence); +if (offloc != checkoff) { +tst_res (TFAIL ,"%" PRId64" = lseek(%d, %" PRId64", %d) != %" PRId64, + (int64_t )offloc, fdesc, (int64_t )offset, whence, (int64_t )checkoff); + } +} + +static void verify_write (void ) +{ +int fail =0 ; +struct stat statbuf; + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_CREAT |O_TRUNC ,0666 );
Quoted 8 lines
testcases/kernel/syscalls/write/write06.c line 49
Quoted 4 lines
testcases/kernel/syscalls/write/write06.c new file +4
-0+SAFE_WRITE (1 , fd, write_buf[0 ],K2 ); +SAFE_CLOSE (fd); + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_APPEND ,0666 );^
No need to pass mode withoutO_CREAT
Got it.
Quoted 9 lines
testcases/kernel/syscalls/write/write06.c line 56
Quoted 7 lines
testcases/kernel/syscalls/write/write06.c new file +7
-0+SAFE_FSTAT (fd, &statbuf); +if (statbuf.st_size !=K2 ) { + fail++; +tst_res (TFAIL ,"file size is %ld != K2" , statbuf.st_size); + } + +l_seek (fd,K1 ,SEEK_SET ,K1 );Why do we do the seek here?
Quoted 5 lines
Wouldn't it make much more sense just to write the write_buf[1] then check that the
st_sizeis K3?That way we would check that
O_APPENDopened file has correct position associated with the file descriptor.
I want to verify that the offset will move to the end of the file.
So I put the offset in the middle of the file before write.
Quoted 4 lines
testcases/kernel/syscalls/write/write06.c line 58
Quoted 2 lines
testcases/kernel/syscalls/write/write06.c new file +2
-0+SAFE_WRITE (1 , fd, write_buf[1 ],K1 ); +l_seek (fd,0 ,SEEK_CUR ,K3 );And here as well, why the seek? This is actually the place that increases the size not the
write()as it should have been.
Do seek to check the offset is moved to the end of the file.
Quoted 7 lines
testcases/kernel/syscalls/write/write06.c line 63
Quoted 5 lines
testcases/kernel/syscalls/write/write06.c new file +5
-0+SAFE_FSTAT (fd, &statbuf); +if (statbuf.st_size !=K3 ) { + fail++; +tst_res (TFAIL ,"file size is %ld != K3" , statbuf.st_size); + }Really the whole test should do:
Quoted 15 lines
open(FILE, O_RDWR | O_CREAT | O_TRUNC, 0666) write() close() open(FILE, O_RDWR | O_APPEND) check size write() check size close() open(FILE, O_RDONLY); read() verify data close()
I'm so sorry, my commit msg is not clear.
What I want to test is the following description of open(2) man-pages:
O_APPEND
The file is opened in append mode. Before each write(2), the
file offset is positioned at the end of the file, as if with lseek(2). The modification of the file offset and the write operation are performed as a single atomic step.
Quoted 14 lines
testcases/kernel/syscalls/write/write06.c line 75
Quoted 11 lines
testcases/kernel/syscalls/write/write06.c new file +11
-0+if (!fail) +tst_res (TPASS ,"O_APPEND test passed." ); +SAFE_CLOSE (fd); +} + +static void setup (void ) +{ + write_buf[0 ] =SAFE_MALLOC (K2 ); +memset (write_buf[0 ],0 ,K2 ); + write_buf[1 ] =SAFE_MALLOC (K1 ); +memset (write_buf[0 ],1 ,K1 );^ 1
Quoted 5 lines
Also can you please switch these two buffers to a guarded buffers?
See:
https://github.com/linux-test-project/ltp/wiki/C-Test-API#131-guarded-buffers
OK. I will switch to guarded buffers.
Quoted 9 lines
testcases/kernel/syscalls/write/write06.c line 83
Quoted 8 lines
testcases/kernel/syscalls/write/write06.c new file +8
-0+} + +static void cleanup (void ) +{ +free (write_buf[0 ]); +free (write_buf[1 ]); + +if (fd >-1 )Probably fd != -1 would be a bit clearer.
Got it.
Quoted 17 lines
Quoted 17 lines
testcases/kernel/syscalls/write/write06.c new file +11
-0+SAFE_CLOSE (fd); + +SAFE_UNLINK (DATA_FILE ); +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_write, +};Signature · 5 lines
1.8.3.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 7 lines
What I want to test is the following description of open(2) man-pages:
O_APPEND
?????? ?? The file is opened in append mode.?? Before each write(2), the
file offset is positioned at the end of the file, as if with lseek(2).?? The modification of the file offset and the write operation are performed as a single atomic step.
Ah, now it makes much more sense.
I think part of the problem is that the code is actually confusing. I do not like the l_seek() function at all, it's confusing at best because it does several different things at the same time. So it would be much better to write the offset check as:
off = SAFE_LSEEK(fd, 1K, SEEK_SET)
if (off != 1K)
tst_brk(TBROK, "Failed to seek to 1K");
SAFE_WRITE(1, fd, write_buf[1], K1);
off = SAFE_LSEEK(fd, 0, SEEK_CUR);
if (off != K3)
tst_res(TFAIL, "Wrong offset after write %zu expected %u", off, K3)
else
tst_res(TPASS, "Offset is correct after write %zu", off);
SAFE_FSTAT(fd, &statbuf);
if (statbuf.st_size != K3) {
tst_res(TFAIL, "Wrong file size after append %zu expected %u",
statubuf.st_size, K3);
} else {
tst_res(TPASS, "Correct file size after append %u", K3);
}This makes it much clearer what happens here and the TPASS message actually says what has passed...
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/1 syscalls/write06: Add new test
Like pwrite04.c, test the write() system call with O_APPEND.
--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 95 ++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 testcases/kernel/syscalls/write/write06.c
runtest/syscalls +1 -0
@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02
testcases/kernel/syscalls/write/.gitignore +1 -0
@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06
testcases/kernel/syscalls/write/write06.c new file +95 -0
95 lines not on this page · raw message
Signature · 5 lines
1.8.3.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Dai,
Quoted 1 line
Like
pwrite04.c, test thewrite()system call withO_APPEND.
...
Quoted 6 lines
+++
b/testcases/kernel/syscalls/write/write06.ctestcases/kernel/syscalls/write/write06.c new file +4
-0@@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Dai Shili <[email protected]>
testcases/kernel/syscalls/write/write06.c line 14
Quoted 10 lines
testcases/kernel/syscalls/write/write06.c new file +10
-0+*/ + +/*\ +* [Description] +* +* Test the write() system call with O_APPEND. +* +* The full description of O_APPEND is in open(2) man-pages: +* O_APPEND +* The file is opened in append mode. Before each write(2), the
nit: FYI this formatting will be lost in our metadata.
(To see the output, you can run make metadata/ and check docparse/metadata.html or docparse/metadata.pdf.)
...
testcases/kernel/syscalls/write/write06.c line 45
Quoted 10 lines
testcases/kernel/syscalls/write/write06.c new file +10
-0+static void verify_write (void ) +{ +off_t off; +struct stat statbuf; + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_CREAT |O_TRUNC ); +SAFE_WRITE (1 , fd, write_buf[0 ],K2 ); +SAFE_CLOSE (fd); + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_APPEND );
Quite often I get EACCES when running the test. It's strange that not always.
$ ./write06 tst_buffers.c:55: TINFO: Test is using guarded buffers tst_test.c:1423: TINFO: Timeout per run is 0h 05m 00s write06.c:45: TBROK: open(write06_file,1026,4162714000) failed: EACCES (13)
IMHO this depends on umask (0022) in my case.
Obviously specifying permissions as it's in pwrite04.c fixes the problem:
@@ -38,7 +38,7 @@ static void verify_write(void)
off_t off;
struct stat statbuf;
- fd = SAFE_OPEN(DATA_FILE, O_RDWR | O_CREAT | O_TRUNC); + fd = SAFE_OPEN(DATA_FILE, O_RDWR | O_CREAT | O_TRUNC, 0666);
SAFE_WRITE(1, fd, write_buf[0], K2);
SAFE_CLOSE(fd);
(pwrite04.c specifies permission in both SAFE_OPEN(), but it's obviously enough to put it just in the first one, which uses O_CREAT).
Also Cyril noted using permissions in review of v1 patch:
https://lore.kernel.org/ltp/Ya9my0FdHXLqvkJr@yuki/
Otherwise LGTM.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/1 syscalls/write06: Add new test
Like pwrite04.c, test the write() system call with O_APPEND.
--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 94 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 testcases/kernel/syscalls/write/write06.c
runtest/syscalls +1 -0
@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02
testcases/kernel/syscalls/write/.gitignore +1 -0
@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06
testcases/kernel/syscalls/write/write06.c new file +94 -0
94 lines not on this page · raw message
Signature · 5 lines
1.8.3.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Dai,
Thanks!
Waiting to our CI be fixed before merge.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Dai
LGTM, merged!
Best Regards
Yang Xu
Quoted 131 lines
Like
pwrite04.c, test thewrite()system call withO_APPEND.Signed-off-by Dai Shili<[email protected]>--- runtest/syscalls | 1 + testcases/kernel/syscalls/write/.gitignore | 1 + testcases/kernel/syscalls/write/write06.c | 94 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+)create mode 100644
testcases/kernel/syscalls/write/write06.cruntest/syscalls +1
-0@@ -1699,6 +1699,7 @@ write02 write02 write03 write03 write04 write04 write05 write05 +write06 write06 writev01 writev01 writev02 writev02testcases/kernel/syscalls/write/.gitignore +1
-0@@ -3,3 +3,4 @@ /write03 /write04 /write05 +/write06testcases/kernel/syscalls/write/write06.c new file +94
-0@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Dai Shili<[email protected]> +*/ + +/*\ +* [Description] +* +* Test the write() system call with O_APPEND. +* +* The full description of O_APPEND is in open(2) man-pages: +* The file is opened in append mode. Before each write(2), the +* file offset is positioned at the end of the file, as if with lseek(2). +* The modification of the file offset and the write operation are +* performed as a single atomic step. +* +* Writing 2k data to the file, close it and reopen it with O_APPEND. +* Verify that the file size is 3k and offset is moved to the end of the file. +*/ + +#include <stdlib.h> +#include <inttypes.h> +#include "tst_test.h" +#include "tst_safe_prw.h" + +#define K1 1024 +#define K2 (K1 * 2) +#define K3 (K1 * 3) +#define DATA_FILE "write06_file" + +static int fd =-1 ; +static char *write_buf[2 ]; + +static void verify_write (void ) +{ +off_t off; +struct stat statbuf; + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_CREAT |O_TRUNC ,0666 ); +SAFE_WRITE (1 , fd, write_buf[0 ],K2 ); +SAFE_CLOSE (fd); + + fd =SAFE_OPEN (DATA_FILE ,O_RDWR |O_APPEND ); +SAFE_FSTAT (fd,&statbuf); +if (statbuf.st_size !=K2 ) +tst_res (TFAIL ,"file size is %ld != K2" , statbuf.st_size); + + off =SAFE_LSEEK (fd,K1 ,SEEK_SET ); +if (off !=K1 ) +tst_brk (TBROK ,"Failed to seek to K1" ); + +SAFE_WRITE (1 , fd, write_buf[1 ],K1 ); + + off =SAFE_LSEEK (fd,0 ,SEEK_CUR ); +if (off !=K3 ) +tst_res (TFAIL ,"Wrong offset after write %zu expected %u" , off,K3 ); +else +tst_res (TPASS ,"Offset is correct after write %zu" , off); + +SAFE_FSTAT (fd,&statbuf); +if (statbuf.st_size !=K3 ) +tst_res (TFAIL ,"Wrong file size after append %zu expected %u" , statbuf.st_size,K3 ); +else +tst_res (TPASS ,"Correct file size after append %u" ,K3 ); + +SAFE_CLOSE (fd); +} + +static void setup (void ) +{ +memset (write_buf[0 ],0 ,K2 ); +memset (write_buf[1 ],1 ,K1 ); +} + +static void cleanup (void ) +{ +if (fd !=-1 ) +SAFE_CLOSE (fd); + +SAFE_UNLINK (DATA_FILE ); +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_write, + .bufs = (struct tst_buffers []) { + {&write_buf[0 ], .size =K2 }, + {&write_buf[1 ], .size =K1 }, + {} + } +};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp