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 09/22] x86/ioport: Switch to new trap handlers Date: Mon, 15 Mar 2021 15:33:37 +0000 [thread overview] Message-ID: <20210315153350.19988-10-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> Now that the x86 I/O ports have trap handlers 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. Since the debug output was done in ioport.c, we would lose this functionality when moving over to the MMIO handlers. So bring this back here explicitly, by introducing debug_io(). Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- x86/ioport.c | 101 +++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 64 deletions(-) diff --git a/x86/ioport.c b/x86/ioport.c index b198de7a..06b7defb 100644 --- a/x86/ioport.c +++ b/x86/ioport.c @@ -8,15 +8,29 @@ static void dummy_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, { } -static bool debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, + u8 is_write, void *ptr) { - dummy_io(vcpu, port, data, size, true, NULL); - return 0; -} + if (!vcpu->kvm->cfg.ioport_debug) + return; -static struct ioport_operations debug_ops = { - .io_out = debug_io_out, -}; + fprintf(stderr, "debug port %s from VCPU%lu: port=0x%lx, size=%u", + is_write ? "write" : "read", vcpu->cpu_id, + (unsigned long)addr, len); + if (is_write) { + u32 value; + + switch (len) { + case 1: value = ioport__read8(data); break; + case 2: value = ioport__read16((u16*)data); break; + case 4: value = ioport__read32((u32*)data); break; + default: value = 0; break; + } + fprintf(stderr, ", data: 0x%x\n", value); + } else { + fprintf(stderr, "\n"); + } +} static void seabios_debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) @@ -31,37 +45,6 @@ static void seabios_debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, putchar(ch); } -static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - seabios_debug_io(vcpu, port, data, size, true, NULL); - return 0; -} - -static struct ioport_operations seabios_debug_ops = { - .io_out = seabios_debug_io_out, -}; - -static bool dummy_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - dummy_io(vcpu, port, data, size, false, NULL); - return true; -} - -static bool dummy_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - dummy_io(vcpu, port, data, size, true, NULL); - return true; -} - -static struct ioport_operations dummy_read_write_ioport_ops = { - .io_in = dummy_io_in, - .io_out = dummy_io_out, -}; - -static struct ioport_operations dummy_write_only_ioport_ops = { - .io_out = dummy_io_out, -}; - /* * The "fast A20 gate" */ @@ -76,17 +59,6 @@ static void ps2_control_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, ioport__write8(data, 0x02); } -static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - ps2_control_io(vcpu, port, data, size, false, NULL); - return true; -} - -static struct ioport_operations ps2_control_a_ops = { - .io_in = ps2_control_a_io_in, - .io_out = dummy_io_out, -}; - void ioport__map_irq(u8 *irq) { } @@ -98,75 +70,76 @@ static int ioport__setup_arch(struct kvm *kvm) /* Legacy ioport setup */ /* 0000 - 001F - DMA1 controller */ - r = ioport__register(kvm, 0x0000, &dummy_read_write_ioport_ops, 32, NULL); + r = kvm__register_pio(kvm, 0x0000, 32, dummy_io, NULL); if (r < 0) return r; /* 0x0020 - 0x003F - 8259A PIC 1 */ - r = ioport__register(kvm, 0x0020, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x0020, 2, dummy_io, NULL); if (r < 0) return r; /* PORT 0040-005F - PIT - PROGRAMMABLE INTERVAL TIMER (8253, 8254) */ - r = ioport__register(kvm, 0x0040, &dummy_read_write_ioport_ops, 4, NULL); + r = kvm__register_pio(kvm, 0x0040, 4, dummy_io, NULL); if (r < 0) return r; /* 0092 - PS/2 system control port A */ - r = ioport__register(kvm, 0x0092, &ps2_control_a_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x0092, 1, ps2_control_io, NULL); if (r < 0) return r; /* 0x00A0 - 0x00AF - 8259A PIC 2 */ - r = ioport__register(kvm, 0x00A0, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x00A0, 2, dummy_io, NULL); if (r < 0) return r; /* 00C0 - 001F - DMA2 controller */ - r = ioport__register(kvm, 0x00C0, &dummy_read_write_ioport_ops, 32, NULL); + r = kvm__register_pio(kvm, 0x00c0, 32, dummy_io, NULL); if (r < 0) return r; /* PORT 00E0-00EF are 'motherboard specific' so we use them for our internal debugging purposes. */ - r = ioport__register(kvm, IOPORT_DBG, &debug_ops, 1, NULL); + r = kvm__register_pio(kvm, IOPORT_DBG, 1, debug_io, NULL); if (r < 0) return r; /* PORT 00ED - DUMMY PORT FOR DELAY??? */ - r = ioport__register(kvm, 0x00ED, &dummy_write_only_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x00ed, 1, dummy_io, NULL); if (r < 0) return r; /* 0x00F0 - 0x00FF - Math co-processor */ - r = ioport__register(kvm, 0x00F0, &dummy_write_only_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x00f0, 2, dummy_io, NULL); + if (r < 0) return r; /* PORT 0278-027A - PARALLEL PRINTER PORT (usually LPT1, sometimes LPT2) */ - r = ioport__register(kvm, 0x0278, &dummy_read_write_ioport_ops, 3, NULL); + r = kvm__register_pio(kvm, 0x0278, 3, dummy_io, NULL); if (r < 0) return r; /* PORT 0378-037A - PARALLEL PRINTER PORT (usually LPT2, sometimes LPT3) */ - r = ioport__register(kvm, 0x0378, &dummy_read_write_ioport_ops, 3, NULL); + r = kvm__register_pio(kvm, 0x0378, 3, dummy_io, NULL); if (r < 0) return r; /* PORT 03D4-03D5 - COLOR VIDEO - CRT CONTROL REGISTERS */ - r = ioport__register(kvm, 0x03D4, &dummy_read_write_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x03d4, 1, dummy_io, NULL); if (r < 0) return r; - r = ioport__register(kvm, 0x03D5, &dummy_write_only_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x03d5, 1, dummy_io, NULL); if (r < 0) return r; - r = ioport__register(kvm, 0x402, &seabios_debug_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x0402, 1, seabios_debug_io, NULL); if (r < 0) return r; /* 0510 - QEMU BIOS configuration register */ - r = ioport__register(kvm, 0x510, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x0510, 2, dummy_io, NULL); if (r < 0) return r; -- 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 09/22] x86/ioport: Switch to new trap handlers Date: Mon, 15 Mar 2021 15:33:37 +0000 [thread overview] Message-ID: <20210315153350.19988-10-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> Now that the x86 I/O ports have trap handlers 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. Since the debug output was done in ioport.c, we would lose this functionality when moving over to the MMIO handlers. So bring this back here explicitly, by introducing debug_io(). Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- x86/ioport.c | 101 +++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 64 deletions(-) diff --git a/x86/ioport.c b/x86/ioport.c index b198de7a..06b7defb 100644 --- a/x86/ioport.c +++ b/x86/ioport.c @@ -8,15 +8,29 @@ static void dummy_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, { } -static bool debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, + u8 is_write, void *ptr) { - dummy_io(vcpu, port, data, size, true, NULL); - return 0; -} + if (!vcpu->kvm->cfg.ioport_debug) + return; -static struct ioport_operations debug_ops = { - .io_out = debug_io_out, -}; + fprintf(stderr, "debug port %s from VCPU%lu: port=0x%lx, size=%u", + is_write ? "write" : "read", vcpu->cpu_id, + (unsigned long)addr, len); + if (is_write) { + u32 value; + + switch (len) { + case 1: value = ioport__read8(data); break; + case 2: value = ioport__read16((u16*)data); break; + case 4: value = ioport__read32((u32*)data); break; + default: value = 0; break; + } + fprintf(stderr, ", data: 0x%x\n", value); + } else { + fprintf(stderr, "\n"); + } +} static void seabios_debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) @@ -31,37 +45,6 @@ static void seabios_debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, putchar(ch); } -static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - seabios_debug_io(vcpu, port, data, size, true, NULL); - return 0; -} - -static struct ioport_operations seabios_debug_ops = { - .io_out = seabios_debug_io_out, -}; - -static bool dummy_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - dummy_io(vcpu, port, data, size, false, NULL); - return true; -} - -static bool dummy_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - dummy_io(vcpu, port, data, size, true, NULL); - return true; -} - -static struct ioport_operations dummy_read_write_ioport_ops = { - .io_in = dummy_io_in, - .io_out = dummy_io_out, -}; - -static struct ioport_operations dummy_write_only_ioport_ops = { - .io_out = dummy_io_out, -}; - /* * The "fast A20 gate" */ @@ -76,17 +59,6 @@ static void ps2_control_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, ioport__write8(data, 0x02); } -static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - ps2_control_io(vcpu, port, data, size, false, NULL); - return true; -} - -static struct ioport_operations ps2_control_a_ops = { - .io_in = ps2_control_a_io_in, - .io_out = dummy_io_out, -}; - void ioport__map_irq(u8 *irq) { } @@ -98,75 +70,76 @@ static int ioport__setup_arch(struct kvm *kvm) /* Legacy ioport setup */ /* 0000 - 001F - DMA1 controller */ - r = ioport__register(kvm, 0x0000, &dummy_read_write_ioport_ops, 32, NULL); + r = kvm__register_pio(kvm, 0x0000, 32, dummy_io, NULL); if (r < 0) return r; /* 0x0020 - 0x003F - 8259A PIC 1 */ - r = ioport__register(kvm, 0x0020, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x0020, 2, dummy_io, NULL); if (r < 0) return r; /* PORT 0040-005F - PIT - PROGRAMMABLE INTERVAL TIMER (8253, 8254) */ - r = ioport__register(kvm, 0x0040, &dummy_read_write_ioport_ops, 4, NULL); + r = kvm__register_pio(kvm, 0x0040, 4, dummy_io, NULL); if (r < 0) return r; /* 0092 - PS/2 system control port A */ - r = ioport__register(kvm, 0x0092, &ps2_control_a_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x0092, 1, ps2_control_io, NULL); if (r < 0) return r; /* 0x00A0 - 0x00AF - 8259A PIC 2 */ - r = ioport__register(kvm, 0x00A0, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x00A0, 2, dummy_io, NULL); if (r < 0) return r; /* 00C0 - 001F - DMA2 controller */ - r = ioport__register(kvm, 0x00C0, &dummy_read_write_ioport_ops, 32, NULL); + r = kvm__register_pio(kvm, 0x00c0, 32, dummy_io, NULL); if (r < 0) return r; /* PORT 00E0-00EF are 'motherboard specific' so we use them for our internal debugging purposes. */ - r = ioport__register(kvm, IOPORT_DBG, &debug_ops, 1, NULL); + r = kvm__register_pio(kvm, IOPORT_DBG, 1, debug_io, NULL); if (r < 0) return r; /* PORT 00ED - DUMMY PORT FOR DELAY??? */ - r = ioport__register(kvm, 0x00ED, &dummy_write_only_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x00ed, 1, dummy_io, NULL); if (r < 0) return r; /* 0x00F0 - 0x00FF - Math co-processor */ - r = ioport__register(kvm, 0x00F0, &dummy_write_only_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x00f0, 2, dummy_io, NULL); + if (r < 0) return r; /* PORT 0278-027A - PARALLEL PRINTER PORT (usually LPT1, sometimes LPT2) */ - r = ioport__register(kvm, 0x0278, &dummy_read_write_ioport_ops, 3, NULL); + r = kvm__register_pio(kvm, 0x0278, 3, dummy_io, NULL); if (r < 0) return r; /* PORT 0378-037A - PARALLEL PRINTER PORT (usually LPT2, sometimes LPT3) */ - r = ioport__register(kvm, 0x0378, &dummy_read_write_ioport_ops, 3, NULL); + r = kvm__register_pio(kvm, 0x0378, 3, dummy_io, NULL); if (r < 0) return r; /* PORT 03D4-03D5 - COLOR VIDEO - CRT CONTROL REGISTERS */ - r = ioport__register(kvm, 0x03D4, &dummy_read_write_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x03d4, 1, dummy_io, NULL); if (r < 0) return r; - r = ioport__register(kvm, 0x03D5, &dummy_write_only_ioport_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x03d5, 1, dummy_io, NULL); if (r < 0) return r; - r = ioport__register(kvm, 0x402, &seabios_debug_ops, 1, NULL); + r = kvm__register_pio(kvm, 0x0402, 1, seabios_debug_io, NULL); if (r < 0) return r; /* 0510 - QEMU BIOS configuration register */ - r = ioport__register(kvm, 0x510, &dummy_read_write_ioport_ops, 2, NULL); + r = kvm__register_pio(kvm, 0x0510, 2, dummy_io, NULL); if (r < 0) return r; -- 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 ` Andre Przywara [this message] 2021-03-15 15:33 ` [PATCH kvmtool v3 09/22] x86/ioport: Switch to new " 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 ` [PATCH kvmtool v3 15/22] vfio: Refactor ioport trap handler Andre Przywara 2021-03-15 15:33 ` 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-10-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.