diff options
| author |   David Miller <davem@davemloft.net> | 2020-02-24 15:01:44 +0100 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-02-24 16:20:09 -0800 |
| commit | 6eac7795e8ef75de062c8f5bdb9520c9f0f065fa (patch) | |
| tree | 9ee0bb821124197be995ccbf76cead42a92c0581 /net/bpf | |
| parent | bpf: Use bpf_prog_run_pin_on_cpu() at simple call sites. (diff) | |
| download | linux-dev-6eac7795e8ef75de062c8f5bdb9520c9f0f065fa.tar.xz linux-dev-6eac7795e8ef75de062c8f5bdb9520c9f0f065fa.zip | |
bpf/tests: Use migrate disable instead of preempt disable
Replace the preemption disable/enable with migrate_disable/enable() to
reflect the actual requirement and to allow PREEMPT_RT to substitute it
with an actual migration disable mechanism which does not disable
preemption.
[ tglx: Switched it over to migrate disable ]
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200224145643.785306549@linutronix.de
Diffstat (limited to 'net/bpf')
| -rw-r--r-- | net/bpf/test_run.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index d555c0d8657d..562443f94133 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -37,7 +37,7 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, repeat = 1; rcu_read_lock(); - preempt_disable(); + migrate_disable(); time_start = ktime_get_ns(); for (i = 0; i < repeat; i++) { bpf_cgroup_storage_set(storage); @@ -54,18 +54,18 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, if (need_resched()) { time_spent += ktime_get_ns() - time_start; - preempt_enable(); + migrate_enable(); rcu_read_unlock(); cond_resched(); rcu_read_lock(); - preempt_disable(); + migrate_disable(); time_start = ktime_get_ns(); } } time_spent += ktime_get_ns() - time_start; - preempt_enable(); + migrate_enable(); rcu_read_unlock(); do_div(time_spent, repeat); |