From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: jack@suse.com, amir73il@gmail.com
Cc: djwong@kernel.org, tytso@mit.edu, david@fromorbit.com,
dhowells@redhat.com, khazhy@google.com,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-api@vger.kernel.org,
Gabriel Krisman Bertazi <krisman@collabora.com>,
kernel@collabora.com
Subject: [PATCH v5 05/23] fanotify: Split superblock marks out to a new cache
Date: Wed, 4 Aug 2021 12:05:54 -0400 [thread overview]
Message-ID: <20210804160612.3575505-6-krisman@collabora.com> (raw)
In-Reply-To: <20210804160612.3575505-1-krisman@collabora.com>
FAN_FS_ERROR will require an error structure to be stored per mark.
But, since FAN_FS_ERROR doesn't apply to inode/mount marks, it should
suffice to only expose this information for superblock marks. Therefore,
wrap this kind of marks into a container and plumb it for the future.
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
Changes since v2:
- Move mark initialization to fanotify_alloc_mark (Amir)
Changes since v1:
- Only extend superblock marks (Amir)
---
fs/notify/fanotify/fanotify.c | 10 ++++++--
fs/notify/fanotify/fanotify.h | 23 ++++++++++++++++++
fs/notify/fanotify/fanotify_user.c | 38 ++++++++++++++++++++++++++++--
3 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 310246f8d3f1..c3eefe3f6494 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -869,9 +869,15 @@ static void fanotify_freeing_mark(struct fsnotify_mark *mark,
dec_ucount(group->fanotify_data.ucounts, UCOUNT_FANOTIFY_MARKS);
}
-static void fanotify_free_mark(struct fsnotify_mark *fsn_mark)
+static void fanotify_free_mark(struct fsnotify_mark *mark)
{
- kmem_cache_free(fanotify_mark_cache, fsn_mark);
+ if (mark->flags & FANOTIFY_MARK_FLAG_SB_MARK) {
+ struct fanotify_sb_mark *fa_mark = FANOTIFY_SB_MARK(mark);
+
+ kmem_cache_free(fanotify_sb_mark_cache, fa_mark);
+ } else {
+ kmem_cache_free(fanotify_mark_cache, mark);
+ }
}
const struct fsnotify_ops fanotify_fsnotify_ops = {
diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
index 4a5e555dc3d2..c548b96472dd 100644
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@ -6,6 +6,7 @@
#include <linux/hashtable.h>
extern struct kmem_cache *fanotify_mark_cache;
+extern struct kmem_cache *fanotify_sb_mark_cache;
extern struct kmem_cache *fanotify_fid_event_cachep;
extern struct kmem_cache *fanotify_path_event_cachep;
extern struct kmem_cache *fanotify_perm_event_cachep;
@@ -129,6 +130,28 @@ static inline void fanotify_info_copy_name(struct fanotify_info *info,
name->name);
}
+#define FANOTIFY_MARK_FLAG(flag) \
+static const unsigned int FANOTIFY_MARK_FLAG_##flag = \
+ (1 << FANOTIFY_MARK_FLAG_BIT_##flag)
+
+enum fanotify_mark_bits {
+ FANOTIFY_MARK_FLAG_BIT_SB_MARK = FSN_MARK_PRIVATE_FLAGS,
+};
+
+FANOTIFY_MARK_FLAG(SB_MARK);
+
+struct fanotify_sb_mark {
+ struct fsnotify_mark fsn_mark;
+};
+
+static inline
+struct fanotify_sb_mark *FANOTIFY_SB_MARK(struct fsnotify_mark *mark)
+{
+ WARN_ON(!(mark->flags & FANOTIFY_MARK_FLAG_SB_MARK));
+
+ return container_of(mark, struct fanotify_sb_mark, fsn_mark);
+}
+
/*
* Common structure for fanotify events. Concrete structs are allocated in
* fanotify_handle_event() and freed when the information is retrieved by
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 67b18dfe0025..0696f2121781 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -99,6 +99,7 @@ struct ctl_table fanotify_table[] = {
extern const struct fsnotify_ops fanotify_fsnotify_ops;
struct kmem_cache *fanotify_mark_cache __read_mostly;
+struct kmem_cache *fanotify_sb_mark_cache __read_mostly;
struct kmem_cache *fanotify_fid_event_cachep __read_mostly;
struct kmem_cache *fanotify_path_event_cachep __read_mostly;
struct kmem_cache *fanotify_perm_event_cachep __read_mostly;
@@ -915,6 +916,38 @@ static __u32 fanotify_mark_add_to_mask(struct fsnotify_mark *fsn_mark,
return mask & ~oldmask;
}
+static struct fsnotify_mark *fanotify_alloc_mark(struct fsnotify_group *group,
+ unsigned int type)
+{
+ struct fanotify_sb_mark *sb_mark;
+ struct fsnotify_mark *mark;
+
+ switch (type) {
+ case FSNOTIFY_OBJ_TYPE_SB:
+ sb_mark = kmem_cache_zalloc(fanotify_sb_mark_cache, GFP_KERNEL);
+ if (!sb_mark)
+ return NULL;
+ mark = &sb_mark->fsn_mark;
+ break;
+
+ case FSNOTIFY_OBJ_TYPE_INODE:
+ case FSNOTIFY_OBJ_TYPE_PARENT:
+ case FSNOTIFY_OBJ_TYPE_VFSMOUNT:
+ mark = kmem_cache_alloc(fanotify_mark_cache, GFP_KERNEL);
+ break;
+ default:
+ WARN_ON(1);
+ return NULL;
+ }
+
+ fsnotify_init_mark(mark, group);
+
+ if (type == FSNOTIFY_OBJ_TYPE_SB)
+ mark->flags |= FANOTIFY_MARK_FLAG_SB_MARK;
+
+ return mark;
+}
+
static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group,
fsnotify_connp_t *connp,
unsigned int type,
@@ -933,13 +966,12 @@ static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group,
!inc_ucount(ucounts->ns, ucounts->uid, UCOUNT_FANOTIFY_MARKS))
return ERR_PTR(-ENOSPC);
- mark = kmem_cache_alloc(fanotify_mark_cache, GFP_KERNEL);
+ mark = fanotify_alloc_mark(group, type);
if (!mark) {
ret = -ENOMEM;
goto out_dec_ucounts;
}
- fsnotify_init_mark(mark, group);
ret = fsnotify_add_mark_locked(mark, connp, type, 0, fsid);
if (ret) {
fsnotify_put_mark(mark);
@@ -1497,6 +1529,8 @@ static int __init fanotify_user_setup(void)
fanotify_mark_cache = KMEM_CACHE(fsnotify_mark,
SLAB_PANIC|SLAB_ACCOUNT);
+ fanotify_sb_mark_cache = KMEM_CACHE(fanotify_sb_mark,
+ SLAB_PANIC|SLAB_ACCOUNT);
fanotify_fid_event_cachep = KMEM_CACHE(fanotify_fid_event,
SLAB_PANIC);
fanotify_path_event_cachep = KMEM_CACHE(fanotify_path_event,
--
2.32.0
next prev parent reply other threads:[~2021-08-04 16:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 16:05 [PATCH v5 00/23] File system wide monitoring Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 01/23] fsnotify: Don't insert unmergeable events in hashtable Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 02/23] fanotify: Fold event size calculation to its own function Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 03/23] fanotify: Split fsid check from other fid mode checks Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 04/23] fsnotify: Reserve mark bits for backends Gabriel Krisman Bertazi
2021-08-05 8:44 ` kernel test robot
2021-08-05 9:14 ` Jan Kara
2021-08-04 16:05 ` Gabriel Krisman Bertazi [this message]
2021-08-05 9:24 ` [PATCH v5 05/23] fanotify: Split superblock marks out to a new cache Jan Kara
2021-08-04 16:05 ` [PATCH v5 06/23] inotify: Don't force FS_IN_IGNORED Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 07/23] fsnotify: Add helper to detect overflow_event Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 08/23] fsnotify: Add wrapper around fsnotify_add_event Gabriel Krisman Bertazi
2021-08-05 9:28 ` Jan Kara
2021-08-04 16:05 ` [PATCH v5 09/23] fsnotify: Support passing argument to insert callback on add_event Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 10/23] fsnotify: Allow events reported with an empty inode Gabriel Krisman Bertazi
2021-08-05 10:24 ` Jan Kara
2021-08-05 14:14 ` Amir Goldstein
2021-08-05 15:55 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 11/23] fsnotify: Support FS_ERROR event type Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 12/23] fanotify: Expose helper to estimate file handle encoding length Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 13/23] fanotify: Allow file handle encoding for unhashed events Gabriel Krisman Bertazi
2021-08-05 9:39 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 14/23] fanotify: Encode invalid file handler when no inode is provided Gabriel Krisman Bertazi
2021-08-05 9:56 ` Jan Kara
2021-08-11 21:12 ` Gabriel Krisman Bertazi
2021-08-12 14:20 ` Jan Kara
2021-08-12 15:14 ` Gabriel Krisman Bertazi
2021-08-12 15:50 ` Amir Goldstein
2021-08-12 15:17 ` Amir Goldstein
2021-08-13 12:09 ` Jan Kara
2021-08-13 17:25 ` Amir Goldstein
2021-08-04 16:06 ` [PATCH v5 15/23] fanotify: Require fid_mode for any non-fd event Gabriel Krisman Bertazi
2021-08-05 10:29 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 16/23] fanotify: Reserve UAPI bits for FAN_FS_ERROR Gabriel Krisman Bertazi
2021-08-05 10:33 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 17/23] fanotify: Preallocate per superblock mark error event Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 18/23] fanotify: Handle FAN_FS_ERROR events Gabriel Krisman Bertazi
2021-08-05 12:15 ` Jan Kara
2021-08-05 13:50 ` Amir Goldstein
2021-08-10 1:35 ` Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 19/23] fanotify: Report fid info for file related file system errors Gabriel Krisman Bertazi
2021-08-05 11:28 ` Jan Kara
2021-08-05 12:06 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 20/23] fanotify: Emit generic error info type for error event Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 21/23] ext4: Send notifications on error Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 22/23] samples: Add fs error monitoring example Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 23/23] docs: Document the FAN_FS_ERROR event Gabriel Krisman Bertazi
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=20210804160612.3575505-6-krisman@collabora.com \
--to=krisman@collabora.com \
--cc=amir73il@gmail.com \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=djwong@kernel.org \
--cc=jack@suse.com \
--cc=kernel@collabora.com \
--cc=khazhy@google.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).