From patchwork Wed Feb 7 16:36:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 870520 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=) 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 3zc76r1ymWz9s71 for ; Thu, 8 Feb 2018 04:07:31 +1100 (AEDT) Received: from localhost ([::1]:60707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejTBw-0006ax-Jf for incoming@patchwork.ozlabs.org; Wed, 07 Feb 2018 12:07:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejShz-00044W-KZ for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:36:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejShy-0005CE-Nd for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:36:31 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48094 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 1ejSht-00059B-E2; Wed, 07 Feb 2018 11:36:25 -0500 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 01AF44040073; Wed, 7 Feb 2018 16:36:25 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-194.ams2.redhat.com [10.36.117.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B30E2024CA5; Wed, 7 Feb 2018 16:36:24 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 7 Feb 2018 17:36:21 +0100 Message-Id: <20180207163622.29935-2-pbonzini@redhat.com> In-Reply-To: <20180207163622.29935-1-pbonzini@redhat.com> References: <20180207163622.29935-1-pbonzini@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.5]); Wed, 07 Feb 2018 16:36:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 07 Feb 2018 16:36:25 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@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 1/2] scsi: add unrealize method for SCSI 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: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The next patch will introduce a different unrealize implementation for scsi-block. Compared to the code before commit fb7b5c0df6 ("scsi: devirtualize unrealize of SCSI devices", 2014-10-31), the common code for all SCSI devices is kept in scsi-bus.c. Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng --- hw/scsi/scsi-bus.c | 4 ++++ include/hw/scsi/scsi.h | 1 + 2 files changed, 5 insertions(+) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 05e501efd3..a0790438f0 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -212,12 +212,16 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp) { SCSIDevice *dev = SCSI_DEVICE(qdev); + SCSIDeviceClass *sc = SCSI_DEVICE_GET_CLASS(dev); if (dev->vmsentry) { qemu_del_vm_change_state_handler(dev->vmsentry); } scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE)); + if (sc->unrealize) { + sc->unrealize(dev, errp); + } blockdev_mark_auto_del(dev->conf.blk); } diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 802a647cdc..569a4b9d14 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -59,6 +59,7 @@ struct SCSIRequest { typedef struct SCSIDeviceClass { DeviceClass parent_class; void (*realize)(SCSIDevice *dev, Error **errp); + void (*unrealize)(SCSIDevice *dev, Error **errp); int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun, From patchwork Wed Feb 7 16:36:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 870515 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=) 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 3zc6lS2PQ6z9s1h for ; Thu, 8 Feb 2018 03:50:43 +1100 (AEDT) Received: from localhost ([::1]:58702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejSvg-00081F-Hy for incoming@patchwork.ozlabs.org; Wed, 07 Feb 2018 11:50:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejSi0-00045b-9U for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:36:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejShz-0005Cb-2X for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:36:32 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37484 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 1ejShu-00059j-Dq; Wed, 07 Feb 2018 11:36:26 -0500 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 087CD4075171; Wed, 7 Feb 2018 16:36:26 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-194.ams2.redhat.com [10.36.117.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4331D2024CA5; Wed, 7 Feb 2018 16:36:25 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 7 Feb 2018 17:36:22 +0100 Message-Id: <20180207163622.29935-3-pbonzini@redhat.com> In-Reply-To: <20180207163622.29935-1-pbonzini@redhat.com> References: <20180207163622.29935-1-pbonzini@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.7]); Wed, 07 Feb 2018 16:36:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 07 Feb 2018 16:36:26 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@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 2/2] scsi: add block job opblockers for scsi-block 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: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" scsi-block bypasses the dirty bitmaps and pre-write notifiers, so it cannot be the source of a block job. The gist of the fix is to add op-blockers to the BlockBackend, and remove them at "unrealize" time, but things are a little more complex because quit closes the BlockBackend without going through unrealize. So use Notifiers: the remove_bs notifier is called by bdrv_close_all, and the insert_bs notifier might not be really necessary but make things a little more symmetric. Suggested-by: Karen Noel Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng --- block/block-backend.c | 9 ++++++ hw/scsi/scsi-disk.c | 62 ++++++++++++++++++++++++++++++++++++++++++ include/sysemu/block-backend.h | 1 + 3 files changed, 72 insertions(+) diff --git a/block/block-backend.c b/block/block-backend.c index baef8e7abc..1759639a4a 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1747,6 +1747,15 @@ bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp) return bdrv_op_is_blocked(bs, op, errp); } +void blk_op_block(BlockBackend *blk, BlockOpType op, Error *reason) +{ + BlockDriverState *bs = blk_bs(blk); + + if (bs) { + bdrv_op_block(bs, op, reason); + } +} + void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason) { BlockDriverState *bs = blk_bs(blk); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 49d2559d93..023673cb04 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2578,9 +2578,39 @@ static int get_device_type(SCSIDiskState *s) return 0; } +typedef struct SCSIBlockState { + SCSIDiskState sd; + Error *mirror_source; + Error *backup_source; + Error *commit_source; + Notifier insert_bs; + Notifier remove_bs; +} SCSIBlockState; + +static void scsi_block_insert_bs(Notifier *n, void *opaque) +{ + SCSIBlockState *sb = container_of(n, SCSIBlockState, insert_bs); + SCSIDiskState *s = &sb->sd; + + blk_op_block(s->qdev.conf.blk, BLOCK_OP_TYPE_MIRROR_SOURCE, sb->mirror_source); + blk_op_block(s->qdev.conf.blk, BLOCK_OP_TYPE_COMMIT_SOURCE, sb->commit_source); + blk_op_block(s->qdev.conf.blk, BLOCK_OP_TYPE_BACKUP_SOURCE, sb->backup_source); +} + +static void scsi_block_remove_bs(Notifier *n, void *opaque) +{ + SCSIBlockState *sb = container_of(n, SCSIBlockState, remove_bs); + SCSIDiskState *s = &sb->sd; + + blk_op_unblock(s->qdev.conf.blk, BLOCK_OP_TYPE_MIRROR_SOURCE, sb->mirror_source); + blk_op_unblock(s->qdev.conf.blk, BLOCK_OP_TYPE_COMMIT_SOURCE, sb->commit_source); + blk_op_unblock(s->qdev.conf.blk, BLOCK_OP_TYPE_BACKUP_SOURCE, sb->backup_source); +} + static void scsi_block_realize(SCSIDevice *dev, Error **errp) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); + SCSIBlockState *sb = DO_UPCAST(SCSIBlockState, sd, s); int sg_version; int rc; @@ -2626,6 +2656,36 @@ static void scsi_block_realize(SCSIDevice *dev, Error **errp) scsi_realize(&s->qdev, errp); scsi_generic_read_device_identification(&s->qdev); + + /* For op blockers, due to lack of support for dirty bitmaps. */ + error_setg(&sb->mirror_source, + "scsi-block does not support acting as a mirroring source"); + error_setg(&sb->commit_source, + "scsi-block does not support acting as an active commit source"); + + /* For op blockers, due to lack of support for write notifiers. */ + error_setg(&sb->backup_source, + "scsi-block does not support acting as a backup source"); + + sb->insert_bs.notify = scsi_block_insert_bs; + blk_add_insert_bs_notifier(s->qdev.conf.blk, &sb->insert_bs); + sb->remove_bs.notify = scsi_block_remove_bs; + blk_add_remove_bs_notifier(s->qdev.conf.blk, &sb->remove_bs); + + scsi_block_insert_bs(&sb->insert_bs, s->qdev.conf.blk); +} + +static void scsi_block_unrealize(SCSIDevice *dev, Error **errp) +{ + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); + SCSIBlockState *sb = DO_UPCAST(SCSIBlockState, sd, s); + + notifier_remove(&sb->insert_bs); + notifier_remove(&sb->remove_bs); + scsi_block_remove_bs(&sb->insert_bs, s->qdev.conf.blk); + error_free(sb->mirror_source); + error_free(sb->commit_source); + error_free(sb->backup_source); } typedef struct SCSIBlockReq { @@ -3017,6 +3077,7 @@ static void scsi_block_class_initfn(ObjectClass *klass, void *data) SCSIDiskClass *sdc = SCSI_DISK_BASE_CLASS(klass); sc->realize = scsi_block_realize; + sc->unrealize = scsi_block_unrealize; sc->alloc_req = scsi_block_new_request; sc->parse_cdb = scsi_block_parse_cdb; sdc->dma_readv = scsi_block_dma_readv; @@ -3031,6 +3092,7 @@ static const TypeInfo scsi_block_info = { .name = "scsi-block", .parent = TYPE_SCSI_DISK_BASE, .class_init = scsi_block_class_initfn, + .instance_size = sizeof(SCSIBlockState), }; #endif diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index c4e52a5fa3..a48a49ca79 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -182,6 +182,7 @@ void blk_set_guest_block_size(BlockBackend *blk, int align); void *blk_try_blockalign(BlockBackend *blk, size_t size); void *blk_blockalign(BlockBackend *blk, size_t size); bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp); +void blk_op_block(BlockBackend *blk, BlockOpType op, Error *reason); void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason); void blk_op_block_all(BlockBackend *blk, Error *reason); void blk_op_unblock_all(BlockBackend *blk, Error *reason);