diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-02 05:42:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-02 05:42:07 +0300 |
| commit | a5f7b0eeb219620e1f7388db817e2fb584c00b64 (patch) | |
| tree | 222a711e961168bfe5df800913c198fb167330de /lib | |
| parent | a6d50512b4d86ecd9f5952525e454583be1c3b14 (diff) | |
| parent | 9960d7669eaa42e82a2f4393adf549191de2e587 (diff) | |
| download | linux-a5f7b0eeb219620e1f7388db817e2fb584c00b64.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-02-28
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Add schedule points and reduce the number of loop iterations
the test_bpf kernel module is performing in order to not hog
the CPU for too long, from Eric.
2) Fix an out of bounds access in tail calls in the ppc64 BPF
JIT compiler, from Daniel.
3) Fix a crash on arm64 on unaligned BPF xadd operations that
could be triggered via interpreter and JIT, from Daniel.
Please not that once you merge net into net-next at some point, there
is a minor merge conflict in test_verifier.c since test cases had
been added at the end in both trees. Resolution is trivial: keep all
the test cases from both trees.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_bpf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/test_bpf.c b/lib/test_bpf.c index b4e22345963f..2efb213716fa 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -24,10 +24,11 @@ #include <linux/if_vlan.h> #include <linux/random.h> #include <linux/highmem.h> +#include <linux/sched.h> /* General test specific settings */ #define MAX_SUBTESTS 3 -#define MAX_TESTRUNS 10000 +#define MAX_TESTRUNS 1000 #define MAX_DATA 128 #define MAX_INSNS 512 #define MAX_K 0xffffFFFF @@ -6582,6 +6583,7 @@ static __init int test_bpf(void) struct bpf_prog *fp; int err; + cond_resched(); if (exclude_test(i)) continue; |