github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

virtio_net: Allocate rss_hdr with devres

Browse Source 
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: 86a48a00ef ("virtio_net: Support dynamic rss indirection table size")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Lei Yang <leiyang@redhat.com>
Link: https://patch.msgid.link/20250321-virtio-v2-4-33afb8f4640b@daynix.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Akihiko Odaki 2025-03-21 15:48:35 +09:00 committed by Jakub Kicinski
parent ed3100e90d
commit 4944be2f5a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/virtio_net.c
View File

@ -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)) { if (vi->has_rss && !netif_is_rxfh_configured(dev)) {
old_rss_hdr = vi->rss_hdr; old_rss_hdr = vi->rss_hdr;
old_rss_trailer = vi->rss_trailer; 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) { if (!vi->rss_hdr) {
vi->rss_hdr = old_rss_hdr; vi->rss_hdr = old_rss_hdr;
return -ENOMEM; return -ENOMEM;
@ -3653,7 +3653,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
if (!virtnet_commit_rss_command(vi)) { if (!virtnet_commit_rss_command(vi)) {
/* restore ctrl_rss if commit_rss_command failed */ /* 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_hdr = old_rss_hdr;
vi->rss_trailer = old_rss_trailer; vi->rss_trailer = old_rss_trailer;
@ -3661,7 +3661,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
queue_pairs); queue_pairs);
return -EINVAL; return -EINVAL;
} }
kfree(old_rss_hdr); devm_kfree(&dev->dev, old_rss_hdr);
goto succ; goto succ;
} }
@ -6768,7 +6768,7 @@ static int virtnet_probe(struct virtio_device *vdev)
virtio_cread16(vdev, offsetof(struct virtio_net_config, virtio_cread16(vdev, offsetof(struct virtio_net_config,
rss_max_indirection_table_length)); 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) { if (!vi->rss_hdr) {
err = -ENOMEM; err = -ENOMEM;
goto free; goto free;
@ -7051,8 +7051,6 @@ static void virtnet_remove(struct virtio_device *vdev)
remove_vq_common(vi); remove_vq_common(vi);
kfree(vi->rss_hdr);
free_netdev(vi->dev); free_netdev(vi->dev);
} }