Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fff5e37 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-20150122' of... 

Merge tag 'kvm-s390-next-20150122' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next

KVM: s390: fixes and features for kvm/next (3.20)

1. Generic
- sparse warning (make function static)
- optimize locking
- bugfixes for interrupt injection
- fix MVPG addressing modes

2. hrtimer/wakeup fun
A recent change can cause KVM hangs if adjtime is used in the host.
The hrtimer might wake up too early or too late. Too early is fatal
as vcpu_block will see that the wakeup condition is not met and
sleep again. This CPU might never wake up again.
This series addresses this problem. adjclock slowing down the host
clock will result in too late wakeups. This will require more work.
In addition to that we also change the hrtimer from REALTIME to
MONOTONIC to avoid similar problems with timedatectl set-time.

3. sigp rework
We will move all "slow" sigps to QEMU (protected with a capability that
can be enabled) to avoid several races between concurrent SIGP orders.

4. Optimize the shadow page table
Provide an interface to announce the maximum guest size. The kernel
will use that to make the pagetable 2,3,4 (or theoretically) 5 levels.

5. Provide an interface to set the guest TOD
We now use two vm attributes instead of two oneregs, as oneregs are
vcpu ioctl and we don't want to call them from other threads.

6. Protected key functions
The real HMC allows to enable/disable protected key CPACF functions.
Lets provide an implementation + an interface for QEMU to activate
this the protected key instructions.
parents 1c6007d5 0eb135ff

Documentation/virtual/kvm/api.txt

+21 −1
Original line number Diff line number Diff line
@@ -2315,7 +2315,7 @@ struct kvm_s390_interrupt { 


type can be one of the following:



KVM_S390_SIGP_STOP (vcpu) - sigp restart

KVM_S390_SIGP_STOP (vcpu) - sigp stop; optional flags in parm

KVM_S390_PROGRAM_INT (vcpu) - program check; code in parm

KVM_S390_SIGP_SET_PREFIX (vcpu) - sigp set prefix; prefix address in parm

KVM_S390_RESTART (vcpu) - restart
@@ -3228,3 +3228,23 @@ userspace from doing that. 
If the hcall number specified is not one that has an in-kernel

implementation, the KVM_ENABLE_CAP ioctl will fail with an EINVAL

error.



7.2 KVM_CAP_S390_USER_SIGP



Architectures: s390

Parameters: none



This capability controls which SIGP orders will be handled completely in user

space. With this capability enabled, all fast orders will be handled completely

in the kernel:

- SENSE

- SENSE RUNNING

- EXTERNAL CALL

- EMERGENCY SIGNAL

- CONDITIONAL EMERGENCY SIGNAL



All other orders will be handled completely in user space.



Only privileged operation exceptions will be checked for in the kernel (or even

in the hardware prior to interception). If this capability is not enabled, the

old way of handling SIGP orders is used (partially in kernel and user space).

Documentation/virtual/kvm/devices/vm.txt

+14 −0
Original line number Diff line number Diff line
@@ -24,3 +24,17 @@ Returns: 0 


Clear the CMMA status for all guest pages, so any pages the guest marked

as unused are again used any may not be reclaimed by the host.



1.3. ATTRIBUTE KVM_S390_VM_MEM_LIMIT_SIZE

Parameters: in attr->addr the address for the new limit of guest memory

Returns: -EFAULT if the given address is not accessible

         -EINVAL if the virtual machine is of type UCONTROL

         -E2BIG if the given guest memory is to big for that machine

         -EBUSY if a vcpu is already defined

         -ENOMEM if not enough memory is available for a new shadow guest mapping

          0 otherwise



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.

arch/arm/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -249,9 +249,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	return ERR_PTR(err);

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

arch/mips/kvm/mips.c

+1 −2
Original line number Diff line number Diff line
@@ -832,9 +832,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	return -ENOIOCTLCMD;

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

arch/powerpc/kvm/powerpc.c

+1 −2
Original line number Diff line number Diff line
@@ -623,9 +623,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	return vcpu;

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)