From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: davem@davemloft.net, pankaj.laxminarayan.bharadiya@intel.com,
keescook@chromium.org, viro@zeniv.linux.org.uk, hare@suse.com,
tglx@linutronix.de, ktkhai@virtuozzo.com, edumazet@google.com,
arnd@arndb.de, axboe@kernel.dk, netdev@vger.kernel.org
Subject: [PATCH 1/2] net: Allow to show socket-specific information in /proc/[pid]/fdinfo/[fd]
Date: Thu, 07 Nov 2019 15:14:32 +0300 [thread overview]
Message-ID: <157312887239.4594.10921390452225648378.stgit@localhost.localdomain> (raw)
In-Reply-To: <157312863230.4594.18421480718399996953.stgit@localhost.localdomain>
This adds .show_fdinfo to socket_file_ops, so protocols will be able
to print their specific data in fdinfo.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
include/linux/net.h | 1 +
net/socket.c | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/include/linux/net.h b/include/linux/net.h
index 9cafb5f353a9..6451425e828f 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -171,6 +171,7 @@ struct proto_ops {
int (*compat_getsockopt)(struct socket *sock, int level,
int optname, char __user *optval, int __user *optlen);
#endif
+ void (*show_fdinfo)(struct seq_file *m, struct socket *sock);
int (*sendmsg) (struct socket *sock, struct msghdr *m,
size_t total_len);
/* Notes for implementing recvmsg:
diff --git a/net/socket.c b/net/socket.c
index 54afceebd7a1..29c5ed4e7d85 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -128,6 +128,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags);
+static void sock_show_fdinfo(struct seq_file *m, struct file *f);
/*
* Socket files have a set of 'special' operations as well as the generic file ones. These don't appear
@@ -150,6 +151,9 @@ static const struct file_operations socket_file_ops = {
.sendpage = sock_sendpage,
.splice_write = generic_splice_sendpage,
.splice_read = sock_splice_read,
+#ifdef CONFIG_PROC_FS
+ .show_fdinfo = sock_show_fdinfo,
+#endif
};
/*
@@ -992,6 +996,14 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)
return res;
}
+static void sock_show_fdinfo(struct seq_file *m, struct file *f)
+{
+ struct socket *sock = f->private_data;
+
+ if (sock->ops->show_fdinfo)
+ sock->ops->show_fdinfo(m, sock);
+}
+
/*
* Atomic setting of ioctl hooks to avoid race
* with module unload.
next prev parent reply other threads:[~2019-11-07 12:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 12:14 [PATCH 0/2] unix: Show number of scm files in fdinfo Kirill Tkhai
2019-11-07 12:14 ` Kirill Tkhai [this message]
2019-11-07 12:14 ` [PATCH 2/2] unix: Show number of pending scm files of receive queue " Kirill Tkhai
2019-11-08 19:30 ` [PATCH 0/2] unix: Show number of scm files " David Miller
2019-11-08 23:15 ` Jens Axboe
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=157312887239.4594.10921390452225648378.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hare@suse.com \
--cc=keescook@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=pankaj.laxminarayan.bharadiya@intel.com \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/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).