summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorMagnus Karlsson <magnus.karlsson@intel.com>2021-05-06 14:43:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-03 09:00:51 +0200
commitbc924bbccc50f28d9b9dc43dd747a43044e0130f (patch)
tree0cf63f5d568feab30e69ffe65b2f42510ce49d48 /samples
parent02ce4c943e2ed7660786d3618afadf27b61b0758 (diff)
downloadlinux-stable-bc924bbccc50f28d9b9dc43dd747a43044e0130f.tar.gz
linux-stable-bc924bbccc50f28d9b9dc43dd747a43044e0130f.tar.bz2
linux-stable-bc924bbccc50f28d9b9dc43dd747a43044e0130f.zip
samples/bpf: Consider frame size in tx_only of xdpsock sample
commit 3b80d106e110d39d3f678954d3b55078669cf07e upstream. Fix the tx_only micro-benchmark in xdpsock to take frame size into consideration. It was hardcoded to the default value of frame_size which is 4K. Changing this on the command line to 2K made half of the packets illegal as they were outside the umem and were therefore discarded by the kernel. Fixes: 46738f73ea4f ("samples/bpf: add use of need_wakeup flag in xdpsock") Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Link: https://lore.kernel.org/bpf/20210506124349.6666-1-magnus.karlsson@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/xdpsock_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index 3edae9018893..2e4508a6cb3a 100644
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -1257,7 +1257,7 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frame_nb, int batch_size)
for (i = 0; i < batch_size; i++) {
struct xdp_desc *tx_desc = xsk_ring_prod__tx_desc(&xsk->tx,
idx + i);
- tx_desc->addr = (*frame_nb + i) << XSK_UMEM__DEFAULT_FRAME_SHIFT;
+ tx_desc->addr = (*frame_nb + i) * opt_xsk_frame_size;
tx_desc->len = PKT_SIZE;
}