From: Andre Przywara <andre.przywara@arm.com>
To: Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>,
kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
Marc Zyngier <maz@kernel.org>,
Sami Mujawar <sami.mujawar@arm.com>
Subject: [PATCH kvmtool v2 16/22] vfio: Switch to new ioport trap handlers
Date: Thu, 25 Feb 2021 00:59:09 +0000 [thread overview]
Message-ID: <20210225005915.26423-17-andre.przywara@arm.com> (raw)
In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com>
Now that the vfio device has a trap handler adhering to the MMIO fault
handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
---
vfio/core.c | 37 ++++++++++---------------------------
1 file changed, 10 insertions(+), 27 deletions(-)
diff --git a/vfio/core.c b/vfio/core.c
index ddd3c2c7..3ff2c0b0 100644
--- a/vfio/core.c
+++ b/vfio/core.c
@@ -81,7 +81,7 @@ out_free_buf:
return ret;
}
-static bool _vfio_ioport_in(struct vfio_region *region, u32 offset,
+static bool vfio_ioport_in(struct vfio_region *region, u32 offset,
void *data, int len)
{
struct vfio_device *vdev = region->vdev;
@@ -115,7 +115,7 @@ static bool _vfio_ioport_in(struct vfio_region *region, u32 offset,
return true;
}
-static bool _vfio_ioport_out(struct vfio_region *region, u32 offset,
+static bool vfio_ioport_out(struct vfio_region *region, u32 offset,
void *data, int len)
{
struct vfio_device *vdev = region->vdev;
@@ -155,30 +155,11 @@ static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,
u32 offset = addr - region->port_base;
if (is_write)
- _vfio_ioport_out(region, offset, data, len);
+ vfio_ioport_out(region, offset, data, len);
else
- _vfio_ioport_in(region, offset, data, len);
+ vfio_ioport_in(region, offset, data, len);
}
-static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu,
- u16 port, void *data, int len)
-{
- vfio_ioport_mmio(vcpu, port, data, len, true, ioport->priv);
- return true;
-}
-
-static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu,
- u16 port, void *data, int len)
-{
- vfio_ioport_mmio(vcpu, port, data, len, false, ioport->priv);
- return true;
-}
-
-static struct ioport_operations vfio_ioport_ops = {
- .io_in = vfio_ioport_in,
- .io_out = vfio_ioport_out,
-};
-
static void vfio_mmio_access(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,
u8 is_write, void *ptr)
{
@@ -223,9 +204,11 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev,
struct vfio_region *region)
{
if (region->is_ioport) {
- int port = ioport__register(kvm, region->port_base,
- &vfio_ioport_ops, region->info.size,
- region);
+ int port;
+
+ port = kvm__register_pio(kvm, region->port_base,
+ region->info.size, vfio_ioport_mmio,
+ region);
if (port < 0)
return port;
return 0;
@@ -292,7 +275,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region)
munmap(region->host_addr, region->info.size);
region->host_addr = NULL;
} else if (region->is_ioport) {
- ioport__unregister(kvm, region->port_base);
+ kvm__deregister_pio(kvm, region->port_base);
} else {
kvm__deregister_mmio(kvm, region->guest_phys_addr);
}
--
2.17.5
next prev parent reply other threads:[~2021-02-25 1:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 0:58 [PATCH kvmtool v2 00/22] Unify I/O port and MMIO trap handling Andre Przywara
2021-02-25 0:58 ` [PATCH kvmtool v2 01/22] ioport: Remove ioport__setup_arch() Andre Przywara
2021-03-02 18:02 ` Alexandru Elisei
2021-02-25 0:58 ` [PATCH kvmtool v2 02/22] hw/serial: Use device abstraction for FDT generator function Andre Przywara
2021-02-25 0:58 ` [PATCH kvmtool v2 03/22] ioport: Retire .generate_fdt_node functionality Andre Przywara
2021-02-25 0:58 ` [PATCH kvmtool v2 04/22] mmio: Extend handling to include ioport emulation Andre Przywara
2021-03-03 17:58 ` Alexandru Elisei
2021-03-15 12:24 ` Andre Przywara
2021-02-25 0:58 ` [PATCH kvmtool v2 05/22] hw/i8042: Clean up data types Andre Przywara
2021-02-25 0:58 ` [PATCH kvmtool v2 06/22] hw/i8042: Refactor trap handler Andre Przywara
2021-03-08 17:16 ` Alexandru Elisei
2021-02-25 0:59 ` [PATCH kvmtool v2 07/22] hw/i8042: Switch to new trap handlers Andre Przywara
2021-03-08 17:22 ` Alexandru Elisei
2021-02-25 0:59 ` [PATCH kvmtool v2 08/22] x86/ioport: Refactor " Andre Przywara
2021-03-09 11:49 ` Alexandru Elisei
2021-03-15 12:26 ` Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 09/22] x86/ioport: Switch to new " Andre Przywara
2021-03-09 12:09 ` Alexandru Elisei
2021-03-15 12:26 ` Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 10/22] hw/rtc: Refactor " Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 11/22] hw/rtc: Switch to new trap handler Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 12/22] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 13/22] hw/serial: Refactor trap handler Andre Przywara
2021-03-12 11:29 ` Alexandru Elisei
2021-03-15 12:26 ` Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 14/22] hw/serial: Switch to new trap handlers Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 15/22] vfio: Refactor ioport trap handler Andre Przywara
2021-03-09 14:21 ` Alexandru Elisei
2021-02-25 0:59 ` Andre Przywara [this message]
2021-02-25 0:59 ` [PATCH kvmtool v2 17/22] virtio: Switch trap handling to use MMIO handler Andre Przywara
2021-03-09 14:43 ` Alexandru Elisei
2021-02-25 0:59 ` [PATCH kvmtool v2 18/22] pci: " Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 19/22] Remove ioport specific routines Andre Przywara
2021-03-09 15:13 ` Alexandru Elisei
2021-02-25 0:59 ` [PATCH kvmtool v2 20/22] arm: Reorganise and document memory map Andre Przywara
2021-03-09 15:46 ` Alexandru Elisei
2021-03-15 12:27 ` Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara
2021-03-09 16:02 ` Alexandru Elisei
2021-03-15 12:27 ` Andre Przywara
2021-02-25 0:59 ` [PATCH kvmtool v2 22/22] hw/rtc: " Andre Przywara
2021-03-09 16:06 ` Alexandru Elisei
2021-03-02 17:57 ` [PATCH kvmtool v2 00/22] Unify I/O port and MMIO trap handling Alexandru Elisei
2021-03-03 18:41 ` Andre Przywara
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=20210225005915.26423-17-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=alexandru.elisei@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=sami.mujawar@arm.com \
--cc=will@kernel.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).