From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
Alexander Graf <agraf@suse.de>
Subject: [Qemu-devel] [PATCH v5 11/11] spapr-vfio: enable for spapr
Date: Wed, 12 Mar 2014 16:52:30 +1100 [thread overview]
Message-ID: <1394603550-11556-12-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1394603550-11556-1-git-send-email-aik@ozlabs.ru>
This turns the sPAPR support on and enables VFIO container use
in the kernel.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v5:
* multiple returns converted to gotos
v4:
* fixed format string to use %m which is a glibc extension:
"Print output of strerror(errno). No argument is required."
---
hw/misc/vfio.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index 6dee090..e7b2b36 100644
--- a/hw/misc/vfio.c
+++ b/hw/misc/vfio.c
@@ -3494,6 +3494,34 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as)
container->iommu_data.type1.initialized = true;
+ } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) {
+ ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd);
+ if (ret) {
+ error_report("vfio: failed to set group container: %m");
+ ret = -errno;
+ goto free_container_exit;
+ }
+
+ ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU);
+ if (ret) {
+ error_report("vfio: failed to set iommu for container: %m");
+ ret = -errno;
+ goto free_container_exit;
+ }
+
+ ret = ioctl(fd, VFIO_IOMMU_ENABLE);
+ if (ret) {
+ error_report("vfio: failed to enable container: %m");
+ ret = -errno;
+ goto free_container_exit;
+ }
+
+ container->iommu_data.type1.listener = vfio_memory_listener;
+ container->iommu_data.release = vfio_listener_release;
+
+ memory_listener_register(&container->iommu_data.type1.listener,
+ container->space->as);
+
} else {
error_report("vfio: No available IOMMU models");
ret = -EINVAL;
--
1.8.4.rc4
next prev parent reply other threads:[~2014-03-12 5:53 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 5:52 [Qemu-devel] [PATCH v5 00/11] vfio on spapr-ppc64 Alexey Kardashevskiy
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 01/11] memory: Sanity check that no listeners remain on a destroyed AddressSpace Alexey Kardashevskiy
2014-03-20 10:20 ` Paolo Bonzini
2014-03-20 11:45 ` David Gibson
2014-03-27 5:40 ` Alexey Kardashevskiy
2014-03-27 12:15 ` Paolo Bonzini
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 02/11] int128: add int128_exts64() Alexey Kardashevskiy
2014-03-20 10:19 ` Paolo Bonzini
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 03/11] vfio: Fix 128 bit handling Alexey Kardashevskiy
2014-03-20 10:20 ` Paolo Bonzini
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 04/11] vfio: rework to have error paths Alexey Kardashevskiy
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 05/11] vfio: Introduce VFIO address spaces Alexey Kardashevskiy
2014-03-19 19:57 ` Alex Williamson
2014-03-28 3:42 ` Alexey Kardashevskiy
2014-03-31 19:14 ` Alex Williamson
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 06/11] vfio: Create VFIOAddressSpace objects as needed Alexey Kardashevskiy
2014-03-19 19:57 ` Alex Williamson
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 07/11] vfio: Add guest side IOMMU support Alexey Kardashevskiy
2014-03-19 19:57 ` Alex Williamson
2014-03-20 5:25 ` David Gibson
2014-03-28 5:12 ` Alexey Kardashevskiy
2014-03-31 19:59 ` Alex Williamson
2014-03-21 7:59 ` Alexey Kardashevskiy
2014-03-21 14:17 ` Alex Williamson
2014-03-21 14:23 ` Paolo Bonzini
2014-03-28 4:49 ` Alexey Kardashevskiy
2014-03-31 19:54 ` Alex Williamson
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 08/11] spapr-iommu: add SPAPR VFIO IOMMU device Alexey Kardashevskiy
2014-04-03 12:17 ` Alexander Graf
2014-04-07 4:07 ` Alexey Kardashevskiy
2014-04-10 12:13 ` Alexander Graf
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 09/11] spapr vfio: add vfio_container_spapr_get_info() Alexey Kardashevskiy
2014-03-12 5:52 ` [Qemu-devel] [PATCH v5 10/11] spapr-vfio: add spapr-pci-vfio-host-bridge to support vfio Alexey Kardashevskiy
2014-03-13 8:12 ` [Qemu-devel] [PATCH v6] " Alexey Kardashevskiy
2014-03-19 19:57 ` [Qemu-devel] [PATCH v5 10/11] " Alex Williamson
2014-03-28 6:01 ` Alexey Kardashevskiy
2014-03-31 20:09 ` Alex Williamson
2014-04-01 6:25 ` Alexey Kardashevskiy
2014-04-01 18:21 ` Alex Williamson
2014-03-12 5:52 ` Alexey Kardashevskiy [this message]
2014-03-19 19:57 ` [Qemu-devel] [PATCH v5 11/11] spapr-vfio: enable for spapr Alex Williamson
2014-03-19 20:12 ` [Qemu-devel] [PATCH v5 00/11] vfio on spapr-ppc64 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=1394603550-11556-12-git-send-email-aik@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=agraf@suse.de \
--cc=alex.williamson@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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).