From mboxrd@z Thu Jan 1 00:00:00 1970 From: Halil Pasic Subject: [PATCH 2/2] virtio-blk: improve virtqueue error to BLK_STS Date: Thu, 13 Feb 2020 13:37:28 +0100 Message-ID: <20200213123728.61216-3-pasic@linux.ibm.com> References: <20200213123728.61216-1-pasic@linux.ibm.com> Return-path: In-Reply-To: <20200213123728.61216-1-pasic@linux.ibm.com> Sender: linux-block-owner@vger.kernel.org To: "Michael S. Tsirkin" , Jason Wang Cc: Halil Pasic , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , virtualization@lists.linux-foundation.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, Christian Borntraeger , Viktor Mihajlovski , Cornelia Huck , Ram Pai , Thiago Jung Bauermann , "Lendacky, Thomas" List-Id: virtualization@lists.linuxfoundation.org Let's change the mapping between virtqueue_add errors to BLK_STS statuses, so that -ENOSPC, which indicates virtqueue full is still mapped to BLK_STS_DEV_RESOURCE, but -ENOMEM which indicates non-device specific resource outage is mapped to BLK_STS_RESOURCE. Signed-off-by: Halil Pasic --- See comment about BLK_STS_DEV_RESOURCE in include/linux/blk_types.h --- drivers/block/virtio_blk.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index adfe43f5ffe4..0736248999b0 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -251,9 +251,14 @@ static blk_status_t virtio_queue_rq(struct blk_mq_hw_ctx *hctx, if (err == -ENOSPC) blk_mq_stop_hw_queue(hctx); spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags); - if (err == -ENOMEM || err == -ENOSPC) + switch (err) { + case -ENOSPC: return BLK_STS_DEV_RESOURCE; - return BLK_STS_IOERR; + case -ENOMEM: + return BLK_STS_RESOURCE; + default: + return BLK_STS_IOERR; + } } if (bd->last && virtqueue_kick_prepare(vblk->vqs[qid].vq)) -- 2.17.1