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 v3 15/22] vfio: Refactor ioport trap handler Date: Mon, 15 Mar 2021 15:33:43 +0000 [thread overview] Message-ID: <20210315153350.19988-16-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Adjust the I/O port trap handler to use that new function, and provide shims to implement the old ioport interface, for now. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- vfio/core.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/vfio/core.c b/vfio/core.c index 0b45e78b..ddd3c2c7 100644 --- a/vfio/core.c +++ b/vfio/core.c @@ -81,15 +81,12 @@ out_free_buf: return ret; } -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int len) +static bool _vfio_ioport_in(struct vfio_region *region, u32 offset, + void *data, int len) { - u32 val; - ssize_t nr; - struct vfio_region *region = ioport->priv; struct vfio_device *vdev = region->vdev; - - u32 offset = port - region->port_base; + ssize_t nr; + u32 val; if (!(region->info.flags & VFIO_REGION_INFO_FLAG_READ)) return false; @@ -97,7 +94,7 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, nr = pread(vdev->fd, &val, len, region->info.offset + offset); if (nr != len) { vfio_dev_err(vdev, "could not read %d bytes from I/O port 0x%x\n", - len, port); + len, offset + region->port_base); return false; } @@ -118,15 +115,13 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, return true; } -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int len) +static bool _vfio_ioport_out(struct vfio_region *region, u32 offset, + void *data, int len) { - u32 val; - ssize_t nr; - struct vfio_region *region = ioport->priv; struct vfio_device *vdev = region->vdev; + ssize_t nr; + u32 val; - u32 offset = port - region->port_base; if (!(region->info.flags & VFIO_REGION_INFO_FLAG_WRITE)) return false; @@ -148,11 +143,37 @@ static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, nr = pwrite(vdev->fd, &val, len, region->info.offset + offset); if (nr != len) vfio_dev_err(vdev, "could not write %d bytes to I/O port 0x%x", - len, port); + len, offset + region->port_base); return nr == len; } +static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, + u8 is_write, void *ptr) +{ + struct vfio_region *region = ptr; + u32 offset = addr - region->port_base; + + if (is_write) + _vfio_ioport_out(region, offset, data, len); + else + _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, -- 2.17.5
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Will Deacon <will@kernel.org>, Julien Thierry <julien.thierry.kdev@gmail.com> Cc: Marc Zyngier <maz@kernel.org>, Sami Mujawar <sami.mujawar@arm.com>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH kvmtool v3 15/22] vfio: Refactor ioport trap handler Date: Mon, 15 Mar 2021 15:33:43 +0000 [thread overview] Message-ID: <20210315153350.19988-16-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Adjust the I/O port trap handler to use that new function, and provide shims to implement the old ioport interface, for now. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- vfio/core.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/vfio/core.c b/vfio/core.c index 0b45e78b..ddd3c2c7 100644 --- a/vfio/core.c +++ b/vfio/core.c @@ -81,15 +81,12 @@ out_free_buf: return ret; } -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int len) +static bool _vfio_ioport_in(struct vfio_region *region, u32 offset, + void *data, int len) { - u32 val; - ssize_t nr; - struct vfio_region *region = ioport->priv; struct vfio_device *vdev = region->vdev; - - u32 offset = port - region->port_base; + ssize_t nr; + u32 val; if (!(region->info.flags & VFIO_REGION_INFO_FLAG_READ)) return false; @@ -97,7 +94,7 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, nr = pread(vdev->fd, &val, len, region->info.offset + offset); if (nr != len) { vfio_dev_err(vdev, "could not read %d bytes from I/O port 0x%x\n", - len, port); + len, offset + region->port_base); return false; } @@ -118,15 +115,13 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, return true; } -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int len) +static bool _vfio_ioport_out(struct vfio_region *region, u32 offset, + void *data, int len) { - u32 val; - ssize_t nr; - struct vfio_region *region = ioport->priv; struct vfio_device *vdev = region->vdev; + ssize_t nr; + u32 val; - u32 offset = port - region->port_base; if (!(region->info.flags & VFIO_REGION_INFO_FLAG_WRITE)) return false; @@ -148,11 +143,37 @@ static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, nr = pwrite(vdev->fd, &val, len, region->info.offset + offset); if (nr != len) vfio_dev_err(vdev, "could not write %d bytes to I/O port 0x%x", - len, port); + len, offset + region->port_base); return nr == len; } +static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, + u8 is_write, void *ptr) +{ + struct vfio_region *region = ptr; + u32 offset = addr - region->port_base; + + if (is_write) + _vfio_ioport_out(region, offset, data, len); + else + _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, -- 2.17.5 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-03-15 15:35 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-15 15:33 [PATCH kvmtool v3 00/22] Unify I/O port and MMIO trap handling Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 01/22] ioport: Remove ioport__setup_arch() Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 02/22] hw/serial: Use device abstraction for FDT generator function Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 03/22] ioport: Retire .generate_fdt_node functionality Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 04/22] mmio: Extend handling to include ioport emulation Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 05/22] hw/i8042: Clean up data types Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 06/22] hw/i8042: Refactor trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 07/22] hw/i8042: Switch to new trap handlers Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 08/22] x86/ioport: Refactor " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 09/22] x86/ioport: Switch to new " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 10/22] hw/rtc: Refactor " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 11/22] hw/rtc: Switch to new trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 12/22] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 13/22] hw/serial: Refactor trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-16 15:40 ` Alexandru Elisei 2021-03-16 15:40 ` Alexandru Elisei 2021-03-15 15:33 ` [PATCH kvmtool v3 14/22] hw/serial: Switch to new trap handlers Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` Andre Przywara [this message] 2021-03-15 15:33 ` [PATCH kvmtool v3 15/22] vfio: Refactor ioport trap handler Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 16/22] vfio: Switch to new ioport trap handlers Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 17/22] virtio: Switch trap handling to use MMIO handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 18/22] pci: " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 19/22] Remove ioport specific routines Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 20/22] arm: Reorganise and document memory map Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 15:17 ` Alexandru Elisei 2021-03-17 15:17 ` Alexandru Elisei 2021-03-15 15:33 ` [PATCH kvmtool v3 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 16:17 ` Alexandru Elisei 2021-03-17 16:17 ` Alexandru Elisei 2021-03-15 15:33 ` [PATCH kvmtool v3 22/22] hw/rtc: " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 17:44 ` [PATCH kvmtool v3 00/22] Unify I/O port and MMIO trap handling Alexandru Elisei 2021-03-17 17:44 ` Alexandru Elisei 2021-03-18 10:04 ` Will Deacon 2021-03-18 10:04 ` Will Deacon
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=20210315153350.19988-16-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.