From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753678Ab2HOJY3 (ORCPT ); Wed, 15 Aug 2012 05:24:29 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:60188 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753212Ab2HOJYQ (ORCPT ); Wed, 15 Aug 2012 05:24:16 -0400 Message-Id: <20120815092409.675473829@openvz.org> User-Agent: quilt/0.48-1 Date: Wed, 15 Aug 2012 13:21:21 +0400 From: Cyrill Gorcunov To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Al Viro , Alexey Dobriyan , Andrew Morton , Pavel Emelyanov , James Bottomley , Matthew Helsley , Cyrill Gorcunov , Al Viro Subject: [patch 5/8] fs, notify: Add procfs fdinfo helper v3 References: <20120815092116.700948346@openvz.org> Content-Disposition: inline; filename=seq-fdinfo-fsnotify-5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allow us to print out fsnotify details such as watchee inode, device, mask and file handle. For example for inotify objects the output is | pos: 0 | flags: 02000000 | inotify wd: 3 ino: 9e7e sdev: 800013 mask: 800afce ignored_mask: 0 fhandle-bytes: 8 fhandle-type: 1 f_handle: 7e9e0000640d1b6d | inotify wd: 2 ino: a111 sdev: 800013 mask: 800afce ignored_mask: 0 fhandle-bytes: 8 fhandle-type: 1 f_handle: 11a1000020542153 | inotify wd: 1 ino: 6b149 sdev: 800013 mask: 800afce ignored_mask: 0 fhandle-bytes: 8 fhandle-type: 1 f_handle: 49b1060023552153 For fanotify it is like | pos: 0 | flags: 02 | fanotify ino: 68f71 sdev: 800013 mask: 1 ignored_mask: 40000000 fhandle-bytes: 8 fhandle-type: 1 f_handle: 718f0600b9f42053 | fanotify mnt_id: 13 mask: 1 ignored_mask: 40000000 To minimize impact on general fsnotify code the new functionality is gathered in fs/notify/fdinfo.c file. v2: - append missing colons to terms v3: - continue from pervious position in list on ->next Signed-off-by: Cyrill Gorcunov CC: Pavel Emelyanov CC: Al Viro CC: Alexey Dobriyan CC: Andrew Morton CC: James Bottomley --- fs/notify/Makefile | 2 fs/notify/fanotify/fanotify_user.c | 4 fs/notify/fdinfo.c | 167 +++++++++++++++++++++++++++++++++++++ fs/notify/fdinfo.h | 22 ++++ fs/notify/inotify/inotify_user.c | 4 5 files changed, 198 insertions(+), 1 deletion(-) Index: linux-2.6.git/fs/notify/Makefile =================================================================== --- linux-2.6.git.orig/fs/notify/Makefile +++ linux-2.6.git/fs/notify/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_FSNOTIFY) += fsnotify.o notification.o group.o inode_mark.o \ - mark.o vfsmount_mark.o + mark.o vfsmount_mark.o fdinfo.o obj-y += dnotify/ obj-y += inotify/ Index: linux-2.6.git/fs/notify/fanotify/fanotify_user.c =================================================================== --- linux-2.6.git.orig/fs/notify/fanotify/fanotify_user.c +++ linux-2.6.git/fs/notify/fanotify/fanotify_user.c @@ -17,6 +17,7 @@ #include #include "../../mount.h" +#include "../fdinfo.h" #define FANOTIFY_DEFAULT_MAX_EVENTS 16384 #define FANOTIFY_DEFAULT_MAX_MARKS 8192 @@ -446,6 +447,9 @@ static long fanotify_ioctl(struct file * } static const struct file_operations fanotify_fops = { +#ifdef CONFIG_PROC_FS + .show_fdinfo = fanotify_show_fdinfo, +#endif .poll = fanotify_poll, .read = fanotify_read, .write = fanotify_write, Index: linux-2.6.git/fs/notify/fdinfo.c =================================================================== --- /dev/null +++ linux-2.6.git/fs/notify/fdinfo.c @@ -0,0 +1,167 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "inotify/inotify.h" +#include "../fs/mount.h" + +struct inode_file_handle { + struct file_handle h; + struct fid fid; +} __packed; + +#if defined(CONFIG_PROC_FS) + +#if defined(CONFIG_INOTIFY_USER) || defined(CONFIG_FANOTIFY) + +#ifdef CONFIG_EXPORTFS +static int inotify_encode_target(struct inode *inode, struct inode_file_handle *fhandle) +{ + int ret, size; + + size = sizeof(fhandle->fid) >> 2; + ret = export_encode_inode_fh(inode, &fhandle->fid, &size); + BUG_ON(ret != FILEID_INO32_GEN); + + fhandle->h.handle_type = FILEID_INO32_GEN; + fhandle->h.handle_bytes = size * sizeof(u32); + + return 0; +} +#else +static int inotify_encode_target(struct inode *inode, struct inode_file_handle *fhandle) +{ + fhandle->h.handle_type = FILEID_ROOT; + fhandle->h.handle_bytes = 0; + return 0; +} +#endif /* CONFIG_EXPORTFS */ + +static int show_fdinfo(struct seq_file *m, struct file *f, + int (*show)(struct seq_file *m, struct fsnotify_mark *mark)) +{ + struct fsnotify_group *group = f->private_data; + struct fsnotify_mark *mark; + int ret = 0; + + spin_lock(&group->mark_lock); + list_for_each_entry(mark, &group->marks_list, g_list) { + ret = show(m, mark); + if (ret) + break; + } + spin_unlock(&group->mark_lock); + return ret; +} + +#ifdef CONFIG_INOTIFY_USER + +static int inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) +{ + struct inotify_inode_mark *inode_mark; + struct inode *inode; + int ret = 0; + + if (!(mark->flags & (FSNOTIFY_MARK_FLAG_ALIVE | FSNOTIFY_MARK_FLAG_INODE))) + return 0; + + inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark); + inode = igrab(mark->i.inode); + if (inode) { + struct inode_file_handle fhandle; + int i; + + inotify_encode_target(inode, &fhandle); + + ret = seq_printf(m, "inotify wd: %8d ino: %16lx sdev: %8x " + "mask: %8x ignored_mask: %8x " + "fhandle-bytes: %8x fhandle-type: %8x f_handle: ", + inode_mark->wd, inode->i_ino, + inode->i_sb->s_dev, + mark->mask, + mark->ignored_mask, + fhandle.h.handle_bytes, + fhandle.h.handle_type); + for (i = 0; i < fhandle.h.handle_bytes; i++) { + ret |= seq_printf(m, "%02x", + (int)(unsigned char)fhandle.h.f_handle[i]); + } + ret |= seq_putc(m, '\n'); + iput(inode); + } + + return ret; +} + +int inotify_show_fdinfo(struct seq_file *m, struct file *f) +{ + return show_fdinfo(m, f, inotify_fdinfo); +} + +#endif /* CONFIG_INOTIFY_USER */ + +#ifdef CONFIG_FANOTIFY + +static int fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) +{ + struct inode *inode; + int ret = 0; + + if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE)) + return 0; + + if (mark->flags & FSNOTIFY_MARK_FLAG_INODE) { + struct inode_file_handle fhandle; + int i; + + inode = igrab(mark->i.inode); + if (!inode) + goto out; + inotify_encode_target(inode, &fhandle); + + ret = seq_printf(m, "fanotify ino: %16lx sdev: %8x " + "mask: %8x ignored_mask: %8x " + "fhandle-bytes: %8x fhandle-type: %8x f_handle: ", + inode->i_ino, + inode->i_sb->s_dev, + mark->mask, + mark->ignored_mask, + fhandle.h.handle_bytes, + fhandle.h.handle_type); + + for (i = 0; i < fhandle.h.handle_bytes; i++) { + ret |= seq_printf(m, "%02x", + (int)(unsigned char)fhandle.h.f_handle[i]); + } + ret |= seq_putc(m, '\n'); + iput(inode); + } else if (mark->flags & FSNOTIFY_MARK_FLAG_VFSMOUNT) { + struct mount *mnt = real_mount(mark->m.mnt); + + ret = seq_printf(m, "fanotify mnt_id: %8x mask: %8x ignored_mask: %8x\n", + mnt->mnt_id, mark->mask, mark->ignored_mask); + } +out: + return ret; +} + +int fanotify_show_fdinfo(struct seq_file *m, struct file *f) +{ + return show_fdinfo(m, f, fanotify_fdinfo); +} + +#endif /* CONFIG_FANOTIFY */ + +#endif /* CONFIG_INOTIFY_USER || CONFIG_FANOTIFY */ + +#endif /* CONFIG_PROC_FS */ Index: linux-2.6.git/fs/notify/fdinfo.h =================================================================== --- /dev/null +++ linux-2.6.git/fs/notify/fdinfo.h @@ -0,0 +1,22 @@ +#ifndef __FSNOTIFY_FDINFO_H__ +#define __FSNOTIFY_FDINFO_H__ + +#include +#include + +struct seq_file; +struct file; + +#ifdef CONFIG_PROC_FS + +#ifdef CONFIG_INOTIFY_USER +extern int inotify_show_fdinfo(struct seq_file *m, struct file *f); +#endif + +#ifdef CONFIG_FANOTIFY +extern int fanotify_show_fdinfo(struct seq_file *m, struct file *f); +#endif + +#endif /* CONFIG_PROC_FS */ + +#endif /* __FSNOTIFY_FDINFO_H__ */ Index: linux-2.6.git/fs/notify/inotify/inotify_user.c =================================================================== --- linux-2.6.git.orig/fs/notify/inotify/inotify_user.c +++ linux-2.6.git/fs/notify/inotify/inotify_user.c @@ -40,6 +40,7 @@ #include #include "inotify.h" +#include "../fdinfo.h" #include @@ -335,6 +336,9 @@ static long inotify_ioctl(struct file *f } static const struct file_operations inotify_fops = { +#ifdef CONFIG_PROC_FS + .show_fdinfo = inotify_show_fdinfo, +#endif .poll = inotify_poll, .read = inotify_read, .fasync = inotify_fasync,