Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jii87-00079u-DF for mharc-qemu-trivial@gnu.org; Tue, 09 Jun 2020 13:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jii85-000762-6D for qemu-trivial@nongnu.org; Tue, 09 Jun 2020 13:33:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:48311 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jii82-0004DU-TK for qemu-trivial@nongnu.org; Tue, 09 Jun 2020 13:33:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591724017; 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=ozlwcaevOxkBiPqU5CsLaPTK4wFZAqmdrORbRpmkUQI=; b=UZhn+awB9BROaeFTQ8ilEGRp0mlUN/tOIdClR4ipYDHLEfzKnSZ3y0XP2540/4EgK8THVE +Bu9dWDxvscSLtptJYmZ8T+CxZb6IHXN0iV0Gr+CxVOHeoN6CjQ4p3L3IPfy85tl6/Qs11 9r/HYR+lP3vxyaMg3AFPuGd+I2d3r7g= 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-99-V-lYuownNtObSlc0xgP9sA-1; Tue, 09 Jun 2020 13:33:34 -0400 X-MC-Unique: V-lYuownNtObSlc0xgP9sA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5326A1007278; Tue, 9 Jun 2020 17:33:33 +0000 (UTC) Received: from w520.home (ovpn-112-195.phx2.redhat.com [10.3.112.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FCA660C87; Tue, 9 Jun 2020 17:33:27 +0000 (UTC) Date: Tue, 9 Jun 2020 11:33:26 -0600 From: Alex Williamson To: Laurent Vivier Cc: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , qemu-devel@nongnu.org, qemu-trivial@nongnu.org, Cornelia Huck , Peter Xu , Eric Auger Subject: Re: [PATCH v2] hw/vfio/common: Trace in which mode an IOMMU is opened Message-ID: <20200609113326.100e74fe@w520.home> In-Reply-To: References: <20200527155555.6833-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=207.211.31.81; envelope-from=alex.williamson@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 23:42:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 17:33:41 -0000 On Tue, 9 Jun 2020 19:23:32 +0200 Laurent Vivier wrote: > Le 27/05/2020 =C3=A0 17:55, Philippe Mathieu-Daud=C3=A9 a =C3=A9crit=C2= =A0: > > One might want to check which IOMMU version the host kernel > > provide. Add a trace event to see in which mode we opened > > our container. > >=20 > > Reviewed-by: Cornelia Huck > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > > --- > > v2: Only display string description (Eric) > >=20 > > Supersedes: <20200526173542.28710-1-philmd@redhat.com> > > --- > > hw/vfio/common.c | 19 ++++++++++++++----- > > hw/vfio/trace-events | 1 + > > 2 files changed, 15 insertions(+), 5 deletions(-) > >=20 > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > > index 0b3593b3c0..f24450472e 100644 > > --- a/hw/vfio/common.c > > +++ b/hw/vfio/common.c > > @@ -1157,15 +1157,24 @@ static void vfio_put_address_space(VFIOAddressS= pace *space) > > static int vfio_get_iommu_type(VFIOContainer *container, > > Error **errp) > > { > > - int iommu_types[] =3D { VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU, > > - VFIO_SPAPR_TCE_v2_IOMMU, VFIO_SPAPR_TCE_IOMM= U }; > > + static const struct { > > + int type; > > + const char *name; > > + } iommu[] =3D { > > + {VFIO_TYPE1v2_IOMMU, "Type1 (v2)"}, > > + {VFIO_TYPE1_IOMMU, "Type1 (v1)"}, > > + {VFIO_SPAPR_TCE_v2_IOMMU, "sPAPR TCE (v2)"}, > > + {VFIO_SPAPR_TCE_IOMMU, "sPAPR TCE (v1)"} > > + }; > > int i; > > =20 > > - for (i =3D 0; i < ARRAY_SIZE(iommu_types); i++) { > > - if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])= ) { > > - return iommu_types[i]; > > + for (i =3D 0; i < ARRAY_SIZE(iommu); i++) { > > + if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu[i].type))= { > > + trace_vfio_get_iommu_type(iommu[i].name); > > + return iommu[i].type; > > } > > } > > + trace_vfio_get_iommu_type("Not available or not supported"); > > error_setg(errp, "No available IOMMU models"); > > return -EINVAL; > > } > > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > > index b1ef55a33f..d3f1e48618 100644 > > --- a/hw/vfio/trace-events > > +++ b/hw/vfio/trace-events > > @@ -115,6 +115,7 @@ vfio_region_sparse_mmap_header(const char *name, in= t index, int nr_areas) "Devic > > vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned lon= g end) "sparse entry %d [0x%lx - 0x%lx]" > > vfio_get_dev_region(const char *name, int index, uint32_t type, uint32= _t subtype) "%s index %d, %08x/%0x8" > > vfio_dma_unmap_overflow_workaround(void) "" > > +vfio_get_iommu_type(const char *type) "IOMMU type: %s" > > =20 > > # platform.c > > vfio_platform_base_device_init(char *name, int groupid) "%s belongs to= group #%d" > > =20 >=20 > Applied to my trivial-patches branch. I was not actually a fan of this patch: https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08144.html I don't think the convenience to the trace user to avoid looking up the type string in the header is worth the bloat to the non-trace user to declare these strings in the code. Thanks, Alex