Commit f0a23883 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-6.11-1' of... 

Merge tag 'kvm-s390-next-6.11-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

Assortment of tiny fixes which are not time critical:
- Rejecting memory region operations for ucontrol mode VMs
- Rewind the PSW on host intercepts for VSIE
- Remove unneeded include
parents 60d2b2f3 7816e589

Documentation/virt/kvm/api.rst

+12 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,12 @@ Instead, an abort (data abort if the cause of the page-table update 
was a load or a store, instruction abort if it was an instruction

fetch) is injected in the guest.



S390:

^^^^^



Returns -EINVAL if the VM has the KVM_VM_S390_UCONTROL flag set.

Returns -EINVAL if called on a protected VM.



4.36 KVM_SET_TSS_ADDR

---------------------
@@ -6273,6 +6279,12 @@ state. At VM creation time, all memory is shared, i.e. the PRIVATE attribute 
is '0' for all gfns.  Userspace can control whether memory is shared/private by

toggling KVM_MEMORY_ATTRIBUTE_PRIVATE via KVM_SET_MEMORY_ATTRIBUTES as needed.



S390:

^^^^^



Returns -EINVAL if the VM has the KVM_VM_S390_UCONTROL flag set.

Returns -EINVAL if called on a protected VM.



4.141 KVM_SET_MEMORY_ATTRIBUTES

-------------------------------

arch/s390/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/hrtimer.h>

#include <linux/interrupt.h>

#include <linux/kvm_types.h>

#include <linux/kvm_host.h>

#include <linux/kvm.h>

#include <linux/seqlock.h>

#include <linux/module.h>

arch/s390/kvm/kvm-s390.c

+3 −0
Original line number Diff line number Diff line
@@ -5748,6 +5748,9 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
{

	gpa_t size;



	if (kvm_is_ucontrol(kvm))

		return -EINVAL;



	/* When we are protected, we should not change the memory slots */

	if (kvm_s390_pv_get_handle(kvm))

		return -EINVAL;

arch/s390/kvm/vsie.c

+19 −3
Original line number Diff line number Diff line
@@ -1304,10 +1304,24 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


		if (rc == -EAGAIN)

			rc = 0;

		if (rc || scb_s->icptcode || signal_pending(current) ||



		/*

		 * Exit the loop if the guest needs to process the intercept

		 */

		if (rc || scb_s->icptcode)

			break;



		/*

		 * Exit the loop if the host needs to process an intercept,

		 * but rewind the PSW to re-enter SIE once that's completed

		 * instead of passing a "no action" intercept to the guest.

		 */

		if (signal_pending(current) ||

		    kvm_s390_vcpu_has_irq(vcpu, 0) ||

		    kvm_s390_vcpu_sie_inhibited(vcpu))

		    kvm_s390_vcpu_sie_inhibited(vcpu)) {

			kvm_s390_rewind_psw(vcpu, 4);

			break;

		}

		cond_resched();

	}
@@ -1426,8 +1440,10 @@ int kvm_s390_handle_vsie(struct kvm_vcpu *vcpu) 
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	if (signal_pending(current) || kvm_s390_vcpu_has_irq(vcpu, 0) ||

	    kvm_s390_vcpu_sie_inhibited(vcpu))

	    kvm_s390_vcpu_sie_inhibited(vcpu)) {

		kvm_s390_rewind_psw(vcpu, 4);

		return 0;

	}



	vsie_page = get_vsie_page(vcpu->kvm, scb_addr);

	if (IS_ERR(vsie_page))