inotify: split kernel API from userspace support
Subsystems (6)
PATCH 1/1 inotify: split kernel API from userspace support
The following series of patches introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes. With these patches, inotify will maintain for each caller a list of watches (via an embedded struct inotify_watch), where each inotify_watch is associated with a corresponding struct inode. The caller registers an event handler and specifies for which filesystem events their event handler should be called per inotify_watch.
These patches are basically identical to my previous post:
http://lkml.org/lkml/2006/5/25/314
except that I've split the original patch between movement of existing inotify code and introduction of new functionality, as Andrew requested.
I based the patches off of 2.6.17-rc5.
Thanks for reviewing.
---
fs/Kconfig | 24 + fs/Makefile | 1 fs/inotify.c | 941 +++++++++++------------------------------------ fs/inotify_user.c | 717 ++++++++++++++++++++++++++++++++++++ include/linux/inotify.h | 76 ++++ include/linux/sched.h | 2 kernel/sysctl.c | 4 kernel/user.c | 2 8 files changed, 1046 insertions(+), 721 deletions(-) create mode 100644 fs/inotify_user.c
a23ad01a5cc42d02b1c251be310f6e89cdc8de10
fs/Kconfig +18 -6
@@ -396,18 +396,30 @@ config INOTIFY bool "Inotify file change notification support" default y ---help--- - Say Y here to enable inotify support and the associated system - calls. Inotify is a file change notification system and a - replacement for dnotify. Inotify fixes numerous shortcomings in - dnotify and introduces several new features. It allows monitoring - of both files and directories via a single open fd. Other features - include multiple file events, one-shot support, and unmount + Say Y here to enable inotify support. Inotify is a file change + notification system and a replacement for dnotify. Inotify fixes + numerous shortcomings in dnotify and introduces several new features + including multiple file events, one-shot support, and unmount notification. For more information, see Documentation/filesystems/inotify.txt If unsure, say Y. +config INOTIFY_USER + bool "Inotify support for userspace" + depends on INOTIFY + default y + ---help--- + Say Y here to enable inotify support for userspace, including the + associated system calls. Inotify allows monitoring of both files and + directories via a single open fd. Events are read from the file + descriptor, which is also select()- and poll()-able. + + For more information, see Documentation/filesystems/inotify.txt + + If unsure, say Y. + config QUOTA bool "Quota support" help
fs/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-y := open.o read_write.o file_table. ioprio.o pnode.o drop_caches.o splice.o sync.o obj-$(CONFIG_INOTIFY) += inotify.o +obj-$(CONFIG_INOTIFY_USER) += inotify_user.o obj-$(CONFIG_EPOLL) += eventpoll.o obj-$(CONFIG_COMPAT) += compat.o compat_ioctl.o
fs/inotify.c +230 -711
1,162 lines not on this page · raw message
fs/inotify_user.c new file +717 -0
717 lines not on this page · raw message
include/linux/inotify.h +76 -0
96 lines not on this page · raw message
include/linux/sched.h +1 -1
@@ -502,7 +502,7 @@ struct user_struct {atomic_t processes;/* How many processes does this user have? */ atomic_t files;/* How many open files does this user have? */ atomic_t sigpending;/* How many pending signals does this user have? */ -#ifdef CONFIG_INOTIFY +#ifdef CONFIG_INOTIFY_USER atomic_t inotify_watches;/* How many inotify watches does this user have? */ atomic_t inotify_devs;/* How many inotify devs does this user have opened? */ #endif
kernel/sysctl.c +2 -2
@@ -170,7 +170,7 @@ extern ctl_table random_table[];#ifdef CONFIG_UNIX98_PTYS extern ctl_table pty_table[];#endif -#ifdef CONFIG_INOTIFY +#ifdef CONFIG_INOTIFY_USER extern ctl_table inotify_table[];#endif
@@ -1194,7 +1194,7 @@ #ifdef CONFIG_MMU .mode = 0644, .proc_handler = &proc_doulongvec_minmax, }, -#ifdef CONFIG_INOTIFY +#ifdef CONFIG_INOTIFY_USER { .ctl_name = FS_INOTIFY, .procname = "inotify",
kernel/user.c +1 -1
@@ -140,7 +140,7 @@ struct user_struct * alloc_uid(uid_t uidatomic_set (&new->processes,0 );atomic_set (&new->files,0 );atomic_set (&new->sigpending,0 ); -#ifdef CONFIG_INOTIFY +#ifdef CONFIG_INOTIFY_USER atomic_set (&new->inotify_watches,0 );atomic_set (&new->inotify_devs,0 );#endif
Signature · 1 line
1.3.0
PATCH 2/5 inotify: add name's inode to event handler
When an inotify event includes a dentry name, also include the inode associated with that name.
---
fs/inotify.c | 13 ++++++++----- fs/inotify_user.c | 3 ++- include/linux/fsnotify.h | 29 ++++++++++++++++------------- include/linux/inotify.h | 7 ++++--- 4 files changed, 30 insertions(+), 22 deletions(-)
79525774dcbc21928de12e12e5be45ae4ca58653
fs/inotify.c +8 -5
@@ -232,7 +232,7 @@ static void remove_watch_no_event(structstatic void remove_watch (struct inotify_watch *watch,struct inotify_handle *ih) {remove_watch_no_event (watch, ih); - ih->in_ops->handle_event (watch, watch->wd,IN_IGNORED ,0 ,NULL ); + ih->in_ops->handle_event (watch, watch->wd,IN_IGNORED ,0 ,NULL ,NULL ); }/* Kernel API for producing events */
@@ -275,9 +275,10 @@ void inotify_d_move(struct dentry *entry* @mask: event mask describing this event * @cookie: cookie for synchronization, or zero * @name: filename, if any +* @n_inode: inode associated with name */ void inotify_inode_queue_event (struct inode *inode,u32 mask,u32 cookie, -const char *name) +const char *name,struct inode *n_inode) {struct inotify_watch *watch, *next;
@@ -292,7 +293,8 @@ void inotify_inode_queue_event(struct inmutex_lock (&ih->mutex);if (watch_mask &IN_ONESHOT )remove_watch_no_event (watch, ih); - ih->in_ops->handle_event (watch, watch->wd, mask, cookie, name); + ih->in_ops->handle_event (watch, watch->wd, mask, cookie, + name, n_inode);mutex_unlock (&ih->mutex); } }
@@ -323,7 +325,8 @@ void inotify_dentry_parent_queue_event(sif (inotify_inode_watched (inode)) {dget (parent);spin_unlock (&dentry->d_lock); -inotify_inode_queue_event (inode, mask, cookie, name); +inotify_inode_queue_event (inode, mask, cookie, name, + dentry->d_inode);dput (parent); }else spin_unlock (&dentry->d_lock);
@@ -407,7 +410,7 @@ void inotify_unmount_inodes(struct list_struct inotify_handle *ih= watch->ih;mutex_lock (&ih->mutex); ih->in_ops->handle_event (watch, watch->wd,IN_UNMOUNT ,0 , -NULL ); +NULL ,NULL );remove_watch (watch, ih);mutex_unlock (&ih->mutex); }
fs/inotify_user.c +2 -1
@@ -253,7 +253,8 @@ inotify_dev_get_event(struct inotify_dev* Can sleep (calls kernel_event()). */ static void inotify_dev_queue_event (struct inotify_watch *w,u32 wd,u32 mask, -u32 cookie,const char *name) +u32 cookie,const char *name, +struct inode *ignored) {struct inotify_user_watch *watch;struct inotify_device *dev;
include/linux/fsnotify.h +16 -13
@@ -54,16 +54,18 @@ static inline void fsnotify_move(structif (isdir) isdir =IN_ISDIR ; -inotify_inode_queue_event (old_dir,IN_MOVED_FROM |isdir,cookie,old_name); -inotify_inode_queue_event (new_dir,IN_MOVED_TO |isdir, cookie, new_name); +inotify_inode_queue_event (old_dir,IN_MOVED_FROM |isdir,cookie,old_name, + source); +inotify_inode_queue_event (new_dir,IN_MOVED_TO |isdir, cookie, new_name, + source);if (target) { -inotify_inode_queue_event (target,IN_DELETE_SELF ,0 ,NULL ); +inotify_inode_queue_event (target,IN_DELETE_SELF ,0 ,NULL ,NULL );inotify_inode_is_dead (target); }if (source) { -inotify_inode_queue_event (source,IN_MOVE_SELF ,0 ,NULL ); +inotify_inode_queue_event (source,IN_MOVE_SELF ,0 ,NULL ,NULL ); }audit_inode_child (old_name, source, old_dir->i_ino);audit_inode_child (new_name, target, new_dir->i_ino);
@@ -85,7 +87,7 @@ static inline void fsnotify_nameremove(s*/ static inline void fsnotify_inoderemove (struct inode *inode) { -inotify_inode_queue_event (inode,IN_DELETE_SELF ,0 ,NULL ); +inotify_inode_queue_event (inode,IN_DELETE_SELF ,0 ,NULL ,NULL );inotify_inode_is_dead (inode); }
@@ -95,7 +97,8 @@ static inline void fsnotify_inoderemove(static inline void fsnotify_create (struct inode *inode,struct dentry *dentry) {inode_dir_notify (inode,DN_CREATE ); -inotify_inode_queue_event (inode,IN_CREATE ,0 , dentry->d_name.name); +inotify_inode_queue_event (inode,IN_CREATE ,0 , dentry->d_name.name, + dentry->d_inode);audit_inode_child (dentry->d_name.name, dentry->d_inode, inode->i_ino); }
@@ -106,7 +109,7 @@ static inline void fsnotify_mkdir(struct {inode_dir_notify (inode,DN_CREATE );inotify_inode_queue_event (inode,IN_CREATE |IN_ISDIR ,0 , - dentry->d_name.name); + dentry->d_name.name, dentry->d_inode);audit_inode_child (dentry->d_name.name, dentry->d_inode, inode->i_ino); }
@@ -123,7 +126,7 @@ static inline void fsnotify_access(strucdnotify_parent (dentry,DN_ACCESS );inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name); -inotify_inode_queue_event (inode, mask,0 ,NULL ); +inotify_inode_queue_event (inode, mask,0 ,NULL ,NULL ); }/*
@@ -139,7 +142,7 @@ static inline void fsnotify_modify(strucdnotify_parent (dentry,DN_MODIFY );inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name); -inotify_inode_queue_event (inode, mask,0 ,NULL ); +inotify_inode_queue_event (inode, mask,0 ,NULL ,NULL ); }/*
@@ -154,7 +157,7 @@ static inline void fsnotify_open(struct mask |=IN_ISDIR ;inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name); -inotify_inode_queue_event (inode, mask,0 ,NULL ); +inotify_inode_queue_event (inode, mask,0 ,NULL ,NULL ); }/*
@@ -172,7 +175,7 @@ static inline void fsnotify_close(struct mask |=IN_ISDIR ;inotify_dentry_parent_queue_event (dentry, mask,0 , name); -inotify_inode_queue_event (inode, mask,0 ,NULL ); +inotify_inode_queue_event (inode, mask,0 ,NULL ,NULL ); }/*
@@ -187,7 +190,7 @@ static inline void fsnotify_xattr(struct mask |=IN_ISDIR ;inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name); -inotify_inode_queue_event (inode, mask,0 ,NULL ); +inotify_inode_queue_event (inode, mask,0 ,NULL ,NULL ); }/*
@@ -234,7 +237,7 @@ static inline void fsnotify_change(strucif (in_mask) {if (S_ISDIR (inode->i_mode)) in_mask |=IN_ISDIR ; -inotify_inode_queue_event (inode, in_mask,0 ,NULL ); +inotify_inode_queue_event (inode, in_mask,0 ,NULL ,NULL );inotify_dentry_parent_queue_event (dentry, in_mask,0 , dentry->d_name.name); }
include/linux/inotify.h +4 -3
@@ -91,7 +91,7 @@ struct inotify_watch {struct inotify_operations {void (*handle_event)(struct inotify_watch *,u32 ,u32 ,u32 , -const char *); +const char *,struct inode *);void (*destroy_watch)(struct inotify_watch *); };
@@ -102,7 +102,7 @@ #ifdef CONFIG_INOTIFYextern void inotify_d_instantiate (struct dentry *,struct inode *);extern void inotify_d_move (struct dentry *);extern void inotify_inode_queue_event (struct inode *,__u32 ,__u32 , -const char *); +const char *,struct inode *);extern void inotify_dentry_parent_queue_event (struct dentry *,__u32 ,__u32 ,const char *);extern void inotify_unmount_inodes (struct list_head *);
@@ -134,7 +134,8 @@ static inline void inotify_d_move(structstatic inline void inotify_inode_queue_event (struct inode *inode,__u32 mask,__u32 cookie, -const char *filename) +const char *filename, +struct inode *n_inode) { }
Signature · 1 line
1.3.0
PATCH 3/5 inotify: add interfaces to kernel API
In reply to Amy GriffisAdd inotify_init_watch() so caller can use inotify_watch refcounts before calling inotify_add_watch().
Add inotify_find_watch() to find an existing watch for an (ih,inode) pair. This is similar to inotify_find_update_watch(), but does not update the watch's mask if one is found.
Add inotify_rm_watch() to remove a watch via the watch pointer instead of the watch descriptor.
---
fs/inotify.c | 64 +++++++++++++++++++++++++++++++++++++++++++---- fs/inotify_user.c | 1 + include/linux/inotify.h | 20 +++++++++++++++ 3 files changed, 79 insertions(+), 6 deletions(-)
48dcb4a1afcdac08fd85b4bf6e7a5600afd33e94
fs/inotify.c +58 -6
@@ -468,6 +468,19 @@ struct inotify_handle *inotify_init(consEXPORT_SYMBOL_GPL (inotify_init);/** +* inotify_init_watch - initialize an inotify watch +* @watch: watch to initialize +*/ +void inotify_init_watch (struct inotify_watch *watch) +{ +INIT_LIST_HEAD (&watch->h_list); +INIT_LIST_HEAD (&watch->i_list); +atomic_set (&watch->count,0 ); +get_inotify_watch (watch);/* initial get */ +} +EXPORT_SYMBOL_GPL (inotify_init_watch); + +/** * inotify_destroy - clean up and destroy an inotify instance * @ih: inotify handle */
@@ -515,6 +528,37 @@ void inotify_destroy(struct inotify_handEXPORT_SYMBOL_GPL (inotify_destroy);/** +* inotify_find_watch - find an existing watch for an (ih,inode) pair +* @ih: inotify handle +* @inode: inode to watch +* @watchp: pointer to existing inotify_watch +* +* Caller must pin given inode (via nameidata). +*/ +s32 inotify_find_watch (struct inotify_handle *ih,struct inode *inode, +struct inotify_watch **watchp) +{ +struct inotify_watch *old; +int ret = -ENOENT ; + +mutex_lock (&inode->inotify_mutex); +mutex_lock (&ih->mutex); + + old =inode_find_handle (inode, ih); +if (unlikely (old)) { +get_inotify_watch (old);/* caller must put watch */ + *watchp = old; + ret = old->wd; + } + +mutex_unlock (&ih->mutex); +mutex_unlock (&inode->inotify_mutex); + +return ret; +} +EXPORT_SYMBOL_GPL (inotify_find_watch); + +/** * inotify_find_update_watch - find and update the mask of an existing watch * @ih: inotify handle * @inode: inode's watch to update
@@ -593,10 +637,6 @@ s32 inotify_add_watch(struct inotify_han goto out; ret = watch->wd; -atomic_set (&watch->count,0 ); -INIT_LIST_HEAD (&watch->h_list); -INIT_LIST_HEAD (&watch->i_list); -/* save a reference to handle and bump the count to make it official */ get_inotify_handle (ih); watch->ih = ih;
@@ -607,8 +647,6 @@ s32 inotify_add_watch(struct inotify_han*/ watch->inode =igrab (inode); -get_inotify_watch (watch);/* initial get */ -if (!inotify_inode_watched (inode))set_dentry_child_flags (inode,1 );
@@ -659,6 +697,20 @@ int inotify_rm_wd(struct inotify_handle }EXPORT_SYMBOL_GPL (inotify_rm_wd); +/** +* inotify_rm_watch - remove a watch from an inotify instance +* @ih: inotify handle +* @watch: watch to remove +* +* Can sleep. +*/ +int inotify_rm_watch (struct inotify_handle *ih, +struct inotify_watch *watch) +{ +return inotify_rm_wd (ih, watch->wd); +} +EXPORT_SYMBOL_GPL (inotify_rm_watch); +/* * inotify_setup - core initialization function */
fs/inotify_user.c +1 -0
@@ -380,6 +380,7 @@ static int create_watch(struct inotify_datomic_inc (&dev->user->inotify_watches); +inotify_init_watch (&watch->wdata); ret =inotify_add_watch (dev->ih, &watch->wdata, inode, mask);if (ret <0 )free_inotify_user_watch (&watch->wdata);
include/linux/inotify.h +20 -0
@@ -112,11 +112,15 @@ extern u32 inotify_get_cookie(void);/* Kernel Consumer API */ extern struct inotify_handle *inotify_init (const struct inotify_operations *); +extern void inotify_init_watch (struct inotify_watch *);extern void inotify_destroy (struct inotify_handle *); +extern __s32 inotify_find_watch (struct inotify_handle *,struct inode *, +struct inotify_watch **);extern __s32 inotify_find_update_watch (struct inotify_handle *,struct inode *,u32 );extern __s32 inotify_add_watch (struct inotify_handle *,struct inotify_watch *,struct inode *,__u32 ); +extern int inotify_rm_watch (struct inotify_handle *,struct inotify_watch *);extern int inotify_rm_wd (struct inotify_handle *,__u32 );extern void get_inotify_watch (struct inotify_watch *);extern void put_inotify_watch (struct inotify_watch *);
@@ -163,10 +167,20 @@ static inline struct inotify_handle *inoreturn ERR_PTR (-EOPNOTSUPP ); } +static inline void inotify_init_watch (struct inotify_watch *watch) +{ +} +static inline void inotify_destroy (struct inotify_handle *ih) { } +static inline __s32 inotify_find_watch (struct inotify_handle *ih,struct inode *inode, +struct inotify_watch **watchp) +{ +return -EOPNOTSUPP ; +} +static inline __s32 inotify_find_update_watch (struct inotify_handle *ih,struct inode *inode,u32 mask) {
@@ -180,6 +194,12 @@ static inline __s32 inotify_add_watch(streturn -EOPNOTSUPP ; } +static inline int inotify_rm_watch (struct inotify_handle *ih, +struct inotify_watch *watch) +{ +return -EOPNOTSUPP ; +} +static inline int inotify_rm_wd (struct inotify_handle *ih,__u32 wd) {return -EOPNOTSUPP ;
Signature · 1 line
1.3.0
PATCH 4/5 inotify: allow watch removal from event handler
In reply to Amy GriffisAllow callers to remove watches from their event handler via inotify_remove_watch_locked(). This functionality can be used to achieve IN_ONESHOT-like functionality for a subset of events in the mask.
---
fs/inotify.c | 23 ++++++++++++++--------- include/linux/inotify.h | 7 +++++++ 2 files changed, 21 insertions(+), 9 deletions(-)
3c6aadc67eed3796ce0b3fdbf7b47ce1469a0123
fs/inotify.c +14 -9
@@ -207,7 +207,7 @@ static struct inotify_watch *inode_find_ }/* -* remove_watch_no_event - remove_watch() without the IN_IGNORED event. +* remove_watch_no_event - remove watch without the IN_IGNORED event. * * Callers must hold both inode->inotify_mutex and ih->mutex. */
@@ -223,17 +223,22 @@ static void remove_watch_no_event(structidr_remove (&ih->idr, watch->wd); } -/* -* remove_watch - Remove a watch from both the handle and the inode. Sends -* the IN_IGNORED event signifying that the inode is no longer watched. +/** +* inotify_remove_watch_locked - Remove a watch from both the handle and the +* inode. Sends the IN_IGNORED event signifying that the inode is no longer +* watched. May be invoked from a caller's event handler. +* @ih: inotify handle associated with watch +* @watch: watch to remove * * Callers must hold both inode->inotify_mutex and ih->mutex. */ -static void remove_watch (struct inotify_watch *watch,struct inotify_handle *ih) +void inotify_remove_watch_locked (struct inotify_handle *ih, +struct inotify_watch *watch) {remove_watch_no_event (watch, ih); ih->in_ops->handle_event (watch, watch->wd,IN_IGNORED ,0 ,NULL ,NULL ); } +EXPORT_SYMBOL_GPL (inotify_remove_watch_locked);/* Kernel API for producing events */
@@ -378,7 +383,7 @@ void inotify_unmount_inodes(struct list_ need_iput_tmp = need_iput; need_iput =NULL ; -/* In case the remove_watch() drops a reference. */ +/* In case inotify_remove_watch_locked() drops a reference. */ if (inode != need_iput_tmp)__iget (inode);else
@@ -411,7 +416,7 @@ void inotify_unmount_inodes(struct list_mutex_lock (&ih->mutex); ih->in_ops->handle_event (watch, watch->wd,IN_UNMOUNT ,0 ,NULL ,NULL ); -remove_watch (watch, ih); +inotify_remove_watch_locked (ih, watch);mutex_unlock (&ih->mutex); }mutex_unlock (&inode->inotify_mutex);
@@ -434,7 +439,7 @@ void inotify_inode_is_dead(struct inodelist_for_each_entry_safe (watch, next, &inode->inotify_watches, i_list) {struct inotify_handle *ih = watch->ih;mutex_lock (&ih->mutex); -remove_watch (watch, ih); +inotify_remove_watch_locked (ih, watch);mutex_unlock (&ih->mutex); }mutex_unlock (&inode->inotify_mutex);
@@ -687,7 +692,7 @@ int inotify_rm_wd(struct inotify_handle/* make sure that we did not race */ if (likely (idr_find (&ih->idr, wd) == watch)) -remove_watch (watch, ih); +inotify_remove_watch_locked (ih, watch);mutex_unlock (&ih->mutex);mutex_unlock (&inode->inotify_mutex);
include/linux/inotify.h +7 -0
@@ -122,6 +122,8 @@ extern __s32 inotify_add_watch(struct in struct inode *, __u32);extern int inotify_rm_watch (struct inotify_handle *,struct inotify_watch *);extern int inotify_rm_wd (struct inotify_handle *,__u32 ); +extern void inotify_remove_watch_locked (struct inotify_handle *, +struct inotify_watch *);extern void get_inotify_watch (struct inotify_watch *);extern void put_inotify_watch (struct inotify_watch *);
@@ -205,6 +207,11 @@ static inline int inotify_rm_wd(struct ireturn -EOPNOTSUPP ; } +static inline void inotify_remove_watch_locked (struct inotify_handle *ih, +struct inotify_watch *watch) +{ +} +static inline void get_inotify_watch (struct inotify_watch *watch) { }
Signature · 1 line
1.3.0
PATCH 5/5 inotify: update kernel documentation
In reply to Amy GriffisUpdate kernel documentation to include a description of the inotify kernel API.
---
Documentation/filesystems/inotify.txt | 130 +++++++++++++++++++++++++++++++-- 1 files changed, 124 insertions(+), 6 deletions(-)
d45652a4125e6e1ade00329ec0a18ffc0398e749
Documentation/filesystems/inotify.txt +124 -6
@@ -69,17 +69,135 @@ Prototypes: int inotify_rm_watch (int fd, __u32 mask); -(iii) Internal Kernel Implementation +(iii) Kernel Interface -Each inotify instance is associated with an inotify_device structure. +Inotify's kernel API consists a set of functions for managing watches and an +event callback. + +To use the kernel API, you must first initialize an inotify instance with a set +of inotify_operations. You are given an opaque inotify_handle, which you use +for any further calls to inotify. + + struct inotify_handle *ih = inotify_init(my_event_handler); + +You must provide a function for processing events and a function for destroying +the inotify watch. + + void handle_event(struct inotify_watch *watch, u32 wd, u32 mask, + u32 cookie, const char *name, struct inode *inode) + + watch - the pointer to the inotify_watch that triggered this call + wd - the watch descriptor + mask - describes the event that occurred + cookie - an identifier for synchronizing events + name - the dentry name for affected files in a directory-based event + inode - the affected inode in a directory-based event + + void destroy_watch(struct inotify_watch *watch) + +You may add watches by providing a pre-allocated and initialized inotify_watch +structure and specifying the inode to watch along with an inotify event mask. +You must pin the inode during the call. You will likely wish to embed the +inotify_watch structure in a structure of your own which contains other +information about the watch. Once you add an inotify watch, it is immediately +subject to removal depending on filesystem events. You must grab a reference if +you depend on the watch hanging around after the call. + + inotify_init_watch(&my_watch->iwatch); + inotify_get_watch(&my_watch->iwatch); // optional + s32 wd = inotify_add_watch(ih, &my_watch->iwatch, inode, mask); + inotify_put_watch(&my_watch->iwatch); // optional + +You may use the watch descriptor (wd) or the address of the inotify_watch for +other inotify operations. You must not directly read or manipulate data in the +inotify_watch. Additionally, you must not call inotify_add_watch() more than +once for a given inotify_watch structure, unless you have first called either +inotify_rm_watch() or inotify_rm_wd(). + +To determine if you have already registered a watch for a given inode, you may +call inotify_find_watch(), which gives you both the wd and the watch pointer for +the inotify_watch, or an error if the watch does not exist. + + wd = inotify_find_watch(ih, inode, &watchp); + +You may use container_of() on the watch pointer to access your own data +associated with a given watch. When an existing watch is found, +inotify_find_watch() bumps the refcount before releasing its locks. You must +put that reference with: + + put_inotify_watch(watchp); + +Call inotify_find_update_watch() to update the event mask for an existing watch. +inotify_find_update_watch() returns the wd of the updated watch, or an error if +the watch does not exist. + + wd = inotify_find_update_watch(ih, inode, mask); + +An existing watch may be removed by calling either inotify_rm_watch() or +inotify_rm_wd(). + + int ret = inotify_rm_watch(ih, &my_watch->iwatch); + int ret = inotify_rm_wd(ih, wd); + +A watch may be removed while executing your event handler with the following: + + inotify_remove_watch_locked(ih, iwatch); + +Call inotify_destroy() to remove all watches from your inotify instance and +release it. If there are no outstanding references, inotify_destroy() will call +your destroy_watch op for each watch. + + inotify_destroy(ih); + +When inotify removes a watch, it sends an IN_IGNORED event to your callback. +You may use this event as an indication to free the watch memory. Note that +inotify may remove a watch due to filesystem events, as well as by your request. +If you use IN_ONESHOT, inotify will remove the watch after the first event, at +which point you may call the final inotify_put_watch. + +(iv) Kernel Interface Prototypes + + struct inotify_handle *inotify_init(struct inotify_operations *ops); + + inotify_init_watch(struct inotify_watch *watch); + + s32 inotify_add_watch(struct inotify_handle *ih, + struct inotify_watch *watch, + struct inode *inode, u32 mask); + + s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode, + struct inotify_watch **watchp); + + s32 inotify_find_update_watch(struct inotify_handle *ih, + struct inode *inode, u32 mask); + + int inotify_rm_wd(struct inotify_handle *ih, u32 wd); + + int inotify_rm_watch(struct inotify_handle *ih, + struct inotify_watch *watch); + + void inotify_remove_watch_locked(struct inotify_handle *ih, + struct inotify_watch *watch); + + void inotify_destroy(struct inotify_handle *ih); + + void get_inotify_watch(struct inotify_watch *watch); + void put_inotify_watch(struct inotify_watch *watch); + + +(v) Internal Kernel Implementation + +Each inotify instance is represented by an inotify_handle structure. +Inotify's userspace consumers also have an inotify_device which is +associated with the inotify_handle, and on which events are queued. Each watch is associated with an inotify_watch structure. Watches are chained -off of each associated device and each associated inode. +off of each associated inotify_handle and each associated inode. -See fs/inotify.c for the locking and lifetime rules. +See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules. -(iv) Rationale +(vi) Rationale Q: What is the design decision behind not tying the watch to the open fd of the watched object?
@@ -145,7 +263,7 @@ A: The poor user-space interface is the file descriptor-based one that allows basic file I/O and poll/select. Obtaining the fd and managing the watches could have been done either via a device file or a family of new system calls. We decided to implement a - family of system calls because that is the preffered approach for new kernel + family of system calls because that is the preferred approach for new kernel interfaces. The only real difference was whether we wanted to use open(2) and ioctl(2) or a couple of new system calls. System calls beat ioctls.
Signature · 1 line
1.3.0
Quoted 8 lines · Amy Griffis
The following series of patches introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes. With these patches, inotify will maintain for each caller a list of watches (via an embedded struct
inotify_watch), where eachinotify_watchis associated with a corresponding struct inode. The caller registers an event handler and specifies for which filesystem events their event handler should be called perinotify_watch.
Thank you for breaking the patch up. Looks good to me.
Robert Love
Quoted 11 lines · Robert Love
Quoted 8 lines · Amy Griffis
The following series of patches introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes. With these patches, inotify will maintain for each caller a list of watches (via an embedded struct
inotify_watch), where eachinotify_watchis associated with a corresponding struct inode. The caller registers an event handler and specifies for which filesystem events their event handler should be called perinotify_watch.
Quoted 3 lines
Thank you for breaking the patch up. Looks good to me.
Acked-by Robert Love <[email protected]>
Ditto
Signature · 1 line
John McCutchan <[email protected]>
Here is a more descriptive changelog message for this patch:
This patch introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes.
To provide the kernel API, the current inotify code is split into two
parts: core functionality remains in inotify.c, and functionality supporting userspace is moved to a new file inotify_user.c. The inotify_device struct is split into inotify_handle (idr, watch list, inotify operations) and inotify_device (event queue for userspace). This patch also makes struct inotify_watch public so it can be embedded in a caller's own watch structure.
In order to separate the find/update watch and add watch operations for the kernel API, this patch adds a second per-inotify_device mutex to prevent a userspace caller from adding the same watch twice.
This patch retains the original assumption that there will be more watches per inotify_handle than watches on any given inode, and performs the search for existing watches accordingly.
Quoted 14 lines · Amy Griffis
Signed-off-by Amy Griffis <[email protected]>---
fs/Kconfig | 24 + fs/Makefile | 1 fs/inotify.c | 941 +++++++++++------------------------------------ fs/inotify_user.c | 717 ++++++++++++++++++++++++++++++++++++ include/linux/inotify.h | 76 ++++ include/linux/sched.h | 2 kernel/sysctl.c | 4 kernel/user.c | 2 8 files changed, 1046 insertions(+), 721 deletions(-) create mode 100644 fs/inotify_user.c
Hi!
Quoted 5 lines
Here is a more descriptive changelog message for this patch:
This patch introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes.
What are proposed uses of this API?
Pavel
Signature · 1 line
Thanks for all the (sleeping) penguins.
Pavel Machek wrote: [Tue Jun 06 2006, 05:06:19PM EDT]
Quoted 7 lines
Quoted 5 lines
Here is a more descriptive changelog message for this patch:
This patch introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes.
What are proposed uses of this API?
Currently there are two uses of this API.
The first user is the code that provides inotify support to userspace, which lives in inotify_user.c in this patch.
The second user is an audit patch which provides path-based rules via inotify directory events. An inotify kernel API allows audit to take advantage of inotify's hooks, list management, and inode removal handling, instead of duplicating that functionality.
I'll send the audit patch in a new thread.
Amy