diff options
| author | Jason Wang <jasowang@redhat.com> | 2024-08-14 13:22:28 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-15 19:14:19 -0700 |
| commit | c392d6019398315526b0b508282f87c7b2318c72 (patch) | |
| tree | aafb7ff3ebc1f4a80307447ecc79e1014228c870 /drivers/net/virtio_net.c | |
| parent | df28de7b00502761eba62490f413c65c9b175ed9 (diff) | |
| download | lwn-c392d6019398315526b0b508282f87c7b2318c72.tar.gz lwn-c392d6019398315526b0b508282f87c7b2318c72.zip | |
virtio-net: synchronize probe with ndo_set_features
We calculate guest offloads during probe without the protection of
rtnl_lock. This lead to race between probe and ndo_set_features. Fix
this by moving the calculation under the rtnl_lock.
Fixes: 3f93522ffab2 ("virtio-net: switch off offloads on demand if possible on XDP set")
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20240814052228.4654-5-jasowang@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 55b712a71e63..6c79fc43fa31 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6606,6 +6606,11 @@ static int virtnet_probe(struct virtio_device *vdev) netif_carrier_on(dev); } + for (i = 0; i < ARRAY_SIZE(guest_offloads); i++) + if (virtio_has_feature(vi->vdev, guest_offloads[i])) + set_bit(guest_offloads[i], &vi->guest_offloads); + vi->guest_offloads_capable = vi->guest_offloads; + rtnl_unlock(); err = virtnet_cpu_notif_add(vi); @@ -6614,11 +6619,6 @@ static int virtnet_probe(struct virtio_device *vdev) goto free_unregister_netdev; } - for (i = 0; i < ARRAY_SIZE(guest_offloads); i++) - if (virtio_has_feature(vi->vdev, guest_offloads[i])) - set_bit(guest_offloads[i], &vi->guest_offloads); - vi->guest_offloads_capable = vi->guest_offloads; - pr_debug("virtnet: registered device %s with %d RX and TX vq's\n", dev->name, max_queue_pairs); |