From: Cyrill Gorcunov <gorcunov@openvz.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Alexey Dobriyan <adobriyan@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Pavel Emelyanov <xemul@parallels.com>,
James Bottomley <jbottomley@parallels.com>,
Matthew Helsley <matt.helsley@gmail.com>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [patch 3/8] procfs: Add ability to plug in auxiliary fdinfo providers
Date: Wed, 15 Aug 2012 13:21:19 +0400 [thread overview]
Message-ID: <20120815092409.507162379@openvz.org> (raw)
In-Reply-To: 20120815092116.700948346@openvz.org
[-- Attachment #1: seq-fdinfo-seq-ops-helpers-10 --]
[-- Type: text/plain, Size: 4175 bytes --]
This patch brings ability to print out auxiliary data associated
with file in procfs interface /proc/pid/fdinfo/fd.
In particular further patches make eventfd, evenpoll, signalfd
and fsnotify to print additional information complete enough
to restore these objects after checkpoint.
To simplify the code we add show_fdinfo callback inside
struct file_operations (as Al proposed and Pavel are proposing).
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Pavel Emelyanov <xemul@parallels.com>
CC: Al Viro <viro@ZenIV.linux.org.uk>
CC: Alexey Dobriyan <adobriyan@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: James Bottomley <jbottomley@parallels.com>
---
fs/proc/fd.c | 51 ++++++++++++++++++++++++++++++++++++---------------
include/linux/fs.h | 3 +++
2 files changed, 39 insertions(+), 15 deletions(-)
Index: linux-2.6.git/fs/proc/fd.c
===================================================================
--- linux-2.6.git.orig/fs/proc/fd.c
+++ linux-2.6.git/fs/proc/fd.c
@@ -15,11 +15,11 @@
#include "fd.h"
struct proc_fdinfo {
- loff_t f_pos;
- int f_flags;
+ struct file *f_file;
+ int f_flags;
};
-static int fdinfo_open_helper(struct inode *inode, int *f_flags, struct path *path)
+static int fdinfo_open_helper(struct inode *inode, int *f_flags, struct file **f_file, struct path *path)
{
struct files_struct *files = NULL;
struct task_struct *task;
@@ -49,6 +49,10 @@ static int fdinfo_open_helper(struct ino
*path = fd_file->f_path;
path_get(&fd_file->f_path);
}
+ if (f_file) {
+ *f_file = fd_file;
+ get_file(fd_file);
+ }
ret = 0;
}
spin_unlock(&files->file_lock);
@@ -61,28 +65,44 @@ static int fdinfo_open_helper(struct ino
static int seq_show(struct seq_file *m, void *v)
{
struct proc_fdinfo *fdinfo = m->private;
- seq_printf(m, "pos:\t%lli\nflags:\t0%o\n",
- (long long)fdinfo->f_pos,
- fdinfo->f_flags);
- return 0;
+ int ret;
+
+ ret = seq_printf(m, "pos:\t%lli\nflags:\t0%o\n",
+ (long long)fdinfo->f_file->f_pos,
+ fdinfo->f_flags);
+
+ if (!ret && fdinfo->f_file->f_op->show_fdinfo)
+ ret = fdinfo->f_file->f_op->show_fdinfo(m, fdinfo->f_file);
+
+ return ret;
}
static int seq_fdinfo_open(struct inode *inode, struct file *file)
{
- struct proc_fdinfo *fdinfo = NULL;
- int ret = -ENOENT;
+ struct proc_fdinfo *fdinfo;
+ struct seq_file *m;
+ int ret;
fdinfo = kzalloc(sizeof(*fdinfo), GFP_KERNEL);
if (!fdinfo)
return -ENOMEM;
- ret = fdinfo_open_helper(inode, &fdinfo->f_flags, NULL);
- if (!ret) {
- ret = single_open(file, seq_show, fdinfo);
- if (!ret)
- fdinfo = NULL;
+ ret = fdinfo_open_helper(inode, &fdinfo->f_flags, &fdinfo->f_file, NULL);
+ if (ret)
+ goto err_free;
+
+ ret = single_open(file, seq_show, fdinfo);
+ if (ret) {
+ put_filp(fdinfo->f_file);
+ goto err_free;
}
+ m = file->private_data;
+ m->private = fdinfo;
+
+ return ret;
+
+err_free:
kfree(fdinfo);
return ret;
}
@@ -92,6 +112,7 @@ static int seq_fdinfo_release(struct ino
struct seq_file *m = file->private_data;
struct proc_fdinfo *fdinfo = m->private;
+ put_filp(fdinfo->f_file);
kfree(fdinfo);
return single_release(inode, file);
@@ -173,7 +194,7 @@ static const struct dentry_operations ti
static int proc_fd_link(struct dentry *dentry, struct path *path)
{
- return fdinfo_open_helper(dentry->d_inode, NULL, path);
+ return fdinfo_open_helper(dentry->d_inode, NULL, NULL, path);
}
static struct dentry *
Index: linux-2.6.git/include/linux/fs.h
===================================================================
--- linux-2.6.git.orig/include/linux/fs.h
+++ linux-2.6.git/include/linux/fs.h
@@ -1775,6 +1775,8 @@ struct block_device_operations;
#define HAVE_COMPAT_IOCTL 1
#define HAVE_UNLOCKED_IOCTL 1
+struct seq_file;
+
struct file_operations {
struct module *owner;
loff_t (*llseek) (struct file *, loff_t, int);
@@ -1803,6 +1805,7 @@ struct file_operations {
int (*setlease)(struct file *, long, struct file_lock **);
long (*fallocate)(struct file *file, int mode, loff_t offset,
loff_t len);
+ int (*show_fdinfo)(struct seq_file *m, struct file *f);
};
struct inode_operations {
next prev parent reply other threads:[~2012-08-15 9:25 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-15 9:21 [patch 0/8] procfs, fdinfo updated Cyrill Gorcunov
2012-08-15 9:21 ` [patch 1/8] procfs: Move /proc/pid/fd[info] handling code to fd.[ch] Cyrill Gorcunov
2012-08-15 9:21 ` [patch 2/8] procfs: Convert /proc/pid/fdinfo/ handling routines to seq-file Cyrill Gorcunov
2012-08-15 9:21 ` Cyrill Gorcunov [this message]
2012-08-15 21:16 ` [patch 3/8] procfs: Add ability to plug in auxiliary fdinfo providers Al Viro
2012-08-15 21:31 ` Cyrill Gorcunov
2012-08-15 21:29 ` Al Viro
2012-08-15 21:34 ` Cyrill Gorcunov
2012-08-16 10:58 ` Cyrill Gorcunov
2012-08-15 9:21 ` [patch 4/8] fs, exportfs: Add export_encode_inode_fh helper Cyrill Gorcunov
2012-08-15 20:45 ` J. Bruce Fields
2012-08-15 21:02 ` Cyrill Gorcunov
2012-08-15 22:06 ` J. Bruce Fields
2012-08-16 6:24 ` Cyrill Gorcunov
2012-08-16 12:38 ` Cyrill Gorcunov
2012-08-16 12:47 ` J. Bruce Fields
2012-08-16 13:16 ` Cyrill Gorcunov
2012-08-16 14:57 ` Cyrill Gorcunov
2012-08-16 15:05 ` Al Viro
2012-08-16 15:09 ` Cyrill Gorcunov
2012-08-16 13:43 ` Al Viro
2012-08-16 13:47 ` Pavel Emelyanov
2012-08-16 13:50 ` Al Viro
2012-08-16 13:53 ` Pavel Emelyanov
2012-08-16 13:54 ` Cyrill Gorcunov
2012-08-16 14:03 ` James Bottomley
2012-08-16 14:13 ` Pavel Emelyanov
2012-08-16 14:15 ` Cyrill Gorcunov
2012-08-16 14:41 ` Al Viro
2012-08-16 14:48 ` Cyrill Gorcunov
2012-08-16 14:54 ` J. Bruce Fields
2012-08-16 14:55 ` Al Viro
2012-08-16 15:06 ` Pavel Emelyanov
2012-08-16 15:35 ` Cyrill Gorcunov
2012-08-16 15:07 ` Cyrill Gorcunov
2012-08-17 20:58 ` Eric W. Biederman
2012-08-16 13:48 ` Al Viro
2012-08-20 14:19 ` Aneesh Kumar K.V
2012-08-20 16:33 ` Cyrill Gorcunov
2012-08-20 18:32 ` J. Bruce Fields
2012-08-20 19:06 ` Cyrill Gorcunov
2012-08-20 19:32 ` J. Bruce Fields
2012-08-20 19:40 ` Cyrill Gorcunov
2012-08-21 9:18 ` Pavel Emelyanov
2012-08-21 10:42 ` Aneesh Kumar K.V
2012-08-21 10:49 ` Pavel Emelyanov
2012-08-21 10:54 ` Cyrill Gorcunov
2012-08-21 11:09 ` Pavel Emelyanov
2012-08-21 12:11 ` J. Bruce Fields
2012-08-21 12:22 ` Pavel Emelyanov
2012-08-21 12:29 ` J. Bruce Fields
2012-08-21 12:40 ` Pavel Emelyanov
2012-08-21 12:51 ` Boaz Harrosh
2012-08-21 12:59 ` Pavel Emelyanov
2012-08-21 13:08 ` Boaz Harrosh
2012-08-21 13:12 ` Al Viro
2012-08-21 13:40 ` Cyrill Gorcunov
2012-08-21 12:09 ` J. Bruce Fields
2012-08-21 12:25 ` Pavel Emelyanov
2012-08-22 5:49 ` Aneesh Kumar K.V
2012-08-23 8:06 ` Cyrill Gorcunov
2012-08-23 8:54 ` Marco Stornelli
2012-08-23 9:29 ` Cyrill Gorcunov
2012-08-15 9:21 ` [patch 5/8] fs, notify: Add procfs fdinfo helper v3 Cyrill Gorcunov
2012-08-15 9:21 ` [patch 6/8] fs, eventfd: Add procfs fdinfo helper Cyrill Gorcunov
2012-08-15 9:21 ` [patch 7/8] fs, epoll: Add procfs fdinfo helper v2 Cyrill Gorcunov
2012-08-15 9:21 ` [patch 8/8] fdinfo: Show sigmask for signalfd fd v2 Cyrill Gorcunov
-- strict thread matches above, loose matches on Subject: below --
2012-08-14 14:03 [patch 0/8] procfs fdinfo providers updated Cyrill Gorcunov
2012-08-14 14:03 ` [patch 3/8] procfs: Add ability to plug in auxiliary fdinfo providers Cyrill Gorcunov
2012-08-14 14:22 ` Pavel Emelyanov
2012-08-14 18:31 ` Al Viro
2012-08-14 18:35 ` Cyrill Gorcunov
2012-08-14 19:56 ` Cyrill Gorcunov
2012-08-14 21:27 ` Al Viro
2012-08-14 21:56 ` Cyrill Gorcunov
2012-08-14 22:21 ` Cyrill Gorcunov
2012-08-15 0:07 ` Al Viro
2012-08-15 7:40 ` Cyrill Gorcunov
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=20120815092409.507162379@openvz.org \
--to=gorcunov@openvz.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jbottomley@parallels.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.helsley@gmail.com \
--cc=viro@zeniv.linux.org.uk \
--cc=xemul@parallels.com \
/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).