fsnotify: Cleanups
Subsystems (5)
Jan Kara
maintainercover fsnotify: Cleanups
Hello,
this patch series (applies on top of my fanotify fix) cleans up some
issues in the mark handling code I've spotted while looking at the fanotify problem. It removes some code duplication and shrinks struct fsnotify_mark by 4 pointers.
Honza
Jan Kara
maintainerPATCH 1/3 fsnotify: Unify inode and mount marks handling
There's lot of common code in inode and mount marks handling. Factor it out to common helper function.
--- fs/notify/dnotify/dnotify.c | 4 +- fs/notify/fdinfo.c | 6 +-- fs/notify/fsnotify.c | 4 +- fs/notify/fsnotify.h | 9 ++++ fs/notify/inode_mark.c | 93 +++++++----------------------------- fs/notify/inotify/inotify_fsnotify.c | 2 +- fs/notify/inotify/inotify_user.c | 10 ++-- fs/notify/mark.c | 78 ++++++++++++++++++++++++++++-- fs/notify/vfsmount_mark.c | 85 ++++++-------------------------- include/linux/fsnotify_backend.h | 24 ++-------- kernel/audit_tree.c | 16 +++---- 11 files changed, 139 insertions(+), 192 deletions(-)
fs/notify/dnotify/dnotify.c +2 -2
@@ -69,8 +69,8 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark)if (old_mask == new_mask)return ; -if (fsn_mark->i.inode) -fsnotify_recalc_inode_mask (fsn_mark->i.inode); +if (fsn_mark->inode) +fsnotify_recalc_inode_mask (fsn_mark->inode); }/*
fs/notify/fdinfo.c +3 -3
@@ -85,7 +85,7 @@ static int inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)return 0 ; inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark); - inode =igrab (mark->i.inode); + inode =igrab (mark->inode);if (inode) { ret = seq_printf(m, "inotify wd:%x ino:%lx sdev:%x " "mask:%x ignored_mask:%x ",
@@ -122,7 +122,7 @@ static int fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) mflags |=FAN_MARK_IGNORED_SURV_MODIFY ;if (mark->flags &FSNOTIFY_MARK_FLAG_INODE ) { - inode =igrab (mark->i.inode); + inode =igrab (mark->inode);if (!inode) goto out; ret = seq_printf(m, "fanotify ino:%lx sdev:%x "
@@ -133,7 +133,7 @@ static int fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) ret |=seq_putc (m,'\n' );iput (inode); }else if (mark->flags &FSNOTIFY_MARK_FLAG_VFSMOUNT ) { -struct mount *mnt =real_mount (mark->m.mnt); +struct mount *mnt =real_mount (mark->mnt); ret = seq_printf(m, "fanotify mnt_id:%x mflags:%x mask:%x " "ignored_mask:%x\n", mnt->mnt_id, mflags,
fs/notify/fsnotify.c +2 -2
@@ -242,13 +242,13 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,if (inode_node) { inode_mark =hlist_entry (srcu_dereference (inode_node, &fsnotify_mark_srcu), - struct fsnotify_mark, i.i_list); + struct fsnotify_mark, obj_list); inode_group = inode_mark->group; }if (vfsmount_node) { vfsmount_mark =hlist_entry (srcu_dereference (vfsmount_node, &fsnotify_mark_srcu), - struct fsnotify_mark, m.m_list); + struct fsnotify_mark, obj_list); vfsmount_group = vfsmount_mark->group; }
fs/notify/fsnotify.h +9 -0
@@ -18,6 +18,10 @@ extern int fsnotify_compare_groups(struct fsnotify_group *a,extern void fsnotify_set_inode_mark_mask_locked (struct fsnotify_mark *fsn_mark,__u32 mask); +/* Add mark to a proper place in mark list */ +extern int fsnotify_add_mark_list (struct hlist_head *head, +struct fsnotify_mark *mark, +int allow_dups);/* add a mark to an inode */ extern int fsnotify_add_inode_mark(struct fsnotify_mark *mark, struct fsnotify_group *group, struct inode *inode,
@@ -31,6 +35,11 @@ extern int fsnotify_add_vfsmount_mark(struct fsnotify_mark *mark,extern void fsnotify_destroy_vfsmount_mark (struct fsnotify_mark *mark);/* inode specific destruction of a mark */ extern void fsnotify_destroy_inode_mark (struct fsnotify_mark *mark); +/* Destroy all marks in the given list */ +extern void fsnotify_destroy_marks (struct list_head *to_free); +/* Find mark belonging to given group in the list of marks */ +extern struct fsnotify_mark *fsnotify_find_mark (struct hlist_head *head, +struct fsnotify_group *group);/* run the list of all marks associated with inode and flag them to be freed */ extern void fsnotify_clear_marks_by_inode (struct inode *inode);/* run the list of all marks associated with vfsmount and flag them to be freed */
fs/notify/inode_mark.c +16 -77
157 lines not on this page · raw message
fs/notify/inotify/inotify_fsnotify.c +1 -1
@@ -156,7 +156,7 @@ static int idr_callback(int id, void *p, void *data)*/ if (fsn_mark)printk (KERN_WARNING "fsn_mark->group=%p inode=%p wd=%d\n" , - fsn_mark->group, fsn_mark->i.inode, i_mark->wd); + fsn_mark->group, fsn_mark->inode, i_mark->wd);return 0 ; }
fs/notify/inotify/inotify_user.c +5 -5
@@ -434,7 +434,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,if (wd ==-1 ) {WARN_ONCE (1 ,"%s: i_mark=%p i_mark->wd=%d i_mark->group=%p" " i_mark->inode=%p\n" , __func__, i_mark, i_mark->wd, - i_mark->fsn_mark.group, i_mark->fsn_mark.i.inode); + i_mark->fsn_mark.group, i_mark->fsn_mark.inode); goto out; }
@@ -443,7 +443,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,if (unlikely (!found_i_mark)) {WARN_ONCE (1 ,"%s: i_mark=%p i_mark->wd=%d i_mark->group=%p" " i_mark->inode=%p\n" , __func__, i_mark, i_mark->wd, - i_mark->fsn_mark.group, i_mark->fsn_mark.i.inode); + i_mark->fsn_mark.group, i_mark->fsn_mark.inode); goto out; }
@@ -457,9 +457,9 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,"mark->inode=%p found_i_mark=%p found_i_mark->wd=%d " "found_i_mark->group=%p found_i_mark->inode=%p\n" , __func__, i_mark, i_mark->wd, i_mark->fsn_mark.group, - i_mark->fsn_mark.i.inode, found_i_mark, found_i_mark->wd, + i_mark->fsn_mark.inode, found_i_mark, found_i_mark->wd, found_i_mark->fsn_mark.group, - found_i_mark->fsn_mark.i.inode); + found_i_mark->fsn_mark.inode); goto out; }
@@ -471,7 +471,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,if (unlikely (atomic_read (&i_mark->fsn_mark.refcnt) <3 )) {printk (KERN_ERR "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p" " i_mark->inode=%p\n" , __func__, i_mark, i_mark->wd, - i_mark->fsn_mark.group, i_mark->fsn_mark.i.inode); + i_mark->fsn_mark.group, i_mark->fsn_mark.inode);/* we can't really recover with bad ref cnting.. */ BUG (); }
fs/notify/mark.c +75 -3
108 lines not on this page · raw message
fs/notify/vfsmount_mark.c +14 -71
145 lines not on this page · raw message
include/linux/fsnotify_backend.h +4 -20
@@ -197,24 +197,6 @@ struct fsnotify_group {#define FSNOTIFY_EVENT_INODE 2/* -* Inode specific fields in an fsnotify_mark -*/ -struct fsnotify_inode_mark { -struct inode *inode;/* inode this mark is associated with */ -struct hlist_node i_list;/* list of marks by inode->i_fsnotify_marks */ -struct list_head free_i_list;/* tmp list used when freeing this mark */ -}; - -/* -* Mount point specific fields in an fsnotify_mark -*/ -struct fsnotify_vfsmount_mark { -struct vfsmount *mnt;/* vfsmount this mark is associated with */ -struct hlist_node m_list;/* list of marks by inode->i_fsnotify_marks */ -struct list_head free_m_list;/* tmp list used when freeing this mark */ -}; - -/* * a mark is simply an object attached to an in core inode which allows an * fsnotify listener to indicate they are either no longer interested in events * of a type matching mask or only interested in those events.
@@ -232,9 +214,11 @@ struct fsnotify_mark {struct fsnotify_group *group;/* group this mark is for */ struct list_head g_list;/* list of marks by group->i_fsnotify_marks */ spinlock_t lock;/* protect group and inode */ +struct hlist_node obj_list;/* list of marks for inode / vfsmount */ +struct list_head free_list;/* tmp list used when freeing this mark */ union { -struct fsnotify_inode_mark i; -struct fsnotify_vfsmount_mark m; +struct inode *inode;/* inode this mark is associated with */ +struct vfsmount *mnt;/* vfsmount this mark is associated with */ };__u32 ignored_mask;/* events types to ignore */ #define FSNOTIFY_MARK_FLAG_INODE 0x01
kernel/audit_tree.c +8 -8
@@ -173,9 +173,9 @@ static void insert_hash(struct audit_chunk *chunk)struct fsnotify_mark *entry = &chunk->mark;struct list_head *list; -if (!entry->i.inode) +if (!entry->inode)return ; - list =chunk_hash (entry->i.inode); + list =chunk_hash (entry->inode);list_add_rcu (&chunk->hash, list); }
@@ -187,7 +187,7 @@ struct audit_chunk *audit_tree_lookup(const struct inode *inode)list_for_each_entry_rcu (p, list, hash) {/* mark.inode may have gone NULL, but who cares? */ -if (p->mark.i.inode == inode) { +if (p->mark.inode == inode) {atomic_long_inc (&p->refs);return p; }
@@ -230,7 +230,7 @@ static void untag_chunk(struct node *p) new =alloc_chunk (size);spin_lock (&entry->lock); -if (chunk->dead || !entry->i.inode) { +if (chunk->dead || !entry->inode) {spin_unlock (&entry->lock);if (new)free_chunk (new);
@@ -257,7 +257,7 @@ static void untag_chunk(struct node *p) goto Fallback;fsnotify_duplicate_mark (&new->mark, entry); -if (fsnotify_add_mark (&new->mark, new->mark.group, new->mark.i.inode,NULL ,1 )) { +if (fsnotify_add_mark (&new->mark, new->mark.group, new->mark.inode,NULL ,1 )) {fsnotify_put_mark (&new->mark); goto Fallback; }
@@ -385,7 +385,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) chunk_entry = &chunk->mark;spin_lock (&old_entry->lock); -if (!old_entry->i.inode) { +if (!old_entry->inode) {/* old_entry is being shot, lets just lie */ spin_unlock (&old_entry->lock);fsnotify_put_mark (old_entry);
@@ -394,7 +394,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) }fsnotify_duplicate_mark (chunk_entry, old_entry); -if (fsnotify_add_mark (chunk_entry, chunk_entry->group, chunk_entry->i.inode,NULL ,1 )) { +if (fsnotify_add_mark (chunk_entry, chunk_entry->group, chunk_entry->inode,NULL ,1 )) {spin_unlock (&old_entry->lock);fsnotify_put_mark (chunk_entry);fsnotify_put_mark (old_entry);
@@ -610,7 +610,7 @@ void audit_trim_trees(void)list_for_each_entry (node, &tree->chunks, list) {struct audit_chunk *chunk =find_chunk (node);/* this could be NULL if the watch is dying else where... */ -struct inode *inode = chunk->mark.i.inode; +struct inode *inode = chunk->mark.inode; node->index |=1U <<31 ;if (iterate_mounts (compare_root, inode, root_mnt)) node->index &= ~(1U <<31 );
Signature · 1 line
1.8.1.4
Jan Kara
maintainerPATCH 2/3 fsnotify: Remove free_list list_head from fsnotify_mark
In reply to Jan Karafree_list list head is used only when all marks for an inode / mount need to be destroyed. However we can just use obj_list for this temporary tracking thus saving two pointers for each fsnotify_mark.
--- fs/notify/fsnotify.h | 2 +- fs/notify/inode_mark.c | 6 +++--- fs/notify/mark.c | 7 ++++--- fs/notify/vfsmount_mark.c | 6 +++--- include/linux/fsnotify_backend.h | 1 - 5 files changed, 11 insertions(+), 11 deletions(-)
fs/notify/fsnotify.h +1 -1
@@ -36,7 +36,7 @@ extern void fsnotify_destroy_vfsmount_mark(struct fsnotify_mark *mark);/* inode specific destruction of a mark */ extern void fsnotify_destroy_inode_mark (struct fsnotify_mark *mark);/* Destroy all marks in the given list */ -extern void fsnotify_destroy_marks (struct list_head *to_free); +extern void fsnotify_destroy_marks (struct hlist_head *to_free);/* Find mark belonging to given group in the list of marks */ extern struct fsnotify_mark *fsnotify_find_mark (struct hlist_head *head,struct fsnotify_group *group);
fs/notify/inode_mark.c +3 -3
@@ -87,14 +87,14 @@ void fsnotify_clear_marks_by_inode(struct inode *inode) {struct fsnotify_mark *mark;struct hlist_node *n; -LIST_HEAD (free_list); +HLIST_HEAD (free_list); +/* Detach list from inode and grab us reference to each mark */ spin_lock (&inode->i_lock);hlist_for_each_entry_safe (mark, n, &inode->i_fsnotify_marks, obj_list) { -list_add (&mark->free_list, &free_list); -hlist_del_init_rcu (&mark->obj_list);fsnotify_get_mark (mark); } +hlist_move_list (&inode->i_fsnotify_marks, &free_list);spin_unlock (&inode->i_lock);fsnotify_destroy_marks (&free_list);
fs/notify/mark.c +4 -3
@@ -196,12 +196,13 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,* Destroy all marks in the given list. The marks must be already detached from * the original inode / vfsmount. */ -void fsnotify_destroy_marks (struct list_head *to_free) +void fsnotify_destroy_marks (struct hlist_head *to_free) { -struct fsnotify_mark *mark, *lmark; +struct fsnotify_mark *mark; +struct hlist_node *next;struct fsnotify_group *group; -list_for_each_entry_safe (mark, lmark, to_free, free_list) { +hlist_for_each_entry_safe (mark, next, to_free, obj_list) {spin_lock (&mark->lock);fsnotify_get_group (mark->group); group = mark->group;
fs/notify/vfsmount_mark.c +3 -3
@@ -35,14 +35,14 @@ void fsnotify_clear_marks_by_mount(struct vfsmount *mnt)struct fsnotify_mark *mark;struct hlist_node *n;struct mount *m =real_mount (mnt); -LIST_HEAD (free_list); +HLIST_HEAD (free_list); +/* Detach list from mount and grab us reference to each mark */ spin_lock (&mnt->mnt_root->d_lock);hlist_for_each_entry_safe (mark, n, &m->mnt_fsnotify_marks, obj_list) { -list_add (&mark->free_list, &free_list); -hlist_del_init_rcu (&mark->obj_list);fsnotify_get_mark (mark); } +hlist_move_list (&m->mnt_fsnotify_marks, &free_list);spin_unlock (&mnt->mnt_root->d_lock);fsnotify_destroy_marks (&free_list);
include/linux/fsnotify_backend.h +0 -1
@@ -215,7 +215,6 @@ struct fsnotify_mark {struct list_head g_list;/* list of marks by group->i_fsnotify_marks */ spinlock_t lock;/* protect group and inode */ struct hlist_node obj_list;/* list of marks for inode / vfsmount */ -struct list_head free_list;/* tmp list used when freeing this mark */ union {struct inode *inode;/* inode this mark is associated with */ struct vfsmount *mnt;/* vfsmount this mark is associated with */
Signature · 1 line
1.8.1.4
Jan Kara
maintainerPATCH 3/3 fsnotify: Remove destroy_list from fsnotify_mark
In reply to Jan Karadestroy_list is used to track marks which still need waiting for srcu period end before they can be freed. However by the time mark is added to destroy_list it isn't in group's list of marks anymore and thus we can reuse fsnotify_mark->g_list for queueing into destroy_list. This saves two pointers for each fsnotify_mark.
--- fs/notify/mark.c | 8 ++++---- include/linux/fsnotify_backend.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
fs/notify/mark.c +4 -4
@@ -150,7 +150,7 @@ void fsnotify_destroy_mark_locked(struct fsnotify_mark *mark,mutex_unlock (&group->mark_mutex);spin_lock (&destroy_lock); -list_add (&mark->destroy_list, &destroy_list); +list_add (&mark->g_list, &destroy_list);spin_unlock (&destroy_lock);wake_up (&destroy_waitq);/*
@@ -360,7 +360,7 @@ err:spin_unlock (&mark->lock);spin_lock (&destroy_lock); -list_add (&mark->destroy_list, &destroy_list); +list_add (&mark->g_list, &destroy_list);spin_unlock (&destroy_lock);wake_up (&destroy_waitq);
@@ -459,8 +459,8 @@ static int fsnotify_mark_destroy(void *ignored)synchronize_srcu (&fsnotify_mark_srcu); -list_for_each_entry_safe (mark, next, &private_destroy_list, destroy_list) { -list_del_init (&mark->destroy_list); +list_for_each_entry_safe (mark, next, &private_destroy_list, g_list) { +list_del_init (&mark->g_list);fsnotify_put_mark (mark); }
include/linux/fsnotify_backend.h +0 -1
@@ -226,7 +226,6 @@ struct fsnotify_mark {#define FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY 0x08#define FSNOTIFY_MARK_FLAG_ALIVE 0x10unsigned int flags;/* vfsmount or inode mark? */ -struct list_head destroy_list;void (*free_mark)(struct fsnotify_mark *mark);/* called on final put+free */ };
Signature · 1 line
1.8.1.4
Re: [PATCH 3/3] fsnotify: Remove destroy_list from fsnotify_mark
Quoted 5 lines · Jan Kara
destroy_listis used to track marks which still need waiting for srcu period end before they can be freed. However by the time mark is added todestroy_listit isn't in group's list of marks anymore and thus we can reusefsnotify_mark->g_listfor queueing intodestroy_list. This saves two pointers for eachfsnotify_mark.
With your patch the information how g_list is used is only provided in the commit message (same is true for obj_list in PATCH 2/3).
Please, provide comments for the fields of structure fsnotify_mark in include/linux/fsnotify_backend.h indicating how these fields are used.
Especially if a field is reused for different purposes, as you now suggest for g_list (and obj_list), this information is indispensable.
Best regards
Heinrich Schuchardt
Jan Kara
maintainerRe: [PATCH 3/3] fsnotify: Remove destroy_list from fsnotify_mark
Quoted 10 lines · Heinrich Schuchardt
Quoted 5 lines · Jan Kara
destroy_listis used to track marks which still need waiting for srcu period end before they can be freed. However by the time mark is added todestroy_listit isn't in group's list of marks anymore and thus we can reusefsnotify_mark->g_listfor queueing intodestroy_list. This saves two pointers for eachfsnotify_mark.With your patch the information how
g_listis used is only provided in the commit message (same is true forobj_listin PATCH 2/3).
Quoted 7 lines
Please, provide comments for the fields of structure
fsnotify_markininclude/linux/fsnotify_backend.hindicating how these fields are used.Especially if a field is reused for different purposes, as you now suggest for
g_list(andobj_list), this information is indispensable.
Good point. I'll update the comments and resend. Thanks.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
maintainerRe: [PATCH 3/3] fsnotify: Remove destroy_list from fsnotify_mark
Quoted 11 lines · Jan Kara
Quoted 10 lines · Heinrich Schuchardt
Quoted 5 lines · Jan Kara
destroy_listis used to track marks which still need waiting for srcu period end before they can be freed. However by the time mark is added todestroy_listit isn't in group's list of marks anymore and thus we can reusefsnotify_mark->g_listfor queueing intodestroy_list. This saves two pointers for eachfsnotify_mark.With your patch the information how
g_listis used is only provided in the commit message (same is true forobj_listin PATCH 2/3).
Quoted 8 lines
Quoted 7 lines
Please, provide comments for the fields of structure
fsnotify_markininclude/linux/fsnotify_backend.hindicating how these fields are used.Especially if a field is reused for different purposes, as you now suggest for
g_list(andobj_list), this information is indispensable.Good point. I'll update the comments and resend. Thanks.
So in the end I've updated comment just for the g_list. For obj_list I
realized that mark can still be reached and destroyed via group's list of marks so the way I changed the code isn't safe. I'll think whether I'll just discard the patch or fix it up.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR