[{"id":1770146,"web_url":"http://patchwork.ozlabs.org/comment/1770146/","msgid":"<20170918131355.GI10621@localhost.localdomain>","list_archive_url":null,"date":"2017-09-18T13:13:55","subject":"Re: [Qemu-devel] [PATCH v3 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","submitter":{"id":195,"url":"http://patchwork.ozlabs.org/api/people/195/","name":"Eduardo Habkost","email":"ehabkost@redhat.com"},"content":"On Mon, Sep 18, 2017 at 12:14:08PM +0200, Mohammed Gamal wrote:\n> Instead of having the same error checks in vtd_realize()\n> and amdvi_realize(), move that over to the generic\n> x86_iommu_realize().\n> \n> Signed-off-by: Mohammed Gamal \n> ---\n> hw/i386/amd_iommu.c | 10 +---------\n> hw/i386/intel_iommu.c | 10 +---------\n> hw/i386/x86-iommu.c | 12 ++++++++++++\n> 3 files changed, 14 insertions(+), 18 deletions(-)\n> \n> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c\n> index 334938a..839f01f 100644\n> --- a/hw/i386/amd_iommu.c\n> +++ b/hw/i386/amd_iommu.c\n> @@ -1141,18 +1141,10 @@ static void amdvi_realize(DeviceState *dev, Error **err)\n> AMDVIState *s = AMD_IOMMU_DEVICE(dev);\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> MachineState *ms = MACHINE(qdev_get_machine());\n> - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> PCMachineState *pcms =\n> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n\nThis is where you shouldn't use object_dynamic_cast() because the\ncode now expects pcms to never be NULL...\n\n> - PCIBus *bus;\n> + PCIBus *bus = pcms->bus;\n> \n> - if (!pcms) {\n> - error_setg(err, \"Machine-type '%s' not supported by amd-iommu\",\n> - mc->name);\n> - return;\n> - }\n> -\n> - bus = pcms->bus;\n> s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,\n> amdvi_uint64_equal, g_free, g_free);\n> \n> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c\n> index 3a5bb0b..aa01812 100644\n> --- a/hw/i386/intel_iommu.c\n> +++ b/hw/i386/intel_iommu.c\n> @@ -3027,20 +3027,12 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)\n> static void vtd_realize(DeviceState *dev, Error **errp)\n> {\n> MachineState *ms = MACHINE(qdev_get_machine());\n> - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> PCMachineState *pcms =\n> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n\nSame as above.\n\n> - PCIBus *bus;\n> + PCIBus *bus = pcms->bus;\n> IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> \n> - if (!pcms) {\n> - error_setg(errp, \"Machine-type '%s' not supported by intel-iommu\",\n> - mc->name);\n> - return;\n> - }\n> -\n> - bus = pcms->bus;\n> x86_iommu->type = TYPE_INTEL;\n> \n> if (!vtd_decide_config(s, errp)) {\n> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\n> index 293caf8..d43b08a 100644\n> --- a/hw/i386/x86-iommu.c\n> +++ b/hw/i386/x86-iommu.c\n> @@ -21,6 +21,8 @@\n> #include \"hw/sysbus.h\"\n> #include \"hw/boards.h\"\n> #include \"hw/i386/x86-iommu.h\"\n> +#include \"hw/i386/pc.h\"\n> +#include \"qapi/error.h\"\n> #include \"qemu/error-report.h\"\n> #include \"trace.h\"\n> \n> @@ -80,7 +82,17 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)\n> {\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);\n> + MachineState *ms = MACHINE(qdev_get_machine());\n> + MachineClass *mc = MACHINE_GET_CLASS(ms);\n> + PCMachineState *pcms = PC_MACHINE(ms);\n\nAnd here is where you really need object_dynamic_cast(),\notherwise the \"if (!pcms)\" check below will be useless and you'll\nget this:\n\n $ qemu-system-x86_64 -machine none -device intel-iommu\n qemu/hw/i386/x86-iommu.c:87:x86_iommu_realize: Object 0x53d7d02060 is not an instance of type generic-pc-machine\n Aborted (core dumped)\n\n\n> QLIST_INIT(&x86_iommu->iec_notifiers);\n> +\n> + if (!pcms) {\n> + error_setg(errp, \"Machine-type '%s' not supported by IOMMU\",\n> + mc->name);\n> + return;\n> + }\n> +\n> if (x86_class->realize) {\n> x86_class->realize(dev, errp);\n> }\n> -- \n> 1.8.3.1\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=ehabkost@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwmgf1bL7z9s3w\n\tfor ;\n\tMon, 18 Sep 2017 23:14:36 +1000 (AEST)","from localhost ([::1]:36583 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtvsg-0001C1-L3\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 09:14:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47578)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtvsL-0001Bj-83\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:14:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtvsG-0002YT-U4\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:14:13 -0400","from mx1.redhat.com ([209.132.183.28]:37354)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtvsG-0002Y8-Kq\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:14:08 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id ACDD8753B3\n\tfor ; Mon, 18 Sep 2017 13:14:07 +0000 (UTC)","from localhost (ovpn-116-24.gru2.redhat.com [10.97.116.24])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4F8B16047B;\n\tMon, 18 Sep 2017 13:13:56 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com ACDD8753B3","Date":"Mon, 18 Sep 2017 10:13:55 -0300","From":"Eduardo Habkost ","To":"Mohammed Gamal ","Message-ID":"<20170918131355.GI10621@localhost.localdomain>","References":"<1505729649-11943-1-git-send-email-mgamal@redhat.com>\n\t<1505729649-11943-2-git-send-email-mgamal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1505729649-11943-2-git-send-email-mgamal@redhat.com>","X-Fnord":"you can see the fnord","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tMon, 18 Sep 2017 13:14:07 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v3 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org,\n\tpeterx@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770171,"web_url":"http://patchwork.ozlabs.org/comment/1770171/","msgid":"<1505742465.3647.4.camel@redhat.com>","list_archive_url":null,"date":"2017-09-18T13:47:45","subject":"Re: [Qemu-devel] [PATCH v3 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","submitter":{"id":72367,"url":"http://patchwork.ozlabs.org/api/people/72367/","name":"Mohammed Gamal","email":"mgamal@redhat.com"},"content":"On Mon, 2017-09-18 at 10:13 -0300, Eduardo Habkost wrote:\n> On Mon, Sep 18, 2017 at 12:14:08PM +0200, Mohammed Gamal wrote:\n> > Instead of having the same error checks in vtd_realize()\n> > and amdvi_realize(), move that over to the generic\n> > x86_iommu_realize().\n> > \n> > Signed-off-by: Mohammed Gamal \n> > ---\n> > hw/i386/amd_iommu.c | 10 +---------\n> > hw/i386/intel_iommu.c | 10 +---------\n> > hw/i386/x86-iommu.c | 12 ++++++++++++\n> > 3 files changed, 14 insertions(+), 18 deletions(-)\n> > \n> > diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c\n> > index 334938a..839f01f 100644\n> > --- a/hw/i386/amd_iommu.c\n> > +++ b/hw/i386/amd_iommu.c\n> > @@ -1141,18 +1141,10 @@ static void amdvi_realize(DeviceState *dev, Error **err)\n> > AMDVIState *s = AMD_IOMMU_DEVICE(dev);\n> > X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> > MachineState *ms = MACHINE(qdev_get_machine());\n> > - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> > PCMachineState *pcms =\n> > PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> \n> This is where you shouldn't use object_dynamic_cast() because the\n> code now expects pcms to never be NULL...\n> \n> > - PCIBus *bus;\n> > + PCIBus *bus = pcms->bus;\n> > \n> > - if (!pcms) {\n> > - error_setg(err, \"Machine-type '%s' not supported by amd-iommu\",\n> > - mc->name);\n> > - return;\n> > - }\n> > -\n> > - bus = pcms->bus;\n> > s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,\n> > amdvi_uint64_equal, g_free, g_free);\n> > \n> > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c\n> > index 3a5bb0b..aa01812 100644\n> > --- a/hw/i386/intel_iommu.c\n> > +++ b/hw/i386/intel_iommu.c\n> > @@ -3027,20 +3027,12 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)\n> > static void vtd_realize(DeviceState *dev, Error **errp)\n> > {\n> > MachineState *ms = MACHINE(qdev_get_machine());\n> > - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> > PCMachineState *pcms =\n> > PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> \n> Same as above.\n> \n> > - PCIBus *bus;\n> > + PCIBus *bus = pcms->bus;\n> > IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);\n> > X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> > \n> > - if (!pcms) {\n> > - error_setg(errp, \"Machine-type '%s' not supported by intel-iommu\",\n> > - mc->name);\n> > - return;\n> > - }\n> > -\n> > - bus = pcms->bus;\n> > x86_iommu->type = TYPE_INTEL;\n> > \n> > if (!vtd_decide_config(s, errp)) {\n> > diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\n> > index 293caf8..d43b08a 100644\n> > --- a/hw/i386/x86-iommu.c\n> > +++ b/hw/i386/x86-iommu.c\n> > @@ -21,6 +21,8 @@\n> > #include \"hw/sysbus.h\"\n> > #include \"hw/boards.h\"\n> > #include \"hw/i386/x86-iommu.h\"\n> > +#include \"hw/i386/pc.h\"\n> > +#include \"qapi/error.h\"\n> > #include \"qemu/error-report.h\"\n> > #include \"trace.h\"\n> > \n> > @@ -80,7 +82,17 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)\n> > {\n> > X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> > X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);\n> > + MachineState *ms = MACHINE(qdev_get_machine());\n> > + MachineClass *mc = MACHINE_GET_CLASS(ms);\n> > + PCMachineState *pcms = PC_MACHINE(ms);\n> \n> And here is where you really need object_dynamic_cast(),\n> otherwise the \"if (!pcms)\" check below will be useless and you'll\n> get this:\n> \n> $ qemu-system-x86_64 -machine none -device intel-iommu\n> qemu/hw/i386/x86-iommu.c:87:x86_iommu_realize: Object 0x53d7d02060 is not an instance of type generic-pc-machine\n> Aborted (core dumped)\n\nThis is what happens when you miss your daily Caffeine dose :)\nI thought the object_dynamic_cast call was redundant and thus needs to\nbe removed when moving the code.\n\nI see the correct sequence you mean now. Since the check is done in the\ncalling x86_iommu_realize(), the check won't be need in the callees.\n\nI will send the fixed version shortly.\n> \n> > QLIST_INIT(&x86_iommu->iec_notifiers);\n> > +\n> > + if (!pcms) {\n> > + error_setg(errp, \"Machine-type '%s' not supported by IOMMU\",\n> > + mc->name);\n> > + return;\n> > + }\n> > +\n> > if (x86_class->realize) {\n> > x86_class->realize(dev, errp);\n> > }\n> > -- \n> > 1.8.3.1\n> > \n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mgamal@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwnQz4q1mz9s7G\n\tfor ;\n\tMon, 18 Sep 2017 23:48:42 +1000 (AEST)","from localhost ([::1]:36719 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtwPe-0004Ir-Fs\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 09:48:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33664)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtwPG-0004HE-7o\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:48:18 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtwPC-0003fN-C0\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:48:14 -0400","from mx1.redhat.com ([209.132.183.28]:57868)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtwPC-0003eO-4B\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:48:10 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C69D0883D2\n\tfor ; Mon, 18 Sep 2017 13:48:08 +0000 (UTC)","from ovpn-205-53.brq.redhat.com (unknown [10.40.205.53])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3A0F85167E;\n\tMon, 18 Sep 2017 13:47:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C69D0883D2","Message-ID":"<1505742465.3647.4.camel@redhat.com>","From":"Mohammed Gamal ","To":"Eduardo Habkost ","Date":"Mon, 18 Sep 2017 15:47:45 +0200","In-Reply-To":"<20170918131355.GI10621@localhost.localdomain>","References":"<1505729649-11943-1-git-send-email-mgamal@redhat.com>\n\t<1505729649-11943-2-git-send-email-mgamal@redhat.com>\n\t<20170918131355.GI10621@localhost.localdomain>","Organization":"Red Hat","Content-Type":"text/plain; charset=\"UTF-8\"","Mime-Version":"1.0","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tMon, 18 Sep 2017 13:48:09 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v3 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"mgamal@redhat.com","Cc":"pbonzini@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org,\n\tpeterx@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]