From nobody Sat Oct 4 17:29:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601988458; cv=none; d=zohomail.com; s=zohoarc; b=iyTCuJEJIB3uMzE1OOP0OpdITWNTQGiRjofnKiMxx1rnxHof2l1qJgzH/SumJzO1jc8rz2FC1E6MHnx3gflXhjz4eVg3oGJJOVuCNzOUaigzP6Agt74cfHRK39IZSPo8qaCWOdDpgj3k5y7fwk58WfBr03roKeEl/srzs1wfPu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988458; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3lZUKs0z7jfCFm1NgfTxccxpZuuL2RU5UTO4LliXmsU=; b=c44jkRenrW3Mpz0j5tw6xD2clAFG3AvvOcOjKH97XbAxe+rnrdu1kq/r6n6z2v3k+bEo5fpi+GeXF6UXs1MmfmTfoEyWRFq2MzSMoD/FqRp8xmrk+OXK+YUy5cz6FcEVl9WlblausOCmpdfBlLNfYJrfSkNHtJgV+2n4LVo2K8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601988458390496.8634363271776; Tue, 6 Oct 2020 05:47:38 -0700 (PDT) Received: from localhost ([::1]:35316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmNV-0001Ad-4H for importer@patchew.org; Tue, 06 Oct 2020 08:47:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmFt-0001HM-MI for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:39:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmFq-0007wK-Lz for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:39:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-US84SNAlNUWtoabEOx1rtg-1; Tue, 06 Oct 2020 08:39:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D634D87950D; Tue, 6 Oct 2020 12:39:37 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0629255767; Tue, 6 Oct 2020 12:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601987981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3lZUKs0z7jfCFm1NgfTxccxpZuuL2RU5UTO4LliXmsU=; b=KRJs9LJaZQ7y/p3p7Jg+fki7EuVPEYbumTwu3SrdRZEQOJxhDg1aUlWEmYUidTHcppFG/P 90M5K81SXg5fxMqQp5NaTJJlXxJRC1XMEcNm7Sp7ret6BocUT3lthX0zqPmlKu73bvHJiO og1AkGRHAdDklxwdhtXVqIhwglGl3oQ= X-MC-Unique: US84SNAlNUWtoabEOx1rtg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v7 05/13] scsi: switch to bus->check_address Date: Tue, 6 Oct 2020 15:38:56 +0300 Message-Id: <20201006123904.610658-6-mlevitsk@redhat.com> In-Reply-To: <20201006123904.610658-1-mlevitsk@redhat.com> References: <20201006123904.610658-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Jason Wang , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Maxim Levitsky , John Snow , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 122 ++++++++++++++++++++++++++++----------------- 1 file changed, 75 insertions(+), 47 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 3284a5d1fb..94921c04b1 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -22,33 +22,6 @@ static void scsi_req_dequeue(SCSIRequest *req); static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len); static void scsi_target_free_buf(SCSIRequest *req); =20 -static Property scsi_props[] =3D { - DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0), - DEFINE_PROP_UINT32("scsi-id", SCSIDevice, id, -1), - DEFINE_PROP_UINT32("lun", SCSIDevice, lun, -1), - DEFINE_PROP_END_OF_LIST(), -}; - -static void scsi_bus_class_init(ObjectClass *klass, void *data) -{ - BusClass *k =3D BUS_CLASS(klass); - HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); - - k->get_dev_path =3D scsibus_get_dev_path; - k->get_fw_dev_path =3D scsibus_get_fw_dev_path; - hc->unplug =3D qdev_simple_device_unplug_cb; -} - -static const TypeInfo scsi_bus_info =3D { - .name =3D TYPE_SCSI_BUS, - .parent =3D TYPE_BUS, - .instance_size =3D sizeof(SCSIBus), - .class_init =3D scsi_bus_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_HOTPLUG_HANDLER }, - { } - } -}; static int next_scsi_bus; =20 static void scsi_device_realize(SCSIDevice *s, Error **errp) @@ -160,35 +133,68 @@ static void scsi_dma_restart_cb(void *opaque, int run= ning, RunState state) } } =20 -static void scsi_qdev_realize(DeviceState *qdev, Error **errp) +static bool scsi_bus_is_address_free(SCSIBus *bus, + int channel, int target, int lun, + SCSIDevice **p_dev) +{ + SCSIDevice *d =3D scsi_device_find(bus, channel, target, lun); + if (d && d->lun =3D=3D lun) { + if (p_dev) { + *p_dev =3D d; + } + return false; + } + if (p_dev) { + *p_dev =3D NULL; + } + return true; +} + +static bool scsi_bus_check_address(BusState *qbus, DeviceState *qdev, Erro= r **errp) { SCSIDevice *dev =3D SCSI_DEVICE(qdev); - SCSIBus *bus =3D DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); - SCSIDevice *d; - Error *local_err =3D NULL; + SCSIBus *bus =3D SCSI_BUS(qbus); =20 if (dev->channel > bus->info->max_channel) { error_setg(errp, "bad scsi channel id: %d", dev->channel); - return; + return false; } if (dev->id !=3D -1 && dev->id > bus->info->max_target) { error_setg(errp, "bad scsi device id: %d", dev->id); - return; + return false; } if (dev->lun !=3D -1 && dev->lun > bus->info->max_lun) { error_setg(errp, "bad scsi device lun: %d", dev->lun); - return; + return false; + } + + if (dev->id !=3D -1 && dev->lun !=3D -1) { + SCSIDevice *d; + if (!scsi_bus_is_address_free(bus, dev->channel, dev->id, dev->lun= , &d)) { + error_setg(errp, "lun already used by '%s'", d->qdev.id); + return false; + } } =20 + return true; +} + +static void scsi_qdev_realize(DeviceState *qdev, Error **errp) +{ + SCSIDevice *dev =3D SCSI_DEVICE(qdev); + SCSIBus *bus =3D DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); + bool is_free; + Error *local_err =3D NULL; + if (dev->id =3D=3D -1) { int id =3D -1; if (dev->lun =3D=3D -1) { dev->lun =3D 0; } do { - d =3D scsi_device_find(bus, dev->channel, ++id, dev->lun); - } while (d && d->lun =3D=3D dev->lun && id < bus->info->max_target= ); - if (d && d->lun =3D=3D dev->lun) { + is_free =3D scsi_bus_is_address_free(bus, dev->channel, ++id, = dev->lun, NULL); + } while (!is_free && id < bus->info->max_target); + if (!is_free) { error_setg(errp, "no free target"); return; } @@ -196,20 +202,13 @@ static void scsi_qdev_realize(DeviceState *qdev, Erro= r **errp) } else if (dev->lun =3D=3D -1) { int lun =3D -1; do { - d =3D scsi_device_find(bus, dev->channel, dev->id, ++lun); - } while (d && d->lun =3D=3D lun && lun < bus->info->max_lun); - if (d && d->lun =3D=3D lun) { + is_free =3D scsi_bus_is_address_free(bus, dev->channel, dev->i= d, ++lun, NULL); + } while (!is_free && lun < bus->info->max_lun); + if (!is_free) { error_setg(errp, "no free lun"); return; } dev->lun =3D lun; - } else { - d =3D scsi_device_find(bus, dev->channel, dev->id, dev->lun); - assert(d); - if (d->lun =3D=3D dev->lun && dev !=3D d) { - error_setg(errp, "lun already used by '%s'", d->qdev.id); - return; - } } =20 QTAILQ_INIT(&dev->requests); @@ -1709,6 +1708,13 @@ const VMStateDescription vmstate_scsi_device =3D { } }; =20 +static Property scsi_props[] =3D { + DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0), + DEFINE_PROP_UINT32("scsi-id", SCSIDevice, id, -1), + DEFINE_PROP_UINT32("lun", SCSIDevice, lun, -1), + DEFINE_PROP_END_OF_LIST(), +}; + static void scsi_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); @@ -1739,6 +1745,28 @@ static const TypeInfo scsi_device_type_info =3D { .instance_init =3D scsi_dev_instance_init, }; =20 +static void scsi_bus_class_init(ObjectClass *klass, void *data) +{ + BusClass *k =3D BUS_CLASS(klass); + HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); + + k->get_dev_path =3D scsibus_get_dev_path; + k->get_fw_dev_path =3D scsibus_get_fw_dev_path; + k->check_address =3D scsi_bus_check_address; + hc->unplug =3D qdev_simple_device_unplug_cb; +} + +static const TypeInfo scsi_bus_info =3D { + .name =3D TYPE_SCSI_BUS, + .parent =3D TYPE_BUS, + .instance_size =3D sizeof(SCSIBus), + .class_init =3D scsi_bus_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } +}; + static void scsi_register_types(void) { type_register_static(&scsi_bus_info); --=20 2.26.2