From: Auger Eric <eric.auger@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
Cornelia Huck <cohuck@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: Re: [PATCH] hw/vfio/common: Trace in which mode a IOMMU is opened
Date: Wed, 27 May 2020 09:08:49 +0200 [thread overview]
Message-ID: <6c7c445d-0335-f67d-bb72-5b0c046bb247@redhat.com> (raw)
In-Reply-To: <20200526173542.28710-1-philmd@redhat.com>
Hi Philippe,
On 5/26/20 7:35 PM, Philippe Mathieu-Daudé wrote:
> 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.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/vfio/common.c | 19 ++++++++++++++-----
> hw/vfio/trace-events | 1 +
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 0b3593b3c0..6b69a259c1 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -1157,15 +1157,24 @@ static void vfio_put_address_space(VFIOAddressSpace *space)
> static int vfio_get_iommu_type(VFIOContainer *container,
> Error **errp)
> {
> - int iommu_types[] = { VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU,
> - VFIO_SPAPR_TCE_v2_IOMMU, VFIO_SPAPR_TCE_IOMMU };
> + static const struct {
> + int type;
> + const char *name;
> + } iommu[] = {
> + {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;
>
> - for (i = 0; i < ARRAY_SIZE(iommu_types); i++) {
> - if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])) {
> - return iommu_types[i];
> + for (i = 0; i < ARRAY_SIZE(iommu); i++) {
> + if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu[i].type)) {
> + trace_vfio_get_iommu_type(iommu[i].type, iommu[i].name);
Just wondering why you want to trace the type as you now have the name
string.
> + return iommu[i].type;
> }
> }
> + trace_vfio_get_iommu_type(-1, "Not available or not supported");
nit: from a debugging pov, this may be not needed as
vfio_get_group/vfio_connect_container() fails and this leads to an error
output.
Thanks
Eric
> error_setg(errp, "No available IOMMU models");
> return -EINVAL;
> }
> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
> index b1ef55a33f..8166c4c50d 100644
> --- a/hw/vfio/trace-events
> +++ b/hw/vfio/trace-events
> @@ -115,6 +115,7 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic
> vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long 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(int iommu_type, const char *iommu_name) "IOMMU type %d (%s)"
>
> # platform.c
> vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d"
>
next prev parent reply other threads:[~2020-05-27 7:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 17:35 [PATCH] hw/vfio/common: Trace in which mode a IOMMU is opened Philippe Mathieu-Daudé
2020-05-27 6:16 ` Cornelia Huck
2020-05-27 7:08 ` Auger Eric [this message]
2020-05-27 7:43 ` Philippe Mathieu-Daudé
2020-05-27 15:53 ` Philippe Mathieu-Daudé
2020-05-27 16:16 ` Peter Xu
2020-05-27 16:27 ` Philippe Mathieu-Daudé
2020-05-27 16:53 ` Peter Xu
2020-05-27 17:06 ` Cornelia Huck
2020-05-27 18:52 ` Peter Xu
2020-05-28 22:34 ` Alex Williamson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6c7c445d-0335-f67d-bb72-5b0c046bb247@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).