Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1759760ybz; Sat, 18 Apr 2020 07:56:00 -0700 (PDT) X-Google-Smtp-Source: APiQypIjJIoFxghc2JQ63supv2HNFzyh4Pf5H+Z+NQt+LGiy05pJNCbL2Ip8bxy8ZnVNZfNGrNHk X-Received: by 2002:a50:d90f:: with SMTP id t15mr7425125edj.209.1587221760631; Sat, 18 Apr 2020 07:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221760; cv=none; d=google.com; s=arc-20160816; b=HZewJnokAaNBSv+9bWAdkEqRroWMJqMuDKbYTu4WUJNpbldIZ7dSvcGbqtRuKPFnDS wE2YsqJrQ0SnuvYKOg0b53vHUE49z0Cgo+Az4J01h9WHq2DMC4rMrrCC6AuMi3CYCBL3 TjuM8jnhOlepTUhk4cnGlb4EpNEhxmw0xlt2WFAP/9Sf2FhiSEiamqdgTTdwx2GCc0yx gHAiD88f+u4hrrKZuczFC2BccclWJQRIoTvsyj3pWFPi37eGrxXOColQJTdqqW8nFnLQ 86jinq6NpTrsDrsSwIFf0e8dScovPi186al8UkgfaegQ0ElvQ6qv+Yt8mGX7icamjAqe P9Dg== 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=fC4bzVI6JweEBsQ4o73wVfH8qEkzyKnLHJIxwREow9aGz73U2OPXmm3jf7bVC+ckZG dlaBsqklwbpY9JqzNzZj2mVKh3T7FKILcwBLbGfPOuqJlciJjrseK9KJkm9VKAwz0KX6 WyLD/cnV7Ab7UQ1fye3iteVAI3na4KlamxvXqPyN/XG23PHgmgynOH7xhp3rs+ndrn5H +WQ/yiqiXPnfNhk9PN5hu0SGqzXFGKysTbnlbfF4e4pKHnHugI8kJ+jubUc7Gm8txoFl 7hNtvXkApmsLtkw7rf/fxwRC2/GuO6pmOFOfi/XGzxvsQa/T6EbmcU19wPKDVrIsVoY4 ZeiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i8N+SEyz; 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 dn6si5414494edb.514.2020.04.18.07.55.37; Sat, 18 Apr 2020 07:56:00 -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=i8N+SEyz; 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 S1728308AbgDROmU (ORCPT + 99 others); Sat, 18 Apr 2020 10:42:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:52264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728298AbgDROmS (ORCPT ); Sat, 18 Apr 2020 10:42:18 -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 2BC7C22244; Sat, 18 Apr 2020 14:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220938; bh=dyQ/jAoog3/afvIT8/E4Yzhzrzavmt+MBeOOR32Pl3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8N+SEyzgbFazV10LUi+yQmfL19an37EHygdBgSpsqn0Sr15jnIObGFdcCC60anld 27Tj+5vOD0lYp/7lkc3ICaKVTGD1fMLAtojxq516hnMWavim4jfLqeiKDPPiLYC89g 9s+Sm67snePGJRlKsRiYxCNtPnp7Ipt/J3yTlf/o= 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.4 73/78] virtio-blk: improve virtqueue error to BLK_STS Date: Sat, 18 Apr 2020 10:40:42 -0400 Message-Id: <20200418144047.9013-73-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-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