On Tue, Nov 13, 2012 at 09:01:59PM +0400, Cyrill Gorcunov wrote:
>
> As from c/r patch I think we can read it lockless (since we do stop
> tasks anyway before doing checkpoint). So I would prefer to provide
> it without locks at all.
Something like this. (Also I wonder where the documentation about
fdinfo should go?)
---
From: Cyrill Gorcunov <gorcu...@openvz.org>
Subject: fdinfo: Show sigmask for signalfd fd v3
The sigmask is read in lockless manner for a sake of
code simplicity, thus if precise data needed here
the tasks which refer to the signalfd should be
stopped before read.
Signed-off-by: Cyrill Gorcunov <gorcu...@openvz.org>
CC: Pavel Emelyanov <xe...@parallels.com>
CC: Al Viro <v...@zeniv.linux.org.uk>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Andrew Morton <a...@linux-foundation.org>
CC: James Bottomley <jbottom...@parallels.com>
CC: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Matthew Helsley <matt.hels...@gmail.com>
CC: "J. Bruce Fields" <bfie...@fieldses.org>
CC: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
---
fs/proc/array.c | 2 +-
fs/signalfd.c | 18 ++++++++++++++++++
include/linux/proc_fs.h | 3 +++
3 files changed, 22 insertions(+), 1 deletion(-)
Index: linux-2.6.git/fs/proc/array.c
===================================================================
--- linux-2.6.git.orig/fs/proc/array.c
+++ linux-2.6.git/fs/proc/array.c
@@ -220,7 +220,7 @@ static inline void task_state(struct seq
seq_putc(m, '\n');
}
-static void render_sigset_t(struct seq_file *m, const char *header,
+void render_sigset_t(struct seq_file *m, const char *header,
sigset_t *set)
{
int i;
Index: linux-2.6.git/fs/signalfd.c
===================================================================
--- linux-2.6.git.orig/fs/signalfd.c
+++ linux-2.6.git/fs/signalfd.c
@@ -29,6 +29,7 @@
#include <linux/anon_inodes.h>
#include <linux/signalfd.h>
#include <linux/syscalls.h>
+#include <linux/proc_fs.h>
void signalfd_cleanup(struct sighand_struct *sighand)
{
@@ -227,7 +228,24 @@ static ssize_t signalfd_read(struct file
return total ? total: ret;
}
+#ifdef CONFIG_PROC_FS
+static int signalfd_show_fdinfo(struct seq_file *m, struct file *f)
+{
+ struct signalfd_ctx *ctx = f->private_data;
+ sigset_t sigmask;
+
+ sigmask = ctx->sigmask;
+ signotset(&sigmask);
+ render_sigset_t(m, "sigmask:\t", &sigmask);
+
+ return 0;
+}
+#endif
+
static const struct file_operations signalfd_fops = {
+#ifdef CONFIG_PROC_FS
+ .show_fdinfo = signalfd_show_fdinfo,
+#endif
.release = signalfd_release,
.poll = signalfd_poll,
.read = signalfd_read,
Index: linux-2.6.git/include/linux/proc_fs.h
===================================================================
--- linux-2.6.git.orig/include/linux/proc_fs.h
+++ linux-2.6.git/include/linux/proc_fs.h
@@ -290,4 +290,7 @@ static inline struct net *PDE_NET(struct
return pde->parent->data;
}
+#include <linux/signal.h>
+
+void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set);
#endif /* _LINUX_PROC_FS_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
