From patchwork Wed Apr 4 01:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 894845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40G83y2GrGz9s3n for ; Wed, 4 Apr 2018 11:47:58 +1000 (AEST) Received: from localhost ([::1]:51757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3XWm-0007SU-9S for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2018 21:47:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3XW6-0007QX-8c for qemu-devel@nongnu.org; Tue, 03 Apr 2018 21:47:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3XW3-0003YY-6J for qemu-devel@nongnu.org; Tue, 03 Apr 2018 21:47:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46212 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 1f3XW3-0003YJ-1f for qemu-devel@nongnu.org; Tue, 03 Apr 2018 21:47:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8CE35722F3; Wed, 4 Apr 2018 01:47:10 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-21.pek2.redhat.com [10.72.12.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60D8E2026DFD; Wed, 4 Apr 2018 01:47:07 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 4 Apr 2018 09:47:02 +0800 Message-Id: <20180404014702.16099-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 04 Apr 2018 01:47:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 04 Apr 2018 01:47:10 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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 v2] 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: Daniel Henrique Barboza , Paolo Bonzini , Fam Zheng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- v2: Fix ->cb. [Daniel] --- hw/scsi/scsi-disk.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f5ab767ab5..9cb08ff491 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,10 @@ 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 = cb; + 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; }