From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72585C432C0 for ; Wed, 27 Nov 2019 21:09:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D2A9215E5 for ; Wed, 27 Nov 2019 21:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888958; bh=RX+hSb8RQCayWmJoMfvcdfouB80+rca0CMTFCrkKRjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K0Gk8+0wWBn0hZu7oe9NpQPIp5EkroHmckO+1WwGf2iBFLiNALx5N2WogvGXY+Bol 4Dpqo0ZI/PJUFtRUhwz3KF1LA5xUYPSfv3d/Jqdsx0KEcC3MW16G3jZIOId9LvwgMZ G3Wiz0PlNP2ucMFbYBW9chKNQFxNtIsE31Q2sCMs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732874AbfK0VJQ (ORCPT ); Wed, 27 Nov 2019 16:09:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:35762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732856AbfK0VJJ (ORCPT ); Wed, 27 Nov 2019 16:09:09 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DFC662086A; Wed, 27 Nov 2019 21:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888949; bh=RX+hSb8RQCayWmJoMfvcdfouB80+rca0CMTFCrkKRjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=13BpFlwFNXR/Ci7tnxhYX88QkWeCJH0S6ANd9lniRAr30molM+yeM4H9r5ri9rtt2 zOESYgDspI4r28AvP8mPfL/zLLG/JG0IllRkpc24gfi6G+55KN8KPvKFtliH0LQCNB 5t9nVgPHGicpyRXqOrYbfAZSM7806OPOnKttOSvg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Halil Pasic , Michael Mueller , "Michael S. Tsirkin" Subject: [PATCH 5.3 25/95] virtio_ring: fix return code on DMA mapping fails Date: Wed, 27 Nov 2019 21:31:42 +0100 Message-Id: <20191127202851.988325824@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit f7728002c1c7bfa787b276a31c3ef458739b8e7c upstream. 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 Tested-by: Michael Mueller Signed-off-by: Michael S. Tsirkin Signed-off-by: Greg Kroah-Hartman --- drivers/virtio/virtio_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -583,7 +583,7 @@ unmap_release: kfree(desc); END_USE(vq); - return -EIO; + return -ENOMEM; } static bool virtqueue_kick_prepare_split(struct virtqueue *_vq) @@ -1085,7 +1085,7 @@ unmap_release: kfree(desc); END_USE(vq); - return -EIO; + return -ENOMEM; } static inline int virtqueue_add_packed(struct virtqueue *_vq,