Commit 80fac0f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull more KVM updates from Paolo Bonzini:
 - ARM bugfix and MSI injection support
 - x86 nested virt tweak and OOPS fix
 - Simplify pvclock code (vdso bits acked by Andy Lutomirski).

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  nvmx: mark ept single context invalidation as supported
  nvmx: remove comment about missing nested vpid support
  KVM: lapic: fix access preemption timer stuff even if kernel_irqchip=off
  KVM: documentation: fix KVM_CAP_X2APIC_API information
  x86: vdso: use __pvclock_read_cycles
  pvclock: introduce seqcount-like API
  arm64: KVM: Set cpsr before spsr on fault injection
  KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype
  KVM: arm/arm64: Enable MSI routing
  KVM: arm/arm64: Enable irqchip routing
  KVM: Move kvm_setup_default/empty_irq_routing declaration in arch specific header
  KVM: irqchip: Convey devid to kvm_set_msi
  KVM: Add devid in kvm_kernel_irq_routing_entry
  KVM: api: Pass the devid in the msi routing entry
parents 4305f424 45e11817

Documentation/virtual/kvm/api.txt

+37 −16
Original line number Diff line number Diff line
@@ -1433,13 +1433,16 @@ KVM_ASSIGN_DEV_IRQ. Partial deassignment of host or guest IRQ is allowed. 
4.52 KVM_SET_GSI_ROUTING



Capability: KVM_CAP_IRQ_ROUTING

Architectures: x86 s390

Architectures: x86 s390 arm arm64

Type: vm ioctl

Parameters: struct kvm_irq_routing (in)

Returns: 0 on success, -1 on error



Sets the GSI routing table entries, overwriting any previously set entries.



On arm/arm64, GSI routing has the following limitation:

- GSI routing does not apply to KVM_IRQ_LINE but only to KVM_IRQFD.



struct kvm_irq_routing {

	__u32 nr;

	__u32 flags;
@@ -1468,7 +1471,13 @@ struct kvm_irq_routing_entry { 
#define KVM_IRQ_ROUTING_S390_ADAPTER 3

#define KVM_IRQ_ROUTING_HV_SINT 4



No flags are specified so far, the corresponding field must be set to zero.

flags:

- KVM_MSI_VALID_DEVID: used along with KVM_IRQ_ROUTING_MSI routing entry

  type, specifies that the devid field contains a valid value.  The per-VM

  KVM_CAP_MSI_DEVID capability advertises the requirement to provide

  the device ID.  If this capability is not available, userspace should

  never set the KVM_MSI_VALID_DEVID flag as the ioctl might fail.

- zero otherwise



struct kvm_irq_routing_irqchip {

	__u32 irqchip;
@@ -1479,9 +1488,16 @@ struct kvm_irq_routing_msi { 
	__u32 address_lo;

	__u32 address_hi;

	__u32 data;

	union {

		__u32 pad;

		__u32 devid;

	};

};



If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier

for the device that wrote the MSI message.  For PCI, this is usually a

BFD identifier in the lower 16 bits.



On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS

feature of KVM_CAP_X2APIC_API capability is enabled.  If it is enabled,

address_hi bits 31-8 provide bits 31-8 of the destination id.  Bits 7-0 of
@@ -2199,18 +2215,19 @@ struct kvm_msi { 
	__u8  pad[12];

};



flags: KVM_MSI_VALID_DEVID: devid contains a valid value

devid: If KVM_MSI_VALID_DEVID is set, contains a unique device identifier

       for the device that wrote the MSI message.

       For PCI, this is usually a BFD identifier in the lower 16 bits.

flags: KVM_MSI_VALID_DEVID: devid contains a valid value.  The per-VM

  KVM_CAP_MSI_DEVID capability advertises the requirement to provide

  the device ID.  If this capability is not available, userspace

  should never set the KVM_MSI_VALID_DEVID flag as the ioctl might fail.



The per-VM KVM_CAP_MSI_DEVID capability advertises the need to provide

the device ID. If this capability is not set, userland cannot rely on

the kernel to allow the KVM_MSI_VALID_DEVID flag being set.

If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier

for the device that wrote the MSI message.  For PCI, this is usually a

BFD identifier in the lower 16 bits.



On x86, address_hi is ignored unless the KVM_CAP_X2APIC_API capability is

enabled.  If it is enabled, address_hi bits 31-8 provide bits 31-8 of the

destination id.  Bits 7-0 of address_hi must be zero.

On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS

feature of KVM_CAP_X2APIC_API capability is enabled.  If it is enabled,

address_hi bits 31-8 provide bits 31-8 of the destination id.  Bits 7-0 of

address_hi must be zero.





4.71 KVM_CREATE_PIT2
@@ -2383,9 +2400,13 @@ Note that closing the resamplefd is not sufficient to disable the 
irqfd.  The KVM_IRQFD_FLAG_RESAMPLE is only necessary on assignment

and need not be specified with KVM_IRQFD_FLAG_DEASSIGN.



On ARM/ARM64, the gsi field in the kvm_irqfd struct specifies the Shared

Peripheral Interrupt (SPI) index, such that the GIC interrupt ID is

given by gsi + 32.

On arm/arm64, gsi routing being supported, the following can happen:

- in case no routing entry is associated to this gsi, injection fails

- in case the gsi is associated to an irqchip routing entry,

  irqchip.pin + 32 corresponds to the injected SPI ID.

- in case the gsi is associated to an MSI routing entry, the MSI

  message and device ID are translated into an LPI (support restricted

  to GICv3 ITS in-kernel emulation).



4.76 KVM_PPC_ALLOCATE_HTAB

arch/arm/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ config KVM 
	select KVM_VFIO

	select HAVE_KVM_EVENTFD

	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER

	---help---

	  Support hosting virtualized guest machines.

arch/arm/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ obj-y += $(KVM)/arm/vgic/vgic-v2.o 
obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-kvm-device.o

obj-y += $(KVM)/irqchip.o

obj-y += $(KVM)/arm/arch_timer.o

arch/arm/kvm/irq.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * irq.h: in kernel interrupt controller related definitions

 * Copyright (c) 2016 Red Hat, Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This header is included by irqchip.c. However, on ARM, interrupt

 * controller declarations are located in include/kvm/arm_vgic.h since

 * they are mostly shared between arm and arm64.

 */



#ifndef __IRQ_H

#define __IRQ_H



#include <kvm/arm_vgic.h>



#endif

arch/arm64/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ config KVM 
	select KVM_ARM_VGIC_V3

	select KVM_ARM_PMU if HW_PERF_EVENTS

	select HAVE_KVM_MSI

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	---help---

	  Support hosting virtualized guest machines.

	  We don't support KVM with 16K page tables yet, due to the multiple

CRA Git | Maintained and supported by SUSTech CRA and CCSE