Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 17:43:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtio_net: xsk: prevent disable tx napi

Browse Source 
Since xsk's TX queue is consumed by TX NAPI, if sq is bound to xsk, then
we must stop tx napi from being disabled.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20241112012928.102478-11-xuanzhuo@linux.alibaba.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Xuan Zhuo 2024-11-12 09:29:25 +08:00 committed by Jakub Kicinski
parent 21a4e3ce6d
commit 1df5116a41
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/virtio_net.c
View File

@ -5090,7 +5090,7 @@ static int virtnet_set_coalesce(struct net_device *dev,
struct netlink_ext_ack *extack)
{
struct virtnet_info *vi = netdev_priv(dev);
int ret, queue_number, napi_weight;
int ret, queue_number, napi_weight, i;
bool update_napi = false;
/* Can't change NAPI weight if the link is up */
@ -5119,6 +5119,14 @@ static int virtnet_set_coalesce(struct net_device *dev,
return ret;
if (update_napi) {
/* xsk xmit depends on the tx napi. So if xsk is active,
* prevent modifications to tx napi.
*/
for (i = queue_number; i < vi->max_queue_pairs; i++) {
if (vi->sq[i].xsk_pool)
return -EBUSY;
}
for (; queue_number < vi->max_queue_pairs; queue_number++)
vi->sq[queue_number].napi.weight = napi_weight;
}