[PATCH 11/16] virtio_net: introduce virtnet_dev_rx_queue_group()
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: 2023-03-28 09:30:36
Also in:
bpf, netdev
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Adding an API to set sysfs_rx_queue_group. This is prepare for separating the virtio-related funcs. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/net/virtio/virtnet.c | 15 +++++++++++---- drivers/net/virtio/virtnet.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio/virtnet.c b/drivers/net/virtio/virtnet.c
index 1323c6733f56..3f58af7d1550 100644
--- a/drivers/net/virtio/virtnet.c
+++ b/drivers/net/virtio/virtnet.c@@ -2661,6 +2661,16 @@ static const struct attribute_group virtio_net_mrg_rx_group = { .name = "virtio_net", .attrs = virtio_net_mrg_rx_attrs }; + +void virtnet_dev_rx_queue_group(struct virtnet_info *vi, struct net_device *dev) +{ + if (vi->mergeable_rx_bufs) + dev->sysfs_rx_queue_group = &virtio_net_mrg_rx_group; +} +#else +void virtnet_dev_rx_queue_group(struct virtnet_info *vi, struct net_device *dev) +{ +} #endif static bool virtnet_fail_on_feature(struct virtio_device *vdev,
@@ -2943,10 +2953,7 @@ static int virtnet_probe(struct virtio_device *vdev) if (err) goto free; -#ifdef CONFIG_SYSFS - if (vi->mergeable_rx_bufs) - dev->sysfs_rx_queue_group = &virtio_net_mrg_rx_group; -#endif + virtnet_dev_rx_queue_group(vi, dev); netif_set_real_num_tx_queues(dev, vi->curr_queue_pairs); netif_set_real_num_rx_queues(dev, vi->curr_queue_pairs);
diff --git a/drivers/net/virtio/virtnet.h b/drivers/net/virtio/virtnet.h
index b889825c54d0..48e0c5ba346a 100644
--- a/drivers/net/virtio/virtnet.h
+++ b/drivers/net/virtio/virtnet.h@@ -184,4 +184,5 @@ struct virtnet_info { int virtnet_rx_resize(struct virtnet_info *vi, struct virtnet_rq *rq, u32 ring_num); int virtnet_tx_resize(struct virtnet_info *vi, struct virtnet_sq *sq, u32 ring_num); int _virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs); +void virtnet_dev_rx_queue_group(struct virtnet_info *vi, struct net_device *dev); #endif
--
2.32.0.3.g01195cf9f
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization