| Message ID | 1706860400-61484-1-git-send-email-wangyunjian@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 45a96c407eb1cd44aa0179db8d600015616bcced |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] tun: Implement ethtool's get_channels() callback | expand |
Fri, Feb 02, 2024 at 08:53:20AM CET, wangyunjian@huawei.com wrote: >Implement the tun .get_channels functionality. This feature is necessary >for some tools, such as libxdp, which need to retrieve the queue count. > >Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Yunjian Wang wrote: > Implement the tun .get_channels functionality. This feature is necessary > for some tools, such as libxdp, which need to retrieve the queue count. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Reviewed-by: Willem de Bruijn <willemb@google.com>
On Fri, Feb 2, 2024 at 3:53 PM Yunjian Wang <wangyunjian@huawei.com> wrote: > > Implement the tun .get_channels functionality. This feature is necessary > for some tools, such as libxdp, which need to retrieve the queue count. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > --- > v2: add conditional on IFF_MULTI_QUEUE > --- > drivers/net/tun.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) Acked-by: Jason Wang <jasowang@redhat.com> Thanks
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 2 Feb 2024 15:53:20 +0800 you wrote: > Implement the tun .get_channels functionality. This feature is necessary > for some tools, such as libxdp, which need to retrieve the queue count. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > --- > v2: add conditional on IFF_MULTI_QUEUE > > [...] Here is the summary with links: - [net-next,v2] tun: Implement ethtool's get_channels() callback https://git.kernel.org/netdev/net-next/c/45a96c407eb1 You are awesome, thank you!
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index afa5497f7c35..0b6d25ede7fc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -3638,12 +3638,22 @@ static int tun_set_coalesce(struct net_device *dev, return 0; } +static void tun_get_channels(struct net_device *dev, + struct ethtool_channels *channels) +{ + struct tun_struct *tun = netdev_priv(dev); + + channels->combined_count = tun->numqueues; + channels->max_combined = tun->flags & IFF_MULTI_QUEUE ? MAX_TAP_QUEUES : 1; +} + static const struct ethtool_ops tun_ethtool_ops = { .supported_coalesce_params = ETHTOOL_COALESCE_RX_MAX_FRAMES, .get_drvinfo = tun_get_drvinfo, .get_msglevel = tun_get_msglevel, .set_msglevel = tun_set_msglevel, .get_link = ethtool_op_get_link, + .get_channels = tun_get_channels, .get_ts_info = ethtool_op_get_ts_info, .get_coalesce = tun_get_coalesce, .set_coalesce = tun_set_coalesce,
Implement the tun .get_channels functionality. This feature is necessary for some tools, such as libxdp, which need to retrieve the queue count. Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> --- v2: add conditional on IFF_MULTI_QUEUE --- drivers/net/tun.c | 10 ++++++++++ 1 file changed, 10 insertions(+)