Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 257b529876cb45ec791eaa89e3d2ee0d16b49383

Authored by Pavel Emelyanov
Committed by David S. Miller
1 parent c0636faa53
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

unix_diag: Add the MEMINFO extension 

[ Fix indentation of sock_diag*() calls. -DaveM ]

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 14 additions and 8 deletions Side-by-side Diff

include/linux/unix_diag.h
Diff comments   View file @ 257b529
... ... @@ -18,6 +18,7 @@
18 18 #define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */
19 19 #define UDIAG_SHOW_ICONS 0x00000008 /* show pending connections */
20 20 #define UDIAG_SHOW_RQLEN 0x00000010 /* show skb receive queue len */
  21 +#define UDIAG_SHOW_MEMINFO 0x00000020 /* show memory info of a socket */
21 22  
22 23 struct unix_diag_msg {
23 24 __u8 udiag_family;
... ... @@ -35,6 +36,7 @@
35 36 UNIX_DIAG_PEER,
36 37 UNIX_DIAG_ICONS,
37 38 UNIX_DIAG_RQLEN,
  39 + UNIX_DIAG_MEMINFO,
38 40  
39 41 UNIX_DIAG_MAX,
40 42 };
... ... @@ -127,25 +127,29 @@
127 127 sock_diag_save_cookie(sk, rep->udiag_cookie);
128 128  
129 129 if ((req->udiag_show & UDIAG_SHOW_NAME) &&
130   - sk_diag_dump_name(sk, skb))
  130 + sk_diag_dump_name(sk, skb))
131 131 goto nlmsg_failure;
132 132  
133 133 if ((req->udiag_show & UDIAG_SHOW_VFS) &&
134   - sk_diag_dump_vfs(sk, skb))
  134 + sk_diag_dump_vfs(sk, skb))
135 135 goto nlmsg_failure;
136 136  
137 137 if ((req->udiag_show & UDIAG_SHOW_PEER) &&
138   - sk_diag_dump_peer(sk, skb))
  138 + sk_diag_dump_peer(sk, skb))
139 139 goto nlmsg_failure;
140 140  
141 141 if ((req->udiag_show & UDIAG_SHOW_ICONS) &&
142   - sk_diag_dump_icons(sk, skb))
  142 + sk_diag_dump_icons(sk, skb))
143 143 goto nlmsg_failure;
144 144  
145 145 if ((req->udiag_show & UDIAG_SHOW_RQLEN) &&
146   - sk_diag_show_rqlen(sk, skb))
  146 + sk_diag_show_rqlen(sk, skb))
147 147 goto nlmsg_failure;
148 148  
  149 + if ((req->udiag_show & UDIAG_SHOW_MEMINFO) &&
  150 + sock_diag_put_meminfo(sk, skb, UNIX_DIAG_MEMINFO))
  151 + goto nlmsg_failure;
  152 +
149 153 nlh->nlmsg_len = skb_tail_pointer(skb) - b;
150 154 return skb->len;
151 155  
... ... @@ -191,9 +195,9 @@
191 195 if (!(req->udiag_states & (1 << sk->sk_state)))
192 196 goto next;
193 197 if (sk_diag_dump(sk, skb, req,
194   - NETLINK_CB(cb->skb).pid,
195   - cb->nlh->nlmsg_seq,
196   - NLM_F_MULTI) < 0)
  198 + NETLINK_CB(cb->skb).pid,
  199 + cb->nlh->nlmsg_seq,
  200 + NLM_F_MULTI) < 0)
197 201 goto done;
198 202 next:
199 203 num++;