From: <gregkh@linuxfoundation.org>
To: daniel@iogearbox.net, edumazet@google.com,
gregkh@linuxfoundation.org, syzkaller@googlegroups.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "bpf: add schedule points in percpu arrays management" has been added to the 4.15-stable tree
Date: Fri, 09 Mar 2018 14:17:02 -0800 [thread overview]
Message-ID: <1520633822208215@kroah.com> (raw)
In-Reply-To: <96ee52a83c789138e21bf415a34569d15b12948a.1520507630.git.daniel@iogearbox.net>
This is a note to let you know that I've just added the patch titled
bpf: add schedule points in percpu arrays management
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpf-add-schedule-points-in-percpu-arrays-management.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From foo@baz Fri Mar 9 14:15:30 PST 2018
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 8 Mar 2018 13:16:47 +0100
Subject: bpf: add schedule points in percpu arrays management
To: gregkh@linuxfoundation.org
Cc: ast@kernel.org, daniel@iogearbox.net, stable@vger.kernel.org, Eric Dumazet <edumazet@google.com>
Message-ID: <96ee52a83c789138e21bf415a34569d15b12948a.1520507630.git.daniel@iogearbox.net>
From: Eric Dumazet <edumazet@google.com>
[ upstream commit 32fff239de37ef226d5b66329dd133f64d63b22d ]
syszbot managed to trigger RCU detected stalls in
bpf_array_free_percpu()
It takes time to allocate a huge percpu map, but even more time to free
it.
Since we run in process context, use cond_resched() to yield cpu if
needed.
Fixes: a10423b87a7e ("bpf: introduce BPF_MAP_TYPE_PERCPU_ARRAY map")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
kernel/bpf/arraymap.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -26,8 +26,10 @@ static void bpf_array_free_percpu(struct
{
int i;
- for (i = 0; i < array->map.max_entries; i++)
+ for (i = 0; i < array->map.max_entries; i++) {
free_percpu(array->pptrs[i]);
+ cond_resched();
+ }
}
static int bpf_array_alloc_percpu(struct bpf_array *array)
@@ -43,6 +45,7 @@ static int bpf_array_alloc_percpu(struct
return -ENOMEM;
}
array->pptrs[i] = ptr;
+ cond_resched();
}
return 0;
Patches currently in stable-queue which might be from daniel@iogearbox.net are
queue-4.15/bpf-fix-mlock-precharge-on-arraymaps.patch
queue-4.15/bpf-x64-implement-retpoline-for-tail-call.patch
queue-4.15/bpf-arm64-fix-out-of-bounds-access-in-tail-call.patch
queue-4.15/bpf-fix-memory-leak-in-lpm_trie-map_free-callback-function.patch
queue-4.15/bpf-ppc64-fix-out-of-bounds-access-in-tail-call.patch
queue-4.15/bpf-add-schedule-points-in-percpu-arrays-management.patch
queue-4.15/bpf-allow-xadd-only-on-aligned-memory.patch
queue-4.15/bpf-fix-rcu-lockdep-warning-for-lpm_trie-map_free-callback.patch
next prev parent reply other threads:[~2018-03-09 22:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 12:16 [PATCH stable 4.15 0/8] BPF stable patches Daniel Borkmann
2018-03-08 12:16 ` [PATCH stable 4.15 1/8] bpf: fix mlock precharge on arraymaps Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf: fix mlock precharge on arraymaps" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 2/8] bpf: fix memory leak in lpm_trie map_free callback function Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf: fix memory leak in lpm_trie map_free callback function" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 3/8] bpf: fix rcu lockdep warning for lpm_trie map_free callback Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf: fix rcu lockdep warning for lpm_trie map_free callback" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 4/8] bpf, x64: implement retpoline for tail call Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf, x64: implement retpoline for tail call" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 5/8] bpf, arm64: fix out of bounds access in tail call Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf, arm64: fix out of bounds access in tail call" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 6/8] bpf: add schedule points in percpu arrays management Daniel Borkmann
2018-03-09 22:17 ` gregkh [this message]
2018-03-08 12:16 ` [PATCH stable 4.15 7/8] bpf: allow xadd only on aligned memory Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf: allow xadd only on aligned memory" has been added to the 4.15-stable tree gregkh
2018-03-08 12:16 ` [PATCH stable 4.15 8/8] bpf, ppc64: fix out of bounds access in tail call Daniel Borkmann
2018-03-09 22:17 ` Patch "bpf, ppc64: fix out of bounds access in tail call" has been added to the 4.15-stable tree gregkh
2018-03-09 22:17 ` [PATCH stable 4.15 0/8] BPF stable patches Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1520633822208215@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=syzkaller@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.