Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755300Ab2HNOGq (ORCPT ); Tue, 14 Aug 2012 10:06:46 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:55680 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375Ab2HNOG2 (ORCPT ); Tue, 14 Aug 2012 10:06:28 -0400 Message-Id: <20120814140620.456133962@openvz.org> User-Agent: quilt/0.48-1 Date: Tue, 14 Aug 2012 18:03:50 +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 Subject: [patch 8/8] fdinfo: Show sigmask for signalfd fd References: <20120814140342.354405844@openvz.org> Content-Disposition: inline; filename=seq-fdinfo-signalfd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3899 Lines: 139 Signed-off-by: Pavel Emelyanov Signed-off-by: Cyrill Gorcunov --- fs/proc/array.c | 2 - fs/signalfd.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/proc_fs.h | 3 ++ 3 files changed, 67 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 #include #include +#include void signalfd_cleanup(struct sighand_struct *sighand) { @@ -46,6 +47,7 @@ void signalfd_cleanup(struct sighand_str } struct signalfd_ctx { + seqcount_t cnt; sigset_t sigmask; }; @@ -259,6 +261,7 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sig return -ENOMEM; ctx->sigmask = sigmask; + seqcount_init(&ctx->cnt); /* * When we call this, the initialization must be complete, since @@ -279,7 +282,9 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sig return -EINVAL; } spin_lock_irq(¤t->sighand->siglock); + write_seqcount_begin(&ctx->cnt); ctx->sigmask = sigmask; + write_seqcount_end(&ctx->cnt); spin_unlock_irq(¤t->sighand->siglock); wake_up(¤t->sighand->signalfd_wqh); @@ -294,3 +299,61 @@ SYSCALL_DEFINE3(signalfd, int, ufd, sigs { return sys_signalfd4(ufd, user_mask, sizemask, 0); } + +#if defined(CONFIG_PROC_FS) && defined(CONFIG_CHECKPOINT_RESTORE) + +static void *seq_start(struct seq_file *m, loff_t *pos) +{ + struct proc_fdinfo_extra *extra = m->private; + return *pos == 0 ? extra->f_file : NULL; +} + +static void *seq_next(struct seq_file *m, void *p, loff_t *pos) +{ + ++*pos; + return NULL; +} + +static int seq_show(struct seq_file *m, void *v) +{ + struct signalfd_ctx *ctx = ((struct file *)v)->private_data; + sigset_t sigmask; + unsigned seq; + + do { + seq = read_seqcount_begin(&ctx->cnt); + sigmask = ctx->sigmask; + } while (read_seqcount_retry(&ctx->cnt, seq)); + + signotset(&sigmask); + render_sigset_t(m, "sigmask:\t", &sigmask); + return 0; +} + +static void seq_stop(struct seq_file *p, void *v) { } + +static const struct seq_operations signalfd_fdinfo_ops = { + .start = seq_start, + .next = seq_next, + .stop = seq_stop, + .show = seq_show, +}; + +static int is_signalfd_file(struct file *file) +{ + return file->f_op == &signalfd_fops; +} + +static struct proc_fdinfo_driver signalfd_fdinfo = { + .name = "signalfd", + .ops = &signalfd_fdinfo_ops, + .probe = is_signalfd_file, +}; + +static int __init signalfd_init(void) +{ + return proc_register_fdinfo_driver(&signalfd_fdinfo); +} +fs_initcall(signalfd_init); + +#endif /* CONFIG_PROC_FS && CONFIG_CHECKPOINT_RESTORE */ 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 @@ -316,4 +316,7 @@ static inline struct net *PDE_NET(struct return pde->parent->data; } +#include + +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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/