diff options
| author | Halil Pasic <pasic@linux.ibm.com> | 2019-11-14 13:46:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-01 09:14:28 +0100 |
| commit | 9870e74477c1db3234c716dccd0ccd157f3ee69d (patch) | |
| tree | bedce1d2580372bf44211ea8202db5a2e2eda7a2 /drivers/virtio/virtio_ring.c | |
| parent | 2d4c3e5c180f0f91cdc41cf65675bd768401b584 (diff) | |
| download | linux-stable-9870e74477c1db3234c716dccd0ccd157f3ee69d.tar.gz linux-stable-9870e74477c1db3234c716dccd0ccd157f3ee69d.tar.bz2 linux-stable-9870e74477c1db3234c716dccd0ccd157f3ee69d.zip | |
virtio_ring: fix return code on DMA mapping fails
[ Upstream commit f7728002c1c7bfa787b276a31c3ef458739b8e7c ]
Commit 780bc7903a32 ("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: 780bc7903a32 ("virtio_ring: Support DMA APIs")
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Tested-by: Michael Mueller <mimu@linux.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/virtio/virtio_ring.c')
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index cc9d421c0929..b82bb0b08161 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -432,7 +432,7 @@ unmap_release: kfree(desc); END_USE(vq); - return -EIO; + return -ENOMEM; } /** |