Skip to content

Unify I/O port and MMIO trap handling

Andre Przywara kvm kvmarm 3 versions – Applied

Status from this message: Applied to kvmtool (master), thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest22 patches 5 repliesApplied
  2. v222 patches 21 repliesSuperseded
  3. v121 patches 50 repliesSuperseded

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/22ioport: Remove ioport__setup_arch()arm/ioport.c include/kvm/ioport.h ioport.c +3 more+2 -240 replies
2/22hw/serial: Use device abstraction for FDT generator functionhw/serial.c include/kvm/kvm.h+41 -100 replies
3/22ioport: Retire .generate_fdt_node functionalityinclude/kvm/ioport.h ioport.c+0 -380 replies
4/22mmio: Extend handling to include ioport emulationinclude/kvm/kvm.h ioport.c mmio.c+102 -160 replies
5/22hw/i8042: Clean up data typeshw/i8042.c+13 -130 replies
6/22hw/i8042: Refactor trap handlerhw/i8042.c+34 -340 replies
7/22hw/i8042: Switch to new trap handlershw/i8042.c include/kvm/i8042.h+4 -270 replies
8/22x86/ioport: Refactor trap handlersx86/ioport.c+26 -40 replies
9/22x86/ioport: Switch to new trap handlersx86/ioport.c+37 -640 replies
10/22hw/rtc: Refactor trap handlershw/rtc.c+35 -350 replies
11/22hw/rtc: Switch to new trap handlerhw/rtc.c+2 -190 replies
12/22hw/vesa: Switch trap handling to use MMIO handlerhw/vesa.c+5 -140 replies
13/22hw/serial: Refactor trap handlerhw/serial.c+37 -131 reply
14/22hw/serial: Switch to new trap handlershw/serial.c+3 -280 replies
15/22vfio: Refactor ioport trap handlervfio/core.c+36 -150 replies
16/22vfio: Switch to new ioport trap handlersvfio/core.c+10 -270 replies
17/22virtio: Switch trap handling to use MMIO handlervirtio/pci.c+14 -320 replies
18/22pci: Switch trap handling to use MMIO handlerpci.c+24 -580 replies
19/22Remove ioport specific routinesMakefile include/kvm/ioport.h include/kvm/kvm.h +2 more+1 -2260 replies
20/22arm: Reorganise and document memory maparm/include/arm-common/kvm-arch.h+29 -121 reply
21/22hw/serial: ARM/arm64: Use MMIO at higher addressesarm/include/arm-common/kvm-arch.h hw/serial.c+42 -191 reply
22/22hw/rtc: ARM/arm64: Use MMIO at higher addressesarm/include/arm-common/kvm-arch.h hw/rtc.c+21 -100 replies

Reviews trailers per patch

All 22 patches have a Reviewed-by or Acked-by.

PatchAlexandru Elisei
1/22R-b
2/22R-b
3/22R-b
4/22R-b
5/22R-b
6/22R-b
7/22R-b
8/22R-b
9/22R-b
10/22R-b
11/22R-b
12/22R-b
13/22R-b
14/22R-b
15/22R-b
16/22R-b
17/22R-b
18/22R-b
19/22R-b
20/22R-b
21/22R-b
22/22R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH kvmtool v3 00/22] Unify I/O port and MMIO trap handling

Hi,

this version is addressing Alexandru's comments, fixing mostly minor issues in the naming scheme. The biggest change is to keep the ioport__read/ioport_write wrappers for the serial device. For more details see the changelog below.
==============

At the moment we use two separate code paths to handle exits for KVM_EXIT_IO (ioport.c) and KVM_EXIT_MMIO (mmio.c), even though they are semantically very similar. Because the trap handler callback routine is different, devices need to decide on one conduit or need to provide different handler functions for both of them.

This is not only unnecessary code duplication, but makes switching devices from I/O port to MMIO a tedious task, even though there is no real difference between the two, especially on ARM and PowerPC.

For ARM we aim at providing a flexible memory layout, and also have trouble with the UART and RTC device overlapping with the PCI I/O area, so it seems indicated to tackle this once and for all.

The first three patches do some cleanup, to simplify things later.

Patch 04/22 lays the groundwork, by extending mmio.c to be able to also register I/O port trap handlers, using the same callback prototype as we use for MMIO.

The next 14 patches then convert devices that use the I/O port interface over to the new joint interface. This requires to rework the trap handler routine to adhere to the same prototype as the existing MMIO handlers. For most devices this is done in two steps: a first to introduce the reworked handler routine, and a second to switch to the new joint registration routine. For some devices the first step is trivial, so it's done in one patch.

Patch 19/22 then retires the old I/O port interface, by removing ioport.c and friends.
Patch 20/22 uses the opportunity to clean up the memory map description, also declares a new region (from 16MB on), where the final two patches switch the UART and the RTC device to. They are now registered on the MMIO "bus", when running on ARM or arm64. This moves them away from the first 64KB, so they are not in the PCI I/O area anymore.

Please have a look and comment!

Cheers,
Andre

Changelog v2 .. v3:
- use _io as function prefix for x86 I/O port devices
- retain ioport__{read,write}8() wrappers for serial device
- fix memory map ASCII art
- fix serial base declaration
- minor nit fixes
- add Reviewed-by: tags

Changelog v1 .. v2:
- rework memory map definition
- add explicit debug output for debug I/O port
- add explicit check for MMIO coalescing on I/O ports
- drop usage of ioport__{read,write}8() from serial
- drop explicit I/O port cleanup routine (to mimic MMIO operation)
- add comment for IOTRAP_BUS_MASK
- minor cleanups / formatting changes

Andre Przywara (22):
ioport: Remove ioport__setup_arch()
hw/serial: Use device abstraction for FDT generator function
ioport: Retire .generate_fdt_node functionality
mmio: Extend handling to include ioport emulation hw/i8042: Clean up data types
hw/i8042: Refactor trap handler
hw/i8042: Switch to new trap handlers
x86/ioport: Refactor trap handlers
x86/ioport: Switch to new trap handlers
hw/rtc: Refactor trap handlers
hw/rtc: Switch to new trap handler
hw/vesa: Switch trap handling to use MMIO handler hw/serial: Refactor trap handler
hw/serial: Switch to new trap handlers
vfio: Refactor ioport trap handler
vfio: Switch to new ioport trap handlers
virtio: Switch trap handling to use MMIO handler
pci: Switch trap handling to use MMIO handler Remove ioport specific routines
arm: Reorganise and document memory map
hw/serial: ARM/arm64: Use MMIO at higher addresses hw/rtc: ARM/arm64: Use MMIO at higher addresses

 Makefile                          |   1 -
 arm/include/arm-common/kvm-arch.h |  47 ++++--
 arm/ioport.c                      |   5 -
 hw/i8042.c                        |  94 +++++-------
 hw/rtc.c                          |  91 ++++++------
 hw/serial.c                       | 126 +++++++++++-----
 hw/vesa.c                         |  19 +--
 include/kvm/i8042.h               |   1 -
 include/kvm/ioport.h              |  32 ----
 include/kvm/kvm.h                 |  49 ++++++-
 ioport.c                          | 235 ------------------------------
 mips/kvm.c                        |   5 -
 mmio.c                            |  65 +++++++--
 pci.c                             |  82 +++--------
 powerpc/ioport.c                  |   6 -
 vfio/core.c                       |  50 ++++---
 virtio/pci.c                      |  46 ++----
 x86/ioport.c                      | 108 +++++++-------
 18 files changed, 421 insertions(+), 641 deletions(-)
 delete mode 100644 ioport.c
Signature · 6 lines
2.17.5

_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm