Commit 4944be2f authored by Akihiko Odaki's avatar Akihiko Odaki Committed by Jakub Kicinski
Browse files

virtio_net: Allocate rss_hdr with devres 



virtnet_probe() lacks the code to free rss_hdr in its error path.
Allocate rss_hdr with devres so that it will be automatically freed.

Fixes: 86a48a00 ("virtio_net: Support dynamic rss indirection table size")
Signed-off-by: default avatarAkihiko Odaki <akihiko.odaki@daynix.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
Link: https://patch.msgid.link/20250321-virtio-v2-4-33afb8f4640b@daynix.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ed3100e9

drivers/net/virtio_net.c

+4 −6
Original line number Diff line number Diff line
@@ -3642,7 +3642,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 
	if (vi->has_rss && !netif_is_rxfh_configured(dev)) {

		old_rss_hdr = vi->rss_hdr;

		old_rss_trailer = vi->rss_trailer;

		vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL);

		vi->rss_hdr = devm_kzalloc(&dev->dev, virtnet_rss_hdr_size(vi), GFP_KERNEL);

		if (!vi->rss_hdr) {

			vi->rss_hdr = old_rss_hdr;

			return -ENOMEM;
@@ -3653,7 +3653,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 


		if (!virtnet_commit_rss_command(vi)) {

			/* restore ctrl_rss if commit_rss_command failed */

			kfree(vi->rss_hdr);

			devm_kfree(&dev->dev, vi->rss_hdr);

			vi->rss_hdr = old_rss_hdr;

			vi->rss_trailer = old_rss_trailer;
@@ -3661,7 +3661,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 
				 queue_pairs);

			return -EINVAL;

		}

		kfree(old_rss_hdr);

		devm_kfree(&dev->dev, old_rss_hdr);

		goto succ;

	}
@@ -6768,7 +6768,7 @@ static int virtnet_probe(struct virtio_device *vdev) 
			virtio_cread16(vdev, offsetof(struct virtio_net_config,

				rss_max_indirection_table_length));

	}

	vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL);

	vi->rss_hdr = devm_kzalloc(&vdev->dev, virtnet_rss_hdr_size(vi), GFP_KERNEL);

	if (!vi->rss_hdr) {

		err = -ENOMEM;

		goto free;
@@ -7051,8 +7051,6 @@ static void virtnet_remove(struct virtio_device *vdev) 


	remove_vq_common(vi);



	kfree(vi->rss_hdr);



	free_netdev(vi->dev);

}