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

Commit 146b2cfe authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-20140530' of... 

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

1. Several minor fixes and cleanups for KVM:
2. Fix flag check for gdb support
3. Remove unnecessary vcpu start
4. Remove code duplication for sigp interrupts
5. Better DAT handling for the TPROT instruction
6. Correct addressing exception for standby memory
parents 356d4c20 5a5e6536

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct kvm_s390_sie_block { 
#define ICTL_ISKE	0x00004000

#define ICTL_SSKE	0x00002000

#define ICTL_RRBE	0x00001000

#define ICTL_TPROT	0x00000200

	__u32	ictl;			/* 0x0048 */

	__u32	eca;			/* 0x004c */

#define ICPT_INST	0x04

arch/s390/kvm/gaccess.c

+55 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void ipte_unlock_siif(struct kvm_vcpu *vcpu) 
		wake_up(&vcpu->kvm->arch.ipte_wq);

}



static void ipte_lock(struct kvm_vcpu *vcpu)

void ipte_lock(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.sie_block->eca & 1)

		ipte_lock_siif(vcpu);
@@ -300,7 +300,7 @@ static void ipte_lock(struct kvm_vcpu *vcpu) 
		ipte_lock_simple(vcpu);

}



static void ipte_unlock(struct kvm_vcpu *vcpu)

void ipte_unlock(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.sie_block->eca & 1)

		ipte_unlock_siif(vcpu);
@@ -644,6 +644,59 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, 
	return rc;

}



/**

 * guest_translate_address - translate guest logical into guest absolute address

 *

 * Parameter semantics are the same as the ones from guest_translate.

 * The memory contents at the guest address are not changed.

 *

 * Note: The IPTE lock is not taken during this function, so the caller

 * has to take care of this.

 */

int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva,

			    unsigned long *gpa, int write)

{

	struct kvm_s390_pgm_info *pgm = &vcpu->arch.pgm;

	psw_t *psw = &vcpu->arch.sie_block->gpsw;

	struct trans_exc_code_bits *tec;

	union asce asce;

	int rc;



	/* Access register mode is not supported yet. */

	if (psw_bits(*psw).t && psw_bits(*psw).as == PSW_AS_ACCREG)

		return -EOPNOTSUPP;



	gva = kvm_s390_logical_to_effective(vcpu, gva);

	memset(pgm, 0, sizeof(*pgm));

	tec = (struct trans_exc_code_bits *)&pgm->trans_exc_code;

	tec->as = psw_bits(*psw).as;

	tec->fsi = write ? FSI_STORE : FSI_FETCH;

	tec->addr = gva >> PAGE_SHIFT;

	if (is_low_address(gva) && low_address_protection_enabled(vcpu)) {

		if (write) {

			rc = pgm->code = PGM_PROTECTION;

			return rc;

		}

	}



	asce.val = get_vcpu_asce(vcpu);

	if (psw_bits(*psw).t && !asce.r) {	/* Use DAT? */

		rc = guest_translate(vcpu, gva, gpa, write);

		if (rc > 0) {

			if (rc == PGM_PROTECTION)

				tec->b61 = 1;

			pgm->code = rc;

		}

	} else {

		rc = 0;

		*gpa = kvm_s390_real_to_abs(vcpu, gva);

		if (kvm_is_error_gpa(vcpu->kvm, *gpa))

			rc = pgm->code = PGM_ADDRESSING;

	}



	return rc;

}



/**

 * kvm_s390_check_low_addr_protection - check for low-address protection

 * @ga: Guest address

arch/s390/kvm/gaccess.h

+5 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ int read_guest_lc(struct kvm_vcpu *vcpu, unsigned long gra, void *data, 
	return kvm_read_guest(vcpu->kvm, gpa, data, len);

}



int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva,

			    unsigned long *gpa, int write);



int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, void *data,

		 unsigned long len, int write);
@@ -324,6 +327,8 @@ int read_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, void *data, 
	return access_guest_real(vcpu, gra, data, len, 0);

}



void ipte_lock(struct kvm_vcpu *vcpu);

void ipte_unlock(struct kvm_vcpu *vcpu);

int ipte_lock_held(struct kvm_vcpu *vcpu);

int kvm_s390_check_low_addr_protection(struct kvm_vcpu *vcpu, unsigned long ga);

arch/s390/kvm/interrupt.c

+0 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, 
		rc |= read_guest_lc(vcpu, offsetof(struct _lowcore, restart_psw),

				    &vcpu->arch.sie_block->gpsw,

				    sizeof(psw_t));

		kvm_s390_vcpu_start(vcpu);

		break;

	case KVM_S390_PROGRAM_INT:

		VCPU_EVENT(vcpu, 4, "interrupt: pgm check code:%x, ilc:%x",

arch/s390/kvm/kvm-s390.c

+4 −2
Original line number Diff line number Diff line
@@ -637,7 +637,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	if (sclp_has_siif())

		vcpu->arch.sie_block->eca |= 1;

	vcpu->arch.sie_block->fac   = (int) (long) vfacilities;

	vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE;

	vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE |

				      ICTL_TPROT;



	if (kvm_s390_cmma_enabled(vcpu->kvm)) {

		rc = kvm_s390_vcpu_setup_cmma(vcpu);

		if (rc)
@@ -950,7 +952,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
	vcpu->guest_debug = 0;

	kvm_s390_clear_bp_data(vcpu);



	if (vcpu->guest_debug & ~VALID_GUESTDBG_FLAGS)

	if (dbg->control & ~VALID_GUESTDBG_FLAGS)

		return -EINVAL;



	if (dbg->control & KVM_GUESTDBG_ENABLE) {