Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0b56f6 authored by Halil Pasic's avatar Halil Pasic Committed by Greg Kroah-Hartman
Browse files

virtio_ring: fix return code on DMA mapping fails 



[ Upstream commit f7728002c1c7bfa787b276a31c3ef458739b8e7c ]

Commit 780bc790 ("virtio_ring: Support DMA APIs")  makes
virtqueue_add() return -EIO when we fail to map our I/O buffers. This is
a very realistic scenario for guests with encrypted memory, as swiotlb
may run out of space, depending on it's size and the I/O load.

The virtio-blk driver interprets -EIO form virtqueue_add() as an IO
error, despite the fact that swiotlb full is in absence of bugs a
recoverable condition.

Let us change the return code to -ENOMEM, and make the block layer
recover form these failures when virtio-blk encounters the condition
described above.

Cc: stable@vger.kernel.org
Fixes: 780bc790 ("virtio_ring: Support DMA APIs")
Signed-off-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Tested-by: default avatarMichael Mueller <mimu@linux.ibm.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 78260a29

drivers/virtio/virtio_ring.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static inline int virtqueue_add(struct virtqueue *_vq, 
		kfree(desc);



	END_USE(vq);

	return -EIO;

	return -ENOMEM;

}



/**