Introduce SAFE_FANOTIFY_MARK() macro + cleanup
v4 cover Introduce SAFE_FANOTIFY_MARK() macro + cleanup
Hi Amir,
another cleanup version, hopefully the last.
Sorry for lengthy comments.
Changes v3->v4:
* fixed unwanted tst_brk() (quitting the test too early). In the end it was problem just in fanotify01.c and fanotify03.c.
In fanotify13.c it was already
tst_test.c:1316: TINFO: Testing on exfat
fanotify.h:209: TCONF: filesystem exfat does not support file handles
...
tst_test.c:859: TINFO: Trying FUSE...
fanotify13.c:161: TINFO: Test #0: FAN_REPORT_FID with mark flag: FAN_MARK_INODE fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #1: FAN_REPORT_FID with mark flag: FAN_MARK_INODE fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #2: FAN_REPORT_FID with mark flag: FAN_MARK_MOUNT fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #3: FAN_REPORT_FID with mark flag: FAN_MARK_MOUNT fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #4: FAN_REPORT_FID with mark flag: FAN_MARK_FILESYSTEM fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #5: FAN_REPORT_FID with mark flag: FAN_MARK_FILESYSTEM fanotify13.c:130: TCONF: FAN_REPORT_FID not supported on filesystem type ntfs
* new commit fanotify: Check for FAN_REPORT_FID support on fs This one I hesitated, whether keep EOPNOTSUPP also as fallback in fanotify.h On all but one test (fanotify01.c) FAN_REPORT_FID was used in all tests.
The only check I kept untouched is this one from fanotify16.c:
fd_notify = fanotify_init(group->flag, 0);
if (fd_notify == -1) {
if (errno == EINVAL) {
tst_res(TCONF,
"%s not supported by kernel", group->name);
return;
}
tst_brk(TBROK | TERRNO,
"fanotify_init(%s, 0) failed", group->name);
}Because this:
fanotify16.c:160: TINFO: Test #0: FAN_REPORT_DFID_NAME monitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_NAME not supported by kernel
fanotify16.c:160: TINFO: Test #1: FAN_REPORT_DFID_NAME monitor directories for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_NAME not supported by kernel
fanotify16.c:160: TINFO: Test #2: FAN_REPORT_DIR_FID monitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DIR_FID not supported by kernel
fanotify16.c:160: TINFO: Test #3: FAN_REPORT_DIR_FID monitor directories for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DIR_FID not supported by kernel
fanotify16.c:160: TINFO: Test #4: FAN_REPORT_DFID_FID monitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_FID not supported by kernel
fanotify16.c:160: TINFO: Test #5: FAN_REPORT_DFID_FID monitor directories for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_FID not supported by kernel
fanotify16.c:160: TINFO: Test #6: FAN_REPORT_DFID_NAME_FID monitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_NAME_FID not supported by kernel
fanotify16.c:160: TINFO: Test #7: FAN_REPORT_DFID_NAME_FID monitor directories for create/delete/move/open/close fanotify16.c:166: TCONF: FAN_REPORT_DFID_NAME_FID not supported by kernel
would be replaced by single message which is misleading:
fanotify16.c:163: TCONF: FAN_REPORT_NAME not supported in kernel? if I usefd_notify = SAFE_FANOTIFY_INIT(group->flag, 0);
+ that problem with skipping what we don't want to skip (although here are skipped all and on old kernel I get
fanotify.h:342: TCONF: FAN_REPORT_FID not supported in kernel?
and on new kernel problematic fs are skipped anyway:
fanotify.h:363: TCONF: FAN_REPORT_FID not supported on exfat filesystem
Feel free to suggest what to do or simply send a following patch.
In following commit "fanotify: Introduce SAFE_FANOTIFY_MARK() macro".
I'd prefer to keep it (fallback if we forget to add a check), but probably instead of "some FAN_REPORT_* flag not supported on %s filesystem",
there should be
"FAN_REPORT_FID flag not supported on %s filesystem",
But on my machine with 5.10.0-rc4-1.gea0f69f-default, this failed on FAN_REPORT_DFID_NAME (synonym for (FAN_REPORT_DIR_FID|FAN_REPORT_NAME) => no FAN_REPORT_FID,
so this would be misleading:
fanotify16.c:160: TINFO: Test #0: FAN_REPORT_DFID_NAME monitor filesystem for create/delete/move/open/close fanotify16.c:177: TCONF: FAN_REPORT_FID not supported on exfat filesystem
* more cleanup in commit "fanotify: Check FAN_REPORT_{FID,NAME} support"
Other changes (suggested mostly by Cyril):
* rename s/support_exec_events/exec_events_unsupported/
* Add "require_" prefix for functions which use tst_brk()
* use tst_res_() and tst_brk_() for safe_*() functions
BTW fanotify16.c use .dev_fs_flags = TST_FS_SKIP_FUSE, this could be added also into fanotify13.c (it'd avoid running ntfs).
If LTP had something like TST_FS_SKIP_MICROSOFT (TST_FS_SKIP_FUSE + exfat), could get rid of "FAN_REPORT_FID not supported on foo filesystem" testing. But it's already implemented, so it's just a note to be ignored.
Kind regards,
Petr
Petr Vorel (6):
fanotify12: Drop incorrect hint
fanotify: Handle supported features checks in setup()
fanotify: Check for FAN_REPORT_FID support on fs
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 | 173 +++++++++++++++--- .../kernel/syscalls/fanotify/fanotify01.c | 73 ++------ .../kernel/syscalls/fanotify/fanotify02.c | 22 +-- .../kernel/syscalls/fanotify/fanotify03.c | 55 ++---- .../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 | 49 +---- .../kernel/syscalls/fanotify/fanotify15.c | 35 +--- .../kernel/syscalls/fanotify/fanotify16.c | 26 +-- 15 files changed, 249 insertions(+), 388 deletions(-)
Signature · 1 line
2.29.2
PATCH v4 1/6 fanotify12: Drop incorrect hint
hint "CONFIG_FANOTIFY_ACCESS_PERMISSIONS not configured in kernel?" is wrong here (fanotify12 does not use FAN_ACCESS_PERM).
---
Changes v3->v4:
Removed second CONFIG_FANOTIFY_ACCESS_PERMISSIONS
testcases/kernel/syscalls/fanotify/fanotify12.c | 9 --------- 1 file changed, 9 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify12.c +0 -9
@@ -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, "
@@ -173,11 +169,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, "
Signature · 1 line
2.29.2
PATCH v4 2/6 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.
Due this change test with FAN_OPEN_EXEC_PERM in fanotify03.c no longer needs to be a first test.
Also rename variable s/support_exec_events/exec_events_unsupported/ for readability.
---
Changes v3->v4:
* rename s/support_exec_events/exec_events_unsupported/
* Add "require_" prefix for functions which use tst_brk()
testcases/kernel/syscalls/fanotify/fanotify.h | 41 +++++++++++++++ .../kernel/syscalls/fanotify/fanotify03.c | 37 +++++-------- .../kernel/syscalls/fanotify/fanotify07.c | 14 ++--- .../kernel/syscalls/fanotify/fanotify10.c | 8 +++ .../kernel/syscalls/fanotify/fanotify12.c | 52 ++++++++----------- 5 files changed, 89 insertions(+), 63 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +41 -0
@@ -60,6 +60,7 @@ 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))
@@ -242,4 +243,44 @@ static inline void fanotify_save_fid(const char *path,#define INIT_FANOTIFY_MARK_TYPE (t) \ { FAN_MARK_ ## t, "FAN_MARK_" #t } +static inline void require_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) +{ +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, ..., AT_FDCWD, \".\") failed" , fd); + } + } + +SAFE_CLOSE (fd); + +return rval; +} +#endif /* __FANOTIFY_H__ */
testcases/kernel/syscalls/fanotify/fanotify03.c +12 -25
@@ -48,18 +48,13 @@ static volatile int fd_notify;static pid_t child_pid;static char event_buf[EVENT_BUF_LEN ]; -static int support_exec_events; +static int exec_events_unsupported;struct event {unsigned long long mask;unsigned int response; }; -/* -* Ensure to keep the first FAN_OPEN_EXEC_PERM test case before the first -* MARK_TYPE(FILESYSTEM) in order to allow for correct detection between -* exec events not supported and filesystem marks not supported. -*/ static struct tcase { const char *tname; struct fanotify_mark_type mark;
@@ -212,28 +207,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 (exec_events_unsupported && 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 +231,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 +329,11 @@ static void test_fanotify(unsigned int n)static void setup (void ) { + +require_fanotify_access_permissions_supported_by_kernel (); + + exec_events_unsupported =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 +5 -9
@@ -106,15 +106,9 @@ static int setup_instance(void)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); - } +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS_PERM, AT_FDCWD, %s) failed." , + fd, fname); }return fd;
@@ -195,6 +189,8 @@ static void test_fanotify(void)static void setup (void ) { +require_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 exec_events_unsupported;#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 (exec_events_unsupported && 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 ) { + exec_events_unsupported =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 -29
82 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v4 2/6 fanotify: Handle supported features checks in setup()
Quoted 10 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.That helps to further code simplification in next commit.
Due this change test with
FAN_OPEN_EXEC_PERMinfanotify03.cno longer needs to be a first test.
Quoted 6 lines
Also rename variable s/support_exec_events/exec_events_unsupported/ for readability.
Suggested-by Amir Goldstein <[email protected]>Signed-off-by Petr Vorel <[email protected]>---
You may add:
Just one nit I wrote it in review and you must have missed it. There is nothing related to "exec" in the helper.
It should be called fanotify_events_supported_by_kernel().
Thanks,
Amir.
PATCH v4 3/6 fanotify: Check for FAN_REPORT_FID support on fs
In reply to Petr VorelThis is related to kernel fixa8b13aa20afb ("fanotify: enable FAN_REPORT_FID init flag")
---
New in v4.
Maybe it'd deserve better commit message.
There might be even more cleanup: not sure if nofid_fd in fanotify13.c is required. According to the description is probably required:
static void do_setup(void)
{
require_fanotify_fan_report_fid_supported_on_fs(MOUNT_PATH);
nofid_fd = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF, O_RDONLY);
/* Create file and directory objects for testing */
create_objects();
/*
* Create a mark on first inode without FAN_REPORT_FID, to test
* uninitialized connector->fsid cache. This mark remains for all test
* cases and is not expected to get any events (no writes in this test).
*/
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/fanotify.h | 31 +++++++++++++++++++ .../kernel/syscalls/fanotify/fanotify01.c | 9 +++++- .../kernel/syscalls/fanotify/fanotify13.c | 4 ++- .../kernel/syscalls/fanotify/fanotify15.c | 6 ++-- .../kernel/syscalls/fanotify/fanotify16.c | 6 +--- 5 files changed, 45 insertions(+), 11 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +31 -0
@@ -283,4 +283,35 @@ static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask)return rval; } +static inline int fanotify_fan_report_fid_supported_on_fs (const char *fname) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF |FAN_REPORT_FID ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD |FAN_MARK_FILESYSTEM , +FAN_ACCESS |FAN_MODIFY |FAN_CLOSE |FAN_OPEN , +AT_FDCWD , fname) <0 ) { +if (errno ==ENODEV || errno ==EOPNOTSUPP || errno ==EXDEV ) { + rval =-1 ; + }else { +tst_brk (TBROK |TERRNO , +"fanotify_mark (%d, FAN_MARK_ADD, ..., AT_FDCWD, \".\") failed" , fd); + } + } + +SAFE_CLOSE (fd); + +return rval; +} + +static inline void require_fanotify_fan_report_fid_supported_on_fs (const char *fname) +{ +if (fanotify_fan_report_fid_supported_on_fs (fname) !=0 ) { +tst_brk (TCONF ,"FAN_REPORT_FID not supported on %s filesystem" , + tst_device->fs_type); + } +} +#endif /* __FANOTIFY_H__ */
testcases/kernel/syscalls/fanotify/fanotify01.c +8 -1
@@ -74,6 +74,7 @@ static struct tcase {static char fname[BUF_SIZE ];static char buf[BUF_SIZE ];static int fd_notify; +static int fan_report_fid_unsupported;static unsigned long long event_set[EVENT_MAX ];
@@ -88,6 +89,12 @@ static void test_fanotify(unsigned int n)tst_res (TINFO ,"Test #%d: %s" , n, tc->tname); +if (fan_report_fid_unsupported && (tc->init_flags &FAN_REPORT_FID )) { +tst_res (TCONF |TERRNO ,"FAN_REPORT_FID not supported on %s filesystem" , + tst_device->fs_type); +return ; + } + fd_notify =fanotify_init (tc->init_flags,O_RDONLY );if (fd_notify <0 ) { if (errno == EINVAL &&
@@ -363,9 +370,9 @@ static void setup(void)/* Check for kernel fanotify support */ fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF ,O_RDONLY );SAFE_CLOSE (fd); -sprintf (fname,MOUNT_PATH "/tfile_%d" ,getpid ());SAFE_FILE_PRINTF (fname,"1" ); + fan_report_fid_unsupported =fanotify_fan_report_fid_supported_on_fs (fname); }static void cleanup (void )
testcases/kernel/syscalls/fanotify/fanotify13.c +3 -1
@@ -281,7 +281,9 @@ out:static void do_setup (void ) { -/* Check for kernel fanotify support */ + +require_fanotify_fan_report_fid_supported_on_fs (MOUNT_PATH ); + nofid_fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF ,O_RDONLY );/* Create file and directory objects for testing */
testcases/kernel/syscalls/fanotify/fanotify15.c +2 -4
@@ -89,10 +89,6 @@ static void do_test(unsigned int number) 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 | "
@@ -303,6 +299,8 @@ static void do_setup(void) }SAFE_MKDIR (TEST_DIR ,0755 ); + +require_fanotify_fan_report_fid_supported_on_fs (TEST_DIR ); }static void do_cleanup (void )
testcases/kernel/syscalls/fanotify/fanotify16.c +1 -5
@@ -562,11 +562,7 @@ check_match:static void setup (void ) { -int fd; - -/* Check kernel for fanotify support */ - fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF ,O_RDONLY ); -SAFE_CLOSE (fd); +require_fanotify_fan_report_fid_supported_on_fs (MOUNT_PATH );sprintf (dname1,"%s/%s" ,MOUNT_PATH ,DIR_NAME1 );sprintf (dname2,"%s/%s" ,MOUNT_PATH ,DIR_NAME2 );
Signature · 1 line
2.29.2
PATCH v4 3/6 fanotify: Check for FAN_REPORT_FID support on fs
Quoted 5 lines · Petr Vorel
This is related to kernel fix
a8b13aa20afb("fanotify: enableFAN_REPORT_FIDinit flag")Signed-off-by Petr Vorel <[email protected]>
Just a minor nit below.
you may add:
As far as I am concerned, you do not need to re-post for the nits if Cyril is going to fix my nit on merge (or even if he doesn't)
Quoted 6 lines
---
New in v4.
Maybe it'd deserve better commit message.There might be even more cleanup: not sure if
nofid_fdinfanotify13.cis required. According to the description is probably required:
You're right, It is required.
Quoted 36 lines
static void
do_setup(void){ require_fanotify_fan_report_fid_supported_on_fs(MOUNT_PATH); nofid_fd = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF, O_RDONLY); /* Create file and directory objects for testing */ create_objects(); /* * Create a mark on first inode without FAN_REPORT_FID, to test * uninitialized connector->fsid cache. This mark remains for all test * cases and is not expected to get any events (no writes in this test). */ 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/fanotify.h | 31 +++++++++++++++++++ .../kernel/syscalls/fanotify/fanotify01.c | 9 +++++- .../kernel/syscalls/fanotify/fanotify13.c | 4 ++- .../kernel/syscalls/fanotify/fanotify15.c | 6 ++-- .../kernel/syscalls/fanotify/fanotify16.c | 6 +--- 5 files changed, 45 insertions(+), 11 deletions(-)testcases/kernel/syscalls/fanotify/fanotify.h +0
-0@@ -283,4 +283,35 @@ static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask)return rval; }
testcases/kernel/syscalls/fanotify/fanotify.h static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask) · line 295
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify.h +10
-0+static inline int fanotify_fan_report_fid_supported_on_fs (const char *fname) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF |FAN_REPORT_FID ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD |FAN_MARK_FILESYSTEM , +FAN_ACCESS |FAN_MODIFY |FAN_CLOSE |FAN_OPEN , +AT_FDCWD , fname) <0 ) {
All those flags are not really needed for the test. This minimal arg list would have been enough:
fanotify_mark(fd, FAN_MARK_ADD, FAN_ACCESS, AT_FDCWD, fname)
Thanks,
Amir.
PATCH v4 3/6 fanotify: Check for FAN_REPORT_FID support on fs
Hi Amir,
Quoted 3 lines
Just a minor nit below.
you may add:Reviewed-by Amir Goldstein <[email protected]>
Sure. Thanks for your review!
Quoted 2 lines
As far as I am concerned, you do not need to re-post for the nits if Cyril is going to fix my nit on merge (or even if he doesn't)
Sure, I also hope that nothing controversial appear after 4 reviews.
...
Quoted 4 lines
Quoted 2 lines
There might be even more cleanup: not sure if
nofid_fdinfanotify13.cis required. According to the description is probably required:You're right, It is required.
Thanks for confirmation!
...
Quoted 1 line
Quoted 1 line
---
a/testcases/kernel/syscalls/fanotify/fanotify.h
...
Quoted 14 lines
testcases/kernel/syscalls/fanotify/fanotify.h static inline int fanotify_exec_events_supported_by_kernel(uint64_t mask) · line 295
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify.h +10
-0+static inline int fanotify_fan_report_fid_supported_on_fs (const char *fname) +{ +int fd; +int rval =0 ; + + fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF |FAN_REPORT_FID ,O_RDONLY ); + +if (fanotify_mark (fd,FAN_MARK_ADD |FAN_MARK_FILESYSTEM , +FAN_ACCESS |FAN_MODIFY |FAN_CLOSE |FAN_OPEN , +AT_FDCWD , fname) <0 ) {All those flags are not really needed for the test. This minimal arg list would have been enough:
Quoted 1 line
fanotify_mark(fd, FAN_MARK_ADD, FAN_ACCESS, AT_FDCWD, fname)
Ack, thanks!
Quoted 2 lines
Thanks,
Amir.
Kind regards,
Petr
PATCH v4 4/6 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().
---
Changes v3->v4:
* use tst_res_() and tst_brk_() for safe_*() functions
testcases/kernel/syscalls/fanotify/fanotify.h | 34 ++++++++++++ .../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 | 9 +--- .../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 | 20 ++----- .../kernel/syscalls/fanotify/fanotify16.c | 20 ++----- 15 files changed, 88 insertions(+), 267 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +34 -0
@@ -190,6 +190,40 @@ struct fanotify_event_info_fid {#define MAX_HANDLE_SZ 128#endif +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_ (file, lineno,TCONF , +"some FAN_REPORT_* flag not supported on %s filesystem" , + tst_device->fs_type); + } + +if (errno ==EINVAL && (flags &FAN_MARK_FILESYSTEM )) { +tst_brk_ (file, lineno,TCONF , +"FAN_MARK_FILESYSTEM not supported in kernel?" ); + } + +tst_brk_ (file, lineno,TBROK |TERRNO ,"fanotify_mark() failed" ); + } + +if (rval <-1 ) { +tst_brk_ (file, lineno,TBROK |TERRNO , +"invalid fanotify_mark() return %d" , rval); + } + +return rval; +} + +#define SAFE_FANOTIFY_MARK (fd, flags, mask, dfd, pathname) \ + safe_fanotify_mark(__FILE__, __LINE__, (fd), (flags), (mask), (dfd), (pathname)) +/* * Helper function used to obtain fsid and file_handle for a given path. * Used by test files correlated to FAN_REPORT_FID functionality.
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
@@ -216,22 +216,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 -8
@@ -102,14 +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); -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;
@@ -294,13 +274,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 -16
@@ -85,17 +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 ) { -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);
@@ -187,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 v4 4/6 fanotify: Introduce SAFE_FANOTIFY_MARK() macro
Quoted 48 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.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().Signed-off-by Petr Vorel <[email protected]>---
Changesv3->v4:
* usetst_res_()andtst_brk_()for safe_*() functionstestcases/kernel/syscalls/fanotify/fanotify.h | 34 ++++++++++++ .../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 | 9 +--- .../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 | 20 ++----- .../kernel/syscalls/fanotify/fanotify16.c | 20 ++----- 15 files changed, 88 insertions(+), 267 deletions(-)testcases/kernel/syscalls/fanotify/fanotify.h +4
-0@@ -190,6 +190,40 @@ struct fanotify_event_info_fid {#define MAX_HANDLE_SZ 128#endif +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) +{
testcases/kernel/syscalls/fanotify/fanotify.h struct fanotify_event_info_fid { · line 206
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify.h +10
-0+int rval; + + rval =fanotify_mark (fd, flags, mask, dfd, pathname); + +if (rval ==-1 ) { +if (errno ==ENODEV || errno ==EOPNOTSUPP || errno ==EXDEV ) { +tst_brk_ (file, lineno,TCONF , +"some FAN_REPORT_* flag not supported on %s filesystem" , + tst_device->fs_type); + }
This is not needed here.
It was already tested by fanotify_fan_report_fid_supported_on_fs()
testcases/kernel/syscalls/fanotify/fanotify.h struct fanotify_event_info_fid { · line 211
Quoted 5 lines
testcases/kernel/syscalls/fanotify/fanotify.h +5
-0+ +if (errno ==EINVAL && (flags &FAN_MARK_FILESYSTEM )) { +tst_brk_ (file, lineno,TCONF , +"FAN_MARK_FILESYSTEM not supported in kernel?" ); + }
This turns test_res to test_brk in all the tests where FAN_MARK_FILESYSTEM test cases should be skipped. What am I missing?
I guess we need another helper to check fanotify_filesystem_mark_support.
For example, in fanotify03:
require_fanotify_access_permissions_supported_by_kernel();
filesystem_mark_unsupported =fanotify_mark_supported_by_kernel(FAN_MARK_FILESYSTEM);
exec_events_unsupported =fanotify_events_supported_by_kernel(FAN_OPEN_EXEC_PERM);
Note that there is no need for fanotify_mark_supported_by_kernel() for tests where all test cases use FAN_REPORT_FID (fanotify15, fanotify16), because all kernels that support FAN_REPORT_FID support FAN_MARK_FILESYSTEM.
[...]
Quoted 5 lines
testcases/kernel/syscalls/fanotify/fanotify03.c +0
-0
testcases/kernel/syscalls/fanotify/fanotify03.c static int setup_mark(unsigned int n) · line 225
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify03.c +0
-7@@ -216,22 +216,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?" );
All these should be removed by a previous patch that adds fanotify_mark_supported_by_kernel() and skips test cases in advance.
Quoted 226 lines
testcases/kernel/syscalls/fanotify/fanotify03.c +2
-9-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
-8@@ -102,14 +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); -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 +1
-2@@ -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 |
testcases/kernel/syscalls/fanotify/fanotify10.c static int create_fanotify_groups(unsigned int n) · line 332
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify10.c +0
-8FAN_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 ;
This should not have been here.
Should have been removed by exec_events_unsupported patch just like you did with fanotify03 and fanotify07.
Quoted 116 lines
testcases/kernel/syscalls/fanotify/fanotify10.c +2
-23- }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 +0
-7@@ -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" );
testcases/kernel/syscalls/fanotify/fanotify13.c static int setup_marks(unsigned int fd, struct test_case_t *tc) · line 135
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify13.c +0
-10-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 ; - }
This should not have been here.
Should here been removed by the patch that addedfanotify_report_fid_supported_on_fs().
But I understand the confusion.FAN_REPORT_FID support on fs can only be tested by fanotify_init followed by fanotify_mark, even though FAN_REPORT_FID is a fanotify_init flag. Nevertheless, fanotify_report_fid_supported_on_fs() has already verified that we can add a mark on filesystem with FAN_REPORT_FID group, so this check here is not needed anymore.
Thanks,
Amir.
PATCH v4 5/6 fanotify: Check FAN_REPORT_{FID, NAME} support
In reply to Petr Vorelin safe_fanotify_init()
That require to move the definition after flags.
Also use tst_res_()/tst_brk_() instead of tst_res()/tst_brk() in safe_fanotify_init() (synchronize with safe_fanotify_mark()).
Make use of this simplification in fanotify15.c.
---
Changes v3->v4:
* use tst_res_() and tst_brk_() for safe_*() functions
testcases/kernel/syscalls/fanotify/fanotify.h | 64 +++++++++++-------- .../kernel/syscalls/fanotify/fanotify01.c | 13 +--- .../kernel/syscalls/fanotify/fanotify13.c | 12 +--- .../kernel/syscalls/fanotify/fanotify15.c | 9 +-- 4 files changed, 41 insertions(+), 57 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify.h +38 -26
@@ -38,32 +38,6 @@ static long fanotify_mark(int fd, unsigned int flags, uint64_t mask,#endif /* HAVE_SYS_FANOTIFY_H */ -int safe_fanotify_init (const char *file,const int lineno, -unsigned int flags,unsigned int event_f_flags) -{ -int rval; - -#ifdef HAVE_SYS_FANOTIFY_H - rval =fanotify_init (flags, event_f_flags); - -if (rval ==-1 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"fanotify is not configured in this kernel." ); - } -tst_brk (TBROK |TERRNO , -"%s:%d: fanotify_init() failed" , file, lineno); - } -#else -tst_brk (TCONF ,"Header <sys/fanotify.h> is not present" ); -#endif /* HAVE_SYS_FANOTIFY_H */ - -return rval; -} - -#define SAFE_FANOTIFY_INIT (fan, mode) \ - safe_fanotify_init(__FILE__, __LINE__, (fan), (mode)) -#ifndef FAN_REPORT_TID #define FAN_REPORT_TID 0x00000100#endif
@@ -190,6 +164,44 @@ struct fanotify_event_info_fid {#define MAX_HANDLE_SZ 128#endif +int safe_fanotify_init (const char *file,const int lineno, +unsigned int flags,unsigned int event_f_flags) +{ +int rval; + +#ifdef HAVE_SYS_FANOTIFY_H + rval =fanotify_init (flags, event_f_flags); + +if (rval ==-1 ) { +if (errno ==ENOSYS ) { +tst_brk_ (file, lineno,TCONF , +"fanotify not configured in kernel" ); + } + +if (errno ==EINVAL ) { +if (flags &FAN_REPORT_FID ) { +tst_brk_ (file, lineno,TCONF , +"FAN_REPORT_FID not supported in kernel?" ); + } + +if (flags &FAN_REPORT_NAME ) { +tst_brk_ (file, lineno,TCONF , +"FAN_REPORT_NAME not supported in kernel?" ); + } + } + +tst_brk_ (file, lineno,TBROK |TERRNO ,"fanotify_init() failed" ); + } +#else +tst_brk_ (file, lineno,TCONF ,"Header <sys/fanotify.h> is not present" ); +#endif /* HAVE_SYS_FANOTIFY_H */ + +return rval; +} + +#define SAFE_FANOTIFY_INIT (fan, mode) \ + safe_fanotify_init(__FILE__, __LINE__, (fan), (mode)) +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)
testcases/kernel/syscalls/fanotify/fanotify01.c +1 -12
@@ -95,18 +95,7 @@ static void test_fanotify(unsigned int n)return ; } - fd_notify =fanotify_init (tc->init_flags,O_RDONLY ); -if (fd_notify <0 ) { -if (errno ==EINVAL && - (tc->init_flags &FAN_REPORT_FID )) { -tst_res (TCONF , -"FAN_REPORT_FID not supported in kernel?" ); -return ; - } -tst_brk (TBROK |TERRNO , -"fanotify_init (0x%x, O_RDONLY) " -"failed" , tc->init_flags); - } + fd_notify =SAFE_FANOTIFY_INIT (tc->init_flags,O_RDONLY );SAFE_FANOTIFY_MARK (fd_notify,FAN_MARK_ADD | mark->flag,FAN_ACCESS |FAN_MODIFY |FAN_CLOSE |FAN_OPEN ,AT_FDCWD , fname);
testcases/kernel/syscalls/fanotify/fanotify13.c +1 -11
@@ -142,17 +142,7 @@ static void do_test(unsigned int number)"Test #%d: FAN_REPORT_FID with mark flag: %s" , number, mark->name); - fanotify_fd =fanotify_init (FAN_CLASS_NOTIF |FAN_REPORT_FID ,O_RDONLY ); -if (fanotify_fd ==-1 ) { -if (errno ==EINVAL ) { -tst_res (TCONF , -"FAN_REPORT_FID not supported by kernel" ); -return ; - } -tst_brk (TBROK |TERRNO , -"fanotify_init(FAN_CLASS_NOTIF | FAN_REPORT_FID, " -"O_RDONLY) failed" ); - } + fanotify_fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF |FAN_REPORT_FID ,O_RDONLY );/* * Place marks on a set of objects and setup the expected masks
testcases/kernel/syscalls/fanotify/fanotify15.c +1 -8
@@ -277,14 +277,7 @@ static void do_setup(void) fd =SAFE_FANOTIFY_INIT (FAN_CLASS_NOTIF ,O_RDONLY );SAFE_CLOSE (fd); - fanotify_fd =fanotify_init (FAN_REPORT_FID ,O_RDONLY ); -if (fanotify_fd ==-1 ) { -if (errno ==EINVAL ) -tst_brk (TCONF , -"FAN_REPORT_FID not supported in kernel" ); -tst_brk (TBROK |TERRNO , -"fanotify_init(FAN_REPORT_FID, O_RDONLY) failed" ); - } + fanotify_fd =SAFE_FANOTIFY_INIT (FAN_REPORT_FID ,O_RDONLY );SAFE_MKDIR (TEST_DIR ,0755 );
Signature · 1 line
2.29.2
PATCH v4 5/6 fanotify: Check FAN_REPORT_{FID, NAME} support
Quoted 72 lines · Petr Vorel
in
safe_fanotify_init()That require to move the definition after flags.
Also use tst_res_()/tst_brk_() instead of tst_res()/tst_brk() in
safe_fanotify_init()(synchronize withsafe_fanotify_mark()).Make use of this simplification in
fanotify15.c.Suggested-by Amir Goldstein <[email protected]>Signed-off-by Petr Vorel <[email protected]>---
Changesv3->v4:
* usetst_res_()andtst_brk_()for safe_*() functionstestcases/kernel/syscalls/fanotify/fanotify.h | 64 +++++++++++-------- .../kernel/syscalls/fanotify/fanotify01.c | 13 +--- .../kernel/syscalls/fanotify/fanotify13.c | 12 +--- .../kernel/syscalls/fanotify/fanotify15.c | 9 +-- 4 files changed, 41 insertions(+), 57 deletions(-)testcases/kernel/syscalls/fanotify/fanotify.h +9
-26@@ -38,32 +38,6 @@ static long fanotify_mark(int fd, unsigned int flags, uint64_t mask,#endif /* HAVE_SYS_FANOTIFY_H */ -int safe_fanotify_init (const char *file,const int lineno, -unsigned int flags,unsigned int event_f_flags) -{ -int rval; - -#ifdef HAVE_SYS_FANOTIFY_H - rval =fanotify_init (flags, event_f_flags); - -if (rval ==-1 ) { -if (errno ==ENOSYS ) { -tst_brk (TCONF , -"fanotify is not configured in this kernel." ); - } -tst_brk (TBROK |TERRNO , -"%s:%d: fanotify_init() failed" , file, lineno); - } -#else -tst_brk (TCONF ,"Header <sys/fanotify.h> is not present" ); -#endif /* HAVE_SYS_FANOTIFY_H */ - -return rval; -} - -#define SAFE_FANOTIFY_INIT (fan, mode) \ - safe_fanotify_init(__FILE__, __LINE__, (fan), (mode)) -#ifndef FAN_REPORT_TID #define FAN_REPORT_TID 0x00000100#endif @@ -190,6 +164,44 @@ struct fanotify_event_info_fid {#define MAX_HANDLE_SZ 128#endif +int safe_fanotify_init (const char *file,const int lineno, +unsigned int flags,unsigned int event_f_flags) +{ +int rval; + +#ifdef HAVE_SYS_FANOTIFY_H + rval =fanotify_init (flags, event_f_flags); + +if (rval ==-1 ) {
testcases/kernel/syscalls/fanotify/fanotify.h struct fanotify_event_info_fid { · line 185
Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify.h +10
-0+if (errno ==ENOSYS ) { +tst_brk_ (file, lineno,TCONF , +"fanotify not configured in kernel" ); + } + +if (errno ==EINVAL ) { +if (flags &FAN_REPORT_FID ) { +tst_brk_ (file, lineno,TCONF , +"FAN_REPORT_FID not supported in kernel?" ); + }
Unless I am missing something, this would make fanotify_fan_report_fid_supported_on_fs()
break on old kernel in the start of fanotify01. That was not the intention...
The FAN_REPORT_FID test case in fanotify01 should be skipped if either kernel has no support for FAN_REPORT_FID (checked on fanotify_init) or filesystem has no support for FAN_REPORT_FID (checked on fanotify_mark).
I guess you can leave SAFE_FANOTIFY_INIT as is and change the helper fanotify_fan_report_fid_supported() to return a different value for unsupported by kernel
and unsupported by fs and then pass that value of fan_report_fid_unsupported to another
helper to decide if test case should be skipped and print the proper TCONF message.
testcases/kernel/syscalls/fanotify/fanotify.h struct fanotify_event_info_fid { · line 190
Quoted 5 lines
testcases/kernel/syscalls/fanotify/fanotify.h +5
-0+ +if (flags &FAN_REPORT_NAME ) { +tst_brk_ (file, lineno,TCONF , +"FAN_REPORT_NAME not supported in kernel?" ); + }
This check should be before the check for FAN_REPORT_FID, because a kernel that does not support FAN_REPORT_FID also does not support FAN_REPORT_NAME, but not the other way around.
I think that also solves the problem you mentioned in the cover letter about fanotify16, but if not you can leave that problem to me.
Thanks,
Amir.
PATCH v4 6/6 fanotify: Add a pedantic check for return value
In reply to Petr Vorelfor fanotify_init() in safe_fanotify_init()
--- testcases/kernel/syscalls/fanotify/fanotify.h | 5 +++++ 1 file changed, 5 insertions(+)
testcases/kernel/syscalls/fanotify/fanotify.h +5 -0
@@ -192,6 +192,11 @@ int safe_fanotify_init(const char *file, const int lineno, tst_brk_(file, lineno, TBROK | TERRNO, "fanotify_init() failed"); } + +if (rval <-1 ) { +tst_brk_ (file, lineno,TBROK |TERRNO , +"invalid fanotify_init() return %d" , rval); + }#else tst_brk_ (file, lineno,TCONF ,"Header <sys/fanotify.h> is not present" );#endif /* HAVE_SYS_FANOTIFY_H */
Signature · 1 line
2.29.2
v4 cover Introduce SAFE_FANOTIFY_MARK() macro + cleanup
In reply to Petr VorelBTW:
FYI this is the first pachset which broke CentOS 6 (kernel: 2.6.32-696, glibc: 2.12).
But we've just agreed to not support it...
In file included from fanotify01.c:21:fanotify.h: In function ?require_fanotify_access_permissions_supported_by_kernel?:
fanotify.h:301: warning: implicit declaration of function ?SAFE_FANOTIFY_INIT? fanotify.h:301: error: ?FAN_CLASS_CONTENT? undeclared (first use in this function) fanotify.h:301: error: (Each undeclared identifier is reported only once fanotify.h:301: error: for each function it appears in.) fanotify.h:303: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h:303: error: ?FAN_ACCESS_PERM? undeclared (first use in this function) fanotify.h: In function ?fanotify_exec_events_supported_by_kernel?:
fanotify.h:321: error: ?FAN_CLASS_CONTENT? undeclared (first use in this function) fanotify.h:323: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h: In function ?fanotify_fan_report_fid_supported_on_fs?:
fanotify.h:342: error: ?FAN_CLASS_NOTIF? undeclared (first use in this function) fanotify.h:344: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h:345: error: ?FAN_ACCESS? undeclared (first use in this function) fanotify.h:345: error: ?FAN_MODIFY? undeclared (first use in this function) fanotify.h:345: error: ?FAN_CLOSE? undeclared (first use in this function) fanotify.h:345: error: ?FAN_OPEN? undeclared (first use in this function)
make: *** [fanotify01] Error 1
make: *** Waiting for unfinished jobs....
In file included from fanotify02.c:21:fanotify.h: In function ?require_fanotify_access_permissions_supported_by_kernel?:
fanotify.h:301: warning: implicit declaration of function ?SAFE_FANOTIFY_INIT? fanotify.h:301: error: ?FAN_CLASS_CONTENT? undeclared (first use in this function) fanotify.h:301: error: (Each undeclared identifier is reported only once fanotify.h:301: error: for each function it appears in.) fanotify.h:303: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h:303: error: ?FAN_ACCESS_PERM? undeclared (first use in this function) fanotify.h: In function ?fanotify_exec_events_supported_by_kernel?:
fanotify.h:321: error: ?FAN_CLASS_CONTENT? undeclared (first use in this function) fanotify.h:323: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h: In function ?fanotify_fan_report_fid_supported_on_fs?:
fanotify.h:342: error: ?FAN_CLASS_NOTIF? undeclared (first use in this function) fanotify.h:344: error: ?FAN_MARK_ADD? undeclared (first use in this function) fanotify.h:345: error: ?FAN_ACCESS? undeclared (first use in this function) fanotify.h:345: error: ?FAN_MODIFY? undeclared (first use in this function) fanotify.h:345: error: ?FAN_CLOSE? undeclared (first use in this function) fanotify.h:345: error: ?FAN_OPEN? undeclared (first use in this function)
make: *** [fanotify02] Error 1
Kind regards,
Petr
v4 cover Introduce SAFE_FANOTIFY_MARK() macro + cleanup
In reply to Petr VorelQuoted 5 lines · Petr Vorel
Hi Amir,
another cleanup version, hopefully the last.
Sorry for lengthy comments.
Don't be :)
Quoted 59 lines
Changes
v3->v4:
* fixed unwantedtst_brk()(quitting the test too early). In the end it was problem just infanotify01.candfanotify03.c.In
fanotify13.cit was alreadytst_test.c:1316: TINFO: Testing on exfat
fanotify.h:209: TCONF: filesystem exfat does not support file handles
...
tst_test.c:859: TINFO: Trying FUSE...
fanotify13.c:161: TINFO: Test #0:FAN_REPORT_FIDwith mark flag:FAN_MARK_INODEfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #1:FAN_REPORT_FIDwith mark flag:FAN_MARK_INODEfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #2:FAN_REPORT_FIDwith mark flag:FAN_MARK_MOUNTfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #3:FAN_REPORT_FIDwith mark flag:FAN_MARK_MOUNTfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #4:FAN_REPORT_FIDwith mark flag:FAN_MARK_FILESYSTEMfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs fanotify13.c:161: TINFO: Test #5:FAN_REPORT_FIDwith mark flag:FAN_MARK_FILESYSTEMfanotify13.c:130: TCONF:FAN_REPORT_FIDnot supported on filesystem type ntfs* new commit fanotify: Check for
FAN_REPORT_FIDsupport on fs This one I hesitated, whether keep EOPNOTSUPP also as fallback infanotify.hOn all but one test (fanotify01.c)FAN_REPORT_FIDwas used in all tests.The only check I kept untouched is this one from
fanotify16.c:fd_notify = fanotify_init(group->flag, 0); if (fd_notify == -1) { if (errno == EINVAL) { tst_res(TCONF, "%s not supported by kernel", group->name); return; } tst_brk(TBROK | TERRNO, "fanotify_init(%s, 0) failed", group->name); }Because this:
fanotify16.c:160: TINFO: Test #0:FAN_REPORT_DFID_NAMEmonitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_NAMEnot supported by kernel
fanotify16.c:160: TINFO: Test #1:FAN_REPORT_DFID_NAMEmonitor directories for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_NAMEnot supported by kernel
fanotify16.c:160: TINFO: Test #2:FAN_REPORT_DIR_FIDmonitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DIR_FIDnot supported by kernel
fanotify16.c:160: TINFO: Test #3:FAN_REPORT_DIR_FIDmonitor directories for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DIR_FIDnot supported by kernel
fanotify16.c:160: TINFO: Test #4:FAN_REPORT_DFID_FIDmonitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_FIDnot supported by kernel
fanotify16.c:160: TINFO: Test #5:FAN_REPORT_DFID_FIDmonitor directories for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_FIDnot supported by kernel
fanotify16.c:160: TINFO: Test #6:FAN_REPORT_DFID_NAME_FIDmonitor filesystem for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_NAME_FIDnot supported by kernel
fanotify16.c:160: TINFO: Test #7:FAN_REPORT_DFID_NAME_FIDmonitor directories for create/delete/move/open/close fanotify16.c:166: TCONF:FAN_REPORT_DFID_NAME_FIDnot supported by kernel
Quoted 7 lines
would be replaced by single message which is misleading:
fanotify16.c:163: TCONF:FAN_REPORT_NAMEnot supported in kernel? if I usefd_notify=SAFE_FANOTIFY_INIT(group->flag, 0);
+ that problem with skipping what we don't want to skip (although here are skipped all and on old kernel I get
fanotify.h:342: TCONF:FAN_REPORT_FIDnot supported in kernel?
That's because you should have tested FAN_REPORT_NAME before testing FAN_REPORT_FID.
Also, instead of testing FAN_REPORT_NAME you can test for (flags & FAN_REPORT_DIR_FID) both flags were added together in the same kernel but FAN_REPORT_NAME cannot be used without FAN_REPORT_DIR_FID.
Quoted 6 lines
and on new kernel problematic fs are skipped anyway:
fanotify.h:363: TCONF:FAN_REPORT_FIDnot supported on exfat filesystemFeel free to suggest what to do or simply send a following patch.
I am not sure if my answers addressed all the problems you encountered with fanotify16. Feel free to leave the remaining problem out of the cleanup and I will fix it later.
Quoted 20 lines
In following commit "fanotify: Introduce
SAFE_FANOTIFY_MARK()macro".
I'd prefer to keep it (fallback if we forget to add a check), but probably instead of "some FAN_REPORT_* flag not supported on %s filesystem",
there should be
"FAN_REPORT_FIDflag not supported on %s filesystem",
But on my machine with 5.10.0-rc4-1.gea0f69f-default, this failed onFAN_REPORT_DFID_NAME(synonym for (FAN_REPORT_DIR_FID|FAN_REPORT_NAME) => noFAN_REPORT_FID,
so this would be misleading:
fanotify16.c:160: TINFO: Test #0:FAN_REPORT_DFID_NAMEmonitor filesystem for create/delete/move/open/close fanotify16.c:177: TCONF:FAN_REPORT_FIDnot supported on exfat filesystem* more cleanup in commit "fanotify: Check FAN_REPORT_{FID,NAME} support"
Other changes (suggested mostly by Cyril):
* rename s/support_exec_events/exec_events_unsupported/* Add "
require_" prefix for functions which usetst_brk()* use
tst_res_()andtst_brk_()for safe_*() functions
Quoted 8 lines
BTW
fanotify16.cuse .dev_fs_flags =TST_FS_SKIP_FUSE, this could be added also intofanotify13.c(it'd avoid running ntfs).If LTP had something like
TST_FS_SKIP_MICROSOFT(TST_FS_SKIP_FUSE+ exfat), could get rid of "FAN_REPORT_FIDnot supported on foo filesystem" testing. But it's already implemented, so it's just a note to be ignored.
It is better to check support by trying unless there is a very good reason for special casing filesystems. I don't remember what was the special case for ntfs that test support checks did not catch.
I guess the TST_FS_SKIP_FUSE flag may not be needed after your fixes?
Thanks,
Amir.