diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-08 21:11:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-08 21:11:01 -0700 |
| commit | a7bc57749f231dcd5fdbc7b653bc260064caf0b9 (patch) | |
| tree | 0925d65fb3e7e0eec9f6d08f22086a861d294dac /kernel/bpf/devmap.c | |
| parent | 109980b894e9dae66c37c3d804a415aa68b19c7e (diff) | |
| parent | 374fb014fc5b15e420faa00af036868a635eadd3 (diff) | |
Merge branch 'xdp-bpf-fixes'
John Fastabend says:
====================
net: Fixes for XDP/BPF
The following fixes, UAPI updates, and small improvement,
i. XDP needs to be called inside RCU with preempt disabled.
ii. Not strictly a bug fix but we have an attach command in the
sockmap UAPI already to avoid having a single kernel released with
only the attach and not the detach I'm pushing this into net branch.
Its early in the RC cycle so I think this is OK (not ideal but better
than supporting a UAPI with a missing detach forever).
iii. Final patch replace cpu_relax with cond_resched in devmap.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/devmap.c')
| -rw-r--r-- | kernel/bpf/devmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index ecf9f99ecc57..959c9a07f318 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -159,7 +159,7 @@ static void dev_map_free(struct bpf_map *map) unsigned long *bitmap = per_cpu_ptr(dtab->flush_needed, cpu); while (!bitmap_empty(bitmap, dtab->map.max_entries)) - cpu_relax(); + cond_resched(); } for (i = 0; i < dtab->map.max_entries; i++) { |