UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: s390: Improved MVPG partial execution handler 

Use the new helper function kvm_arch_fault_in_page() for faulting-in
the guest pages and only inject addressing errors when we've really
hit a bad address (and return other error codes to userspace instead).

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Thomas Huth 2014-05-07 11:44:17 +02:00 committed by Christian Borntraeger
parent fa576c583d
commit f22166dcfd
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/s390/kvm/intercept.c
View File

@ -292,33 +292,26 @@ static int handle_external_interrupt(struct kvm_vcpu *vcpu)
*/ */
static int handle_mvpg_pei(struct kvm_vcpu *vcpu) static int handle_mvpg_pei(struct kvm_vcpu *vcpu)
{ {
unsigned long hostaddr, srcaddr, dstaddr;
psw_t *psw = &vcpu->arch.sie_block->gpsw; psw_t *psw = &vcpu->arch.sie_block->gpsw;
struct mm_struct *mm = current->mm; unsigned long srcaddr, dstaddr;
int reg1, reg2, rc; int reg1, reg2, rc;
kvm_s390_get_regs_rre(vcpu, &reg1, &reg2); kvm_s390_get_regs_rre(vcpu, &reg1, &reg2);
srcaddr = kvm_s390_real_to_abs(vcpu, vcpu->run->s.regs.gprs[reg2]);
dstaddr = kvm_s390_real_to_abs(vcpu, vcpu->run->s.regs.gprs[reg1]);
/* Make sure that the source is paged-in */ /* Make sure that the source is paged-in */
hostaddr = gmap_fault(srcaddr, vcpu->arch.gmap); srcaddr = kvm_s390_real_to_abs(vcpu, vcpu->run->s.regs.gprs[reg2]);
if (IS_ERR_VALUE(hostaddr)) if (kvm_is_error_gpa(vcpu->kvm, srcaddr))
return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
down_read(&mm->mmap_sem); rc = kvm_arch_fault_in_page(vcpu, srcaddr, 0);
rc = get_user_pages(current, mm, hostaddr, 1, 0, 0, NULL, NULL); if (rc != 0)
up_read(&mm->mmap_sem);
if (rc < 0)
return rc; return rc;
/* Make sure that the destination is paged-in */ /* Make sure that the destination is paged-in */
hostaddr = gmap_fault(dstaddr, vcpu->arch.gmap); dstaddr = kvm_s390_real_to_abs(vcpu, vcpu->run->s.regs.gprs[reg1]);
if (IS_ERR_VALUE(hostaddr)) if (kvm_is_error_gpa(vcpu->kvm, dstaddr))
return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
down_read(&mm->mmap_sem); rc = kvm_arch_fault_in_page(vcpu, dstaddr, 1);
rc = get_user_pages(current, mm, hostaddr, 1, 1, 0, NULL, NULL); if (rc != 0)
up_read(&mm->mmap_sem);
if (rc < 0)
return rc; return rc;
psw->addr = __rewind_psw(*psw, 4); psw->addr = __rewind_psw(*psw, 4);