Unverified Commit 446aa954 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11004 kvm: s390: Reject memory region operations for ucontrol VMs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QVFLHYX66CBOXMOQ53AT3W2ZBLYUZUBR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ5E 
 
Link:https://gitee.com/openeuler/kernel/pulls/11004

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a768b922 1df3320c

Documentation/virt/kvm/api.rst

+6 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,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

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

arch/s390/kvm/kvm-s390.c

+3 −0
Original line number Diff line number Diff line
@@ -5764,6 +5764,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;