Skip to content

Commit 1f5d2e3

Browse files
Andrey Smetaninmstsirkin
authored andcommitted
vhost_net: revert upend_idx only on retriable error
Fix possible virtqueue used buffers leak and corresponding stuck in case of temporary -EIO from sendmsg() which is produced by tun driver while backend device is not up. In case of no-retriable error and zcopy do not revert upend_idx to pass packet data (that is update used_idx in corresponding vhost_zerocopy_signal_used()) as if packet data has been transferred successfully. v2: set vq->heads[ubuf->desc].len equal to VHOST_DMA_DONE_LEN in case of fake successful transmit. Signed-off-by: Andrey Smetanin <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Andrey Smetanin <[email protected]> Acked-by: Jason Wang <[email protected]>
1 parent 376daf3 commit 1f5d2e3

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

drivers/vhost/net.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -935,13 +935,18 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
935935

936936
err = sock->ops->sendmsg(sock, &msg, len);
937937
if (unlikely(err < 0)) {
938+
bool retry = err == -EAGAIN || err == -ENOMEM || err == -ENOBUFS;
939+
938940
if (zcopy_used) {
939941
if (vq->heads[ubuf->desc].len == VHOST_DMA_IN_PROGRESS)
940942
vhost_net_ubuf_put(ubufs);
941-
nvq->upend_idx = ((unsigned)nvq->upend_idx - 1)
942-
% UIO_MAXIOV;
943+
if (retry)
944+
nvq->upend_idx = ((unsigned)nvq->upend_idx - 1)
945+
% UIO_MAXIOV;
946+
else
947+
vq->heads[ubuf->desc].len = VHOST_DMA_DONE_LEN;
943948
}
944-
if (err == -EAGAIN || err == -ENOMEM || err == -ENOBUFS) {
949+
if (retry) {
945950
vhost_discard_vq_desc(vq, 1);
946951
vhost_net_enable_vq(net, vq);
947952
break;

0 commit comments

Comments
 (0)