Skip to content

Commit 9b9cd80

Browse files
jasowangrustyrussell
authored andcommitted
virtio-net: fix the race between channels setting and refill
Commit 55257d7 (virtio-net: fill only rx queues which are being used) tries to refill on demand when changing the number of channels by call try_refill_recv() directly, this may race: - the refill work who may do the refill in the same time - the try_refill_recv() called in bh since napi was not disabled Which may led guest complain during setting channels: virtio_net virtio0: input.1:id 0 is not a head! Solve this issue by scheduling a refill work which can guarantee the serialization of refill. Cc: Sasha Levin <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Michael S. Tsirkin <[email protected]> Signed-off-by: Jason Wang <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
1 parent 0d69a65 commit 9b9cd80

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/net/virtio_net.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
900900
struct scatterlist sg;
901901
struct virtio_net_ctrl_mq s;
902902
struct net_device *dev = vi->dev;
903-
int i;
904903

905904
if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ))
906905
return 0;
@@ -914,10 +913,8 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
914913
queue_pairs);
915914
return -EINVAL;
916915
} else {
917-
for (i = vi->curr_queue_pairs; i < queue_pairs; i++)
918-
if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
919-
schedule_delayed_work(&vi->refill, 0);
920916
vi->curr_queue_pairs = queue_pairs;
917+
schedule_delayed_work(&vi->refill, 0);
921918
}
922919

923920
return 0;

0 commit comments

Comments
 (0)