--- zzzz-none-000/linux-2.6.39.4/fs/notify/fsnotify.c 2011-08-03 19:43:28.000000000 +0000 +++ puma6-arm-6490-729/linux-2.6.39.4/fs/notify/fsnotify.c 2021-11-10 13:23:10.000000000 +0000 @@ -27,6 +27,12 @@ #include #include "fsnotify.h" +#ifndef CONFIG_TRACE_FSNOTIFY_EVENTS +# define NOTRACE +#endif +#define CREATE_TRACE_POINTS +#include "trace-fsnotify.h" + /* * Clear all of the marks on an inode when it is being evicted from core */ @@ -41,6 +47,34 @@ fsnotify_clear_marks_by_mount(mnt); } +#if defined(CONFIG_FSNOTIFY_RECURSIVE) +static void +__fsnotify_update_child_dentry_flags_recursivly(struct dentry *dentry) +{ + struct dentry *child; + int watched_recursivly = 0; + + if (dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY) + watched_recursivly = 1; + + list_for_each_entry (child, &dentry->d_subdirs, d_u.d_child) { + if (!child->d_inode) + continue; + + spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED); + if (watched_recursivly) + child->d_flags |= + DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY; + else + child->d_flags &= + ~DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY; + + __fsnotify_update_child_dentry_flags_recursivly(child); + spin_unlock(&child->d_lock); + } +} +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ + /* * Given an inode, first check if we care what happens to our children. Inotify * and dnotify both tell their parents about events. If we care about any event @@ -52,12 +86,18 @@ { struct dentry *alias; int watched; +#if defined(CONFIG_FSNOTIFY_RECURSIVE) + int watched_recursivly; +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ if (!S_ISDIR(inode->i_mode)) return; /* determine if the children should tell inode about their events */ watched = fsnotify_inode_watches_children(inode); +#if defined(CONFIG_FSNOTIFY_RECURSIVE) + watched_recursivly = fsnotify_inode_watches_children_recursivly(inode); +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ spin_lock(&inode->i_lock); /* run all of the dentries associated with this inode. Since this is a @@ -65,6 +105,11 @@ list_for_each_entry(alias, &inode->i_dentry, d_alias) { struct dentry *child; +#if defined(CONFIG_FSNOTIFY_RECURSIVE) + if (alias->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY) + watched_recursivly = 1; +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ + /* run all of the children of the original inode and fix their * d_flags to indicate parental interest (their parent is the * original inode) */ @@ -78,6 +123,17 @@ child->d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED; else child->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED; + +#if defined(CONFIG_FSNOTIFY_RECURSIVE) + if (watched_recursivly) + child->d_flags |= + DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY; + else + child->d_flags &= + ~DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY; + + __fsnotify_update_child_dentry_flags_recursivly(child); +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ spin_unlock(&child->d_lock); } spin_unlock(&alias->d_lock); @@ -122,6 +178,266 @@ } EXPORT_SYMBOL_GPL(__fsnotify_parent); +#if defined(CONFIG_FSNOTIFY_RECURSIVE) +/** + * Formats a relative path beginning at an entry with the given name up to top. + * + * @param parent The parent of the name + * @param root The parent dentry from which to start the path + * @param name The name of the last component + * @return A kmalloc'd string representing the path + */ +static char *alloc_relative_path(struct dentry *root, + struct dentry *parent, + const char *name) +{ + size_t size, name_size; + unsigned int seq; + struct dentry *d; + bool locked; + char *buf; + + WARN_ON_ONCE(!rcu_read_lock_held()); + name_size = strlen(name) + 1; + + locked = false; + seq = read_seqbegin(&rename_lock); +again: + size = name_size; + + /* + * First we go upwards the tree to calculate the needed size. + * __getname is supposedly faster, but wastes memory. + */ + for (d = parent; + d != root && !IS_ROOT(d); + d = ACCESS_ONCE(d->d_parent)) + size += ACCESS_ONCE(d->d_name.len) + sizeof("/")-1; + + buf = kmalloc(size, GFP_ATOMIC); + if (!buf) { + if (locked) + write_sequnlock(&rename_lock); + return ERR_PTR(-ENOMEM); + } + + size -= name_size; + memcpy(&buf[size], name, name_size); + + /* + * Traverse the path upwards again, building the path. + */ + for (d = parent; + d != root && !IS_ROOT(d); + d = ACCESS_ONCE(d->d_parent)) { + unsigned int dlen = ACCESS_ONCE(d->d_name.len); + const char *dname = ACCESS_ONCE(d->d_name.name); + + /* + * Dentry names may change anytime. Here, just make sure we + * don't overflow our buffer. Any inconsistencies will be + * caught by the seq check below. + */ + if (dlen + sizeof("/")-1 > size) + break; + + buf[--size] = '/'; + size -= dlen; + memcpy(&buf[size], dname, dlen); + } + + /* + * If no renames happened inbetween, we're done. Else, redo with lock. + */ + if (locked) { + write_sequnlock(&rename_lock); + } else if (read_seqretry(&rename_lock, seq)) { + kfree(buf); + write_seqlock(&rename_lock); + locked = true; + goto again; + } + + return buf; +} + +/** + * Find an ancestor dentry that is watching its children recursively for + * selected events. + * + * @param dentry The dentry for which to find an ancestor + * @param mask The event bitmask in question + * @return An interested ancestor dentry, with a reference held, or + * NULL if there are none. + */ +static struct dentry *__dget_watching_ancestor(struct dentry *dentry, __u32 mask) +{ + WARN_ON_ONCE(!rcu_read_lock_held()); + + while (!IS_ROOT(dentry)) { + struct inode *inode; + + dentry = ACCESS_ONCE(dentry->d_parent); + inode = ACCESS_ONCE(dentry->d_inode); + + if (inode && fsnotify_inode_watches_children_recursivly(inode) && + (inode->i_fsnotify_mask & mask)) + return dget(dentry); + + if (!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY)) + break; + } + + return NULL; +} + +/** + * Notifies the ancestor interested. + * + * Walks the dentry tree upwards to find an interested ancestor and forwards the + * event to it. + * + * DOES NOT cross fs boundaries + * DOES ONLY notify the first interested ancestor dentry that is found + * The immediate parent is not notified here, but by the standard + * fsnotify_parent(). + * + * @param path path for the event + * @param dentry the dentry for the event + * @param parent the parent of dentry, if it is different because dentry has been moved + * @param name the name of dentry, if it is different because dentry has been renamed + * @param mask the event mask to pass + * @param cookie the cookie to pass + * @return 0 on success, !=0 otherwise + */ +int __fsnotify_parent_recursive(struct path *path, + struct dentry *dentry, + struct dentry *parent, + const char *name, + __u32 mask, + __u32 cookie) +{ + const char *d_name = NULL; + struct dentry *d_to_tell; + struct inode *to_tell; + char *rel_path; + int ret = 0; + + if (!dentry) + dentry = path->dentry; + + /* + * No one above us in the hierarchy is interested in our events + */ + if (!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED_RECURSIVLY)) + return 0; + + /* + * The event is not allowed to propagate upwards + */ + if (!(mask & FS_EVENTS_POSS_ON_CHILD_RECURSIVLY)) + return 0; + + /* + * If there is an ancestor watching recursively, we try to construct + * the path from that ancestor down to the dentry that generated the + * event. + * + * This is far from being bullet-proof. For example, since the dentry + * chain can be changed anytime by concurrent renames, traversing it + * need not yield reproducible results. We might fail to find a + * watching ancestor, because the chain got destroyed before we came + * to traverse it. In this case we lose events. + * + * Also, no critical section ties the fsnotify hooks to the events + * that triggered them, so things can get mixed up. + * + * Also, maintaining the d_flags in a sub-tree is prone to races. + * + * But if there's not too much activity on the directory tree, + * results should be good enough. Just don't count on it. ;) + */ + + /* + * Protect against dentries perishing beneath us. + */ + rcu_read_lock(); + + if (!parent) + parent = ACCESS_ONCE(dentry->d_parent); + + /* + * Traverse upwards, looking for a watching ancestor. This skips the + * parent, which is already notified non-recursively. + */ + d_to_tell = __dget_watching_ancestor(parent, mask); + if (!d_to_tell) { + rcu_read_unlock(); + return 0; + } + + /* + * Try to construct the path. This traverses the path again. + */ + if (!name) { + d_name = fsnotify_oldname_init(dentry->d_name.name); + name = d_name; + } + rel_path = alloc_relative_path(d_to_tell, parent, name); + if (IS_ERR(rel_path)) { + ret = PTR_ERR(rel_path); + rcu_read_unlock(); + goto err_dput; + } + + /* + * If the existing chain has been modified inbetween, the path might + * not end up at the watching dentry, but at the root. This cannot be + * repaired without taking the global rename_lock. Assume that we got + * it right if there is still a linking chain. Otherwise, drop the + * event, since we lack useful data to report. + */ + if (!d_ancestor(d_to_tell, parent)) { + ret = 0; + rcu_read_unlock(); + goto err_free; + } + + rcu_read_unlock(); + + to_tell = ACCESS_ONCE(d_to_tell->d_inode); + + /* + * We are notifying a parent so come up with the new mask which + * specifies these are events which came from a child. + */ + mask |= FS_EVENT_ON_CHILD_RECURSIVLY; + + if (path) + ret = fsnotify(to_tell, mask, path, + FSNOTIFY_EVENT_PATH, rel_path, cookie); + else + ret = fsnotify(to_tell, mask, dentry->d_inode, + FSNOTIFY_EVENT_INODE, rel_path, cookie); +err_free: + kfree(rel_path); +err_dput: + dput(d_to_tell); + + /* + * Should we repeat, looking for more watchers upwards the path? + * This would require dgetting the parent, since we drop rcu + * when calling fsnotify(). + */ + + if (name == d_name) + fsnotify_oldname_free(d_name); + + return ret; +} +EXPORT_SYMBOL_GPL(__fsnotify_parent_recursive); +#endif /* CONFIG_FSNOTIFY_RECURSIVE */ + static int send_to_group(struct inode *to_tell, struct vfsmount *mnt, struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, @@ -225,6 +541,8 @@ !(mnt && test_mask & mnt->mnt_fsnotify_mask)) return 0; + trace_fsnotify_event(to_tell, mask, file_name); + idx = srcu_read_lock(&fsnotify_mark_srcu); if ((mask & FS_MODIFY) ||