The second vhost_net_flush() call in vhost_net_release() doesn't do anything. vhost_dev_cleanup() stops dev->worker and NULLifies it. vhost_net_reset_vq(n) NULLifies n->vqs[i].ubufs So vhost_net_flush() after vhost_dev_cleanup()&vhost_net_reset_vq() doesn't do anything, it simply doesn't pass NULL checks. Hence remove it for simplicity. Signed-off-by: Andrey Ryabinin <arbn@xxxxxxxxxxxxxxx> --- drivers/vhost/net.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index b1feb5e0571e..97a209d6a527 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1406,9 +1406,7 @@ static int vhost_net_release(struct inode *inode, struct file *f) sockfd_put(rx_sock); /* Make sure no callbacks are outstanding */ synchronize_rcu(); - /* We do an extra flush before freeing memory, - * since jobs can re-queue themselves. */ - vhost_net_flush(n); + kfree(n->vqs[VHOST_NET_VQ_RX].rxq.queue); kfree(n->vqs[VHOST_NET_VQ_TX].xdp); kfree(n->dev.vqs); -- 2.32.0
