inotify: Add SAFE_MYINOTIFY_INIT{,1}() helpers
PATCH 1/2 inotify: Add SAFE_MYINOTIFY_INIT{,1}() helpers
---
Hi,
should there be inc/tst_safe_inotify.h and lib/tst_safe_inotify.c? I didn't do that as that would link to everything, which is waste of space.
Kind regards,
Petr
--- testcases/kernel/syscalls/inotify/inotify.h | 51 ++++++++++--------- testcases/kernel/syscalls/inotify/inotify01.c | 10 +--- testcases/kernel/syscalls/inotify/inotify02.c | 10 +--- testcases/kernel/syscalls/inotify/inotify03.c | 10 +--- testcases/kernel/syscalls/inotify/inotify04.c | 11 +--- testcases/kernel/syscalls/inotify/inotify05.c | 11 +--- testcases/kernel/syscalls/inotify/inotify06.c | 4 +- testcases/kernel/syscalls/inotify/inotify07.c | 11 +--- testcases/kernel/syscalls/inotify/inotify08.c | 11 +--- testcases/kernel/syscalls/inotify/inotify09.c | 4 +- 10 files changed, 35 insertions(+), 98 deletions(-)
testcases/kernel/syscalls/inotify/inotify.h +26 -25
@@ -1,27 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * inotify testcase common definitions. * -* Copyright (c) 2012 Linux Test Project. All Rights Reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -* -* Further, this software is distributed without any warranty that it is -* free of the rightful claim of any third person regarding infringement -* or the like. Any license provided herein, whether implied or -* otherwise, applies only to this software file. Patent licenses, if -* any, provided herein do not apply to combinations of this program with -* other software, or any other product whatsoever. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -* +* Copyright (c) 2012-2019 Linux Test Project. All Rights Reserved. * Ngie Cooper, April 2012 */
@@ -33,20 +14,40 @@/* inotify(7) wrappers */ #if __NR_inotify_init != __LTP__NR_INVALID_SYSCALL -#define myinotify_init () \ +#define myinotify_init () \ tst_syscall(__NR_inotify_init)#else -#define myinotify_init () \ +#define myinotify_init () \ tst_syscall(__NR_inotify_init1, 0)#endif #define myinotify_init1 (flags) \ tst_syscall(__NR_inotify_init1, flags) -#define myinotify_add_watch (fd, pathname, mask) \ +#define myinotify_add_watch (fd, pathname, mask) \ tst_syscall(__NR_inotify_add_watch, fd, pathname, mask) -#define myinotify_rm_watch (fd, wd) \ +#define myinotify_rm_watch (fd, wd) \ tst_syscall(__NR_inotify_rm_watch, fd, wd) +static inline int safe_myinotify_init (const char *file,const int lineno,int fd) +{ +if (fd <0 ) { +if (errno ==ENOSYS ) { +tst_brk (TCONF ,"%s:%d: inotify is not configured in this kernel" , + file, lineno); + }else { +tst_brk (TBROK |TERRNO ,"%s:%d: inotify_init failed" , + file, lineno); + } + } +return fd; +} + +#define SAFE_MYINOTIFY_INIT () \ + safe_myinotify_init(__FILE__, __LINE__, myinotify_init()) + +#define SAFE_MYINOTIFY_INIT1 (flags) \ + safe_myinotify_init(__FILE__, __LINE__, myinotify_init1(flags)) +#endif /* _INOTIFY_H */
testcases/kernel/syscalls/inotify/inotify01.c +1 -9
@@ -167,15 +167,7 @@ static void setup(void)SAFE_FILE_PRINTF (fname,"%s" , fname); -if ((fd_notify =myinotify_init ()) <0 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel." ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT ();if ((wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS )) <0 ) { tst_brk(TBROK | TERRNO,
testcases/kernel/syscalls/inotify/inotify02.c +1 -9
@@ -234,15 +234,7 @@ void verify_inotify(void)static void setup (void ) { -if ((fd_notify =myinotify_init ()) <0 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel." ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init () failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT ();if ((wd =myinotify_add_watch (fd_notify,"." ,IN_ALL_EVENTS )) <0 ) { tst_brk(TBROK | TERRNO,
testcases/kernel/syscalls/inotify/inotify03.c +1 -9
@@ -171,15 +171,7 @@ static void setup(void)/* close the file we have open */ SAFE_CLOSE (fd); - fd_notify =myinotify_init (); -if (fd_notify <0 ) { -if (errno ==ENOSYS ) -tst_brk (TCONF , -"inotify is not configured in this kernel." ); -else -tst_brk (TBROK |TERRNO , -"inotify_init failed" ); - } + fd_notify =SAFE_MYINOTIFY_INIT ();tst_umount (mntpoint); mount_flag =0 ;
testcases/kernel/syscalls/inotify/inotify04.c +1 -10
@@ -95,16 +95,7 @@ static void cleanup(void)static void setup (void ) { - fd_notify =myinotify_init (); -if (fd_notify ==-1 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel." ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT (); }void verify_inotify (void )
testcases/kernel/syscalls/inotify/inotify05.c +1 -10
@@ -143,16 +143,7 @@ static void setup(void)SAFE_WRITE (1 , fd, buf,BUF_SIZE );SAFE_CLOSE (fd); - fd_notify =myinotify_init1 (O_NONBLOCK ); -if (fd_notify <0 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel." ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK ); wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS );if (wd <0 ) {
testcases/kernel/syscalls/inotify/inotify06.c +1 -3
@@ -82,9 +82,7 @@ static void verify_inotify(void) }for (tests =0 ; tests <TEARDOWNS ; tests++) { - inotify_fd =myinotify_init1 (O_NONBLOCK ); -if (inotify_fd <0 ) -tst_brk (TBROK |TERRNO ,"inotify_init failed" ); + inotify_fd =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );for (i =0 ; i <FILES ; i++) {/*
testcases/kernel/syscalls/inotify/inotify07.c +1 -10
@@ -165,16 +165,7 @@ static void setup(void)SAFE_TOUCH (OVL_LOWER "/" DIR_NAME "/" FILE_NAME ,0644 ,NULL );SAFE_MOUNT_OVERLAY (); - fd_notify =myinotify_init1 (O_NONBLOCK ); -if (fd_notify <0 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel" ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init () failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower directory */ if ((wd =myinotify_add_watch (fd_notify,DIR_PATH ,IN_ALL_EVENTS )) <0 ) {
testcases/kernel/syscalls/inotify/inotify08.c +1 -10
@@ -157,16 +157,7 @@ static void setup(void)SAFE_TOUCH (OVL_LOWER "/" FILE_NAME ,0644 ,NULL );SAFE_MOUNT_OVERLAY (); - fd_notify =myinotify_init1 (O_NONBLOCK ); -if (fd_notify <0 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"inotify is not configured in this kernel" ); - }else { -tst_brk (TBROK |TERRNO , -"inotify_init () failed" ); - } - } + fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower file */ if ((wd = myinotify_add_watch(fd_notify, FILE_PATH,
testcases/kernel/syscalls/inotify/inotify09.c +1 -3
@@ -85,9 +85,7 @@ static void verify_inotify(void)int inotify_fd;int wd; - inotify_fd =myinotify_init1 (0 ); -if (inotify_fd <0 ) -tst_brk (TBROK |TERRNO ,"inotify_init failed" ); + inotify_fd =SAFE_MYINOTIFY_INIT1 (0 );tst_fzsync_pair_reset (&fzsync_pair, write_seek);while (tst_fzsync_run_a (&fzsync_pair)) {
Signature · 1 line
2.21.0
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
---
Hi,
with reap_wd defined in inotify.h there could be also SAFE_MYINOTIFY_RM_WATCH().
Kind regards,
Petr
--- testcases/kernel/syscalls/inotify/inotify.h | 13 +++++++++++++ testcases/kernel/syscalls/inotify/inotify01.c | 9 ++------- testcases/kernel/syscalls/inotify/inotify02.c | 9 ++------- testcases/kernel/syscalls/inotify/inotify03.c | 7 +------ testcases/kernel/syscalls/inotify/inotify04.c | 13 ++----------- testcases/kernel/syscalls/inotify/inotify05.c | 8 +------- testcases/kernel/syscalls/inotify/inotify07.c | 8 ++------ testcases/kernel/syscalls/inotify/inotify08.c | 11 +++-------- testcases/kernel/syscalls/inotify/inotify09.c | 4 +--- 9 files changed, 27 insertions(+), 55 deletions(-)
testcases/kernel/syscalls/inotify/inotify.h +13 -0
@@ -50,4 +50,17 @@ static inline int safe_myinotify_init(const char *file, const int lineno, int fd#define SAFE_MYINOTIFY_INIT1 (flags) \ safe_myinotify_init(__FILE__, __LINE__, myinotify_init1(flags)) +static inline int safe_myinotify_watch (const char *file,const int lineno,int wd,int fd,const char * fname,const char * mask) +{ +if (wd <0 ) { +tst_brk (TBROK |TERRNO , +"%s:%d: inotify_add_watch (%d, %s, %s) failed." , + file, lineno, fd, fname, mask); + } +return wd; +} + +#define SAFE_MYINOTIFY_ADD_WATCH (fd, pathname, mask) \ + safe_myinotify_watch(__FILE__, __LINE__, myinotify_add_watch(fd, pathname, mask), fd, pathname, #mask) +#endif /* _INOTIFY_H */
testcases/kernel/syscalls/inotify/inotify01.c +2 -7
@@ -169,13 +169,8 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT (); -if ((wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS )) <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed" , - fd_notify, fname); - reap_wd =1 ; - }; - + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS ); + reap_wd =1 ; }static void cleanup (void )
testcases/kernel/syscalls/inotify/inotify02.c +2 -7
@@ -236,12 +236,8 @@ static void setup(void) { fd_notify =SAFE_MYINOTIFY_INIT (); -if ((wd =myinotify_add_watch (fd_notify,"." ,IN_ALL_EVENTS )) <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, \".\", IN_ALL_EVENTS) failed" , - fd_notify); - reap_wd =1 ; - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,"." ,IN_ALL_EVENTS ); + reap_wd =1 ; }static void cleanup (void )
@@ -249,7 +245,6 @@ static void cleanup(void)if (reap_wd &&myinotify_rm_watch (fd_notify, wd) <0 ) {tst_res (TWARN ,"inotify_rm_watch (%d, %d) failed," , fd_notify, wd); - }if (fd_notify >0 )
testcases/kernel/syscalls/inotify/inotify03.c +1 -6
@@ -77,12 +77,7 @@ void verify_inotify(void)SAFE_MOUNT (tst_device->dev, mntpoint, tst_device->fs_type,0 ,NULL ); mount_flag =1 ; - wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS ); -if (wd <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed." , - fd_notify, fname); - } + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS ); event_set[test_cnt] =IN_UNMOUNT ; test_cnt++;
testcases/kernel/syscalls/inotify/inotify04.c +2 -11
@@ -106,19 +106,10 @@ void verify_inotify(void)SAFE_MKDIR (TEST_DIR ,00700 );close (SAFE_CREAT (TEST_FILE ,00600 )); - wd_dir =myinotify_add_watch (fd_notify,TEST_DIR ,IN_ALL_EVENTS ); -if (wd_dir ==-1 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch(%d, \"%s\", IN_ALL_EVENTS) [1] failed" , - fd_notify,TEST_DIR ); - } + wd_dir =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,TEST_DIR ,IN_ALL_EVENTS ); reap_wd_dir =1 ; - wd_file =myinotify_add_watch (fd_notify,TEST_FILE ,IN_ALL_EVENTS ); -if (wd_file ==-1 ) -tst_brk (TBROK |TERRNO , -"inotify_add_watch(%d, \"%s\", IN_ALL_EVENTS) [2] failed" , - fd_notify,TEST_FILE ); + wd_file =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,TEST_FILE ,IN_ALL_EVENTS ); reap_wd_file =1 ;SAFE_RMDIR (TEST_DIR );
testcases/kernel/syscalls/inotify/inotify05.c +1 -7
@@ -145,12 +145,7 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK ); - wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS ); -if (wd <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed" , - fd_notify, fname); - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS );SAFE_FILE_SCANF ("/proc/sys/fs/inotify/max_queued_events" ,"%d" , &max_events);
@@ -161,7 +156,6 @@ static void cleanup(void)if (fd_notify >0 &&myinotify_rm_watch (fd_notify, wd) ==-1 ) {tst_res (TWARN |TERRNO ,"inotify_rm_watch (%d, %d) failed" , fd_notify, wd); - }if (fd_notify >0 )
testcases/kernel/syscalls/inotify/inotify07.c +2 -6
@@ -168,12 +168,8 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower directory */ -if ((wd =myinotify_add_watch (fd_notify,DIR_PATH ,IN_ALL_EVENTS )) <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, " DIR_PATH ", IN_ALL_EVENTS) failed" , - fd_notify); - reap_wd =1 ; - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,DIR_PATH ,IN_ALL_EVENTS ); + reap_wd =1 ;SAFE_STAT (DIR_PATH , &buf);tst_res (TINFO ,DIR_PATH " ino=%lu" , buf.st_ino);
testcases/kernel/syscalls/inotify/inotify08.c +3 -8
@@ -160,14 +160,9 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower file */ -if ((wd =myinotify_add_watch (fd_notify,FILE_PATH , -IN_ATTRIB |IN_OPEN |IN_CLOSE_WRITE )) <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, " FILE_PATH ", " -"IN_ATTRIB | IN_OPEN | IN_CLOSE_WRITE) failed" , - fd_notify); - reap_wd =1 ; - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,FILE_PATH , +IN_ATTRIB |IN_OPEN |IN_CLOSE_WRITE ); + reap_wd =1 ;SAFE_STAT (FILE_PATH , &buf); tst_res(TINFO, FILE_PATH " ino=%lu, dev=%u:%u", buf.st_ino,
testcases/kernel/syscalls/inotify/inotify09.c +1 -3
@@ -89,9 +89,7 @@ static void verify_inotify(void)tst_fzsync_pair_reset (&fzsync_pair, write_seek);while (tst_fzsync_run_a (&fzsync_pair)) { - wd =myinotify_add_watch (inotify_fd,FNAME ,IN_MODIFY ); -if (wd <0 ) -tst_brk (TBROK |TERRNO ,"inotify_add_watch() failed." ); + wd =SAFE_MYINOTIFY_ADD_WATCH (inotify_fd,FNAME ,IN_MODIFY );tst_fzsync_start_race_a (&fzsync_pair); wd =myinotify_rm_watch (inotify_fd, wd);
Signature · 1 line
2.21.0
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
Quoted 53 lines · Petr Vorel
Signed-off-by Petr Vorel <[email protected]>---
Hi,with
reap_wddefined ininotify.hthere could be alsoSAFE_MYINOTIFY_RM_WATCH().Kind regards,
Petr--- testcases/kernel/syscalls/inotify/inotify.h | 13 +++++++++++++ testcases/kernel/syscalls/inotify/inotify01.c | 9 ++------- testcases/kernel/syscalls/inotify/inotify02.c | 9 ++------- testcases/kernel/syscalls/inotify/inotify03.c | 7 +------ testcases/kernel/syscalls/inotify/inotify04.c | 13 ++----------- testcases/kernel/syscalls/inotify/inotify05.c | 8 +------- testcases/kernel/syscalls/inotify/inotify07.c | 8 ++------ testcases/kernel/syscalls/inotify/inotify08.c | 11 +++-------- testcases/kernel/syscalls/inotify/inotify09.c | 4 +--- 9 files changed, 27 insertions(+), 55 deletions(-)testcases/kernel/syscalls/inotify/inotify.h +0
-0@@ -50,4 +50,17 @@ static inline int safe_myinotify_init(const char *file,const int lineno, int fd
#define SAFE_MYINOTIFY_INIT1(flags) \ safe_myinotify_init(__FILE__, __LINE__, myinotify_init1(flags))+static inline int
safe_myinotify_watch(const char *file, const int lineno, int wd, int fd, const char* fname, const char* mask)testcases/kernel/syscalls/inotify/inotify.h +11
-0+{ +if (wd <0 ) { +tst_brk (TBROK |TERRNO , +"%s:%d: inotify_add_watch (%d, %s, %s) failed." , + file, lineno, fd, fname, mask); + } +return wd; +} + +#define SAFE_MYINOTIFY_ADD_WATCH (fd, pathname, mask) \ + safe_myinotify_watch(__FILE__, __LINE__, myinotify_add_watch(fd,pathname, mask), fd, pathname, #mask)
testcases/kernel/syscalls/inotify/inotify.h +1
-0+#endif /* _INOTIFY_H */ testcases/kernel/syscalls/inotify/inotify01.c +0
-0
testcases/kernel/syscalls/inotify/inotify01.c static void setup(void) · line 173
Quoted 10 lines
testcases/kernel/syscalls/inotify/inotify01.c +0
-5@@ -169,13 +169,8 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT (); -if ((wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS )) < 0) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed" , - fd_notify, fname); - reap_wd =1 ;
If test exit with TBROK the reap_wd will never get a chance to set as 1, and the cleanup() also make no sense in tst_brk() calling.
testcases/kernel/syscalls/inotify/inotify01.c static void setup(void) · line 179
Quoted 1 line
testcases/kernel/syscalls/inotify/inotify01.c +0
-1- };
-
testcases/kernel/syscalls/inotify/inotify01.c static void setup(void) · line 175
Quoted 3 lines
testcases/kernel/syscalls/inotify/inotify01.c +2
-0+ wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS ); + reap_wd =1 ;
Even wrap into safe macro the problem is still there, the 'reap_wd = 1;' make no sense to the whole test.
}
Quoted 8 lines
testcases/kernel/syscalls/inotify/inotify01.c +0
-0static void cleanup (void )testcases/kernel/syscalls/inotify/inotify02.c +0
-0
testcases/kernel/syscalls/inotify/inotify02.c static void setup(void) · line 245
Quoted 10 lines
testcases/kernel/syscalls/inotify/inotify02.c +0
-5@@ -236,12 +236,8 @@ static void setup(void) { fd_notify =SAFE_MYINOTIFY_INIT (); -if ((wd =myinotify_add_watch (fd_notify,"." ,IN_ALL_EVENTS )) <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, \".\", IN_ALL_EVENTS) failed", - fd_notify); - reap_wd =1 ;
- };
testcases/kernel/syscalls/inotify/inotify02.c static void setup(void) · line 240
Quoted 2 lines
testcases/kernel/syscalls/inotify/inotify02.c +2
-0+ wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,"." ,IN_ALL_EVENTS ); + reap_wd =1 ;
here as well.
Quoted 101 lines
testcases/kernel/syscalls/inotify/inotify02.c +0
-1}static void cleanup (void )@@ -249,7 +245,6 @@ static void cleanup(void)if (reap_wd &&myinotify_rm_watch (fd_notify, wd) <0 ) {tst_res (TWARN ,"inotify_rm_watch (%d, %d) failed," , fd_notify, wd); - }if (fd_notify > 0)testcases/kernel/syscalls/inotify/inotify03.c +1
-6@@ -77,12 +77,7 @@ void verify_inotify(void)SAFE_MOUNT (tst_device->dev, mntpoint, tst_device->fs_type,0 ,NULL ); mount_flag =1 ; - wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS ); -if (wd <0 ) { -tst_brk (TBROK |TERRNO , - "inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed.", - fd_notify, fname); - } + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS );event_set[test_cnt] = IN_UNMOUNT; test_cnt++;testcases/kernel/syscalls/inotify/inotify04.c +2
-11@@ -106,19 +106,10 @@ void verify_inotify(void)SAFE_MKDIR (TEST_DIR ,00700 );close (SAFE_CREAT (TEST_FILE ,00600 )); - wd_dir =myinotify_add_watch (fd_notify,TEST_DIR ,IN_ALL_EVENTS ); -if (wd_dir ==-1 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch(%d, \"%s\", IN_ALL_EVENTS) [1] failed", - fd_notify,TEST_DIR ); - } + wd_dir =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,TEST_DIR ,IN_ALL_EVENTS ); reap_wd_dir =1 ; - wd_file =myinotify_add_watch (fd_notify,TEST_FILE ,IN_ALL_EVENTS ); -if (wd_file ==-1 ) -tst_brk (TBROK |TERRNO , -"inotify_add_watch(%d, \"%s\", IN_ALL_EVENTS) [2] failed", - fd_notify,TEST_FILE ); + wd_file = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, TEST_FILE,IN_ALL_EVENTS); reap_wd_file = 1; SAFE_RMDIR(TEST_DIR);testcases/kernel/syscalls/inotify/inotify05.c +1
-7@@ -145,12 +145,7 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK ); - wd =myinotify_add_watch (fd_notify, fname,IN_ALL_EVENTS ); -if (wd <0 ) { -tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed" , - fd_notify, fname); - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify, fname,IN_ALL_EVENTS );SAFE_FILE_SCANF ("/proc/sys/fs/inotify/max_queued_events" ,"%d" , &max_events);@@ -161,7 +156,6 @@ static void cleanup(void)if (fd_notify >0 &&myinotify_rm_watch (fd_notify, wd) ==-1 ) {tst_res (TWARN |TERRNO ,"inotify_rm_watch (%d, %d) failed" , fd_notify, wd); - }if (fd_notify >0 )testcases/kernel/syscalls/inotify/inotify07.c +0
-1@@ -168,12 +168,8 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower directory */ - if ((wd = myinotify_add_watch(fd_notify, DIR_PATH, IN_ALL_EVENTS))
testcases/kernel/syscalls/inotify/inotify07.c static void setup(void) · line 175
Quoted 10 lines
testcases/kernel/syscalls/inotify/inotify07.c +2
-5< 0) { -tst_brk (TBROK |TERRNO , - "inotify_add_watch (%d, " DIR_PATH ", IN_ALL_EVENTS) failed", - fd_notify); - reap_wd =1 ; - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,DIR_PATH ,IN_ALL_EVENTS ); + reap_wd =1 ;
here as well.
Quoted 15 lines
SAFE_STAT(DIR_PATH, &buf); tst_res(TINFO, DIR_PATH " ino=%lu", buf.st_ino);testcases/kernel/syscalls/inotify/inotify08.c +0
-2@@ -160,14 +160,9 @@ static void setup(void) fd_notify =SAFE_MYINOTIFY_INIT1 (O_NONBLOCK );/* Setup a watch on an overlayfs lower file */ -if ((wd =myinotify_add_watch (fd_notify,FILE_PATH , -IN_ATTRIB |IN_OPEN |IN_CLOSE_WRITE )) < 0) {
testcases/kernel/syscalls/inotify/inotify08.c static void setup(void) · line 167
Quoted 10 lines
testcases/kernel/syscalls/inotify/inotify08.c +3
-6-tst_brk (TBROK |TERRNO , -"inotify_add_watch (%d, " FILE_PATH ", " -"IN_ATTRIB | IN_OPEN | IN_CLOSE_WRITE) failed" , - fd_notify); - reap_wd =1 ; - }; + wd =SAFE_MYINOTIFY_ADD_WATCH (fd_notify,FILE_PATH , +IN_ATTRIB |IN_OPEN |IN_CLOSE_WRITE ); + reap_wd =1 ;
and here.
Quoted 28 lines
testcases/kernel/syscalls/inotify/inotify08.c +0
-0SAFE_STAT (FILE_PATH , &buf);tst_res(TINFO, FILE_PATH " ino=%lu, dev=%u:%u", buf.st_ino,testcases/kernel/syscalls/inotify/inotify09.c +1
-3@@ -89,9 +89,7 @@ static void verify_inotify(void)tst_fzsync_pair_reset (&fzsync_pair, write_seek);while (tst_fzsync_run_a (&fzsync_pair)) { - wd =myinotify_add_watch (inotify_fd,FNAME ,IN_MODIFY ); -if (wd <0 ) - tst_brk(TBROK | TERRNO, "inotify_add_watch() failed."); + wd =SAFE_MYINOTIFY_ADD_WATCH (inotify_fd,FNAME ,IN_MODIFY );tst_fzsync_start_race_a(&fzsync_pair); wd = myinotify_rm_watch(inotify_fd, wd);--
2.21.0--
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20190605/4a731c0d/attachment-0001.html>
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
Hi Li,
thanks for your review.
Quoted 2 lines
If test exit with TBROK the
reap_wdwill never get a chance to set as 1, and thecleanup()also make no sense intst_brk()calling.
No, that's a "flag" for cleanup function which is run always (no matter whether tst_brk() was called). See cleanup() and mount_flag in [1].
Quoted 2 lines
Quoted 2 lines
with
reap_wddefined ininotify.hthere could be alsoSAFE_MYINOTIFY_RM_WATCH().
And my suggestion above was to handle this flag in inotify.h. Than it'd make sense to add also SAFE_MYINOTIFY_RM_WATCH().
Kind regards,
Petr
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
Quoted 10 lines · Petr Vorel
Hi Li,
thanks for your review.
Quoted 2 lines
If test exit with TBROK the
reap_wdwill never get a chance to set as 1, and thecleanup()also make no sense intst_brk()calling.No, that's a "flag" for cleanup function which is run always (no matter whether
tst_brk()was called). Seecleanup()andmount_flagin [1].
You are right. And seems the problem is only exist in original code, it put reap_wd in wrong place and mislead my sight.
if ((wd = myinotify_add_watch(fd_notify, DIR_PATH, IN_ALL_EVENTS)) <
0) {
tst_brk(TBROK | TERRNO,
"inotify_add_watch (%d, " DIR_PATH ", IN_ALL_EVENTS)
failed",
fd_notify);
reap_wd = 1;
};Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
with
reap_wddefined ininotify.hthere could be alsoSAFE_MYINOTIFY_RM_WATCH().And my suggestion above was to handle this flag in
inotify.h. Than it'd make
sense to add alsoSAFE_MYINOTIFY_RM_WATCH().
You patch set looks good.
Sorry for the error in judgment, that remind me it's time to go to bed now:).
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20190605/3ed111b1/attachment.html>
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
Hi Li,
Quoted 11 lines
You are right. And seems the problem is only exist in original code, it put
reap_wdin wrong place and mislead my sight.if ((wd =
myinotify_add_watch(fd_notify, DIR_PATH, IN_ALL_EVENTS)) <
0) {
tst_brk(TBROK | TERRNO,
"inotify_add_watch(%d, "DIR_PATH",IN_ALL_EVENTS)
failed",fd_notify); reap_wd = 1; };
Thanks for pointing it out. I was surprised why this is there. I'll note it in git commit.
...
Quoted 4 lines
You patch set looks good.
Sorry for the error in judgment, that remind me it's time to go to bed now:).
Really, thanks a lot for a review! (I'll add your ack).
Kind regards,
Petr
PATCH 2/2 inotify: Add SAFE_MYINOTIFY_ADD_WATCH() helper
In reply to Li WangHi,
Quoted 10 lines
Quoted 5 lines
Quoted 2 lines
If test exit with TBROK the
reap_wdwill never get a chance to set as 1, and thecleanup()also make no sense intst_brk()calling.No, that's a "flag" for cleanup function which is run always (no matter whether
tst_brk()was called). Seecleanup()andmount_flagin [1].You are right. And seems the problem is only exist in original code, it put
reap_wdin wrong place and mislead my sight.
Quoted 8 lines
if ((wd =
myinotify_add_watch(fd_notify, DIR_PATH, IN_ALL_EVENTS)) <
0) {
tst_brk(TBROK | TERRNO,
"inotify_add_watch(%d, "DIR_PATH",IN_ALL_EVENTS)
failed",fd_notify); reap_wd = 1; };
so I'll put into commit message:
Also put reap_wd to correct place in inotify0[127].c
(in original code it was in if clause after tst_brk() so it was
1) unreachable 2) for detection it should have been after if (outside).
Kind regards,
Petr
PATCH 1/2 inotify: Add SAFE_MYINOTIFY_INIT{, 1}() helpers
In reply to Petr VorelHi!
These two patches are obviously OK.
Well I we were pedantic the licence change should be in a separate patch, but I guess that it's fine as it is.
Also we should probably switch to the inotify_init() from sys/inotify.h and drop the my from the functions and macros, but that could be done in a subsequent patch.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/2 inotify: Add SAFE_MYINOTIFY_INIT{, 1}() helpers
Hi Cyril,
Quoted 1 line
These two patches are obviously OK.
Thanks for review.
Quoted 2 lines
Well I we were pedantic the licence change should be in a separate patch, but I guess that it's fine as it is.
I'll replace license text to SPDX in all tests using new API in separate commit.
Quoted 3 lines
Also we should probably switch to the
inotify_init()fromsys/inotify.hand drop the my from the functions and macros, but that could be done in a subsequent patch.
Merged. I'll do it in a separate patch.
Kind regards,
Petr
PATCH 1/2 inotify: Add SAFE_MYINOTIFY_INIT{, 1}() helpers
In reply to Cyril HrubisHi Cyril,
Quoted 9 lines
Hi!
These two patches are obviously OK.Well I we were pedantic the licence change should be in a separate patch, but I guess that it's fine as it is.
Also we should probably switch to the
inotify_init()fromsys/inotify.hand drop the my from the functions and macros, but that could be done in a subsequent patch.
Looking into this old TODO for inotify tests. I have similar question to
fanotify: do you consider worth of testing both raw syscall and inotify_init()?
Kind regards,
Petr