netdev - Re: [PATCH bpf-next] samples/bpf: xdpsock, minor fixes

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+HfNiJVkfWMwz441hSCzbDQJoUO+cnbQyOu-f4hrHL2SX-VA@mail.gmail.com>
Date:   Fri, 31 Aug 2018 09:32:39 +0200
From:   Björn Töpel <bjorn.topel@...il.com>
To:     bhole_prashant_q7@....ntt.co.jp
Cc:     ast@...nel.org, Daniel Borkmann <daniel@...earbox.net>,
        Björn Töpel <bjorn.topel@...el.com>,
        "Karlsson, Magnus" <magnus.karlsson@...el.com>,
        Netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH bpf-next] samples/bpf: xdpsock, minor fixes

Den fre 31 aug. 2018 kl 03:04 skrev Prashant Bhole
<bhole_prashant_q7@....ntt.co.jp>:
>
> - xsks_map size was fixed to 4, changed it MAX_SOCKS
> - Remove redundant definition of MAX_SOCKS in xdpsock_user.c
> - In dump_stats(), add NULL check for xsks[i]
>

Thanks for the cleanup!

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

> Signed-off-by: Prashant Bhole <bhole_prashant_q7@....ntt.co.jp>
> ---
>  samples/bpf/xdpsock_kern.c | 2 +-
>  samples/bpf/xdpsock_user.c | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/samples/bpf/xdpsock_kern.c b/samples/bpf/xdpsock_kern.c
> index d8806c41362e..b8ccd0802b3f 100644
> --- a/samples/bpf/xdpsock_kern.c
> +++ b/samples/bpf/xdpsock_kern.c
> @@ -16,7 +16,7 @@ struct bpf_map_def SEC("maps") xsks_map = {
>         .type = BPF_MAP_TYPE_XSKMAP,
>         .key_size = sizeof(int),
>         .value_size = sizeof(int),
> -       .max_entries = 4,
> +       .max_entries = MAX_SOCKS,
>  };
>
>  struct bpf_map_def SEC("maps") rr_map = {
> diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
> index b3906111bedb..57ecadc58403 100644
> --- a/samples/bpf/xdpsock_user.c
> +++ b/samples/bpf/xdpsock_user.c
> @@ -118,7 +118,6 @@ struct xdpsock {
>         unsigned long prev_tx_npkts;
>  };
>
> -#define MAX_SOCKS 4
>  static int num_socks;
>  struct xdpsock *xsks[MAX_SOCKS];
>
> @@ -596,7 +595,7 @@ static void dump_stats(void)
>
>         prev_time = now;
>
> -       for (i = 0; i < num_socks; i++) {
> +       for (i = 0; i < num_socks && xsks[i]; i++) {
>                 char *fmt = "%-15s %'-11.0f %'-11lu\n";
>                 double rx_pps, tx_pps;
>
> --
> 2.17.1
>
>