diff options
| author |   Björn Töpel <bjorn.topel@intel.com> | 2020-05-20 21:20:49 +0200 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-05-21 17:31:26 -0700 |
| commit | 44ac082b30dc2a05a7e23ed7e17b5f9513873386 (patch) | |
| tree | c3a094687c7d6d0ebf5b5e437db42699deddea05 /include/net/xdp_sock.h | |
| parent | selftests/bpf: Convert bpf_iter_test_kern{3, 4}.c to define own bpf_iter_meta (diff) | |
| download | wireguard-linux-44ac082b30dc2a05a7e23ed7e17b5f9513873386.tar.xz wireguard-linux-44ac082b30dc2a05a7e23ed7e17b5f9513873386.zip | |
xsk: Fix xsk_umem_xdp_frame_sz()
Calculating the "data_hard_end" for an XDP buffer coming from AF_XDP
zero-copy mode, the return value of xsk_umem_xdp_frame_sz() is added
to "data_hard_start".
Currently, the chunk size of the UMEM is returned by
xsk_umem_xdp_frame_sz(). This is not correct, if the fixed UMEM
headroom is non-zero. Fix this by returning the chunk_size without the
UMEM headroom.
Fixes: 2a637c5b1aaf ("xdp: For Intel AF_XDP drivers add XDP frame_sz")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200520192103.355233-2-bjorn.topel@gmail.com
Diffstat (limited to 'include/net/xdp_sock.h')
| -rw-r--r-- | include/net/xdp_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index abd72de25fa4..6b1137ce1692 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -239,7 +239,7 @@ static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 address, static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem) { - return umem->chunk_size_nohr + umem->headroom; + return umem->chunk_size_nohr; } #else |