netdev - Re: [PATCH 08/11] samples/bpf: add unaligned chunks mode support to xdpsock

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJ+HfNi=QtGEGq=4PaxEMUrBxsSg8JsJcQHik_8WGVdAawJHKA@mail.gmail.com>
Date:   Mon, 24 Jun 2019 17:31:19 +0200
From:   Björn Töpel <bjorn.topel@...il.com>
To:     Kevin Laatz <kevin.laatz@...el.com>
Cc:     Netdev <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Björn Töpel <bjorn.topel@...el.com>,
        "Karlsson, Magnus" <magnus.karlsson@...el.com>,
        bpf <bpf@...r.kernel.org>,
        intel-wired-lan <intel-wired-lan@...ts.osuosl.org>,
        Bruce Richardson <bruce.richardson@...el.com>,
        ciara.loftus@...el.com
Subject: Re: [PATCH 08/11] samples/bpf: add unaligned chunks mode support to xdpsock

On Thu, 20 Jun 2019 at 19:25, Kevin Laatz <kevin.laatz@...el.com> wrote:
>
> 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@...el.com>
> Signed-off-by: Ciara Loftus <ciara.loftus@...el.com>

Acked-by: Björn Töpel <bjorn.topel@...el.com>

> ---
>  samples/bpf/xdpsock_user.c | 20 ++++++++++++++++++--
>  1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
> index d08ee1ab7bb4..e26f43382d01 100644
> --- a/samples/bpf/xdpsock_user.c
> +++ b/samples/bpf/xdpsock_user.c
> @@ -67,6 +67,8 @@ static int opt_ifindex;
>  static int opt_queue;
>  static int opt_poll;
>  static int opt_interval = 1;
> +static u32 opt_umem_flags;
> +static int opt_unaligned_chunks;
>  static u32 opt_xdp_bind_flags;
>  static __u32 prog_id;
>
> @@ -276,14 +278,21 @@ static size_t gen_eth_frame(struct xsk_umem_info *umem, u64 addr)
>  static struct xsk_umem_info *xsk_configure_umem(void *buffer, u64 size)
>  {
>         struct xsk_umem_info *umem;
> +       struct xsk_umem_config umem_cfg;
>         int ret;
>
>         umem = calloc(1, sizeof(*umem));
>         if (!umem)
>                 exit_with_error(errno);
>
> +       umem_cfg.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
> +       umem_cfg.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
> +       umem_cfg.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
> +       umem_cfg.frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;
> +       umem_cfg.flags = opt_umem_flags;
> +
>         ret = xsk_umem__create(&umem->umem, buffer, size, &umem->fq, &umem->cq,
> -                              NULL);
> +                              &umem_cfg);
>         if (ret)
>                 exit_with_error(-ret);
>
> @@ -346,6 +355,7 @@ static struct option long_options[] = {
>         {"interval", required_argument, 0, 'n'},
>         {"zero-copy", no_argument, 0, 'z'},
>         {"copy", no_argument, 0, 'c'},
> +       {"unaligned", no_argument, 0, 'u'},
>         {0, 0, 0, 0}
>  };
>
> @@ -365,6 +375,7 @@ static void usage(const char *prog)
>                 "  -n, --interval=n     Specify statistics update interval (default 1 sec).\n"
>                 "  -z, --zero-copy      Force zero-copy mode.\n"
>                 "  -c, --copy           Force copy mode.\n"
> +               "  -u, --unaligned      Enable unaligned chunk placement\n"
>                 "\n";
>         fprintf(stderr, str, prog);
>         exit(EXIT_FAILURE);
> @@ -377,7 +388,7 @@ static void parse_command_line(int argc, char **argv)
>         opterr = 0;
>
>         for (;;) {
> -               c = getopt_long(argc, argv, "Frtli:q:psSNn:cz", long_options,
> +               c = getopt_long(argc, argv, "Frtli:q:psSNn:czu", long_options,
>                                 &option_index);
>                 if (c == -1)
>                         break;
> @@ -417,9 +428,14 @@ 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_CHUNKS;
> +                       opt_unaligned_chunks = 1;
> +                       break;
>                 case 'F':
>                         opt_xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;
>                         break;
> +
>                 default:
>                         usage(basename(argv[0]));
>                 }
> --
> 2.17.1
>