Martin KaFai Lau 085c20cacf
bpf: inet_diag: Dump bpf_sk_storages in inet_diag_dump() ...
This patch will dump out the bpf_sk_storages of a sk
if the request has the INET_DIAG_REQ_SK_BPF_STORAGES nlattr.
An array of SK_DIAG_BPF_STORAGE_REQ_MAP_FD can be specified in
INET_DIAG_REQ_SK_BPF_STORAGES to select which bpf_sk_storage to dump.
If no map_fd is specified, all bpf_sk_storages of a sk will be dumped.
bpf_sk_storages can be added to the system at runtime. It is difficult
to find a proper static value for cb->min_dump_alloc.
This patch learns the nlattr size required to dump the bpf_sk_storages
of a sk. If it happens to be the very first nlmsg of a dump and it
cannot fit the needed bpf_sk_storages, it will try to expand the
skb by "pskb_expand_head()".
Instead of expanding it in inet_sk_diag_fill(), it is expanded at a
sleepable context in __inet_diag_dump() so __GFP_DIRECT_RECLAIM can
be used. In __inet_diag_dump(), it will retry as long as the
skb is empty and the cb->min_dump_alloc becomes larger than before.
cb->min_dump_alloc is bounded by KMALLOC_MAX_SIZE. The min_dump_alloc
is also changed from 'u16' to 'u32' to accommodate a sk that may have
a few large bpf_sk_storages.
The updated cb->min_dump_alloc will also be used to allocate the skb in
the next dump. This logic already exists in netlink_dump().
Here is the sample output of a locally modified 'ss' and it could be made
more readable by using BTF later:
[root@arch-fb-vm1 ~]# ss --bpf-map-id 14 --bpf-map-id 13 -t6an 'dst [::1]:8989'
State Recv-Q Send-Q Local Address:Port Peer Address:PortProcess
ESTAB 0 0 [::1]:51072 [::1]:8989
bpf_map_id:14 value:[ 3feb ]
bpf_map_id:13 value:[ 3f ]
ESTAB 0 0 [::1]:51070 [::1]:8989
bpf_map_id:14 value:[ 3feb ]
bpf_map_id:13 value:[ 3f ]
[root@arch-fb-vm1 ~]# ~/devshare/github/iproute2/misc/ss --bpf-maps -t6an 'dst [::1]:8989'
State Recv-Q Send-Q Local Address:Port Peer Address:Port Process
ESTAB 0 0 [::1]:51072 [::1]:8989
bpf_map_id:14 value:[ 3feb ]
bpf_map_id:13 value:[ 3f ]
bpf_map_id:12 value:[ 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000... total:65407 ]
ESTAB 0 0 [::1]:51070 [::1]:8989
bpf_map_id:14 value:[ 3feb ]
bpf_map_id:13 value:[ 3f ]
bpf_map_id:12 value:[ 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000... total:65407 ]
Signed-off-by: Martin KaFai Lau <kafai@fb.com >
Signed-off-by: Alexei Starovoitov <ast@kernel.org >
Acked-by: Song Liu <songliubraving@fb.com >
Link: https://lore.kernel.org/bpf/20200225230427.1976129-1-kafai@fb.com
2020-02-27 18:50:19 -08:00
2020-01-02 15:34:27 +01:00
2020-02-08 13:26:41 -08:00
2019-11-27 08:15:00 -08:00
2019-12-16 10:11:16 +01:00
2020-01-21 11:06:12 +05:30
2020-01-05 15:13:13 -08:00
2020-02-08 14:04:19 -08:00
2020-02-16 18:30:41 -08:00
2020-01-29 09:51:36 -08:00
2019-08-28 17:24:22 +02:00
2020-01-18 14:26:13 +00:00
2019-09-16 09:56:27 -07:00
2020-02-08 10:01:33 +00:00
2019-12-11 09:12:38 +01:00
2019-11-12 11:43:29 -05:00
2020-01-08 12:59:53 +01:00
2020-02-04 07:17:41 +00:00
2020-01-31 14:40:36 -08:00
2020-02-21 13:39:34 -08:00
2020-01-28 16:02:33 -08:00
2020-01-27 17:49:15 +01:00
2020-01-24 20:54:29 +01:00
2019-09-13 12:47:36 +02:00
2019-09-13 12:47:36 +02:00
2019-09-13 12:47:36 +02:00
2019-09-13 12:47:36 +02:00
2020-01-14 10:50:19 +05:30
2019-12-30 14:27:53 +01:00
2020-02-08 17:15:08 -08:00
2019-12-19 01:07:53 +01:00
2020-01-27 14:35:32 +01:00
2020-01-13 11:44:09 -08:00
2020-01-15 14:10:45 +00:00
2020-01-20 10:29:56 -08:00
2020-01-20 10:29:56 -08:00
2019-10-16 10:39:00 +02:00
2020-02-15 12:51:22 -08:00
2020-02-08 14:04:19 -08:00
2020-01-16 17:32:43 +05:30
2020-01-23 12:37:18 +00:00
2020-02-07 17:39:56 -08:00
2020-02-10 11:14:22 -08:00
2019-12-27 11:02:07 +01:00
2019-10-18 17:05:42 -05:00
2019-12-04 13:32:45 +10:00
2019-12-25 20:47:19 -07:00
2020-01-24 21:03:53 +01:00
2020-01-14 15:16:50 +01:00
2019-11-14 12:31:00 +08:00
2019-10-14 10:55:14 +01:00
2019-10-21 19:20:30 +01:00
2020-01-15 22:55:36 -05:00
2019-11-23 09:56:02 -08:00
2019-08-27 09:22:38 -06:00
2020-01-31 10:30:36 -08:00
2019-09-02 15:55:03 +01:00
2019-12-28 09:44:56 -07:00
2020-02-04 03:05:26 +00:00
2020-02-04 03:05:26 +00:00
2019-11-21 09:06:47 -07:00
2019-12-12 09:26:55 -07:00
2019-11-13 12:50:38 -07:00
2020-01-29 18:16:16 -08:00
2020-01-13 13:19:38 -05:00
2020-01-22 23:04:52 +01:00
2020-01-10 17:20:07 +01:00
2020-02-28 01:21:02 +01:00
2020-02-27 18:50:19 -08:00
2019-10-23 20:42:52 -07:00
2019-11-14 13:15:11 -05:00
2020-01-22 23:04:52 +01:00
2019-09-05 10:15:16 +02:00
2019-12-04 19:44:12 -08:00
2020-01-04 20:23:39 -07:00
2019-11-12 08:18:04 -08:00
2019-11-12 08:18:04 -08:00
2020-01-31 13:14:26 -08:00
2020-01-07 11:31:47 +01:00
2020-01-27 10:24:32 +01:00
2019-09-24 15:54:10 -07:00
2020-02-21 11:22:15 -08:00
2019-10-11 09:26:05 -07:00
2019-09-21 09:47:19 -07:00
2019-09-08 14:53:58 +02:00
2020-01-21 13:28:24 +01:00
2019-09-04 13:38:26 +02:00
2019-10-29 10:01:16 +01:00
2020-01-27 19:59:55 +01:00
2019-11-04 21:57:51 +01:00
2019-10-18 19:47:49 +01:00
2020-01-27 10:24:32 +01:00
2019-11-26 10:26:26 +01:00
2020-02-03 16:56:48 +01:00
2020-02-08 14:04:19 -08:00
2019-09-03 09:36:36 +02:00
2020-01-23 00:35:50 +01:00
2020-02-04 03:05:27 +00:00
2019-09-23 11:21:04 -07:00
2020-01-09 11:30:53 +08:00
2020-01-16 09:52:27 -08:00
2019-11-15 13:49:04 -05:00
2019-12-10 22:29:58 -05:00
2019-12-16 10:11:10 +01:00
2019-08-25 12:44:38 +09:00
2019-12-30 09:59:06 +09:00
2019-10-07 15:11:38 -05:00
2019-11-25 11:53:26 -08:00
2019-12-16 10:11:16 +01:00
2019-10-09 19:33:43 -07:00
2019-11-26 11:52:57 +01:00
2019-08-21 07:14:10 +09:00
2019-11-21 18:14:35 +01:00
2019-08-17 18:46:33 +01:00
2019-12-11 11:13:33 +05:30
2019-11-28 11:16:43 -08:00
2019-11-20 20:31:38 +01:00
2020-01-27 10:55:50 -08:00
2019-11-11 16:07:13 +01:00
2019-12-03 11:20:37 +01:00
2019-10-22 12:54:44 -07:00
2019-11-10 12:40:14 +01:00
2020-01-20 08:14:29 +01:00
2019-09-05 19:52:33 -06:00
2019-11-07 07:02:40 +01:00
2019-10-17 16:23:25 +02:00
2020-01-27 11:09:31 +01:00
2019-12-27 16:40:02 -08:00
2020-02-03 17:27:38 -07:00
2020-01-29 15:45:47 -07:00
2019-12-16 10:35:33 +01:00
2019-11-12 08:18:04 -08:00
2019-10-17 16:44:36 +02:00
2020-01-13 14:15:27 +09:00
2020-01-17 16:48:07 -08:00
2020-01-03 09:42:52 +01:00
2020-01-03 14:27:40 +01:00
2020-01-18 09:19:18 -05:00
2020-01-13 21:48:42 +01:00
2020-02-24 16:20:09 -08:00
2020-02-07 14:48:39 -05:00
2020-02-07 14:48:38 -05:00
2020-02-08 13:26:41 -08:00
2020-01-22 14:50:03 -08:00
2019-08-19 11:00:39 -04:00
2020-01-14 13:27:32 -08:00
2019-12-11 12:22:38 -08:00
2019-11-20 09:40:10 +01:00
2019-11-27 11:06:20 -08:00
2019-12-04 19:44:13 -08:00
2020-01-28 10:07:09 -08:00
2019-12-01 12:59:06 -08:00
2019-09-05 11:40:54 +02:00
2019-08-27 19:02:59 +02:00
2019-09-18 15:58:13 +02:00
2019-11-23 19:56:45 -04:00
2020-01-15 16:21:28 +10:00
2020-01-14 12:20:55 +01:00
2020-01-27 20:00:01 +01:00
2019-12-16 12:41:40 -08:00
2020-01-23 13:15:09 -08:00
2020-01-26 22:10:17 -05:00
2019-12-17 16:48:34 +01:00
2019-11-05 14:03:11 -08:00
2020-02-13 14:19:00 -08:00
2020-01-30 07:39:10 -08:00
2019-09-03 11:33:29 +02:00
2019-11-08 08:46:49 -08:00
2020-02-14 09:59:24 +01:00
2020-01-08 12:52:33 -08:00
2019-10-24 14:53:49 -07:00
2019-10-24 14:53:48 -07:00
2019-10-24 14:53:49 -07:00
2020-01-22 15:22:51 -05:00
2020-02-27 18:50:19 -08:00
2019-08-28 11:50:33 +02:00
2019-12-12 18:58:24 +01:00
2019-10-04 12:31:46 -07:00
2020-01-07 14:05:58 +01:00
2020-02-10 10:41:20 +01:00
2019-12-16 09:25:24 +02:00
2019-12-03 12:20:25 -08:00
2019-09-25 17:51:39 -07:00
2020-01-31 10:30:41 -08:00
2020-01-10 15:52:25 +00:00
2020-01-06 09:45:59 +01:00
2019-10-15 13:34:25 +02:00
2019-10-21 08:51:59 -07:00
2020-01-24 15:39:39 +01:00
2019-11-07 15:44:14 +01:00
2019-10-22 14:42:34 -05:00
2019-11-11 09:02:56 +01:00
2020-02-01 09:31:47 +01:00
2020-02-09 12:11:12 -08:00
2020-01-25 03:01:56 -05:00
2019-12-18 18:07:33 +01:00
2019-10-21 09:16:46 -04:00
2019-12-31 13:15:38 +01:00
2019-12-04 19:44:14 -08:00
2020-01-31 17:33:54 +00:00
2019-11-21 07:33:24 +01:00
2020-02-20 21:17:24 +01:00
2019-12-11 09:12:38 +01:00
2019-11-12 08:18:04 -08:00
2019-09-28 08:14:15 -07:00
2019-09-02 11:43:54 +01:00
2019-09-25 17:51:40 -07:00
2019-09-24 15:54:11 -07:00
2020-02-21 11:22:15 -08:00
2020-01-30 18:47:59 +01:00
2020-01-30 18:45:55 +01:00
2019-11-03 17:38:36 +01:00
2019-12-21 20:09:54 +01:00
2020-01-06 00:20:18 +01:00
2020-02-06 06:11:50 +00:00
2019-11-26 13:35:25 -07:00
2019-11-19 09:52:12 -08:00
2019-11-14 11:36:53 +08:00
2019-10-18 12:13:35 +02:00
2020-02-16 19:39:44 -08:00
2020-01-10 14:00:57 -08:00
2020-01-28 08:46:13 -08:00
2019-11-01 13:08:19 +01:00
2019-12-11 11:13:50 +02:00
2019-11-05 08:45:46 +08:00
2019-12-09 17:53:58 -05:00
2019-10-17 21:31:55 +02:00
2019-09-05 12:32:05 +02:00
2020-01-31 10:30:38 -08:00
2019-12-01 12:59:07 -08:00
2020-02-04 03:05:23 +00:00
2020-01-31 10:30:39 -08:00
2019-09-28 14:05:38 -07:00
2019-11-07 15:45:00 +01:00
2019-09-29 10:33:41 -07:00
2019-10-17 16:31:52 -07:00
2019-08-20 09:35:03 -03:00
2019-12-25 19:51:33 -08:00
2020-01-05 23:22:32 -08:00
2019-12-06 10:28:09 -08:00
2019-09-25 17:51:40 -07:00
2020-02-04 07:21:04 +00:00
2020-02-04 07:24:48 +00:00
2020-01-14 11:54:47 -04:00
2020-02-04 03:05:23 +00:00
2019-12-20 21:47:04 -08:00
2020-02-01 10:01:52 -08:00
2019-12-01 12:59:05 -08:00
2019-12-09 10:55:03 +01:00
2019-10-04 11:10:56 -07:00
2019-10-23 17:23:44 +02:00
2020-01-29 11:20:24 -08:00
2019-11-14 19:06:47 -08:00
2019-12-12 17:04:54 -08:00
2020-01-27 11:00:21 +01:00
2020-02-16 19:32:11 -08:00
2019-09-13 12:35:33 +02:00
2019-09-13 12:35:33 +02:00
2019-10-17 12:20:48 +02:00
2020-02-27 18:50:19 -08:00
2019-11-06 08:55:24 -05:00
2020-01-15 10:54:33 -05:00
2020-02-12 13:55:25 -05:00
2020-01-24 16:51:13 -05:00
2019-12-04 19:44:12 -08:00
2020-01-14 12:20:48 +01:00
2019-11-27 02:48:27 +09:00
2019-11-04 10:56:40 -07:00
2019-11-22 02:21:08 +09:00
2019-11-27 10:53:50 -08:00
2020-01-09 10:48:54 +01:00
2019-10-08 13:55:26 -05:00
2020-02-05 14:52:03 -08:00
2019-09-11 14:46:02 +01:00
2019-12-26 15:17:26 -08:00
2019-11-04 11:21:25 -08:00
2019-11-21 07:49:29 -06:00
2020-01-02 16:50:04 +01:00
2019-12-17 08:06:51 -08:00
2019-12-11 16:37:02 +08:00
2019-10-14 15:04:00 -07:00
2019-11-06 08:28:58 -08:00
2020-01-31 10:30:39 -08:00
2020-01-06 08:58:23 -08:00
2020-02-04 03:05:25 +00:00
2019-11-13 19:09:47 +08:00
2019-08-28 15:25:53 -05:00
2020-01-16 17:09:18 +01:00
2020-01-15 16:30:28 +00:00
2019-10-14 10:22:26 -05:00
2020-01-29 17:00:02 -06:00
2020-01-31 11:15:59 -08:00
2020-01-20 17:04:02 -07:00
2019-10-09 12:46:10 +02:00
2020-02-09 12:04:09 -08:00
2019-09-05 11:54:14 +02:00
2019-12-09 10:36:44 -08:00
2020-02-16 19:39:44 -08:00
2020-02-16 19:39:45 -08:00
2019-11-15 23:49:22 +01:00
2019-11-15 23:49:22 +01:00
2020-02-12 11:54:08 -08:00
2019-11-05 18:33:13 +01:00
2020-01-02 16:52:40 +01:00
2019-11-11 10:27:15 +05:30
2019-11-29 12:04:50 +01:00
2019-10-29 14:45:54 -05:00
2019-11-13 11:41:50 +01:00
2020-01-23 13:15:09 -08:00
2019-12-30 20:19:27 -08:00
2019-09-05 21:16:22 +02:00
2019-12-19 01:36:32 +01:00
2020-02-20 21:17:24 +01:00
2019-12-06 10:47:28 +01:00
2020-02-04 03:05:26 +00:00
2020-01-29 11:20:24 -08:00
2019-12-03 11:46:20 +01:00
2020-01-02 16:49:59 +01:00
2020-01-04 13:49:51 +08:00
2020-02-04 03:05:25 +00:00
2019-12-30 20:31:40 -08:00
2020-01-13 18:16:43 -08:00
2019-10-21 16:50:03 +02:00
2019-10-18 18:24:50 +01:00
2020-01-07 22:14:38 -08:00
2019-11-11 11:06:27 +01:00
2019-11-06 10:52:10 +01:00
2019-11-01 22:26:34 -04:00
2020-02-07 14:48:37 -05:00
2020-01-25 12:18:50 -05:00
2019-12-04 19:44:13 -08:00
2020-01-24 10:24:31 -08:00
2019-10-30 08:32:07 -07:00
2020-02-17 10:55:14 +01:00
2020-01-10 14:00:58 -08:00
2020-01-24 10:37:27 -08:00
2020-01-24 10:24:31 -08:00
2020-01-24 10:24:31 -08:00
2019-09-25 17:42:29 +02:00
2019-11-25 09:15:32 +01:00
2020-01-09 21:23:36 +00:00
2020-01-20 16:19:10 +01:00
2019-12-05 11:43:31 -08:00
2019-12-05 11:43:31 -08:00
2019-10-29 10:47:14 +00:00
2020-01-13 13:19:38 -05:00
2019-09-16 11:43:38 -05:00
2019-12-18 10:38:07 +01:00
2019-11-14 13:07:48 +08:00
2019-10-09 12:46:10 +02:00
2019-11-13 12:50:40 -07:00
2020-01-29 19:38:34 -08:00
2019-12-24 11:35:48 +00:00
2019-10-10 14:55:24 -07:00
2019-12-09 17:53:58 -05:00
2019-11-04 07:11:31 -07:00
2019-11-14 13:15:12 -05:00
2020-02-04 03:05:26 +00:00
2019-10-09 12:46:10 +02:00
2019-12-18 15:04:42 +01:00
2020-01-15 13:39:14 +01:00
2019-12-11 11:53:41 -08:00
2020-02-07 14:48:37 -05:00
2019-09-24 15:54:11 -07:00
2019-08-19 06:34:13 -05:00
2020-02-16 19:50:02 -08:00
2020-02-21 22:29:45 +01:00
2020-02-04 03:05:24 +00:00
2020-01-24 20:40:09 +01:00
2019-12-03 07:04:30 -07:00
2019-11-14 13:15:11 -05:00
2019-10-09 12:46:10 +02:00
2019-11-13 12:15:34 -08:00
2020-01-13 18:31:48 -08:00
2020-01-17 10:19:21 +01:00
2020-02-04 03:05:26 +00:00
2020-02-11 10:11:02 +01:00
2020-01-31 10:30:40 -08:00
2019-12-01 12:59:07 -08:00
2020-02-05 18:53:05 +01:00
2020-01-15 11:00:39 -06:00
2020-01-06 13:33:14 -08:00
2019-10-10 14:35:32 +02:00
2020-01-29 19:38:34 -08:00
2019-12-04 19:44:11 -08:00
2019-11-13 00:33:21 +11:00
2019-09-17 20:03:49 -06:00
2020-01-29 17:45:20 +01:00
2020-01-31 10:30:40 -08:00
2019-12-04 19:44:14 -08:00
2019-08-26 12:15:06 +03:00
2019-12-09 12:32:59 -08:00
2020-02-21 11:22:15 -08:00
2019-08-30 07:27:17 -07:00
2020-01-14 12:20:59 +01:00
2020-01-14 12:20:57 +01:00
2019-08-23 02:12:11 +02:00
2020-02-21 11:22:15 -08:00
2019-08-28 11:50:43 +02:00
2020-01-15 13:39:59 -08:00
2019-09-16 17:25:49 -07:00
2019-10-07 15:24:36 +02:00
2019-12-17 11:46:43 +02:00
2020-02-11 16:39:18 -08:00
2019-11-14 13:15:12 -05:00
2019-11-22 19:41:08 -05:00
2019-12-10 22:29:58 -05:00
2020-01-15 22:55:37 -05:00
2020-02-10 12:26:44 -08:00
2020-02-21 11:22:15 -08:00
2019-11-07 20:03:08 -08:00
2019-11-02 12:39:12 -07:00
2019-10-31 15:12:34 +00:00
2020-01-31 10:30:39 -08:00
2019-08-21 10:03:35 -07:00
2020-01-14 12:20:48 +01:00
2019-11-14 18:12:18 -08:00
2019-12-10 10:12:55 +01:00
2019-12-04 19:44:11 -08:00
2019-11-14 18:12:18 -08:00
2019-10-29 10:01:16 +01:00
2019-11-14 12:20:02 +08:00
2019-10-31 15:12:23 +00:00
2019-09-13 21:15:39 +10:00
2019-08-27 09:22:38 -06:00
2019-10-09 12:46:10 +02:00
2020-01-17 22:33:37 -05:00
2020-01-31 10:30:40 -08:00
2019-09-24 15:54:12 -07:00
085c20cacf