Commit 1baa5efb 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 KVM updates from Paolo Bonzini:
 "PPC changes will come next week.

   - s390: Support for runtime instrumentation within guests, support of
     248 VCPUs.

   - ARM: rewrite of the arm64 world switch in C, support for 16-bit VM
     identifiers.  Performance counter virtualization missed the boat.

   - x86: Support for more Hyper-V features (synthetic interrupt
     controller), MMU cleanups"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (115 commits)
  kvm: x86: Fix vmwrite to SECONDARY_VM_EXEC_CONTROL
  kvm/x86: Hyper-V SynIC timers tracepoints
  kvm/x86: Hyper-V SynIC tracepoints
  kvm/x86: Update SynIC timers on guest entry only
  kvm/x86: Skip SynIC vector check for QEMU side
  kvm/x86: Hyper-V fix SynIC timer disabling condition
  kvm/x86: Reorg stimer_expiration() to better control timer restart
  kvm/x86: Hyper-V unify stimer_start() and stimer_restart()
  kvm/x86: Drop stimer_stop() function
  kvm/x86: Hyper-V timers fix incorrect logical operation
  KVM: move architecture-dependent requests to arch/
  KVM: renumber vcpu->request bits
  KVM: document which architecture uses each request bit
  KVM: Remove unused KVM_REQ_KICK to save a bit in vcpu->requests
  kvm: x86: Check kvm_write_guest return value in kvm_write_wall_clock
  KVM: s390: implement the RI support of guest
  kvm/s390: drop unpaired smp_mb
  kvm: x86: fix comment about {mmu,nested_mmu}.gva_to_gpa
  KVM: x86: MMU: Use clear_page() instead of init_shadow_page_table()
  arm/arm64: KVM: Detect vGIC presence at runtime
  ...
parents c9bed1cf 45bdbcfd

Documentation/virtual/kvm/api.txt

+41 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,7 @@ struct kvm_irq_routing_entry { 
		struct kvm_irq_routing_irqchip irqchip;

		struct kvm_irq_routing_msi msi;

		struct kvm_irq_routing_s390_adapter adapter;

		struct kvm_irq_routing_hv_sint hv_sint;

		__u32 pad[8];

	} u;

};
@@ -1459,6 +1460,7 @@ struct kvm_irq_routing_entry { 
#define KVM_IRQ_ROUTING_IRQCHIP 1

#define KVM_IRQ_ROUTING_MSI 2

#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.
@@ -1482,6 +1484,10 @@ struct kvm_irq_routing_s390_adapter { 
	__u32 adapter_id;

};



struct kvm_irq_routing_hv_sint {

	__u32 vcpu;

	__u32 sint;

};



4.53 KVM_ASSIGN_SET_MSIX_NR (deprecated)
@@ -3331,6 +3337,28 @@ the userspace IOAPIC should process the EOI and retrigger the interrupt if 
it is still asserted.  Vector is the LAPIC interrupt vector for which the

EOI was received.



		struct kvm_hyperv_exit {

#define KVM_EXIT_HYPERV_SYNIC          1

			__u32 type;

			union {

				struct {

					__u32 msr;

					__u64 control;

					__u64 evt_page;

					__u64 msg_page;

				} synic;

			} u;

		};

		/* KVM_EXIT_HYPERV */

                struct kvm_hyperv_exit hyperv;

Indicates that the VCPU exits into userspace to process some tasks

related to Hyper-V emulation.

Valid values for 'type' are:

	KVM_EXIT_HYPERV_SYNIC -- synchronously notify user-space about

Hyper-V SynIC state change. Notification is used to remap SynIC

event/message pages and to enable/disable SynIC messages/events processing

in userspace.



		/* Fix the size of the union. */

		char padding[256];

	};
@@ -3685,3 +3713,16 @@ available, means that that the kernel has an implementation of the 
H_RANDOM hypercall backed by a hardware random-number generator.

If present, the kernel H_RANDOM handler can be enabled for guest use

with the KVM_CAP_PPC_ENABLE_HCALL capability.



8.2 KVM_CAP_HYPERV_SYNIC



Architectures: x86

This capability, if KVM_CHECK_EXTENSION indicates that it is

available, means that that the kernel has an implementation of the

Hyper-V Synthetic interrupt controller(SynIC). Hyper-V SynIC is

used to support Windows Hyper-V based guest paravirt drivers(VMBus).



In order to use SynIC, it has to be activated by setting this

capability via KVM_ENABLE_CAP ioctl on the vcpu fd. Note that this

will disable the use of APIC hardware virtualization even if supported

by the CPU, as it's incompatible with SynIC auto-EOI behavior.

Documentation/virtual/kvm/devices/vm.txt

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ Returns: -EFAULT if the given address is not accessible 
Allows userspace to query the actual limit and set a new limit for

the maximum guest memory size. The limit will be rounded up to

2048 MB, 4096 GB, 8192 TB respectively, as this limit is governed by

the number of page table levels.

the number of page table levels. In the case that there is no limit we will set

the limit to KVM_S390_NO_MEM_LIMIT (U64_MAX).



2. GROUP: KVM_S390_VM_CPU_MODEL

Architectures: s390

Documentation/virtual/kvm/mmu.txt

+2 −2
Original line number Diff line number Diff line
@@ -203,10 +203,10 @@ Shadow pages contain the following information: 
    page cannot be destroyed.  See role.invalid.

  parent_ptes:

    The reverse mapping for the pte/ptes pointing at this page's spt. If

    parent_ptes bit 0 is zero, only one spte points at this pages and

    parent_ptes bit 0 is zero, only one spte points at this page and

    parent_ptes points at this single spte, otherwise, there exists multiple

    sptes pointing at this page and (parent_ptes & ~0x1) points at a data

    structure with a list of parent_ptes.

    structure with a list of parent sptes.

  unsync:

    If true, then the translations in this page may not match the guest's

    translation.  This is equivalent to the state of the tlb when a pte is

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6089,6 +6089,7 @@ M: Marc Zyngier <marc.zyngier@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

W:	http://systems.cs.columbia.edu/projects/kvm-arm

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

S:	Supported

F:	arch/arm/include/uapi/asm/kvm*

F:	arch/arm/include/asm/kvm*

arch/arm/include/asm/kvm_arm.h

+17 −17
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifndef __ARM_KVM_ARM_H__

#define __ARM_KVM_ARM_H__



#include <linux/const.h>

#include <linux/types.h>



/* Hyp Configuration Register (HCR) bits */
@@ -132,10 +133,9 @@ 
 * space.

 */

#define KVM_PHYS_SHIFT	(40)

#define KVM_PHYS_SIZE	(1ULL << KVM_PHYS_SHIFT)

#define KVM_PHYS_MASK	(KVM_PHYS_SIZE - 1ULL)

#define PTRS_PER_S2_PGD	(1ULL << (KVM_PHYS_SHIFT - 30))

#define S2_PGD_ORDER	get_order(PTRS_PER_S2_PGD * sizeof(pgd_t))

#define KVM_PHYS_SIZE	(_AC(1, ULL) << KVM_PHYS_SHIFT)

#define KVM_PHYS_MASK	(KVM_PHYS_SIZE - _AC(1, ULL))

#define PTRS_PER_S2_PGD	(_AC(1, ULL) << (KVM_PHYS_SHIFT - 30))



/* Virtualization Translation Control Register (VTCR) bits */

#define VTCR_SH0	(3 << 12)
@@ -162,17 +162,17 @@ 
#define VTTBR_X		(5 - KVM_T0SZ)

#endif

#define VTTBR_BADDR_SHIFT (VTTBR_X - 1)

#define VTTBR_BADDR_MASK  (((1LLU << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  (48LLU)

#define VTTBR_VMID_MASK	  (0xffLLU << VTTBR_VMID_SHIFT)

#define VTTBR_BADDR_MASK  (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  _AC(48, ULL)

#define VTTBR_VMID_MASK(size)	(_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)



/* Hyp Syndrome Register (HSR) bits */

#define HSR_EC_SHIFT	(26)

#define HSR_EC		(0x3fU << HSR_EC_SHIFT)

#define HSR_IL		(1U << 25)

#define HSR_EC		(_AC(0x3f, UL) << HSR_EC_SHIFT)

#define HSR_IL		(_AC(1, UL) << 25)

#define HSR_ISS		(HSR_IL - 1)

#define HSR_ISV_SHIFT	(24)

#define HSR_ISV		(1U << HSR_ISV_SHIFT)

#define HSR_ISV		(_AC(1, UL) << HSR_ISV_SHIFT)

#define HSR_SRT_SHIFT	(16)

#define HSR_SRT_MASK	(0xf << HSR_SRT_SHIFT)

#define HSR_FSC		(0x3f)
@@ -180,9 +180,9 @@ 
#define HSR_SSE		(1 << 21)

#define HSR_WNR		(1 << 6)

#define HSR_CV_SHIFT	(24)

#define HSR_CV		(1U << HSR_CV_SHIFT)

#define HSR_CV		(_AC(1, UL) << HSR_CV_SHIFT)

#define HSR_COND_SHIFT	(20)

#define HSR_COND	(0xfU << HSR_COND_SHIFT)

#define HSR_COND	(_AC(0xf, UL) << HSR_COND_SHIFT)



#define FSC_FAULT	(0x04)

#define FSC_ACCESS	(0x08)
@@ -210,13 +210,13 @@ 
#define HSR_EC_DABT	(0x24)

#define HSR_EC_DABT_HYP	(0x25)



#define HSR_WFI_IS_WFE		(1U << 0)

#define HSR_WFI_IS_WFE		(_AC(1, UL) << 0)



#define HSR_HVC_IMM_MASK	((1UL << 16) - 1)

#define HSR_HVC_IMM_MASK	((_AC(1, UL) << 16) - 1)



#define HSR_DABT_S1PTW		(1U << 7)

#define HSR_DABT_CM		(1U << 8)

#define HSR_DABT_EA		(1U << 9)

#define HSR_DABT_S1PTW		(_AC(1, UL) << 7)

#define HSR_DABT_CM		(_AC(1, UL) << 8)

#define HSR_DABT_EA		(_AC(1, UL) << 9)



#define kvm_arm_exception_type	\

	{0, "RESET" }, 		\

CRA Git | Maintained and supported by SUSTech CRA and CCSE