diff options
| author |   Jesper Dangaard Brouer <brouer@redhat.com> | 2019-06-18 15:05:27 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-19 11:23:13 -0400 |
| commit | 6bf071bf09d4b2ff3ee8783531e2ce814f0870cb (patch) | |
| tree | e0d7a1d6e896f754c77f53f66cccb7a1b2b762f4 /kernel/bpf | |
| parent | xdp: fix leak of IDA cyclic id if rhashtable_insert_slow fails (diff) | |
| download | linux-dev-6bf071bf09d4b2ff3ee8783531e2ce814f0870cb.tar.xz linux-dev-6bf071bf09d4b2ff3ee8783531e2ce814f0870cb.zip | |
xdp: page_pool related fix to cpumap
When converting an xdp_frame into an SKB, and sending this into the network
stack, then the underlying XDP memory model need to release associated
resources, because the network stack don't have callbacks for XDP memory
models. The only memory model that needs this is page_pool, when a driver
use the DMA-mapping feature.
Introduce page_pool_release_page(), which basically does the same as
page_pool_unmap_page(). Add xdp_release_frame() as the XDP memory model
interface for calling it, if the memory model match MEM_TYPE_PAGE_POOL, to
save the function call overhead for others. Have cpumap call
xdp_release_frame() before xdp_scrub_frame().
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/cpumap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index 8ee5532cf6a6..8dff08768087 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -208,6 +208,9 @@ static struct sk_buff *cpu_map_build_skb(struct bpf_cpu_map_entry *rcpu, * - RX ring dev queue index (skb_record_rx_queue) */ + /* Until page_pool get SKB return path, release DMA here */ + xdp_release_frame(xdpf); + /* Allow SKB to reuse area used by xdp_frame */ xdp_scrub_frame(xdpf); |