netdev - Re: [PATCH v2 bpf-next 13/17] veth: implement ethtool's get

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]

Date:   Tue, 16 Mar 2021 09:44:38 +0100
From:   Magnus Karlsson <magnus.karlsson@...il.com>
To:     Maciej Fijalkowski <maciej.fijalkowski@...el.com>
Cc:     bpf <bpf@...r.kernel.org>,
        Network Development <netdev@...r.kernel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Björn Töpel <bjorn.topel@...el.com>,
        "Karlsson, Magnus" <magnus.karlsson@...el.com>,
        Ciara Loftus <ciara.loftus@...el.com>,
        John Fastabend <john.fastabend@...il.com>,
        Toke Høiland-Jørgensen <toke@...hat.com>
Subject: Re: [PATCH v2 bpf-next 13/17] veth: implement ethtool's
 get_channels() callback

On Thu, Mar 11, 2021 at 4:43 PM Maciej Fijalkowski
<maciej.fijalkowski@...el.com> wrote:
>
> Libbpf's xsk part calls get_channels() API to retrieve the queue count
> of the underlying driver so that XSKMAP is sized accordingly.
>
> Implement that in veth so multi queue scenarios can work properly.
>
> Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@...el.com>
> ---
>  drivers/net/veth.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/drivers/net/veth.c b/drivers/net/veth.c
> index aa1a66ad2ce5..efca3d45f5c2 100644
> --- a/drivers/net/veth.c
> +++ b/drivers/net/veth.c
> @@ -218,6 +218,17 @@ static void veth_get_ethtool_stats(struct net_device *dev,
>         }
>  }
>
> +static void veth_get_channels(struct net_device *dev,
> +                             struct ethtool_channels *channels)
> +{
> +       channels->tx_count = dev->real_num_tx_queues;
> +       channels->rx_count = dev->real_num_rx_queues;
> +       channels->max_tx = dev->real_num_tx_queues;
> +       channels->max_rx = dev->real_num_rx_queues;
> +       channels->combined_count = min(dev->real_num_rx_queues, dev->real_num_rx_queues);
> +       channels->max_combined = min(dev->real_num_rx_queues, dev->real_num_rx_queues);

Copy and paste error in the above two lines. One of the min entries
should be dev->real_num_tx_queues. Kind of pointless otherwise ;-).

> +}
> +
>  static const struct ethtool_ops veth_ethtool_ops = {
>         .get_drvinfo            = veth_get_drvinfo,
>         .get_link               = ethtool_op_get_link,
> @@ -226,6 +237,7 @@ static const struct ethtool_ops veth_ethtool_ops = {
>         .get_ethtool_stats      = veth_get_ethtool_stats,
>         .get_link_ksettings     = veth_get_link_ksettings,
>         .get_ts_info            = ethtool_op_get_ts_info,
> +       .get_channels           = veth_get_channels,
>  };
>
>  /* general routines */
> --
> 2.20.1
>