Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1726027ybz; Sat, 18 Apr 2020 07:14:49 -0700 (PDT) X-Google-Smtp-Source: APiQypL0JCOO8EO6fxWA6Rz8RZThDK3aCCzY3An8XclpEoKm2167csD5c75s/3XkMJSvGE3v1KxK X-Received: by 2002:aa7:c983:: with SMTP id c3mr1344766edt.343.1587219289448; Sat, 18 Apr 2020 07:14:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219289; cv=none; d=google.com; s=arc-20160816; b=JqKRwFSwvH/OHO4Jd8TS9Ca+OGDkMZsoyGrq0eeSDG3XTag9FmRMnoyc2SVJ2zlv9l 5KnDPHMaA4cmSHsfu/wyuQDkoNNSNFDaJlqWxZ/smlb7LWL+HN/aNHDDp1covck5D/06 vV1rIFDbprf9KW/ytkoXfc/4zr0BAxi0Qremj8p1hTa4CWEXoWOOrXLyMOsnlFF0apdF xt7sB+9RpAHF+qquMYAFLatP741EoCjLzGEgs5PmJQMP8znwJklh3lIKJypUeiz2c11M 99oUughPgaJF4ub9lpSOUBoe9YYx+/OizVniEszXwMjrDhLxboHLVr5vK5ClXno36lRC OxpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jvzYpBBXICRwELr3j0iULpegdVQm86vDuwYJdoAC5cQ=; b=s5Wvh2jBqyuEXxbrmCwUylFjNi9W/qmMClfDXmIQRulnPjqPnJgH5eM3vRKLaOMdRO cUq/+1jMajN2BULvcijFcBzxPQkcqy4NQ2CMBvOVm6ZHN7iXXj2ZhtLFjPr9FrW7my2n rtMVTjzOnl63KkBjnc//Ybt6IpvEE8pXgY9aFJkHbZ+tmN3JdFP9vvpF54Ev0KOt0Cml RWj8SC78mR7U6rUwX62o/GybSkl0Z3Svjj0xVZ75j+3xGPNpwcLNd2zS1tj3CjVlYoQh 30YlhaixP0OrwEi/sReiuGKXUAKOk5focVsuAnmB6vWIqAglpztpNrfN9rBgZ5Z9rjHr tcfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PdlplNxO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gz10si12077781ejb.167.2020.04.18.07.14.27; Sat, 18 Apr 2020 07:14:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PdlplNxO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725879AbgDROKx (ORCPT + 99 others); Sat, 18 Apr 2020 10:10:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:39096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727946AbgDROKm (ORCPT ); Sat, 18 Apr 2020 10:10:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0C9921BE5; Sat, 18 Apr 2020 14:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587219041; bh=dyQ/jAoog3/afvIT8/E4Yzhzrzavmt+MBeOOR32Pl3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PdlplNxOP9vZTZ0bpCVxuo6LmNdOGMmAbRyRJXnoe8kFz07qnvooMjHBurzJBINH5 eUBbRnfn0aW3sjt9899ETWCKEloTkzSs2XwR+AyVTEsR0mzGi+44dJIVAW/dy+ajEc vaX7iKnAJmjPFBYvGVp3BcfAr403+fweJe6T3liI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Halil Pasic , "Michael S . Tsirkin" , Stefan Hajnoczi , Sasha Levin , virtualization@lists.linux-foundation.org, linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 74/75] virtio-blk: improve virtqueue error to BLK_STS Date: Sat, 18 Apr 2020 10:09:09 -0400 Message-Id: <20200418140910.8280-74-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Halil Pasic [ Upstream commit 3d973b2e9a625996ee997c7303cd793b9d197c65 ] 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 Link: https://lore.kernel.org/r/20200213123728.61216-3-pasic@linux.ibm.com Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Signed-off-by: Sasha Levin --- 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 c2ed3e9128e3a..a55383b139df9 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -345,9 +345,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.20.1