From: Amir Goldstein <amir73il@gmail.com> To: Jan Kara <jack@suse.cz> Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH v5 22/22] fanotify: report parent fid + child fid Date: Thu, 16 Jul 2020 11:42:30 +0300 [thread overview] Message-ID: <20200716084230.30611-23-amir73il@gmail.com> (raw) In-Reply-To: <20200716084230.30611-1-amir73il@gmail.com> Add support for FAN_REPORT_FID | FAN_REPORT_DIR_FID. Internally, it is implemented as a private case of reporting both parent and child fids and name, the parent and child fids are recorded in a variable length fanotify_name_event, but there is no name. It should be noted that directory modification events are recorded in fixed size fanotify_fid_event when not reporting name, just like with group flags FAN_REPORT_FID. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- fs/notify/fanotify/fanotify.c | 16 +++++++++++----- fs/notify/fanotify/fanotify_user.c | 15 ++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 1d8eb886fe08..8cb4fdeb567a 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -539,7 +539,7 @@ static struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, /* * With both flags FAN_REPORT_DIR_FID and FAN_REPORT_FID, we * report the child fid for events reported on a non-dir child - * in addition to reporting the parent fid and child name. + * in addition to reporting the parent fid and maybe child name. */ if ((fid_mode & FAN_REPORT_FID) && (mask & FAN_EVENT_ON_CHILD) && !(mask & FAN_ONDIR)) @@ -556,11 +556,17 @@ static struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, * * For event on non-directory that is reported to parent, we * record the fid of the parent and the name of the child. + * + * Even if not reporting name, we need a variable length + * fanotify_name_event if reporting both parent and child fids. */ - if ((fid_mode & FAN_REPORT_NAME) && - ((mask & ALL_FSNOTIFY_DIRENT_EVENTS) || - !(mask & FAN_ONDIR))) + if (!(fid_mode & FAN_REPORT_NAME)) { + name_event = !!child; + file_name = NULL; + } else if ((mask & ALL_FSNOTIFY_DIRENT_EVENTS) || + !(mask & FAN_ONDIR)) { name_event = true; + } } /* @@ -579,7 +585,7 @@ static struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, if (fanotify_is_perm_event(mask)) { event = fanotify_alloc_perm_event(path, gfp); - } else if (name_event && file_name) { + } else if (name_event && (file_name || child)) { event = fanotify_alloc_name_event(id, fsid, file_name, child, gfp); } else if (fid_mode) { diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index be328d7ee283..559de311deca 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -371,7 +371,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, /* Event info records order is: dir fid + name, child fid */ if (fanotify_event_dir_fh_len(event)) { - info_type = FAN_EVENT_INFO_TYPE_DFID_NAME; + info_type = info->name_len ? FAN_EVENT_INFO_TYPE_DFID_NAME : + FAN_EVENT_INFO_TYPE_DFID; ret = copy_info_to_user(fanotify_event_fsid(event), fanotify_info_dir_fh(info), info_type, fanotify_info_name(info), @@ -957,18 +958,10 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags) /* * Child name is reported with parent fid so requires dir fid. - * If reporting child name, we can report both child fid and dir fid. + * We can report both child fid and dir fid with or without name. */ - switch (fid_mode) { - case 0: - case FAN_REPORT_FID: - case FAN_REPORT_DIR_FID: - case FAN_REPORT_DFID_NAME: - case FAN_REPORT_DFID_NAME | FAN_REPORT_FID: - break; - default: + if ((fid_mode & FAN_REPORT_NAME) && !(fid_mode & FAN_REPORT_DIR_FID)) return -EINVAL; - } user = get_current_user(); if (atomic_read(&user->fanotify_listeners) > FANOTIFY_DEFAULT_MAX_LISTENERS) { -- 2.17.1
next prev parent reply other threads:[~2020-07-16 8:43 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-16 8:42 [PATCH v5 00/22] fanotify events with name info Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 01/22] fanotify: generalize the handling of extra event flags Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 02/22] fanotify: generalize merge logic of events on dir Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 03/22] fanotify: distinguish between fid encode error and null fid Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 04/22] fanotify: generalize test for FAN_REPORT_FID Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 05/22] fanotify: mask out special event flags from ignored mask Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 06/22] fanotify: prepare for implicit event flags in mark mask Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 07/22] fanotify: use FAN_EVENT_ON_CHILD as implicit flag on sb/mount/non-dir marks Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 08/22] fsnotify: add object type "child" to object type iterator Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 09/22] fanotify: use struct fanotify_info to parcel the variable size buffer Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 10/22] fanotify: no external fh buffer in fanotify_name_event Amir Goldstein 2020-07-16 12:44 ` Jan Kara 2020-07-16 13:30 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 11/22] dnotify: report both events on parent and child with single callback Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 12/22] inotify: " Amir Goldstein 2020-07-16 12:52 ` Jan Kara 2020-07-16 14:25 ` Amir Goldstein 2020-07-16 15:17 ` Jan Kara 2020-07-16 8:42 ` [PATCH v5 13/22] fanotify: " Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 14/22] fsnotify: send event to " Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 15/22] fsnotify: send event with parent/name info to sb/mount/non-dir marks Amir Goldstein 2020-07-16 17:01 ` Jan Kara 2020-07-16 17:20 ` Amir Goldstein 2020-07-16 17:57 ` Jan Kara 2020-07-16 18:42 ` Amir Goldstein 2020-07-16 22:34 ` Jan Kara 2020-07-17 3:49 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 16/22] fsnotify: remove check that source dentry is positive Amir Goldstein 2020-07-16 13:13 ` Jan Kara 2020-07-16 13:29 ` Jan Kara 2020-07-16 13:54 ` Amir Goldstein 2020-07-16 14:06 ` Jan Kara 2020-07-16 8:42 ` [PATCH v5 17/22] fsnotify: send MOVE_SELF event with parent/name info Amir Goldstein 2020-07-16 13:45 ` Jan Kara 2020-07-16 13:59 ` Amir Goldstein 2020-07-16 14:10 ` Amir Goldstein 2020-07-16 15:57 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 18/22] fanotify: add basic support for FAN_REPORT_DIR_FID Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 19/22] fanotify: report events with parent dir fid to sb/mount/non-dir marks Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 20/22] fanotify: add support for FAN_REPORT_NAME Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 21/22] fanotify: report parent fid + name + child fid Amir Goldstein 2020-07-16 15:59 ` Jan Kara 2020-07-16 16:08 ` Amir Goldstein 2020-07-16 8:42 ` Amir Goldstein [this message] 2020-07-16 17:13 ` [PATCH v5 00/22] fanotify events with name info Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200716084230.30611-23-amir73il@gmail.com \ --to=amir73il@gmail.com \ --cc=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --subject='Re: [PATCH v5 22/22] fanotify: report parent fid + child fid' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).