diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-04-25 02:53:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-29 13:21:30 -0400 |
commit | 76d0eeb1a1579453cfd7c4da22004d4b34187ab4 (patch) | |
tree | 86deb897a9bf6fe95b72634a7d413abbd1780629 | |
parent | 626419038a3e4a1f61119a4af08d01415961eb4e (diff) |
packet_diag: disclose meminfo values
sk_rmem_alloc is disclosed via /proc/net/packet but not via netlink messages.
The goal is to have the same level of information.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/uapi/linux/packet_diag.h | 2 | ||||
-rw-r--r-- | net/packet/diag.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index 84f83a47b6f6..c0802c18c8ad 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h | |||
@@ -16,6 +16,7 @@ struct packet_diag_req { | |||
16 | #define PACKET_SHOW_MCLIST 0x00000002 /* A set of packet_diag_mclist-s */ | 16 | #define PACKET_SHOW_MCLIST 0x00000002 /* A set of packet_diag_mclist-s */ |
17 | #define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */ | 17 | #define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */ |
18 | #define PACKET_SHOW_FANOUT 0x00000008 | 18 | #define PACKET_SHOW_FANOUT 0x00000008 |
19 | #define PACKET_SHOW_MEMINFO 0x00000010 | ||
19 | 20 | ||
20 | struct packet_diag_msg { | 21 | struct packet_diag_msg { |
21 | __u8 pdiag_family; | 22 | __u8 pdiag_family; |
@@ -33,6 +34,7 @@ enum { | |||
33 | PACKET_DIAG_TX_RING, | 34 | PACKET_DIAG_TX_RING, |
34 | PACKET_DIAG_FANOUT, | 35 | PACKET_DIAG_FANOUT, |
35 | PACKET_DIAG_UID, | 36 | PACKET_DIAG_UID, |
37 | PACKET_DIAG_MEMINFO, | ||
36 | 38 | ||
37 | __PACKET_DIAG_MAX, | 39 | __PACKET_DIAG_MAX, |
38 | }; | 40 | }; |
diff --git a/net/packet/diag.c b/net/packet/diag.c index 04c8219a2d06..822fe9b33a49 100644 --- a/net/packet/diag.c +++ b/net/packet/diag.c | |||
@@ -166,6 +166,10 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, | |||
166 | pdiag_put_fanout(po, skb)) | 166 | pdiag_put_fanout(po, skb)) |
167 | goto out_nlmsg_trim; | 167 | goto out_nlmsg_trim; |
168 | 168 | ||
169 | if ((req->pdiag_show & PACKET_SHOW_MEMINFO) && | ||
170 | sock_diag_put_meminfo(sk, skb, PACKET_DIAG_MEMINFO)) | ||
171 | goto out_nlmsg_trim; | ||
172 | |||
169 | return nlmsg_end(skb, nlh); | 173 | return nlmsg_end(skb, nlh); |
170 | 174 | ||
171 | out_nlmsg_trim: | 175 | out_nlmsg_trim: |