From: Jason Wang Date: Wed, 14 Aug 2024 05:22:28 +0000 (+0800) Subject: virtio-net: synchronize probe with ndo_set_features X-Git-Tag: v6.12-rc1~232^2~249^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c392d6019398315526b0b508282f87c7b2318c72;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Jason Wang Link: https://patch.msgid.link/20240814052228.4654-5-jasowang@redhat.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 55b712a71e637..6c79fc43fa31d 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);