ss: Get netlink sockets info via sock-diag (v2)

v2: update netlink_diag.h

Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Andrey Vagin <avagin@openvz.org>

diff --git a/include/linux/netlink_diag.h b/include/linux/netlink_diag.h
new file mode 100644 (file)
index 0000000..4e31db4
--- /dev/null
+++ b/include/linux/netlink_diag.h
@@ -0,0 +1,52 @@
+#ifndef __NETLINK_DIAG_H__
+#define __NETLINK_DIAG_H__
+
+#include <linux/types.h>
+
+struct netlink_diag_req {
+       __u8    sdiag_family;
+       __u8    sdiag_protocol;
+       __u16   pad;
+       __u32   ndiag_ino;
+       __u32   ndiag_show;
+       __u32   ndiag_cookie[2];
+};
+
+struct netlink_diag_msg {
+       __u8    ndiag_family;
+       __u8    ndiag_type;
+       __u8    ndiag_protocol;
+       __u8    ndiag_state;
+
+       __u32   ndiag_portid;
+       __u32   ndiag_dst_portid;
+       __u32   ndiag_dst_group;
+       __u32   ndiag_ino;
+       __u32   ndiag_cookie[2];
+};
+
+struct netlink_diag_ring {
+       __u32   ndr_block_size;
+       __u32   ndr_block_nr;
+       __u32   ndr_frame_size;
+       __u32   ndr_frame_nr;
+};
+
+enum {
+       NETLINK_DIAG_MEMINFO,
+       NETLINK_DIAG_GROUPS,
+       NETLINK_DIAG_RX_RING,
+       NETLINK_DIAG_TX_RING,
+
+       __NETLINK_DIAG_MAX,
+};
+
+#define NETLINK_DIAG_MAX (__NETLINK_DIAG_MAX - 1)
+
+#define NDIAG_PROTO_ALL                ((__u8) ~0)
+
+#define NDIAG_SHOW_MEMINFO     0x00000001 /* show memory info of a socket */
+#define NDIAG_SHOW_GROUPS      0x00000002 /* show groups of a netlink socket */
+#define NDIAG_SHOW_RING_CFG    0x00000004 /* show ring configuration */
+
+#endif

diff --git a/misc/ss.c b/misc/ss.c
index c8534ff14c1b75a1ce90a853a9fc8622a250a14f..e0d11ff04d3bcc9c4cc63e72e83de063d19c2164 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -39,6 +39,7 @@
 #include <linux/netdevice.h>   /* for MAX_ADDR_LEN */
 #include <linux/filter.h>
 #include <linux/packet_diag.h>
+#include <linux/netlink_diag.h>
 
 int resolve_hosts = 0;
 int resolve_services = 1;
@@ -2746,6 +2747,61 @@ static void netlink_show_one(struct filter *f,
        return;
 }
 
+static int netlink_show_sock(struct nlmsghdr *nlh, struct filter *f)
+{
+       struct netlink_diag_msg *r = NLMSG_DATA(nlh);
+       struct rtattr *tb[NETLINK_DIAG_MAX+1];
+       int rq = 0, wq = 0;
+       unsigned long groups = 0;
+
+       parse_rtattr(tb, NETLINK_DIAG_MAX, (struct rtattr*)(r+1),
+                    nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r)));
+
+       if (tb[NETLINK_DIAG_GROUPS] && RTA_PAYLOAD(tb[NETLINK_DIAG_GROUPS]))
+               groups = *(unsigned long *) RTA_DATA(tb[NETLINK_DIAG_GROUPS]);
+
+       if (tb[NETLINK_DIAG_MEMINFO]) {
+               const __u32 *skmeminfo;
+               skmeminfo = RTA_DATA(tb[NETLINK_DIAG_MEMINFO]);
+
+               rq = skmeminfo[SK_MEMINFO_RMEM_ALLOC];
+               wq = skmeminfo[SK_MEMINFO_WMEM_ALLOC];
+       }
+
+       netlink_show_one(f, r->ndiag_protocol, r->ndiag_portid, groups,
+                        r->ndiag_state, r->ndiag_dst_portid, r->ndiag_dst_group,
+                        rq, wq, 0, 0);
+
+       if (show_mem) {
+               printf("\t");
+               print_skmeminfo(tb, NETLINK_DIAG_MEMINFO);
+               printf("\n");
+       }
+
+       return 0;
+}
+
+static int netlink_show_netlink(struct filter *f, FILE *dump_fp)
+{
+       struct {
+               struct nlmsghdr nlh;
+               struct netlink_diag_req r;
+       } req;
+
+       memset(&req, 0, sizeof(req));
+       req.nlh.nlmsg_len = sizeof(req);
+       req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
+       req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+       req.nlh.nlmsg_seq = 123456;
+
+       req.r.sdiag_family = AF_NETLINK;
+       req.r.sdiag_protocol = NDIAG_PROTO_ALL;
+       req.r.ndiag_show = NDIAG_SHOW_GROUPS | NDIAG_SHOW_MEMINFO;
+
+       return handle_netlink_request(f, dump_fp, &req.nlh,
+                                       sizeof(req), netlink_show_sock);
+}
+
 static int netlink_show(struct filter *f)
 {
        FILE *fp;