[PATCH net-next] bpf: bpf_event_entry_gen's alloc needs to be in atomic context

[PATCH net-next] bpf: bpf_event_entry_gen's alloc needs to be in atomic context

[Daniel Borkmann]

Should have been obvious, only called from bpf() syscall via map_update_elem()
that calls bpf_fd_array_map_update_elem() under RCU read lock and thus this
must also be in GFP_ATOMIC, of course.

Fixes: 3b1efb196eee ("bpf, maps: flush own entries on perf map release")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
---
 Sorry for missing this typo, sigh.

 kernel/bpf/arraymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index db1a743..633a650 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -430,7 +430,7 @@ static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file,
 {
 	struct bpf_event_entry *ee;
 
-	ee = kzalloc(sizeof(*ee), GFP_KERNEL);
+	ee = kzalloc(sizeof(*ee), GFP_ATOMIC);
 	if (ee) {
 		ee->event = perf_file->private_data;
 		ee->perf_file = perf_file;
-- 
1.9.3

Re: [PATCH net-next] bpf: bpf_event_entry_gen's alloc needs to be in atomic context

[David Miller]

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Sat, 16 Jul 2016 01:15:55 +0200

> Should have been obvious, only called from bpf() syscall via map_update_elem()
> that calls bpf_fd_array_map_update_elem() under RCU read lock and thus this
> must also be in GFP_ATOMIC, of course.
> 
> Fixes: 3b1efb196eee ("bpf, maps: flush own entries on perf map release")
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
> Acked-by: Alexei Starovoitov <ast@kernel.org>

Applied.