Yonghong Song
43cdb648e1
bpf: Fix a rcu warning for bpffs map pretty-print
[ Upstream commit ce880cb825 ]
Running selftest
./btf_btf -p
the kernel had the following warning:
[ 51.528185] WARNING: CPU: 3 PID: 1756 at kernel/bpf/hashtab.c:717 htab_map_get_next_key+0x2eb/0x300
[ 51.529217] Modules linked in:
[ 51.529583] CPU: 3 PID: 1756 Comm: test_btf Not tainted 5.9.0-rc1+ #878
[ 51.530346] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.9.3-1.el7.centos 04/01/2014
[ 51.531410] RIP: 0010:htab_map_get_next_key+0x2eb/0x300
...
[ 51.542826] Call Trace:
[ 51.543119] map_seq_next+0x53/0x80
[ 51.543528] seq_read+0x263/0x400
[ 51.543932] vfs_read+0xad/0x1c0
[ 51.544311] ksys_read+0x5f/0xe0
[ 51.544689] do_syscall_64+0x33/0x40
[ 51.545116] entry_SYSCALL_64_after_hwframe+0x44/0xa9
The related source code in kernel/bpf/hashtab.c:
709 static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key)
710 {
711 struct bpf_htab *htab = container_of(map, struct bpf_htab, map);
712 struct hlist_nulls_head *head;
713 struct htab_elem *l, *next_l;
714 u32 hash, key_size;
715 int i = 0;
716
717 WARN_ON_ONCE(!rcu_read_lock_held());
In kernel/bpf/inode.c, bpffs map pretty print calls map->ops->map_get_next_key()
without holding a rcu_read_lock(), hence causing the above warning.
To fix the issue, just surrounding map->ops->map_get_next_key() with rcu read lock.
Fixes: a26ca7c982 ("bpf: btf: Add pretty print support to the basic arraymap")
Reported-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Cc: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200916004401.146277-1-yhs@fb.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-10-01 13:18:19 +02:00
..
2020-10-01 13:18:19 +02:00
2020-07-22 09:32:49 +02:00
2018-10-24 20:55:56 -04:00
2020-07-09 09:37:51 +02:00
2020-04-29 16:33:00 +02:00
2020-10-01 13:17:48 +02:00
2020-09-17 13:47:56 +02:00
2020-09-03 11:27:06 +02:00
2019-08-19 13:03:37 +02:00
2020-10-01 13:17:33 +02:00
2020-05-06 08:15:09 +02:00
2020-10-01 13:18:04 +02:00
2020-03-05 16:43:50 +01:00
2020-10-01 13:17:57 +02:00
2020-10-01 13:17:38 +02:00
2020-10-01 13:18:14 +02:00
2019-04-29 16:48:03 +02:00
2019-04-04 21:04:13 -04:00
2019-06-05 17:37:17 +02:00
2019-05-30 11:26:37 -07:00
2019-04-26 13:51:03 -04:00
2020-10-01 13:17:32 +02:00
2020-06-22 09:30:59 +02:00
2020-06-22 09:30:59 +02:00
2020-06-22 09:30:59 +02:00
2019-05-28 17:46:43 -04:00
2019-06-05 17:37:17 +02:00
2018-10-31 08:54:14 -07:00
2019-01-25 11:22:43 -08:00
2019-06-19 17:09:55 +02:00
2019-07-30 18:34:15 +02:00
2019-05-21 10:50:45 +02:00
2020-06-22 09:31:22 +02:00
2020-06-22 09:31:01 +02:00
2019-06-19 17:09:06 +02:00
2019-05-21 10:50:45 +02:00
2020-01-17 19:48:42 +01:00
2019-05-21 11:52:39 +02:00
2018-05-16 07:23:35 +02:00
2019-09-25 17:51:39 -07:00
2018-05-16 07:23:35 +02:00
2020-06-22 09:31:01 +02:00
2019-08-21 22:23:48 +10:00
2019-06-03 15:49:06 +02:00
2020-10-01 13:17:47 +02:00
2019-10-06 09:11:37 -06:00
2020-03-25 08:25:58 +01:00
2020-09-03 11:27:10 +02:00
2019-05-21 10:50:45 +02:00
2019-07-12 11:05:40 -07:00
2019-05-21 10:50:45 +02:00
2019-08-29 15:10:10 +01:00
2020-07-16 08:16:44 +02:00
2020-10-01 13:17:48 +02:00
2019-05-21 10:50:46 +02:00
2019-05-21 10:50:46 +02:00
2019-05-21 10:50:46 +02:00
2019-07-22 18:05:11 +02:00
2019-03-07 18:32:02 -08:00
2019-09-25 17:51:40 -07:00
2019-09-06 23:58:44 +02:00
2019-09-28 08:14:15 -07:00
2019-08-19 21:54:15 -07:00
2019-05-24 20:16:01 +02:00
2020-04-17 10:50:22 +02:00
2020-09-26 18:03:11 +02:00
2019-05-30 11:26:39 -07:00
2020-08-26 10:40:53 +02:00
2019-06-05 17:37:17 +02:00
2020-10-01 13:17:10 +02:00
2019-08-05 18:39:56 -04:00
2019-08-05 18:39:56 -04:00
2019-05-24 17:27:11 +02:00
2020-10-01 13:17:24 +02:00
2020-10-01 13:17:23 +02:00
2019-06-05 17:37:17 +02:00
2020-06-17 16:40:22 +02:00
2019-10-07 15:47:19 -07:00
2019-08-19 21:54:16 -07:00
2019-07-18 17:08:07 -07:00
2019-07-16 19:23:24 -07:00
2019-05-21 10:50:45 +02:00
2020-01-23 08:22:36 +01:00
2019-05-21 10:50:45 +02:00
2020-08-26 10:40:51 +02:00
2020-06-24 17:50:35 +02:00
2019-05-27 09:36:28 -05:00
2020-08-19 08:15:58 +02:00
2020-05-02 08:48:55 +02:00
2019-07-20 11:27:16 +02:00
2019-05-21 10:50:45 +02:00
2019-07-08 11:01:13 -07:00
2018-12-05 19:31:44 -08:00
2019-11-04 21:19:25 +01:00
2019-10-17 12:47:12 +02:00
2019-06-21 01:54:53 +02:00
2020-10-01 13:17:23 +02:00
2019-01-04 13:13:47 -08:00
2020-10-01 13:17:10 +02:00
2020-01-04 19:18:32 +01:00
2020-01-09 10:19:54 +01:00
2019-05-21 11:52:39 +02:00
2019-08-01 14:30:22 -07:00
2019-07-18 11:51:00 -07:00
2019-05-30 11:26:37 -07:00
2019-07-18 17:08:07 -07:00
2018-04-02 20:15:59 +02:00
2018-04-02 20:15:30 +02:00
2020-05-20 08:20:13 +02:00
2019-06-23 14:26:26 +02:00
2019-07-08 19:36:47 -07:00
2019-05-21 10:50:45 +02:00
2019-07-08 19:36:47 -07:00
2019-06-05 17:37:17 +02:00
2019-06-05 17:37:17 +02:00
2019-04-19 09:46:05 -07:00
2020-02-24 08:36:52 +01:00
2019-04-16 16:55:15 +02:00
2020-10-01 13:17:54 +02:00