syscalls/readv02: Convert to new API and merge readv03 into readv02.
PATCH 1/1 syscalls/readv02: Convert to new API and merge readv03 into readv02.
1) merge readv03 into readv02
2) use tst_get_bad_addr() API
3) use TST_EXP_FAIL2 macro
--- runtest/syscalls | 1 - testcases/kernel/syscalls/readv/.gitignore | 1 - testcases/kernel/syscalls/readv/readv02.c | 331 ++++++++++------------------- testcases/kernel/syscalls/readv/readv03.c | 53 ----- 4 files changed, 108 insertions(+), 278 deletions(-) delete mode 100644 testcases/kernel/syscalls/readv/readv03.c
runtest/syscalls +0 -1
@@ -1085,7 +1085,6 @@ readlinkat02 readlinkat02 readv01 readv01 readv02 readv02 -readv03 readv03 realpath01 realpath01
testcases/kernel/syscalls/readv/.gitignore +0 -1
@@ -1,3 +1,2 @@ /readv01 /readv02 -/readv03
testcases/kernel/syscalls/readv/readv02.c +108 -223
390 lines not on this page · raw message
testcases/kernel/syscalls/readv/readv03.c deleted +0 -53
53 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 1/1 syscalls/readv02: Convert to new API and merge readv03 into readv02.
Hi!
Quoted 11 lines
testcases/kernel/syscalls/readv/readv02.c +1
-4-/* Test case #1 */ +static struct iovec rd_iovec[MAX_IOVEC ] = { {buf2,-1 }, {(buf2 +CHUNK ),CHUNK }, {(buf2 +CHUNK *2 ),CHUNK }, - - /* Test case #2 */ {(buf2 +CHUNK *3 ),G_1 }, {(buf2 +CHUNK *4 ),G_1 }, {(buf2 +CHUNK *5 ),G_1 }, -
testcases/kernel/syscalls/readv/readv02.c line 61
Quoted 10 lines
testcases/kernel/syscalls/readv/readv02.c +2
-4-/* Test case #3 */ {(caddr_t) - 1, CHUNK}, {(buf2 + CHUNK * 6), CHUNK}, {(buf2 + CHUNK * 8), CHUNK}, - - /* Test case #4 */ - {(buf2 + CHUNK * 9), CHUNK} + {(buf2 + CHUNK * 9), CHUNK}, + {buf1, K_1} };
It would be much easier to read the code if we split this iovec so that each test has it's own structure. There is absolutely no reason to keep them all together like that.
I.e. we will have it as:
static struct iovec invalid_iovec[] = {
{buf, -1},
{buf + CHUNK, CHUNK},
{buf + 2*CHUNK, CHUNK},
};static struct iovec large_iovec[] = {
{buf2, G_1},
{buf2 + CHUNK, G_1},
{buf2 + CHUNK*2, G_1},
};static struct iovec efault_iovec[] = {
{NULL, CHUNK},
{buf + CHUNK, CHUNK},
{buf + 2*CHUNK, CHUNK},
};static struct iovec valid_iovec[] = {
{buf, CHUNK},
};Also we can use the valid iovec for both EISDIR and EBADFD.
static void setup(void)
{
...
efault_iovec[0].iov_base = tst_get_bad_addr(NULL);
...
}Also I do not think that we need three buffers, the buf3 is completely unused and there is no point in having special buffer for badfd test either.
Quoted 182 lines
testcases/kernel/syscalls/readv/readv02.c +53
-105-char f_name[K_1 ]; - -int fd[4 ]; -char *buf_list[NBUFS ]; - -char *TCID ="readv02" ; -int TST_TOTAL =1 ; - -char *bad_addr =0 ; +static struct tcase { +int *fd; +void *buf; +int count; +int exp_error; +} tcases[] = { + {&fd[0 ], rd_iovec,1 ,EINVAL }, + {&fd[1 ], rd_iovec +6 ,3 ,EFAULT }, + {&fd[2 ], rd_iovec +10 ,-1 ,EINVAL }, + {&fd[3 ], rd_iovec +10 ,1 ,EISDIR }, + {&badfd, rd_iovec +9 ,3 ,EBADF }, +}; -int init_buffs (char **); -int fill_mem (char *,int ,int ); -long l_seek (int ,long ,int ); -char *getenv (); -void setup (); -void cleanup (); -int main (int ac,char **av) +void fill_mem (char *c_ptr,int c1,int c2) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); +int count; -/* The following loop checks looping state if -i option given */ -for (lc =0 ;TEST_LOOPING (lc); lc++) { +for (count =1 ; count <=K_1 /CHUNK ; count++) { +if (count &0x01 )/* if odd */ +memset (c_ptr, c1,CHUNK ); +else /* if even */ +memset (c_ptr, c2,CHUNK ); + } +return ; +} -/* reset tst_count in case we are looping */ - tst_count =0 ; +void init_buffs (char *pbufs[]) +{ +int i; -//test1: -if (readv (fd[0 ], rd_iovec,1 ) <0 ) { -if (errno !=EINVAL ) { -tst_resm (TFAIL ,"readv() set an illegal errno:" -" expected: EINVAL, got %d" , errno); - }else { -tst_resm (TPASS ,"got EINVAL" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); +for (i =0 ; pbufs[i] !=NULL ; i++) { +switch (i) { +case 0 : +case 1 : +fill_mem (pbufs[i],0 ,1 ); +break ; +case 2 : +fill_mem (pbufs[i],1 ,0 ); +break ; +default : +tst_brk (TBROK ,"Error in init_buffs function" ); } + } +return ; +} -//test2: -l_seek (fd[0 ],CHUNK *6 ,0 ); -if (readv (fd[0 ], (rd_iovec +6 ),3 ) <0 ) { -if (errno !=EFAULT ) { -tst_resm (TFAIL ,"expected errno = EFAULT, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EFAULT" ); - } -if (memcmp ((buf_list[0 ] +CHUNK *6 ), - (buf_list[1 ] +CHUNK *6 ),CHUNK *3 ) !=0 ) { -tst_resm (TFAIL ,"Error: readv() partially " -"overlaid buf[2]" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); - } +static void verify_readv (unsigned int n) +{ +struct tcase *tc = &tcases[n]; -//test3: -if (readv (fd[1 ], (rd_iovec +9 ),1 ) <0 ) { -if (errno !=EBADF ) { -tst_resm (TFAIL ,"expected errno = EBADF, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EBADF" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); - } +TST_EXP_FAIL2 (readv (*tc->fd, tc->buf, tc->count), tc->exp_error, +"readv(%d, %p, %d)" , *tc->fd, tc->buf, tc->count); -//test4: -l_seek (fd[0 ],CHUNK *10 ,0 ); -if (readv (fd[0 ], (rd_iovec +10 ),-1 ) <0 ) { -if (errno !=EINVAL ) { -tst_resm (TFAIL ,"expected errno = EINVAL, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EINVAL" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); +if (tc->exp_error ==EFAULT ) { +if (memcmp ((buf_list[0 ] +CHUNK *6 ), + (buf_list[1 ] +CHUNK *6 ),CHUNK *3 )) { +tst_res (TFAIL ,"Error: readv() partially overlaid buf[2]" ); } - } -close (fd[0 ]); -close (fd[1 ]); -cleanup (); -tst_exit (); - } -/* -* setup() - performs all ONE TIME setup for this test. -*/ void setup (void ) { -int nbytes; - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* make a temporary directory and cd to it */ -tst_tmpdir (); +int i; buf_list[0 ] = buf1; buf_list[1 ] = buf2;@@ -201,84 +133,37 @@ void setup(void)init_buffs (buf_list); -sprintf (f_name,"%s.%d" ,DATA_FILE ,getpid ()); +for (i =0 ; i <3 ; i++) { + fd[i] =SAFE_OPEN (TEST_FILE [i],O_WRONLY |O_CREAT ,0666 ); +SAFE_WRITE (1 , fd[i], buf_list[2 ],K_1 ); -if ((fd[0 ] =open (f_name,O_WRONLY |O_CREAT ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open failed: fname = %s, " -"errno = %d" , f_name, errno); - }else { -if ((nbytes =write (fd[0 ], buf_list[2 ],K_1 )) !=K_1 ) { -tst_brkm (TBROK , cleanup,"write failed: nbytes " -"= %d " "errno = %d" , nbytes, errno); - } - } +SAFE_CLOSE (fd[i]);
testcases/kernel/syscalls/readv/readv02.c void setup(void) · line 145
Quoted 10 lines
testcases/kernel/syscalls/readv/readv02.c +3
-5-SAFE_CLOSE (cleanup, fd[0 ]); - -if ((fd[0 ] =open (f_name,O_RDONLY ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open failed: fname = %s, " -"errno = %d" , f_name, errno); + fd[i] =SAFE_OPEN (TEST_FILE [i],O_RDONLY ,0666 ); } +SAFE_LSEEK (fd[1 ],CHUNK *6 ,0 ); +SAFE_LSEEK (fd[2 ],CHUNK *10 ,0 );
Does these readv calls actually read anyting?
Because as far as I can tell they just fail without actually reading anything, so there is no point in intializing the buffers and also there is no point in having three different files opened for the test either.
Quoted 76 lines
testcases/kernel/syscalls/readv/readv02.c +14
-53- fd[1 ] =-1 ;/* Invalid file descriptor */ + rd_iovec[6 ].iov_base =tst_get_bad_addr (NULL ); - bad_addr =mmap (0 ,1 ,PROT_NONE , -MAP_PRIVATE_EXCEPT_UCLINUX |MAP_ANONYMOUS ,0 ,0 ); -if (bad_addr ==MAP_FAILED ) { -tst_brkm (TBROK , cleanup,"mmap failed" ); - } - rd_iovec[6 ].iov_base = bad_addr; +SAFE_MKDIR (TEST_DIR ,MODES ); + fd[3 ] =SAFE_OPEN (TEST_DIR ,O_RDONLY ); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) -{ -SAFE_UNLINK (NULL , f_name); -tst_rmdir (); - -} - -int init_buffs (char *pbufs[]) +static void cleanup (void ) {int i; -for (i =0 ; pbufs[i] !=NULL ; i++) { -switch (i) { -case 0 : -/*FALLTHROUGH*/ case 1 : -fill_mem (pbufs[i],0 ,1 ); -break ; - -case 2 : -fill_mem (pbufs[i],1 ,0 ); -break ; - -default : -tst_brkm (TBROK , cleanup,"Error in init_buffs()" ); - } - } -return 0 ; -} - -int fill_mem (char *c_ptr,int c1,int c2) -{ -int count; - -for (count =1 ; count <=K_1 /CHUNK ; count++) { -if (count &0x01 ) {/* if odd */ -memset (c_ptr, c1,CHUNK ); - }else {/* if even */ -memset (c_ptr, c2,CHUNK ); - } +for (i =0 ; i <4 ; i++) { +if (fd[i] >0 ) +SAFE_CLOSE (fd[i]); } -return 0 ; } -long l_seek (int fdesc,long offset,int whence) -{ -SAFE_LSEEK (cleanup, fdesc, offset, whence); -return 0 ; -} +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_readv, +};
Signature · 2 lines
Cyril Hrubis [email protected]
Hi Cyril,
Thank you very much for your comments. I will send a v2.
Quoted 347 lines
-----????-----
???: Cyril Hrubis <[email protected]>
????: 2021?8?3? 21:44
???: Dai, Shili/? ?? <[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] syscalls/readv02: Convert to new API and merge readv03 into readv02.Hi!
Quoted 11 lines
testcases/kernel/syscalls/readv/readv02.c +1
-4-/* Test case #1 */ +static struct iovec rd_iovec[MAX_IOVEC ] = { {buf2,-1 }, {(buf2 +CHUNK ),CHUNK }, {(buf2 +CHUNK *2 ),CHUNK }, - - /* Test case #2 */ {(buf2 +CHUNK *3 ),G_1 }, {(buf2 +CHUNK *4 ),G_1 }, {(buf2 +CHUNK *5 ),G_1 }, -testcases/kernel/syscalls/readv/readv02.c line 61
Quoted 10 lines
testcases/kernel/syscalls/readv/readv02.c +2
-4-/* Test case #3 */ {(caddr_t) - 1, CHUNK}, {(buf2 + CHUNK * 6), CHUNK}, {(buf2 + CHUNK * 8), CHUNK}, - - /* Test case #4 */ - {(buf2 + CHUNK * 9), CHUNK} + {(buf2 + CHUNK * 9), CHUNK}, + {buf1, K_1} };It would be much easier to read the code if we split this iovec so that each test has it's own structure. There is absolutely no reason to keep them all together like that.
I.e. we will have it as:
static struct iovec invalid_iovec[] = { {buf, -1}, {buf + CHUNK, CHUNK}, {buf + 2*CHUNK, CHUNK}, };static struct iovec large_iovec[] = { {buf2, G_1}, {buf2 + CHUNK, G_1}, {buf2 + CHUNK*2, G_1}, };static struct iovec efault_iovec[] = { {NULL, CHUNK}, {buf + CHUNK, CHUNK}, {buf + 2*CHUNK, CHUNK}, };static struct iovec valid_iovec[] = { {buf, CHUNK}, };Also we can use the valid iovec for both EISDIR and EBADFD.
static void setup(void)
{ ... efault_iovec[0].iov_base = tst_get_bad_addr(NULL); ... }Also I do not think that we need three buffers, the buf3 is completely unused and there is no point in having special buffer for badfd test either.
Quoted 181 lines
testcases/kernel/syscalls/readv/readv02.c +52
-105-char f_name[K_1 ]; - -int fd[4 ]; -char *buf_list[NBUFS ]; - -char *TCID ="readv02" ; -int TST_TOTAL =1 ; - -char *bad_addr =0 ; +static struct tcase { +int *fd; +void *buf; +int count; +int exp_error; +} tcases[] = { + {&fd[0 ], rd_iovec,1 ,EINVAL }, + {&fd[1 ], rd_iovec +6 ,3 ,EFAULT }, + {&fd[2 ], rd_iovec +10 ,-1 ,EINVAL }, + {&fd[3 ], rd_iovec +10 ,1 ,EISDIR }, + {&badfd, rd_iovec +9 ,3 ,EBADF }, +}; -int init_buffs (char **); -int fill_mem (char *,int ,int ); -long l_seek (int ,long ,int ); -char *getenv (); -void setup (); -void cleanup (); -int main (int ac,char **av) +void fill_mem (char *c_ptr,int c1,int c2) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); +int count; -/* The following loop checks looping state if -i option given */ -for (lc =0 ;TEST_LOOPING (lc); lc++) { +for (count =1 ; count <=K_1 /CHUNK ; count++) { +if (count &0x01 )/* if odd */ +memset (c_ptr, c1,CHUNK ); +else /* if even */ +memset (c_ptr, c2,CHUNK ); + } +return ; +} -/* reset tst_count in case we are looping */ - tst_count =0 ; +void init_buffs (char *pbufs[]) +{ +int i; -//test1: -if (readv (fd[0 ], rd_iovec,1 ) <0 ) { -if (errno !=EINVAL ) { -tst_resm (TFAIL ,"readv() set an illegal errno:" -" expected: EINVAL, got %d" , errno); - }else { -tst_resm (TPASS ,"got EINVAL" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); +for (i =0 ; pbufs[i] !=NULL ; i++) { +switch (i) { +case 0 : +case 1 : +fill_mem (pbufs[i],0 ,1 ); +break ; +case 2 : +fill_mem (pbufs[i],1 ,0 ); +break ; +default : +tst_brk (TBROK ,"Error in init_buffs function" ); } + } +return ; +} -//test2: -l_seek (fd[0 ],CHUNK *6 ,0 ); -if (readv (fd[0 ], (rd_iovec +6 ),3 ) <0 ) { -if (errno !=EFAULT ) { -tst_resm (TFAIL ,"expected errno = EFAULT, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EFAULT" ); - } -if (memcmp ((buf_list[0 ] +CHUNK *6 ), - (buf_list[1 ] +CHUNK *6 ),CHUNK *3 ) !=0 ) { -tst_resm (TFAIL ,"Error: readv() partially " -"overlaid buf[2]" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); - } +static void verify_readv (unsigned int n) { +struct tcase *tc = &tcases[n]; -//test3: -if (readv (fd[1 ], (rd_iovec +9 ),1 ) <0 ) { -if (errno !=EBADF ) { -tst_resm (TFAIL ,"expected errno = EBADF, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EBADF" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); - } +TST_EXP_FAIL2 (readv (*tc->fd, tc->buf, tc->count), tc->exp_error, +"readv(%d, %p, %d)" , *tc->fd, tc->buf, tc->count); -//test4: -l_seek (fd[0 ],CHUNK *10 ,0 ); -if (readv (fd[0 ], (rd_iovec +10 ),-1 ) <0 ) { -if (errno !=EINVAL ) { -tst_resm (TFAIL ,"expected errno = EINVAL, " -"got %d" , errno); - }else { -tst_resm (TPASS ,"got EINVAL" ); - } - }else { -tst_resm (TFAIL ,"Error: readv returned a positive " -"value" ); +if (tc->exp_error ==EFAULT ) { +if (memcmp ((buf_list[0 ] +CHUNK *6 ), + (buf_list[1 ] +CHUNK *6 ),CHUNK *3 )) { +tst_res (TFAIL ,"Error: readv() partially overlaid buf[2]" ); } - } -close (fd[0 ]); -close (fd[1 ]); -cleanup (); -tst_exit (); - } -/* -* setup() - performs all ONE TIME setup for this test. -*/ void setup (void ) { -int nbytes; - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* make a temporary directory and cd to it */ -tst_tmpdir (); +int i; buf_list[0 ] = buf1; buf_list[1 ] = buf2;@@ -201,84 +133,37 @@ void setup(void)init_buffs (buf_list); -sprintf (f_name,"%s.%d" ,DATA_FILE ,getpid ()); +for (i =0 ; i <3 ; i++) { + fd[i] =SAFE_OPEN (TEST_FILE [i],O_WRONLY |O_CREAT ,0666 ); +SAFE_WRITE (1 , fd[i], buf_list[2 ],K_1 ); -if ((fd[0 ] =open (f_name,O_WRONLY |O_CREAT ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open failed: fname = %s, " -"errno = %d" , f_name, errno); - }else { -if ((nbytes =write (fd[0 ], buf_list[2 ],K_1 )) !=K_1 ) { -tst_brkm (TBROK , cleanup,"write failed: nbytes " -"= %d " "errno = %d" , nbytes, errno); - } - } +SAFE_CLOSE (fd[i]);testcases/kernel/syscalls/readv/readv02.c void setup(void) · line 145
Quoted 10 lines
testcases/kernel/syscalls/readv/readv02.c +3
-5-SAFE_CLOSE (cleanup, fd[0 ]); - -if ((fd[0 ] =open (f_name,O_RDONLY ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open failed: fname = %s, " -"errno = %d" , f_name, errno); + fd[i] =SAFE_OPEN (TEST_FILE [i],O_RDONLY ,0666 ); } +SAFE_LSEEK (fd[1 ],CHUNK *6 ,0 ); +SAFE_LSEEK (fd[2 ],CHUNK *10 ,0 );Does these readv calls actually read anyting?
Because as far as I can tell they just fail without actually reading anything, so there is no point in intializing the buffers and also there is no point in having three different files opened for the test either.
Quoted 64 lines
testcases/kernel/syscalls/readv/readv02.c +7
-48- fd[1 ] =-1 ;/* Invalid file descriptor */ + rd_iovec[6 ].iov_base =tst_get_bad_addr (NULL ); - bad_addr =mmap (0 ,1 ,PROT_NONE , -MAP_PRIVATE_EXCEPT_UCLINUX |MAP_ANONYMOUS ,0 ,0 ); -if (bad_addr ==MAP_FAILED ) { -tst_brkm (TBROK , cleanup,"mmap failed" ); - } - rd_iovec[6 ].iov_base = bad_addr; +SAFE_MKDIR (TEST_DIR ,MODES ); + fd[3 ] =SAFE_OPEN (TEST_DIR ,O_RDONLY ); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) -{ -SAFE_UNLINK (NULL , f_name); -tst_rmdir (); - -} - -int init_buffs (char *pbufs[]) +static void cleanup (void ) {int i; -for (i =0 ; pbufs[i] !=NULL ; i++) { -switch (i) { -case 0 : -/*FALLTHROUGH*/ case 1 : -fill_mem (pbufs[i],0 ,1 ); -break ; - -case 2 : -fill_mem (pbufs[i],1 ,0 ); -break ; - -default : -tst_brkm (TBROK , cleanup,"Error in init_buffs()" ); - } - } -return 0 ; -} - -int fill_mem(char *c_ptr, int c1, int c2) -{ -int count; - -for (count =1 ; count <=K_1 /CHUNK ; count++) { -if (count &0x01 ) {/* if odd */ -memset (c_ptr, c1,CHUNK ); - }else {/* if even */ -memset (c_ptr, c2,CHUNK ); - } +for (i =0 ; i <4 ; i++) { +if (fd[i] >0 ) +SAFE_CLOSE (fd[i]); } -return 0 ; } -long l_seek(int fdesc, long offset, int whence) -{testcases/kernel/syscalls/readv/readv02.c void setup(void) · line 169
Quoted 10 lines
testcases/kernel/syscalls/readv/readv02.c +7
-3-SAFE_LSEEK (cleanup, fdesc, offset, whence); -return 0 ; -} +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_readv, +};--
Cyril Hrubis
[email protected]
PATCH v2 1/1 syscalls/readv02: Convert to new API and merge readv03 into readv02
In reply to Cyril Hrubis1) merge readv03 into readv02
2) use tst_get_bad_addr() API
3) use TST_EXP_FAIL2 macro
--- runtest/syscalls | 1 - testcases/kernel/syscalls/readv/.gitignore | 1 - testcases/kernel/syscalls/readv/readv02.c | 327 +++++++---------------------- testcases/kernel/syscalls/readv/readv03.c | 53 ----- 4 files changed, 79 insertions(+), 303 deletions(-) delete mode 100644 testcases/kernel/syscalls/readv/readv03.c
runtest/syscalls +0 -1
@@ -1085,7 +1085,6 @@ readlinkat02 readlinkat02 readv01 readv01 readv02 readv02 -readv03 readv03 realpath01 realpath01
testcases/kernel/syscalls/readv/.gitignore +0 -1
@@ -1,3 +1,2 @@ /readv01 /readv02 -/readv03
testcases/kernel/syscalls/readv/readv02.c +79 -248
363 lines not on this page · raw message
testcases/kernel/syscalls/readv/readv03.c deleted +0 -53
53 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v2 1/1 syscalls/readv02: Convert to new API and merge readv03 into readv02
Hi!
Pushed with minor changes, thanks.
- reformatted the documentation comment so that it renders nicely in asccidoc
- got rid of the fd array, it's a bit more readable with fd_file and fd_dir instead
- simplified setup a bit
Full diff:
testcases/kernel/syscalls/readv/readv02.c +19 -29
@@ -7,22 +7,15 @@*/ /*\ -* DESCRIPTION -* test 1: -* The sum of the iov_len values overflows an ssize_t value, expect an EINVAL. +* [Description] * -* test 2: -* Buf is outside the accessible address space, expect an EFAULT. +* Tests readv() failures: * -* test 3: -* The vector count iovcnt is less than zero, expect an EINVAL. -* -* test 4: -* The parameter passed to read is a directory, check if the errno is -* set to EISDIR. -* -* test 5: -* Read with an invalid file descriptor, and expect an EBADF. +* - EINVAL the sum of the iov_len values overflows an ssize_t value +* - EFAULT buffer is outside the accessible address space +* - EINVAL the vector count iovcnt is less than zero +* - EISDIR the file descriptor is a directory +* - EBADF the file descriptor is not valid */ #include <sys/uio.h>
@@ -34,7 +27,7 @@#define CHUNK 64static int badfd =-1 ; -static int fd[2 ] = {-1 ,-1 }; +static int fd_dir, fd_file;static char buf1[K_1 ];const char *TEST_DIR ="test_dir" ;const char *TEST_FILE ="test_file" ;
@@ -67,10 +60,10 @@ static struct tcase {int count;int exp_error; } tcases[] = { - {&fd[0], invalid_iovec, 1, EINVAL}, - {&fd[0], efault_iovec, 3, EFAULT}, - {&fd[0], large_iovec, -1, EINVAL}, - {&fd[1], valid_iovec, 1, EISDIR}, + {&fd_file, invalid_iovec, 1, EINVAL}, + {&fd_file, efault_iovec, 3, EFAULT}, + {&fd_file, large_iovec, -1, EINVAL}, + {&fd_dir, valid_iovec, 1, EISDIR}, {&badfd, valid_iovec, 3, EBADF}, };
@@ -84,26 +77,23 @@ static void verify_readv(unsigned int n)static void setup (void ) { - fd[0 ] =SAFE_OPEN (TEST_FILE ,O_WRONLY |O_CREAT ,0666 ); -SAFE_WRITE (1 , fd[0 ], buf1,CHUNK ); -SAFE_CLOSE (fd[0 ]); +SAFE_FILE_PRINTF (TEST_FILE ,"test" ); - fd[0 ] =SAFE_OPEN (TEST_FILE ,O_RDONLY ,0666 ); + fd_file =SAFE_OPEN (TEST_FILE ,O_RDONLY ); efault_iovec[0 ].iov_base =tst_get_bad_addr (NULL );SAFE_MKDIR (TEST_DIR ,MODES ); - fd[1 ] =SAFE_OPEN (TEST_DIR ,O_RDONLY ); + fd_dir =SAFE_OPEN (TEST_DIR ,O_RDONLY ); }static void cleanup (void ) { -int i; +if (fd_file >0 ) +SAFE_CLOSE (fd_file); -for (i =0 ; i <2 ; i++) { -if (fd[i] >0 ) -SAFE_CLOSE (fd[i]); - } +if (fd_dir >0 ) +SAFE_CLOSE (fd_dir); }static struct tst_test test = {
Signature · 2 lines
Cyril Hrubis [email protected]