[{"id":1769204,"web_url":"http://patchwork.ozlabs.org/comment/1769204/","msgid":"<20170915135223.GV3617@pxdev.xzpeter.org>","list_archive_url":null,"date":"2017-09-15T13:52:23","subject":"Re: [Qemu-devel] [PATCH 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/","name":"Peter Xu","email":"peterx@redhat.com"},"content":"On Fri, Sep 15, 2017 at 01:13:45PM +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 | 13 +++++++++++++\n> 3 files changed, 15 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> - 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> - 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..4d17e1f 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,18 @@ 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 =\n> + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> QLIST_INIT(&x86_iommu->iec_notifiers);\n> +\n> + if (!pcms) {\n> + error_setg(errp, \"Machine-type '%s' not supported by iommu\",\n\nWhen moving it, maybe also fix the English? :)\n\n \"Machine-type '%s' does not support IOMMU.\"\n\nOtherwise:\n\nReviewed-by: Peter Xu \n\nThanks,\n\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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@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 3xtxgQ5kYWz9sxR\n\tfor ;\n\tFri, 15 Sep 2017 23:53:04 +1000 (AEST)","from localhost ([::1]:53468 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsr3G-0007qM-74\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:53:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52601)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsr2r-0007pd-Bo\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsr2o-0006Do-3b\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:37 -0400","from mx1.redhat.com ([209.132.183.28]:31357)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsr2n-0006Bz-QK\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:34 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 877CD83F40\n\tfor ; Fri, 15 Sep 2017 13:52:32 +0000 (UTC)","from pxdev.xzpeter.org (ovpn-12-38.pek2.redhat.com [10.72.12.38])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id B3E6F6B6E8;\n\tFri, 15 Sep 2017 13:52:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 877CD83F40","Date":"Fri, 15 Sep 2017 21:52:23 +0800","From":"Peter Xu ","To":"Mohammed Gamal ","Message-ID":"<20170915135223.GV3617@pxdev.xzpeter.org>","References":"<1505474026-13151-1-git-send-email-mgamal@redhat.com>\n\t<1505474026-13151-2-git-send-email-mgamal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<1505474026-13151-2-git-send-email-mgamal@redhat.com>","User-Agent":"Mutt/1.5.24 (2015-08-30)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tFri, 15 Sep 2017 13:52:32 +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 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":"thuth@redhat.com, mst@redhat.com, qemu-devel@nongnu.org,\n\tehabkost@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1769207,"web_url":"http://patchwork.ozlabs.org/comment/1769207/","msgid":"<20170915135543.GX3617@pxdev.xzpeter.org>","list_archive_url":null,"date":"2017-09-15T13:55:43","subject":"Re: [Qemu-devel] [PATCH 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/","name":"Peter Xu","email":"peterx@redhat.com"},"content":"On Fri, Sep 15, 2017 at 09:52:23PM +0800, Peter Xu wrote:\n> On Fri, Sep 15, 2017 at 01:13:45PM +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 | 13 +++++++++++++\n> > 3 files changed, 15 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> > - 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> > - 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..4d17e1f 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,18 @@ 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 =\n> > + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> > QLIST_INIT(&x86_iommu->iec_notifiers);\n> > +\n> > + if (!pcms) {\n> > + error_setg(errp, \"Machine-type '%s' not supported by iommu\",\n> \n> When moving it, maybe also fix the English? :)\n> \n> \"Machine-type '%s' does not support IOMMU.\"\n\nI was wrong. I changed the correct thing into error. E.g., ppc64\nobviously supports IOMMU... Please ignore my comment and just pick my\nr-b. Sorry for the noise.\n\n> \n> Otherwise:\n> \n> Reviewed-by: Peter Xu \n> \n> Thanks,\n> \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> \n> -- \n> Peter Xu","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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@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 3xtxl464Cjz9sxR\n\tfor ;\n\tFri, 15 Sep 2017 23:56:16 +1000 (AEST)","from localhost ([::1]:53480 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsr6N-0000sx-1F\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:56:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53669)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsr65-0000sn-JA\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:55:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsr62-0008NU-Ac\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:55:57 -0400","from mx1.redhat.com ([209.132.183.28]:57432)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsr61-0008LM-MY\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:55:54 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 4CE154A6FB\n\tfor ; Fri, 15 Sep 2017 13:55:52 +0000 (UTC)","from pxdev.xzpeter.org (ovpn-12-38.pek2.redhat.com [10.72.12.38])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id AE4A26B6EB;\n\tFri, 15 Sep 2017 13:55:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4CE154A6FB","Date":"Fri, 15 Sep 2017 21:55:43 +0800","From":"Peter Xu ","To":"Mohammed Gamal ","Message-ID":"<20170915135543.GX3617@pxdev.xzpeter.org>","References":"<1505474026-13151-1-git-send-email-mgamal@redhat.com>\n\t<1505474026-13151-2-git-send-email-mgamal@redhat.com>\n\t<20170915135223.GV3617@pxdev.xzpeter.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20170915135223.GV3617@pxdev.xzpeter.org>","User-Agent":"Mutt/1.5.24 (2015-08-30)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tFri, 15 Sep 2017 13:55:52 +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 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":"thuth@redhat.com, mst@redhat.com, qemu-devel@nongnu.org,\n\tehabkost@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]