From patchwork Mon Apr 2 03:23:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 10319435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3974B60247 for ; Mon, 2 Apr 2018 03:24:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2953328D3A for ; Mon, 2 Apr 2018 03:24:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A34928D62; Mon, 2 Apr 2018 03:24:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9216A28D3A for ; Mon, 2 Apr 2018 03:24:50 +0000 (UTC) Received: from localhost ([::1]:56347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2q5P-0002jY-Gj for patchwork-qemu-devel@patchwork.kernel.org; Sun, 01 Apr 2018 23:24:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2q4h-0002Kf-F9 for qemu-devel@nongnu.org; Sun, 01 Apr 2018 23:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2q4e-0006Ee-Aa for qemu-devel@nongnu.org; Sun, 01 Apr 2018 23:24:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54052 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f2q4e-0006DL-69 for qemu-devel@nongnu.org; Sun, 01 Apr 2018 23:24:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C5759722E1 for ; Mon, 2 Apr 2018 03:23:56 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-113.pek2.redhat.com [10.72.12.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FDEC1102E20; Mon, 2 Apr 2018 03:23:49 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 11:23:36 +0800 Message-Id: <20180402032336.31834-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 02 Apr 2018 03:23:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 02 Apr 2018 03:23:56 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] scsi-block: Handle error from host devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Fam Zheng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The callback of blk_aio_ioctl is not sensible to SCSI errors, so werror=stop doesn't work if ioctl returns 0 but the scsi status is error. Peek at the sg_io_hdr_t fields and amend ret to fix that. Signed-off-by: Fam Zheng --- hw/scsi/scsi-disk.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f5ab767ab5..2c43830586 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2651,10 +2651,26 @@ typedef struct SCSIBlockReq { /* Selected bytes of the original CDB, copied into our own CDB. */ uint8_t cmd, cdb1, group_number; + BlockCompletionFunc *cb; + void *cb_opaque; + /* CDB passed to SG_IO. */ uint8_t cdb[16]; } SCSIBlockReq; +static void scsi_block_sgio_cb(void *opaque, int ret) +{ + SCSIBlockReq *req = opaque; + + if (!ret && + (req->io_header.status || + req->io_header.host_status || + req->io_header.driver_status)) { + ret = -EIO; + } + req->cb(req->cb_opaque, ret); +} + static BlockAIOCB *scsi_block_do_sgio(SCSIBlockReq *req, int64_t offset, QEMUIOVector *iov, int direction, @@ -2734,7 +2750,9 @@ static BlockAIOCB *scsi_block_do_sgio(SCSIBlockReq *req, io_header->usr_ptr = r; io_header->flags |= SG_FLAG_DIRECT_IO; - aiocb = blk_aio_ioctl(s->qdev.conf.blk, SG_IO, io_header, cb, opaque); + req->cb_opaque = opaque; + aiocb = blk_aio_ioctl(s->qdev.conf.blk, SG_IO, io_header, + scsi_block_sgio_cb, req); assert(aiocb != NULL); return aiocb; }