Commit 44e98edc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kvm-4.3-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm updates from Paolo Bonzini:
 "A very small release for x86 and s390 KVM.

   - s390: timekeeping changes, cleanups and fixes

   - x86: support for Hyper-V MSRs to report crashes, and a bunch of
     cleanups.

  One interesting feature that was planned for 4.3 (emulating the local
  APIC in kernel while keeping the IOAPIC and 8254 in userspace) had to
  be delayed because Intel complained about my reading of the manual"

* tag 'kvm-4.3-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (42 commits)
  x86/kvm: Rename VMX's segment access rights defines
  KVM: x86/vPMU: Fix unnecessary signed extension for AMD PERFCTRn
  kvm: x86: Fix error handling in the function kvm_lapic_sync_from_vapic
  KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully
  KVM: VMX: drop ept misconfig check
  KVM: MMU: fully check zero bits for sptes
  KVM: MMU: introduce is_shadow_zero_bits_set()
  KVM: MMU: introduce the framework to check zero bits on sptes
  KVM: MMU: split reset_rsvds_bits_mask_ept
  KVM: MMU: split reset_rsvds_bits_mask
  KVM: MMU: introduce rsvd_bits_validate
  KVM: MMU: move FNAME(is_rsvd_bits_set) to mmu.c
  KVM: MMU: fix validation of mmio page fault
  KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON
  KVM: s390: host STP toleration for VMs
  KVM: x86: clean/fix memory barriers in irqchip_in_kernel
  KVM: document memory barriers for kvm->vcpus/kvm->online_vcpus
  KVM: x86: remove unnecessary memory barriers for shared MSRs
  KVM: move code related to KVM_SET_BOOT_CPU_ID to x86
  KVM: s390: log capability enablement and vm attribute changes
  ...
parents 64291f7d 4d283ec9

Documentation/s390/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ Debugging390.txt 
	- hints for debugging on s390 systems.

driver-model.txt

	- information on s390 devices and the driver model.

kvm.txt

	- ioctl calls to /dev/kvm on s390.

monreader.txt

	- information on accessing the z/VM monitor stream from Linux.

qeth.txt

Documentation/s390/kvm.txt

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
*** BIG FAT WARNING ***

The kvm module is currently in EXPERIMENTAL state for s390. This means that

the interface to the module is not yet considered to remain stable. Thus, be

prepared that we keep breaking your userspace application and guest

compatibility over and over again until we feel happy with the result. Make sure

your guest kernel, your host kernel, and your userspace launcher are in a

consistent state.



This Documentation describes the unique ioctl calls to /dev/kvm, the resulting

kvm-vm file descriptors, and the kvm-vcpu file descriptors that differ from x86.



1. ioctl calls to /dev/kvm

KVM does support the following ioctls on s390 that are common with other

architectures and do behave the same:

KVM_GET_API_VERSION

KVM_CREATE_VM		(*) see note

KVM_CHECK_EXTENSION

KVM_GET_VCPU_MMAP_SIZE



Notes:

* KVM_CREATE_VM may fail on s390, if the calling process has multiple

threads and has not called KVM_S390_ENABLE_SIE before.



In addition, on s390 the following architecture specific ioctls are supported:

ioctl:		KVM_S390_ENABLE_SIE

args:		none

see also:	include/linux/kvm.h

This call causes the kernel to switch on PGSTE in the user page table. This

operation is needed in order to run a virtual machine, and it requires the

calling process to be single-threaded. Note that the first call to KVM_CREATE_VM

will implicitly try to switch on PGSTE if the user process has not called

KVM_S390_ENABLE_SIE before. User processes that want to launch multiple threads

before creating a virtual machine have to call KVM_S390_ENABLE_SIE, or will

observe an error calling KVM_CREATE_VM. Switching on PGSTE is a one-time

operation, is not reversible, and will persist over the entire lifetime of

the calling process. It does not have any user-visible effect other than a small

performance penalty.



2. ioctl calls to the kvm-vm file descriptor

KVM does support the following ioctls on s390 that are common with other

architectures and do behave the same:

KVM_CREATE_VCPU

KVM_SET_USER_MEMORY_REGION      (*) see note

KVM_GET_DIRTY_LOG		(**) see note



Notes:

*  kvm does only allow exactly one memory slot on s390, which has to start

   at guest absolute address zero and at a user address that is aligned on any

   page boundary. This hardware "limitation" allows us to have a few unique

   optimizations. The memory slot doesn't have to be filled

   with memory actually, it may contain sparse holes. That said, with different

   user memory layout this does still allow a large flexibility when

   doing the guest memory setup.

** KVM_GET_DIRTY_LOG doesn't work properly yet. The user will receive an empty

log. This ioctl call is only needed for guest migration, and we intend to

implement this one in the future.



In addition, on s390 the following architecture specific ioctls for the kvm-vm

file descriptor are supported:

ioctl:		KVM_S390_INTERRUPT

args:		struct kvm_s390_interrupt *

see also:	include/linux/kvm.h

This ioctl is used to submit a floating interrupt for a virtual machine.

Floating interrupts may be delivered to any virtual cpu in the configuration.

Only some interrupt types defined in include/linux/kvm.h make sense when

submitted as floating interrupts. The following interrupts are not considered

to be useful as floating interrupts, and a call to inject them will result in

-EINVAL error code: program interrupts and interprocessor signals. Valid

floating interrupts are:

KVM_S390_INT_VIRTIO

KVM_S390_INT_SERVICE



3. ioctl calls to the kvm-vcpu file descriptor

KVM does support the following ioctls on s390 that are common with other

architectures and do behave the same:

KVM_RUN

KVM_GET_REGS

KVM_SET_REGS

KVM_GET_SREGS

KVM_SET_SREGS

KVM_GET_FPU

KVM_SET_FPU



In addition, on s390 the following architecture specific ioctls for the

kvm-vcpu file descriptor are supported:

ioctl:		KVM_S390_INTERRUPT

args:		struct kvm_s390_interrupt *

see also:	include/linux/kvm.h

This ioctl is used to submit an interrupt for a specific virtual cpu.

Only some interrupt types defined in include/linux/kvm.h make sense when

submitted for a specific cpu. The following interrupts are not considered

to be useful, and a call to inject them will result in -EINVAL error code:

service processor calls and virtio interrupts. Valid interrupt types are:

KVM_S390_PROGRAM_INT

KVM_S390_SIGP_STOP

KVM_S390_RESTART

KVM_S390_SIGP_SET_PREFIX

KVM_S390_INT_EMERGENCY



ioctl:		KVM_S390_STORE_STATUS

args:		unsigned long

see also:	include/linux/kvm.h

This ioctl stores the state of the cpu at the guest real address given as

argument, unless one of the following values defined in include/linux/kvm.h

is given as argument:

KVM_S390_STORE_STATUS_NOADDR - the CPU stores its status to the save area in

absolute lowcore as defined by the principles of operation

KVM_S390_STORE_STATUS_PREFIXED - the CPU stores its status to the save area in

its prefix page just like the dump tool that comes with zipl. This is useful

to create a system dump for use with lkcdutils or crash.



ioctl:		KVM_S390_SET_INITIAL_PSW

args:		struct kvm_s390_psw *

see also:	include/linux/kvm.h

This ioctl can be used to set the processor status word (psw) of a stopped cpu

prior to running it with KVM_RUN. Note that this call is not required to modify

the psw during sie intercepts that fall back to userspace because struct kvm_run

does contain the psw, and this value is evaluated during reentry of KVM_RUN

after the intercept exit was recognized.



ioctl:		KVM_S390_INITIAL_RESET

args:		none

see also:	include/linux/kvm.h

This ioctl can be used to perform an initial cpu reset as defined by the

principles of operation. The target cpu has to be in stopped state.

Documentation/virtual/kvm/api.txt

+5 −0
Original line number Diff line number Diff line
@@ -3277,6 +3277,7 @@ should put the acknowledged interrupt vector into the 'epr' field. 
		struct {

#define KVM_SYSTEM_EVENT_SHUTDOWN       1

#define KVM_SYSTEM_EVENT_RESET          2

#define KVM_SYSTEM_EVENT_CRASH          3

			__u32 type;

			__u64 flags;

		} system_event;
@@ -3296,6 +3297,10 @@ Valid values for 'type' are: 
  KVM_SYSTEM_EVENT_RESET -- the guest has requested a reset of the VM.

   As with SHUTDOWN, userspace can choose to ignore the request, or

   to schedule the reset to occur in the future and may call KVM_RUN again.

  KVM_SYSTEM_EVENT_CRASH -- the guest crash occurred and the guest

   has requested a crash condition maintenance. Userspace can choose

   to ignore the request, or to gather VM memory core dump and/or

   reset/shutdown of the VM.



		/* Fix the size of the union. */

		char padding[256];

arch/s390/include/asm/etr.h

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ static inline int etr_ptff(void *ptff_block, unsigned int func) 
void etr_switch_to_local(void);

void etr_sync_check(void);



/* notifier for syncs */

extern struct atomic_notifier_head s390_epoch_delta_notifier;



/* STP interruption parameter */

struct stp_irq_parm {

	unsigned int _pad0	: 14;

arch/s390/include/asm/kvm_host.h

+3 −1
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ struct kvm_vcpu_stat { 
	u32 diagnose_10;

	u32 diagnose_44;

	u32 diagnose_9c;

	u32 diagnose_258;

	u32 diagnose_308;

	u32 diagnose_500;

};



#define PGM_OPERATION			0x01
@@ -630,7 +633,6 @@ extern char sie_exit; 


static inline void kvm_arch_hardware_disable(void) {}

static inline void kvm_arch_check_processor_compat(void *rtn) {}

static inline void kvm_arch_exit(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE