Introduce SAFE_FANOTIFY_MARK() macro + cleanup
v2 cover Introduce SAFE_FANOTIFY_MARK() macro + cleanup
Hi Amir,
Changes v1->v2
New commits:
* fanotify12: Drop incorrect hint
* fanotify: Handle supported features checks in setup()
* fanotify: Add a pedantic check for return value
* fanotify: Check FAN_REPORT_{FID,NAME} support
+ implemented changes you suggested for the original commit "fanotify:
Introduce SAFE_FANOTIFY_MARK() macro":
More info at the patches.
Kind regards,
Petr
Petr Vorel (5):
fanotify12: Drop incorrect hint
fanotify: Handle supported features checks in setup()
fanotify: Introduce SAFE_FANOTIFY_MARK() macro
fanotify: Check FAN_REPORT_{FID,NAME} support
fanotify: Add a pedantic check for return value
testcases/kernel/syscalls/fanotify/fanotify.h | 108 +++++++++++++++++- .../kernel/syscalls/fanotify/fanotify01.c | 53 ++------- .../kernel/syscalls/fanotify/fanotify02.c | 22 +--- .../kernel/syscalls/fanotify/fanotify03.c | 48 +++----- .../kernel/syscalls/fanotify/fanotify04.c | 32 +----- .../kernel/syscalls/fanotify/fanotify05.c | 9 +- .../kernel/syscalls/fanotify/fanotify06.c | 21 +--- .../kernel/syscalls/fanotify/fanotify07.c | 17 +-- .../kernel/syscalls/fanotify/fanotify09.c | 19 +-- .../kernel/syscalls/fanotify/fanotify10.c | 44 ++----- .../kernel/syscalls/fanotify/fanotify11.c | 5 +- .../kernel/syscalls/fanotify/fanotify12.c | 57 +++------ .../kernel/syscalls/fanotify/fanotify13.c | 33 +----- .../kernel/syscalls/fanotify/fanotify15.c | 24 +--- .../kernel/syscalls/fanotify/fanotify16.c | 20 +--- 15 files changed, 188 insertions(+), 324 deletions(-)
Signature · 1 line
2.29.2
PATCH v2 1/5 fanotify12: Drop incorrect hint
hint "CONFIG_FANOTIFY_ACCESS_PERMISSIONS not configured in kernel?" is wrong here (fanotify12 does not use FAN_ACCESS_PERM).
---
New in v2.
testcases/kernel/syscalls/fanotify/fanotify12.c | 4 ---- 1 file changed, 4 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify12.c +0 -4
@@ -146,10 +146,6 @@ static int setup_mark(unsigned int n)"FAN_OPEN_EXEC not supported in " "kernel?");return -1 ; - }else if (errno ==EINVAL ) { -tst_brk (TCONF |TERRNO , -"CONFIG_FANOTIFY_ACCESS_PERMISSIONS " -"not configured in kernel?" ); }else {tst_brk (TBROK |TERRNO , "fanotify_mark(%d, FAN_MARK_ADD | %s, "
Signature · 1 line
2.29.2
PATCH v2 2/5 fanotify: Handle supported features checks in setup()
In reply to Petr VorelCreate 2 helpers which are used in various tests in setup() to check for FAN_ACCESS_PERM enablement (caused by disabled CONFIG_FANOTIFY_ACCESS_PERMISSIONS) or FAN_OPEN_EXEC and FAN_OPEN_EXEC_PERM support in kernel.
That helps to further code simplification in next commit.
---
Hi Amir,
New in v2.
Is that how you meant the check?
Not sure about function names, feel free to suggest better ones. Also it's not good that it's not clear from function name whether it uses tst_brk() on EINVAL or it returns value.
Kind regards,
Petr
testcases/kernel/syscalls/fanotify/fanotify.h | 47 +++++++++++++++ .../kernel/syscalls/fanotify/fanotify03.c | 30 ++++------ .../kernel/syscalls/fanotify/fanotify07.c | 2 + .../kernel/syscalls/fanotify/fanotify10.c | 8 +++ .../kernel/syscalls/fanotify/fanotify12.c | 57 ++++++++----------- 5 files changed, 91 insertions(+), 53 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +47 -0
@@ -242,4 +242,51 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } + +static inline void fanotify_access_permissions_supported_by_kernel (void ) +{ +int fd; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD ,FAN_ACCESS_PERM ,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { +tst_brk (TCONF |TERRNO , +"CONFIG_FANOTIFY_ACCESS_PERMISSIONS not configured in kernel?" ); + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS_PERM, AT_FDCWD," +" \".\") failed" , fd); + } + } + +SAFE_CLOSE (fd); +} + +static inline int fanotify_exec_events_supported_by_kernel (uint64_t mask, +const char * smask) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD , mask,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { + rval =-1 ; + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, %s, AT_FDCWD, \".\") failed" , + fd, smask); + } + } + +SAFE_CLOSE (fd); + +return rval; +} + +#define FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (mask) \ + fanotify_exec_events_supported_by_kernel(mask, #mask) +#endif /* __FANOTIFY_H__ */
testcases/kernel/syscalls/fanotify/fanotify03.c +11 -19
@@ -212,28 +212,23 @@ static int setup_mark(unsigned int n)char *const files[] = {fname,FILE_EXEC_PATH };tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); + +if (support_exec_events !=0 && tc->mask &FAN_OPEN_EXEC_PERM ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC_PERM not supported in kernel?" ); +return -1 ; + } + fd_notify =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY );for (; i <ARRAY_SIZE (files); i++) {if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, tc->mask,AT_FDCWD , files[i]) <0 ) {if (errno ==EINVAL && - (tc->mask &FAN_OPEN_EXEC_PERM && - !support_exec_events)) { -tst_res (TCONF , -"FAN_OPEN_EXEC_PERM not supported in " -"kernel?" ); -return -1 ; - }else if (errno ==EINVAL && mark->flag ==FAN_MARK_FILESYSTEM ) {tst_res (TCONF ,"FAN_MARK_FILESYSTEM not supported in " "kernel?" );return -1 ; - }else if (errno ==EINVAL ) { -tst_brk (TCONF |TERRNO , -"CONFIG_FANOTIFY_ACCESS_PERMISSIONS " -"not configured in kernel?" ); }else {tst_brk (TBROK |TERRNO , "fanotify_mark(%d, FAN_MARK_ADD | %s, "
@@ -241,14 +236,6 @@ static int setup_mark(unsigned int n)"AT_FDCWD, %s) failed." , fd_notify, mark->name, fname); } - }else { -/* -* To distinguish between perm not supported, exec -* events not supported and filesystem mark not -* supported. -*/ -if (tc->mask &FAN_OPEN_EXEC_PERM ) - support_exec_events =1 ; } }
@@ -347,6 +334,11 @@ static void test_fanotify(unsigned int n)static void setup (void ) { + +fanotify_access_permissions_supported_by_kernel (); + + support_exec_events =FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (FAN_OPEN_EXEC_PERM ); +sprintf (fname,MOUNT_PATH "/fname_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"1" );
testcases/kernel/syscalls/fanotify/fanotify07.c +2 -0
@@ -195,6 +195,8 @@ static void test_fanotify(void)static void setup (void ) { +fanotify_access_permissions_supported_by_kernel (); +sprintf (fname,"fname_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"%s" , fname); }
testcases/kernel/syscalls/fanotify/fanotify10.c +8 -0
@@ -64,6 +64,7 @@ static unsigned int fanotify_class[] = {static int fd_notify[NUM_CLASSES ][GROUPS_PER_PRIO ];static char event_buf[EVENT_BUF_LEN ]; +static int support_exec_events;#define MOUNT_PATH "fs_mnt"#define MNT2_PATH "mntpoint"
@@ -451,6 +452,11 @@ static void test_fanotify(unsigned int n)tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); +if (support_exec_events !=0 && tc->expected_mask_with_ignore &FAN_OPEN_EXEC ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC not supported in kernel?" ); +return ; + } +if (tc->ignored_onchild &&tst_kvercmp (5 ,9 ,0 ) <0 ) {tst_res (TCONF ,"ignored mask in combination with flag FAN_EVENT_ON_CHILD" " has undefined behavior on kernel < 5.9" );
@@ -535,6 +541,8 @@ cleanup:static void setup (void ) { + support_exec_events =FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (FAN_OPEN_EXEC ); +/* Create another bind mount@another path for generating events */ SAFE_MKDIR (MNT2_PATH ,0755 );SAFE_MOUNT (MOUNT_PATH ,MNT2_PATH ,"none" ,MS_BIND ,NULL );
testcases/kernel/syscalls/fanotify/fanotify12.c +23 -34
87 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v2 2/5 fanotify: Handle supported features checks in setup()
Quoted 5 lines · Petr Vorel
Create 2 helpers which are used in various tests in
setup()to check forFAN_ACCESS_PERMenablement (caused by disabledCONFIG_FANOTIFY_ACCESS_PERMISSIONS) orFAN_OPEN_EXECandFAN_OPEN_EXEC_PERMsupport in kernel.
Quoted 7 lines
That helps to further code simplification in next commit.
Suggested-by Amir Goldstein <[email protected]>Signed-off-by Petr Vorel <[email protected]>---
Hi Amir,
Hi Petr,
Quoted 3 lines
New in v2.
Is that how you meant the check?
Yes, almost.
FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL() does not need to take a mask argument.
It just needs to check support for FAN_OPEN_EXEC. FAN_OPEN_EXEC_PERM will be supported if FAN_OPEN_EXEC is supported and permission events are supported.
Alternatively, rename the helper to FANOTIFY_EVENTS_SUPPORTED_BY_KERNEL() with the mask argument and then it could be used in the future for testing support for more new events.
Quoted 1 line
Not sure about function names, feel free to suggest better ones.
I am not good with naming ;-)
Quoted 2 lines
Also it's not good that it's not clear from function name whether it uses
tst_brk()on EINVAL or it returns value.
I agree with that.
Better look for precedents in LTP or consult with other LTP developers.
Thanks,
Amir.
Quoted 277 lines
Kind regards,
Petrtestcases/kernel/syscalls/fanotify/fanotify.h | 47 +++++++++++++++ .../kernel/syscalls/fanotify/fanotify03.c | 30 ++++------ .../kernel/syscalls/fanotify/fanotify07.c | 2 + .../kernel/syscalls/fanotify/fanotify10.c | 8 +++ .../kernel/syscalls/fanotify/fanotify12.c | 57 ++++++++----------- 5 files changed, 91 insertions(+), 53 deletions(-)testcases/kernel/syscalls/fanotify/fanotify.h +47
-0@@ -242,4 +242,51 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } + +static inline void fanotify_access_permissions_supported_by_kernel (void ) +{ +int fd; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD ,FAN_ACCESS_PERM ,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { +tst_brk (TCONF |TERRNO , +"CONFIG_FANOTIFY_ACCESS_PERMISSIONS not configured in kernel?" ); + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS_PERM, AT_FDCWD," +" \".\") failed" , fd); + } + } + +SAFE_CLOSE (fd); +} + +static inline int fanotify_exec_events_supported_by_kernel (uint64_t mask, +const char * smask) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD , mask,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { + rval =-1 ; + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, %s, AT_FDCWD, \".\") failed" , + fd, smask); + } + } + +SAFE_CLOSE (fd); + +return rval; +} + +#define FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (mask) \ + fanotify_exec_events_supported_by_kernel(mask, #mask) +#endif /* __FANOTIFY_H__ */ testcases/kernel/syscalls/fanotify/fanotify03.c +11
-19@@ -212,28 +212,23 @@ static int setup_mark(unsigned int n)char *const files[] = {fname,FILE_EXEC_PATH };tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); + +if (support_exec_events !=0 && tc->mask &FAN_OPEN_EXEC_PERM ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC_PERM not supported in kernel?" ); +return -1 ; + } + fd_notify =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY );for (; i <ARRAY_SIZE (files); i++) {if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, tc->mask,AT_FDCWD , files[i]) <0 ) {if (errno ==EINVAL && - (tc->mask &FAN_OPEN_EXEC_PERM && - !support_exec_events)) { -tst_res (TCONF , -"FAN_OPEN_EXEC_PERM not supported in " -"kernel?" ); -return -1 ; - }else if (errno ==EINVAL && mark->flag ==FAN_MARK_FILESYSTEM ) {tst_res (TCONF ,"FAN_MARK_FILESYSTEM not supported in " "kernel?" );return -1 ; - }else if (errno ==EINVAL ) { -tst_brk (TCONF |TERRNO , -"CONFIG_FANOTIFY_ACCESS_PERMISSIONS " -"not configured in kernel?" ); }else {tst_brk (TBROK |TERRNO , "fanotify_mark(%d, FAN_MARK_ADD | %s, "@@ -241,14 +236,6 @@ static int setup_mark(unsigned int n)"AT_FDCWD, %s) failed." , fd_notify, mark->name, fname); } - }else { -/* -* To distinguish between perm not supported, exec -* events not supported and filesystem mark not -* supported. -*/ -if (tc->mask &FAN_OPEN_EXEC_PERM ) - support_exec_events =1 ; } }@@ -347,6 +334,11 @@ static void test_fanotify(unsigned int n)static void setup (void ) { + +fanotify_access_permissions_supported_by_kernel (); + + support_exec_events =FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (FAN_OPEN_EXEC_PERM ); +sprintf (fname,MOUNT_PATH "/fname_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"1" );testcases/kernel/syscalls/fanotify/fanotify07.c +2
-0@@ -195,6 +195,8 @@ static void test_fanotify(void)static void setup (void ) { +fanotify_access_permissions_supported_by_kernel (); +sprintf (fname,"fname_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"%s" , fname); }testcases/kernel/syscalls/fanotify/fanotify10.c +8
-0@@ -64,6 +64,7 @@ static unsigned int fanotify_class[] = {static int fd_notify[NUM_CLASSES ][GROUPS_PER_PRIO ];static char event_buf[EVENT_BUF_LEN ]; +static int support_exec_events;#define MOUNT_PATH "fs_mnt"#define MNT2_PATH "mntpoint"@@ -451,6 +452,11 @@ static void test_fanotify(unsigned int n)tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); +if (support_exec_events !=0 && tc->expected_mask_with_ignore &FAN_OPEN_EXEC ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC not supported in kernel?" ); +return ; + } +if (tc->ignored_onchild &&tst_kvercmp (5 ,9 ,0 ) <0 ) {tst_res (TCONF ,"ignored mask in combination with flag FAN_EVENT_ON_CHILD" " has undefined behavior on kernel < 5.9" );@@ -535,6 +541,8 @@ cleanup:static void setup (void ) { + support_exec_events =FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (FAN_OPEN_EXEC ); +/* Create another bind mount at another path for generating events */ SAFE_MKDIR (MNT2_PATH ,0755 );SAFE_MOUNT (MOUNT_PATH ,MNT2_PATH ,"none" ,MS_BIND ,NULL );testcases/kernel/syscalls/fanotify/fanotify12.c +23
-35@@ -39,6 +39,7 @@ static char fname[BUF_SIZE];static volatile int fd_notify;static volatile int complete;static char event_buf[EVENT_BUF_LEN ]; +static int support_exec_events; static struct test_case_t { const char *tname;@@ -135,26 +136,25 @@ static int setup_mark(unsigned int n)const char *const files[] = {fname,TEST_APP };tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); + +if (support_exec_events !=0 && tc->mask &FAN_OPEN_EXEC ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC not supported in kernel?" ); +return -1 ; + } + fd_notify =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF ,O_RDONLY );for (; i <ARRAY_SIZE (files); i++) {/* Setup normal mark on object */ if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, tc->mask,AT_FDCWD , files[i]) <0 ) { -if (errno ==EINVAL && tc->mask &FAN_OPEN_EXEC ) { -tst_res (TCONF , -"FAN_OPEN_EXEC not supported in " -"kernel?" ); -return -1 ; - }else { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s, " -"%llx, AT_FDCWD, %s) failed" , - fd_notify, - mark->name, - tc->mask, - files[i]); - } +tst_brk (TBROK |TERRNO , +"fanotify_mark(%d, FAN_MARK_ADD | %s, " +"%llx, AT_FDCWD, %s) failed" , + fd_notify, + mark->name, + tc->mask, + files[i]); }/* Setup ignore mark on object */ @@ -163,26 +163,13 @@ static int setup_mark(unsigned int n) | FAN_MARK_IGNORED_MASK, tc->ignore_mask, AT_FDCWD, files[i]) < 0) { -if (errno ==EINVAL && - tc->ignore_mask &FAN_OPEN_EXEC ) { -tst_res (TCONF , -"FAN_OPEN_EXEC not supported " -"in kernel?" ); -return -1 ; - }else if (errno ==EINVAL ) { -tst_brk (TCONF |TERRNO , -"CONFIG_FANOTIFY_ACCESS_" -"PERMISSIONS not configured in " -"kernel?" ); - }else { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, " -"FAN_MARK_ADD | %s " -"| FAN_MARK_IGNORED_MASK, " -"%llx, AT_FDCWD, %s) failed" , - fd_notify, mark->name, - tc->ignore_mask, files[i]); - } +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, " +"FAN_MARK_ADD | %s " +"| FAN_MARK_IGNORED_MASK, " +"%llx, AT_FDCWD, %s) failed" , + fd_notify, mark->name, + tc->ignore_mask, files[i]); } } }@@ -249,6 +236,8 @@ cleanup:static void do_setup (void ) { + support_exec_events =FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (FAN_OPEN_EXEC ); +sprintf (fname,"fname_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"1" ); } --2.29.2
PATCH v2 2/5 fanotify: Handle supported features checks in setup()
Quoted 120 lines · Amir Goldstein
Quoted 5 lines · Petr Vorel
Create 2 helpers which are used in various tests in
setup()to check forFAN_ACCESS_PERMenablement (caused by disabledCONFIG_FANOTIFY_ACCESS_PERMISSIONS) orFAN_OPEN_EXECandFAN_OPEN_EXEC_PERMsupport in kernel.Quoted 7 lines
That helps to further code simplification in next commit.
Suggested-by Amir Goldstein <[email protected]>Signed-off-by Petr Vorel <[email protected]>---
Hi Amir,Hi Petr,
Quoted 3 lines
New in v2.
Is that how you meant the check?
Yes, almost.
FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL()does not need to take a mask argument.
It just needs to check support forFAN_OPEN_EXEC.FAN_OPEN_EXEC_PERMwill be supported ifFAN_OPEN_EXECis supported and permission events are supported.Alternatively, rename the helper to
FANOTIFY_EVENTS_SUPPORTED_BY_KERNEL()with the mask argument and then it could be used in the future for testing support for more new events.Quoted 1 line
Not sure about function names, feel free to suggest better ones.
I am not good with naming ;-)
Quoted 2 lines
Also it's not good that it's not clear from function name whether it uses
tst_brk()on EINVAL or it returns value.I agree with that.
Better look for precedents in LTP or consult with other LTP developers.Thanks,
Amir.Quoted 74 lines
Kind regards,
Petrtestcases/kernel/syscalls/fanotify/fanotify.h | 47 +++++++++++++++ .../kernel/syscalls/fanotify/fanotify03.c | 30 ++++------ .../kernel/syscalls/fanotify/fanotify07.c | 2 + .../kernel/syscalls/fanotify/fanotify10.c | 8 +++ .../kernel/syscalls/fanotify/fanotify12.c | 57 ++++++++----------- 5 files changed, 91 insertions(+), 53 deletions(-)testcases/kernel/syscalls/fanotify/fanotify.h +47
-0@@ -242,4 +242,51 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } + +static inline void fanotify_access_permissions_supported_by_kernel (void ) +{ +int fd; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD ,FAN_ACCESS_PERM ,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { +tst_brk (TCONF |TERRNO , +"CONFIG_FANOTIFY_ACCESS_PERMISSIONS not configured in kernel?" ); + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS_PERM, AT_FDCWD," +" \".\") failed" , fd); + } + } + +SAFE_CLOSE (fd); +} + +static inline int fanotify_exec_events_supported_by_kernel (uint64_t mask, +const char * smask) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD , mask,AT_FDCWD ,"." ) <0 ) { +if (errno ==EINVAL ) { + rval =-1 ; + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, %s, AT_FDCWD, \".\") failed" , + fd, smask); + } + } + +SAFE_CLOSE (fd); + +return rval; +} + +#define FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (mask) \ + fanotify_exec_events_supported_by_kernel(mask, #mask) +#endif /* __FANOTIFY_H__ */ testcases/kernel/syscalls/fanotify/fanotify03.c +0
-0@@ -212,28 +212,23 @@ static int setup_mark(unsigned int n)char *const files[] = {fname,FILE_EXEC_PATH };
Quoted 7 lines
testcases/kernel/syscalls/fanotify/fanotify03.c static int setup_mark(unsigned int n) · line 220
Quoted 7 lines
testcases/kernel/syscalls/fanotify/fanotify03.c +6
-0tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); + +if (support_exec_events !=0 && tc->mask &FAN_OPEN_EXEC_PERM ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC_PERM not supported in kernel?" ); +return -1 ; + } +
Please remove the comment above tcases[] definition:
"Ensure to keep the first..."
It is no longer needed after this change.
Thanks,
Amir.
PATCH v2 2/5 fanotify: Handle supported features checks in setup()
Hi Amir,
Quoted 15 lines
Quoted 11 lines
testcases/kernel/syscalls/fanotify/fanotify03.c static int setup_mark(unsigned int n) · line 220
Quoted 11 lines
+++
b/testcases/kernel/syscalls/fanotify/fanotify03.ctestcases/kernel/syscalls/fanotify/fanotify03.c +6
-0@@ -212,28 +212,23 @@ static int setup_mark(unsigned int n)char *const files[] = {fname,FILE_EXEC_PATH };tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); + +if (support_exec_events !=0 && tc->mask &FAN_OPEN_EXEC_PERM ) { +tst_res (TCONF |TERRNO ,"FAN_OPEN_EXEC_PERM not supported in kernel?" ); +return -1 ; + } +Please remove the comment above tcases[] definition:
"Ensure to keep the first..."
Quoted 1 line
It is no longer needed after this change.
+1 (this one is easy).
FYI I've sent v3, but that does not address your comments (just fixes failure).
I'll have look into your comments next week.
Quoted 2 lines
Thanks,
Amir.
Kind regards,
Petr
PATCH v2 3/5 fanotify: Introduce SAFE_FANOTIFY_MARK() macro
In reply to Petr Voreland function and use it in all tests which use fanotify_mark().
Motivation was not only to simplify the code but also check for unsupported filesystems which was missing least for exfat on fanotify16, because filesystem can be set via LTP_DEV_FS_TYPE environment variable on tests which don't tests all filesystems.
Previous commit added check for FAN_ACCESS_PERM enablement (caused by disabled CONFIG_FANOTIFY_ACCESS_PERMISSIONS) or FAN_OPEN_EXEC and FAN_OPEN_EXEC_PERM support in kernel, which are tested in setup functions for relevant tests, thus only FAN_MARK_FILESYSTEM is needed to check in safe_fanotify_mark().
---
Hi Amir,
to be honest, I'm not sure if it's worth to remove FAN_ACCESS_PERM (CONFIG_FANOTIFY_ACCESS_PERMISSIONS) check from safe_fanotify_mark(). The downside of fanotify_access_permissions_supported_by_kernel() is that you have to remember to add it to the relevant test.
Kind regards,
Petr
testcases/kernel/syscalls/fanotify/fanotify.h | 37 ++++++++++++- .../kernel/syscalls/fanotify/fanotify01.c | 53 ++++--------------- .../kernel/syscalls/fanotify/fanotify02.c | 22 ++------ .../kernel/syscalls/fanotify/fanotify03.c | 18 +------ .../kernel/syscalls/fanotify/fanotify04.c | 32 +++-------- .../kernel/syscalls/fanotify/fanotify05.c | 9 +--- .../kernel/syscalls/fanotify/fanotify06.c | 21 ++------ .../kernel/syscalls/fanotify/fanotify07.c | 15 +----- .../kernel/syscalls/fanotify/fanotify09.c | 19 ++----- .../kernel/syscalls/fanotify/fanotify10.c | 36 ++----------- .../kernel/syscalls/fanotify/fanotify11.c | 5 +- .../kernel/syscalls/fanotify/fanotify12.c | 24 ++------- .../kernel/syscalls/fanotify/fanotify13.c | 33 ++---------- .../kernel/syscalls/fanotify/fanotify15.c | 24 ++------- .../kernel/syscalls/fanotify/fanotify16.c | 20 ++----- 15 files changed, 90 insertions(+), 278 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +36 -1
@@ -60,9 +60,13 @@ int safe_fanotify_init(const char *file, const int lineno,return rval; } +#define SAFE_FANOTIFY_INIT (fan, mode) \ safe_fanotify_init(__FILE__, __LINE__, (fan), (mode)) +#define SAFE_FANOTIFY_MARK (fd, flags, mask, dfd, pathname) \ + safe_fanotify_mark(__FILE__, __LINE__, (fd), (flags), (mask), (dfd), (pathname)) +#ifndef FAN_REPORT_TID #define FAN_REPORT_TID 0x00000100#endif
@@ -242,7 +246,6 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } -static inline void fanotify_access_permissions_supported_by_kernel (void ) {int fd;
@@ -289,4 +292,36 @@ static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask,#define FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (mask) \ fanotify_exec_events_supported_by_kernel(mask, #mask) +static inline int safe_fanotify_mark (const char *file,const int lineno, +int fd,unsigned int flags,uint64_t mask, +int dfd,const char *pathname) +{ +int rval; + + rval =fanotify_mark (fd, flags, mask, dfd, pathname); + +if (rval ==-1 ) { +if (errno ==ENODEV || errno ==EOPNOTSUPP || errno ==EXDEV ) +tst_brk (TCONF , +"%s:%d: FAN_REPORT_FID not supported on %s filesystem" , + file, lineno, tst_device->fs_type); + +if (errno ==EINVAL && (flags &FAN_MARK_FILESYSTEM ) ==FAN_MARK_FILESYSTEM ) { +tst_brk (TCONF , +"%s:%d: FAN_MARK_FILESYSTEM not supported by kernel?" , + file, lineno); + } + +tst_brk (TBROK |TERRNO ,"%s:%d: fanotify_mark() failed" , + file, lineno); + } + +if (rval <-1 ) { +tst_brk (TBROK |TERRNO ,"%s:%d: invalid fanotify_mark() return %d" , + file, lineno, rval); + } + +return rval; +} +#endif /* __FANOTIFY_H__ */
testcases/kernel/syscalls/fanotify/fanotify01.c +10 -43
87 lines not on this page · raw message
testcases/kernel/syscalls/fanotify/fanotify02.c +5 -17
@@ -46,16 +46,9 @@ void test01(void)int tst_count =0 ; -if (fanotify_mark (fd_notify,FAN_MARK_ADD ,FAN_ACCESS | -FAN_MODIFY |FAN_CLOSE |FAN_OPEN | -FAN_EVENT_ON_CHILD |FAN_ONDIR ,AT_FDCWD , -"." ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS | " -"FAN_MODIFY | FAN_CLOSE | FAN_OPEN | " -"FAN_EVENT_ON_CHILD | FAN_ONDIR, AT_FDCWD, '.') " -"failed" , fd_notify); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD ,FAN_ACCESS | +FAN_MODIFY |FAN_CLOSE |FAN_OPEN |FAN_EVENT_ON_CHILD | +FAN_ONDIR ,AT_FDCWD ,"." );/* * generate sequence of events
@@ -102,13 +95,8 @@ void test01(void)/* * now remove child mark */ -if (fanotify_mark (fd_notify,FAN_MARK_REMOVE , -FAN_EVENT_ON_CHILD ,AT_FDCWD ,"." ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK REMOVE, " -"FAN_EVENT_ON_CHILD, AT_FDCWD, '.') failed" , - fd_notify); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_REMOVE , +FAN_EVENT_ON_CHILD ,AT_FDCWD ,"." );/* * Do something to verify events didn't get generated
testcases/kernel/syscalls/fanotify/fanotify03.c +2 -16
@@ -221,22 +221,8 @@ static int setup_mark(unsigned int n) fd_notify =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY );for (; i <ARRAY_SIZE (files); i++) { -if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, - tc->mask,AT_FDCWD , files[i]) <0 ) { -if (errno ==EINVAL && - mark->flag ==FAN_MARK_FILESYSTEM ) { -tst_res (TCONF , -"FAN_MARK_FILESYSTEM not supported in " -"kernel?" ); -return -1 ; - }else { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s, " -"FAN_ACCESS_PERM | FAN_OPEN_PERM, " -"AT_FDCWD, %s) failed." , - fd_notify, mark->name, fname); - } - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | mark->flag, + tc->mask,AT_FDCWD , files[i]); }return 0 ;
testcases/kernel/syscalls/fanotify/fanotify04.c +6 -26
@@ -77,13 +77,8 @@ static void check_mark(char *file, unsigned long long flag, char *flagstr,if (test_event)test_event (file); -if (fanotify_mark (fd_notify,FAN_MARK_REMOVE | flag, -FAN_OPEN ,AT_FDCWD , file) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_REMOVE | %s, " -"FAN_OPEN, AT_FDCWD, '%s') failed" , - fd_notify, flagstr, file); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_REMOVE | flag, +FAN_OPEN ,AT_FDCWD , file); } }
@@ -191,29 +186,14 @@ void test01(void)CHECK_MARK (sname,0 ,0 , test_open_file);/* Verify FAN_MARK_FLUSH destroys all inode marks */ -if (fanotify_mark (fd_notify,FAN_MARK_ADD , -FAN_OPEN ,AT_FDCWD , fname) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD, FAN_OPEN, " -"AT_FDCWD, '%s') failed" , fd_notify, fname); - } -if (fanotify_mark (fd_notify,FAN_MARK_ADD , -FAN_OPEN |FAN_ONDIR ,AT_FDCWD , dir) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD, FAN_OPEN | " -"FAN_ONDIR, AT_FDCWD, '%s') failed" , fd_notify, - dir); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD ,FAN_OPEN ,AT_FDCWD , fname); +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD ,FAN_OPEN |FAN_ONDIR , +AT_FDCWD , dir);open_file (fname);verify_event (S_IFREG );open_dir (dir);verify_event (S_IFDIR ); -if (fanotify_mark (fd_notify,FAN_MARK_FLUSH , -0 ,AT_FDCWD ,"." ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_FLUSH, 0, " -"AT_FDCWD, '.') failed" , fd_notify); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_FLUSH ,0 ,AT_FDCWD ,"." );open_dir (dir);verify_no_event ();
testcases/kernel/syscalls/fanotify/fanotify05.c +2 -7
@@ -107,13 +107,8 @@ static void setup(void) fd_notify =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF |FAN_NONBLOCK ,O_RDONLY ); -if (fanotify_mark (fd_notify,FAN_MARK_MOUNT |FAN_MARK_ADD ,FAN_OPEN , -AT_FDCWD ,MOUNT_PATH ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_MOUNT | FAN_MARK_ADD, " -"FAN_OPEN, AT_FDCWD, \".\") failed" , - fd_notify); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_MOUNT |FAN_MARK_ADD ,FAN_OPEN , +AT_FDCWD ,MOUNT_PATH ); }static void cleanup (void )
testcases/kernel/syscalls/fanotify/fanotify06.c +4 -17
@@ -78,7 +78,6 @@ static struct tcase {static void create_fanotify_groups (void ) {unsigned int p, i; -int ret;for (p =0 ; p <FANOTIFY_PRIORITIES ; p++) {for (i =0 ; i <GROUPS_PER_PRIO ; i++) {
@@ -87,32 +86,20 @@ static void create_fanotify_groups(void) O_RDONLY);/* Add mount mark for each group */ - ret =fanotify_mark (fd_notify[p][i], +SAFE_FANOTIFY_MARK (fd_notify[p][i],FAN_MARK_ADD |FAN_MARK_MOUNT ,FAN_MODIFY ,AT_FDCWD , fname); -if (ret <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | " -"FAN_MARK_MOUNT, FAN_MODIFY, AT_FDCWD," -" %s) failed" , fd_notify[p][i], fname); - } +/* Add ignore mark for groups with higher priority */ if (p ==0 )continue ; - ret =fanotify_mark (fd_notify[p][i], + +SAFE_FANOTIFY_MARK (fd_notify[p][i],FAN_MARK_ADD |FAN_MARK_IGNORED_MASK |FAN_MARK_IGNORED_SURV_MODIFY ,FAN_MODIFY ,AT_FDCWD , fname); -if (ret <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | " -"FAN_MARK_IGNORED_MASK | " -"FAN_MARK_IGNORED_SURV_MODIFY, " -"FAN_MODIFY, AT_FDCWD, %s) failed" , - fd_notify[p][i], fname); - } } } }
testcases/kernel/syscalls/fanotify/fanotify07.c +1 -14
@@ -102,20 +102,7 @@ static int setup_instance(void)int fd; fd =SAFE_FANOTIFY_INIT (FAN_CLASS_CONTENT ,O_RDONLY ); - -if (fanotify_mark (fd,FAN_MARK_ADD ,FAN_ACCESS_PERM ,AT_FDCWD , - fname) <0 ) { -close (fd); -if (errno ==EINVAL ) { -tst_brk (TCONF |TERRNO , -"CONFIG_FANOTIFY_ACCESS_PERMISSIONS not " -"configured in kernel?" ); - }else { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS_PERM, " -"AT_FDCWD, %s) failed." , fd, fname); - } - } +SAFE_FANOTIFY_MARK (fd,FAN_MARK_ADD ,FAN_ACCESS_PERM ,AT_FDCWD , fname);return fd; }
testcases/kernel/syscalls/fanotify/fanotify09.c +3 -16
@@ -99,7 +99,6 @@ static void create_fanotify_groups(struct tcase *tc) {struct fanotify_mark_type *mark = &tc->mark;unsigned int i, onchild, ondir = tc->ondir; -int ret;for (i =0 ; i <NUM_GROUPS ; i++) { fd_notify[i] = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF |
@@ -111,17 +110,11 @@ static void create_fanotify_groups(struct tcase *tc)* but only the first group requests events on dir. */ onchild = (i ==0 ) ?FAN_EVENT_ON_CHILD | ondir :0 ; - ret =fanotify_mark (fd_notify[i], +SAFE_FANOTIFY_MARK (fd_notify[i],FAN_MARK_ADD | mark->flag,FAN_CLOSE_NOWRITE | onchild,AT_FDCWD , tc->testdir); -if (ret <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s, " -"%x, AT_FDCWD, '%s') failed" , - fd_notify[i], mark->name, -FAN_CLOSE_NOWRITE | ondir, tc->testdir); - } +/* * Add inode mark on parent for each group with MODIFY event, * but only the first group requests events on child.
@@ -129,15 +122,9 @@ static void create_fanotify_groups(struct tcase *tc)* setting the DCACHE_FSNOTIFY_PARENT_WATCHED dentry * flag. */ - ret =fanotify_mark (fd_notify[i],FAN_MARK_ADD , +SAFE_FANOTIFY_MARK (fd_notify[i],FAN_MARK_ADD ,FAN_MODIFY | ondir | onchild,AT_FDCWD ,"." ); -if (ret <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD, " -"%x, AT_FDCWD, '.') failed" , - fd_notify[i],FAN_MODIFY | ondir | onchild); - } } }
testcases/kernel/syscalls/fanotify/fanotify10.c +3 -33
@@ -288,7 +288,6 @@ static int create_fanotify_groups(unsigned int n)struct fanotify_mark_type *mark, *ignore_mark;unsigned int mark_ignored, mask;unsigned int p, i; -int ret; mark = &fanotify_mark_types[tc->mark_type]; ignore_mark = &fanotify_mark_types[tc->ignore_mark_type];
@@ -317,32 +316,12 @@ static int create_fanotify_groups(unsigned int n)* FAN_EVENT_ON_CHILD has no effect on filesystem/mount * or inode mark on non-directory. */ - ret =fanotify_mark (fd_notify[p][i], +SAFE_FANOTIFY_MARK (fd_notify[p][i],FAN_MARK_ADD | mark->flag, tc->expected_mask_without_ignore |FAN_EVENT_ON_CHILD ,AT_FDCWD , tc->mark_path); -if (ret <0 ) { -if (errno ==EINVAL && - tc->expected_mask_without_ignore & -FAN_OPEN_EXEC ) { -tst_res (TCONF , -"FAN_OPEN_EXEC not supported " -"by kernel?" ); -return -1 ; - }else if (errno ==EINVAL && - tc->mark_type ==FANOTIFY_FILESYSTEM ) { -tst_res (TCONF , -"FAN_MARK_FILESYSTEM not " -"supported in kernel?" ); -return -1 ; - } -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s," -"FAN_OPEN, AT_FDCWD, %s) failed" , - fd_notify[p][i], mark->name, - tc->mark_path); - } +/* Add ignore mark for groups with higher priority */ if (p ==0 )continue ;
@@ -351,18 +330,9 @@ static int create_fanotify_groups(unsigned int n) mark_ignored =FAN_MARK_IGNORED_MASK |FAN_MARK_IGNORED_SURV_MODIFY ; add_mark: - ret =fanotify_mark (fd_notify[p][i], +SAFE_FANOTIFY_MARK (fd_notify[p][i],FAN_MARK_ADD | ignore_mark->flag | mark_ignored, mask,AT_FDCWD , tc->ignore_path); -if (ret <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s | %s, " -"%x, AT_FDCWD, %s) failed" , - fd_notify[p][i], ignore_mark->name, - mark_ignored ?"FAN_MARK_IGNORED_MASK | " -"FAN_MARK_IGNORED_SURV_MODIFY" :"" , - mask, tc->ignore_path); - }/* * If ignored mask is on a parent watching children,
testcases/kernel/syscalls/fanotify/fanotify11.c +1 -4
@@ -55,7 +55,6 @@ static unsigned int tcases[] = {void test01 (unsigned int i) { -int ret;pthread_t p_id;struct fanotify_event_metadata event;int fd_notify;
@@ -76,10 +75,8 @@ void test01(unsigned int i) tcases[i]); } - ret =fanotify_mark (fd_notify,FAN_MARK_ADD , +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD ,FAN_ALL_EVENTS |FAN_EVENT_ON_CHILD ,AT_FDCWD ,"." ); -if (ret !=0 ) -tst_brk (TBROK ,"fanotify_mark FAN_MARK_ADD fail ret=%d" , ret);SAFE_PTHREAD_CREATE (&p_id,NULL , thread_create_file,NULL );
testcases/kernel/syscalls/fanotify/fanotify12.c +4 -20
@@ -146,31 +146,15 @@ static int setup_mark(unsigned int n)for (; i <ARRAY_SIZE (files); i++) {/* Setup normal mark on object */ -if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, - tc->mask,AT_FDCWD , files[i]) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s, " -"%llx, AT_FDCWD, %s) failed" , - fd_notify, - mark->name, - tc->mask, - files[i]); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | mark->flag, + tc->mask,AT_FDCWD , files[i]);/* Setup ignore mark on object */ if (tc->ignore_mask) { -if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | mark->flag |FAN_MARK_IGNORED_MASK , tc->ignore_mask,AT_FDCWD , - files[i]) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, " -"FAN_MARK_ADD | %s " -"| FAN_MARK_IGNORED_MASK, " -"%llx, AT_FDCWD, %s) failed" , - fd_notify, mark->name, - tc->ignore_mask, files[i]); - } + files[i]); } }
testcases/kernel/syscalls/fanotify/fanotify13.c +4 -29
@@ -116,28 +116,8 @@ static int setup_marks(unsigned int fd, struct test_case_t *tc)struct fanotify_mark_type *mark = &tc->mark;for (i =0 ; i <ARRAY_SIZE (objects); i++) { -if (fanotify_mark (fd,FAN_MARK_ADD | mark->flag, tc->mask, -AT_FDCWD , objects[i].path) ==-1 ) { -if (errno ==EINVAL && - mark->flag &FAN_MARK_FILESYSTEM ) { -tst_res (TCONF , -"FAN_MARK_FILESYSTEM not supported by " -"kernel" ); -return 1 ; - }else if (errno ==ENODEV && - !objects[i].fid.fsid.val[0 ] && - !objects[i].fid.fsid.val[1 ]) { -tst_res (TCONF , -"FAN_REPORT_FID not supported on " -"filesystem type %s" , - tst_device->fs_type); -return 1 ; - } -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD, FAN_OPEN, " -"AT_FDCWD, %s) failed" , - fanotify_fd, objects[i].path); - } +SAFE_FANOTIFY_MARK (fd,FAN_MARK_ADD | mark->flag, tc->mask, +AT_FDCWD , objects[i].path);/* Setup the expected mask for each generated event */ event_set[i].expected_mask = tc->mask;
@@ -292,13 +272,8 @@ static void do_setup(void)* uninitialized connector->fsid cache. This mark remains for all test * cases and is not expected to get any events (no writes in this test). */ -if (fanotify_mark (nofid_fd,FAN_MARK_ADD ,FAN_CLOSE_WRITE ,AT_FDCWD , -FILE_PATH_ONE ) ==-1 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD, FAN_CLOSE_WRITE, " -"AT_FDCWD, " FILE_PATH_ONE ") failed" , - nofid_fd); - } +SAFE_FANOTIFY_MARK (nofid_fd,FAN_MARK_ADD ,FAN_CLOSE_WRITE ,AT_FDCWD , +FILE_PATH_ONE );/* Get the filesystem fsid and file handle for each created object */ get_object_stats ();
testcases/kernel/syscalls/fanotify/fanotify15.c +4 -20
@@ -85,21 +85,10 @@ static void do_test(unsigned int number)tst_res (TINFO ,"Test #%d: %s" , number, tc->tname); -if (fanotify_mark (fanotify_fd,FAN_MARK_ADD | mark->flag, tc->mask | +SAFE_FANOTIFY_MARK (fanotify_fd,FAN_MARK_ADD | mark->flag, tc->mask |FAN_CREATE |FAN_DELETE |FAN_MOVE |FAN_MODIFY |FAN_ONDIR , -AT_FDCWD ,TEST_DIR ) ==-1 ) { -if (errno ==ENODEV || errno ==EOPNOTSUPP || errno ==EXDEV ) -tst_brk (TCONF , -"FAN_REPORT_FID not supported on %s " -"filesystem" , tst_device->fs_type); -tst_brk (TBROK |TERRNO , -"fanotify_mark(%d, FAN_MARK_ADD | %s, " -"FAN_CREATE | FAN_DELETE | FAN_MOVE | " -"FAN_MODIFY | FAN_ONDIR | 0x%lx, " -"AT_FDCWD, %s) failed" , - fanotify_fd, mark->name, tc->mask,TEST_DIR ); - } +AT_FDCWD ,TEST_DIR );/* Save the test root dir fid */ fanotify_save_fid (TEST_DIR , &root_fid);
@@ -191,13 +180,8 @@ static void do_test(unsigned int number)/* * Cleanup the mark */ -if (fanotify_mark (fanotify_fd,FAN_MARK_FLUSH | mark->flag,0 , -AT_FDCWD ,TEST_DIR ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_FLUSH | %s, 0," -"AT_FDCWD, '" TEST_DIR "') failed" , - fanotify_fd, mark->name); - } +SAFE_FANOTIFY_MARK (fanotify_fd,FAN_MARK_FLUSH | mark->flag,0 , +AT_FDCWD ,TEST_DIR );/* Process each event in buffer */ for (i = 0, metadata = (struct fanotify_event_metadata *) events_buf;
testcases/kernel/syscalls/fanotify/fanotify16.c +5 -15
@@ -174,13 +174,8 @@ static void do_test(unsigned int number)/* * Watch dir modify events with name in filesystem/dir */ -if (fanotify_mark (fd_notify,FAN_MARK_ADD | mark->flag, tc->mask, -AT_FDCWD ,MOUNT_PATH ) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD | %s, 0x%lx, " -"AT_FDCWD, '" MOUNT_PATH "') failed" , - fd_notify, mark->name, tc->mask); - } +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | mark->flag, tc->mask, +AT_FDCWD ,MOUNT_PATH );/* Save the mount root fid */ fanotify_save_fid (MOUNT_PATH , &root_fid);
@@ -195,14 +190,9 @@ static void do_test(unsigned int number)/* Save the subdir fid */ fanotify_save_fid (dname1, &dir_fid); -if (tc->sub_mask && -fanotify_mark (fd_notify,FAN_MARK_ADD | sub_mark->flag, tc->sub_mask, -AT_FDCWD , dname1) <0 ) { -tst_brk (TBROK |TERRNO , -"fanotify_mark (%d, FAN_MARK_ADD | %s, 0x%lx, " -"AT_FDCWD, '%s') failed" , - fd_notify, sub_mark->name, tc->sub_mask, dname1); - } +if (tc->sub_mask) +SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | sub_mark->flag, + tc->sub_mask,AT_FDCWD , dname1); event_set[tst_count].mask =FAN_CREATE |FAN_ONDIR ; event_set[tst_count].fid = &root_fid;
Signature · 1 line
2.29.2
PATCH v2 3/5 fanotify: Introduce SAFE_FANOTIFY_MARK() macro
Quoted 8 lines · Petr Vorel
and function and use it in all tests which use
fanotify_mark().Motivation was not only to simplify the code but also check for unsupported filesystems which was missing least for exfat on fanotify16, because filesystem can be set via
LTP_DEV_FS_TYPEenvironment variable on tests which don't tests all filesystems.
Quoted 5 lines
Previous commit added check for
FAN_ACCESS_PERMenablement (caused by disabledCONFIG_FANOTIFY_ACCESS_PERMISSIONS) orFAN_OPEN_EXECandFAN_OPEN_EXEC_PERMsupport in kernel, which are tested in setup functions for relevant tests, thus onlyFAN_MARK_FILESYSTEMis needed to check insafe_fanotify_mark().
So previous commit should have removed the check for exec event support on failure instead of including this change in this commit. IOW, the paragraph above should not have been needed.
Quoted 10 lines
Signed-off-by Petr Vorel <[email protected]>---
Hi Amir,to be honest, I'm not sure if it's worth to remove
FAN_ACCESS_PERM(CONFIG_FANOTIFY_ACCESS_PERMISSIONS) check fromsafe_fanotify_mark(). The downside offanotify_access_permissions_supported_by_kernel()is that you have to remember to add it to the relevant test.
It's a problem.
If anotify_mark() has FAN_MARK_FILESYSTEM in flags and FAN_ACCESS_PERM and FAN_OPEN_EXEC in mask you
cannot know what the reason of failure was, but see suggestion below.
Quoted 4 lines
Kind regards,
Petr
Quoted 16 lines
testcases/kernel/syscalls/fanotify/fanotify.h | 37 ++++++++++++- .../kernel/syscalls/fanotify/fanotify01.c | 53 ++++--------------- .../kernel/syscalls/fanotify/fanotify02.c | 22 ++------ .../kernel/syscalls/fanotify/fanotify03.c | 18 +------ .../kernel/syscalls/fanotify/fanotify04.c | 32 +++-------- .../kernel/syscalls/fanotify/fanotify05.c | 9 +--- .../kernel/syscalls/fanotify/fanotify06.c | 21 ++------ .../kernel/syscalls/fanotify/fanotify07.c | 15 +----- .../kernel/syscalls/fanotify/fanotify09.c | 19 ++----- .../kernel/syscalls/fanotify/fanotify10.c | 36 ++----------- .../kernel/syscalls/fanotify/fanotify11.c | 5 +- .../kernel/syscalls/fanotify/fanotify12.c | 24 ++------- .../kernel/syscalls/fanotify/fanotify13.c | 33 ++---------- .../kernel/syscalls/fanotify/fanotify15.c | 24 ++------- .../kernel/syscalls/fanotify/fanotify16.c | 20 ++----- 15 files changed, 90 insertions(+), 278 deletions(-)
I like that diffstat :-)
Quoted 33 lines
testcases/kernel/syscalls/fanotify/fanotify.h +6
-1@@ -60,9 +60,13 @@ int safe_fanotify_init(const char *file, const int lineno,return rval; } +#define SAFE_FANOTIFY_INIT (fan, mode) \ safe_fanotify_init(__FILE__, __LINE__, (fan), (mode)) +#define SAFE_FANOTIFY_MARK (fd, flags, mask, dfd, pathname) \ + safe_fanotify_mark(__FILE__, __LINE__, (fd), (flags), (mask), (dfd), (pathname)) +#ifndef FAN_REPORT_TID #define FAN_REPORT_TID 0x00000100#endif @@ -242,7 +246,6 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } -static inline void fanotify_access_permissions_supported_by_kernel (void ) {int fd;@@ -289,4 +292,36 @@ static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask,#define FANOTIFY_EXEC_EVENTS_SUPPORTED_BY_KERNEL (mask) \ fanotify_exec_events_supported_by_kernel(mask, #mask) +static inline int safe_fanotify_mark(const char *file, const int lineno, + int fd, unsigned int flags, uint64_t mask,
testcases/kernel/syscalls/fanotify/fanotify.h static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask, · line 306
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify.h +10
-0+ int dfd, const char *pathname) +{ + int rval; + + rval =fanotify_mark (fd, flags, mask, dfd, pathname); + +if (rval ==-1 ) { + if (errno == ENODEV || errno == EOPNOTSUPP || errno == EXDEV) + tst_brk(TCONF, + "%s:%d: FAN_REPORT_FID not supported on %s filesystem",
It would be better to check that flags actually have FAN_REPORT_FID before emitting this error
testcases/kernel/syscalls/fanotify/fanotify.h static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask, · line 314
Quoted 8 lines
testcases/kernel/syscalls/fanotify/fanotify.h +8
-0+ file, lineno, tst_device->fs_type); + +if (errno ==EINVAL && (flags &FAN_MARK_FILESYSTEM ) ==FAN_MARK_FILESYSTEM ) { +tst_brk (TCONF , +"%s:%d: FAN_MARK_FILESYSTEM not supported by kernel?" , + file, lineno); + } +
I find it weird to give the wrong hint, if there could be more than one reason for EINVAL, but if you like you could give all the hints, i.e.:
"FAN_MARK_FILESYSTEM not supported by kernel?"
and
"permission events not supported by kernel?"
per every possible reason found in flags and mask.
You could also make the support_exec_events variable from fanotify03 global, which fanotify_exec_events_supported_by_kernel() will set and work that knowledge into safe_fanotify_mark(). You could do the same with fanotify_access_permissions_supported_by_kernel().
So in case test setup() does have those checks, there will be no wrong hints in safe_fanotify_mark().
Thanks,
Amir.
PATCH v2 4/5 fanotify: Check FAN_REPORT_{FID, NAME} support
In reply to Petr Vorelin safe_fanotify_init()
---
New in v2.
testcases/kernel/syscalls/fanotify/fanotify.h | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +17 -4
@@ -48,11 +48,24 @@ int safe_fanotify_init(const char *file, const int lineno,if (rval ==-1 ) {if (errno ==ENOSYS ) { -tst_brk (TCONF , -"fanotify is not configured in this kernel." ); +tst_brk (TCONF ,"%s:%d: fanotify is not configured in this kernel" , + file, lineno); } -tst_brk (TBROK |TERRNO , -"%s:%d: fanotify_init() failed" , file, lineno); + +if (errno ==EINVAL ) { +if (flags &FAN_REPORT_FID ) { +tst_brk (TCONF ,"%s:%d: FAN_REPORT_FID not supported by kernel?" , + file, lineno); + } + +if (flags &FAN_REPORT_NAME ) { +tst_brk (TCONF ,"%s:%d: FAN_REPORT_NAME not supported by kernel?" , + file, lineno); + } + } + +tst_brk (TBROK |TERRNO ,"%s:%d: fanotify_init() failed" , + file, lineno); }#else tst_brk (TCONF ,"Header <sys/fanotify.h> is not present" );
Signature · 1 line
2.29.2
PATCH v2 5/5 fanotify: Add a pedantic check for return value
In reply to Petr Vorelfor fanotify_init() in safe_fanotify_init()
---
New in v2.
FYI We agreed in LTP to test these.
testcases/kernel/syscalls/fanotify/fanotify.h | 5 +++++ 1 file changed, 5 insertions(+)
testcases/kernel/syscalls/fanotify/fanotify.h +5 -0
@@ -67,6 +67,11 @@ int safe_fanotify_init(const char *file, const int lineno,tst_brk (TBROK |TERRNO ,"%s:%d: fanotify_init() failed" , file, lineno); } + +if (rval <-1 ) { +tst_brk (TBROK |TERRNO ,"%s:%d: invalid fanotify_init() return %d" , + file, lineno, rval); + }#else tst_brk (TCONF ,"Header <sys/fanotify.h> is not present" );#endif /* HAVE_SYS_FANOTIFY_H */
Signature · 1 line
2.29.2