samples/bpf: add unaligned chunks mode support to xdpsock

This patch adds support for the unaligned chunks mode. The addition of the
unaligned chunks option will allow users to run the application with more
relaxed chunk placement in the XDP umem.

Unaligned chunks mode can be used with the '-u' or '--unaligned' command
line options.

Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index da84c760c0946b1a7ae3d0ffc692f8b42ffad501..7312eab4d201ea3750085fc09db0dcc6f2f428d8 100644 (file)
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -68,6 +68,9 @@ static int opt_queue;
 static int opt_poll;
 static int opt_interval = 1;
 static u32 opt_xdp_bind_flags = XDP_USE_NEED_WAKEUP;
+static u32 opt_umem_flags;
+static int opt_unaligned_chunks;
+static u32 opt_xdp_bind_flags;
 static int opt_xsk_frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
 static int opt_timeout = 1000;
 static bool opt_need_wakeup = true;
@@ -284,7 +287,9 @@ static struct xsk_umem_info *xsk_configure_umem(void *buffer, u64 size)
                .comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
                .frame_size = opt_xsk_frame_size,
                .frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM,
+               .flags = opt_umem_flags
        };
+
        int ret;
 
        umem = calloc(1, sizeof(*umem));
@@ -293,6 +298,7 @@ static struct xsk_umem_info *xsk_configure_umem(void *buffer, u64 size)
 
        ret = xsk_umem__create(&umem->umem, buffer, size, &umem->fq, &umem->cq,
                               &cfg);
+
        if (ret)
                exit_with_error(-ret);
 
@@ -355,6 +361,7 @@ static struct option long_options[] = {
        {"copy", no_argument, 0, 'c'},
        {"frame-size", required_argument, 0, 'f'},
        {"no-need-wakeup", no_argument, 0, 'm'},
+       {"unaligned", no_argument, 0, 'u'},
        {0, 0, 0, 0}
 };
 
@@ -376,6 +383,8 @@ static void usage(const char *prog)
                "  -c, --copy           Force copy mode.\n"
                "  -f, --frame-size=n   Set the frame size (must be a power of two, default is %d).\n"
                "  -m, --no-need-wakeup Turn off use of driver need wakeup flag.\n"
+               "  -f, --frame-size=n   Set the frame size (must be a power of two in aligned mode, default is %d).\n"
+               "  -u, --unaligned      Enable unaligned chunk placement\n"
                "\n";
        fprintf(stderr, str, prog, XSK_UMEM__DEFAULT_FRAME_SIZE);
        exit(EXIT_FAILURE);
@@ -388,8 +397,7 @@ static void parse_command_line(int argc, char **argv)
        opterr = 0;
 
        for (;;) {
-
-               c = getopt_long(argc, argv, "Frtli:q:psSNn:czf:m",
+               c = getopt_long(argc, argv, "Frtli:q:psSNn:czf:mu",
                                long_options, &option_index);
                if (c == -1)
                        break;
@@ -429,6 +437,10 @@ static void parse_command_line(int argc, char **argv)
                case 'c':
                        opt_xdp_bind_flags |= XDP_COPY;
                        break;
+               case 'u':
+                       opt_umem_flags |= XDP_UMEM_UNALIGNED_CHUNK_FLAG;
+                       opt_unaligned_chunks = 1;
+                       break;
                case 'F':
                        opt_xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;
                        break;
@@ -438,6 +450,7 @@ static void parse_command_line(int argc, char **argv)
                        opt_need_wakeup = false;
                        opt_xdp_bind_flags &= ~XDP_USE_NEED_WAKEUP;
                        break;
+
                default:
                        usage(basename(argv[0]));
                }
@@ -450,7 +463,8 @@ static void parse_command_line(int argc, char **argv)
                usage(basename(argv[0]));
        }
 
-       if (opt_xsk_frame_size & (opt_xsk_frame_size - 1)) {
+       if ((opt_xsk_frame_size & (opt_xsk_frame_size - 1)) &&
+           !opt_unaligned_chunks) {
                fprintf(stderr, "--frame-size=%d is not a power of two\n",
                        opt_xsk_frame_size);
                usage(basename(argv[0]));