S390 needs this series of three patches in order to enable a non-blocking
path for irqfd injection on s390 via kvm_arch_set_irq_inatomic(). Before
these changes, kvm_arch_set_irq_inatomic() would just return -EWOULDBLOCK
and place all interrupts on the global work queue, which must subsequently
be processed by a different thread. This series of patches implements an
s390 version of inatomic and is relevant to virtio-blk and virtio-net and
was tested against virtio-pci and virtio-ccw.
The inatomic fast path cannot lose control since it is running with
interrupts disabled. This meant making the following changes that exist on
the slow path today. First, the adapter_indicators page needs to be mapped
since it is accessed with interrupts disabled, so we added map/unmap
functions. Second, access to shared resources between the fast and slow
paths needed to be changed from mutex and semaphores to spin_lock's.
Finally, the memory allocation on the slow path utilizes GFP_KERNEL_ACCOUNT
but we had to implement the fast path with GFP_ATOMIC allocation. Each of
these enhancements were required to prevent blocking on the fast inject
path.
Statistical counters have been added to enable analysis of irq injection on
the fast path and slow path including io_390_inatomic, io_flic_inject_airq,
io_set_adapter_int and io_390_inatomic_adapter_masked. And counters have
been added to analyze map/unmap of the adapter_indicator
pages in non-Secure Execution environments and to track fencing of Fast
Inject in Secure Execution environments. In order to take advantage of this
kernel series with virtio-pci, a QEMU that includes the
's390x/pci: set kvm_msi_via_irqfd_allowed' fix is needed. Additionally,
the guest xml needs a thread pool and threads explicitly assigned per disk
device using the common way of defining threads for disks.
Patch 1 enables map/unmap of adapter indicator pages but for Secure
Execution environments it avoids the long term mapping.
v2->v3: GFP_KERNEL to GFP_KERNEL_ACCOUNT in one instance of allocation.
v2->v3: Fix alignment error.
v2->v3: Increment nr_maps after new map added to list
v2->v3: kvm_s390_adapter_unmap do mark_page_dirty and set_page_dirty_lock.
v2->v3: In unmap_all_adapters_pv do mark_page_dirty, set_page_dirty_lock.
v2->v3: Move kvm_s390_unmap_all_adapters_pv() to after check if in pv.
v2->v3: Move mutex_unlock after map/unmap in modify_io_adapter.
v2->v3: Add spin_lock to get maps->lock in kvm_s390_unmap_all_adapters_pv.
v2->v3: Only put_page(ind_page) if !ind_info which allocates ind_page.
v2->v3: Move the spin_lock inside of the adapter_indicators_set in patch 2.
v2->v3: On last conditional in kvm_arch_set_irq_inatomic, add else clause.
v2->v3: Clear ind/summ bits if inject fails upon return to inatomic.
Douglas Freimuth (3):
Add map/unmap ioctl and clean mappings post-guest
Enable adapter_indicators_set to use mapped pages
Introducing kvm_arch_set_irq_inatomic fast inject
arch/s390/include/asm/kvm_host.h | 11 +-
arch/s390/kvm/interrupt.c | 392 ++++++++++++++++++++++++++-----
arch/s390/kvm/kvm-s390.c | 51 +++-
arch/s390/kvm/kvm-s390.h | 3 +-
4 files changed, 387 insertions(+), 70 deletions(-)
--
2.52.0