Commit 3f5198c7 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-6.8-1' of... 

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

pqap instruction missing cc fix
vsie shadow creation race fix
parents 6613476e 83303a4c

arch/s390/kvm/priv.c

+6 −2
Original line number Diff line number Diff line
@@ -676,8 +676,12 @@ static int handle_pqap(struct kvm_vcpu *vcpu) 
	if (vcpu->kvm->arch.crypto.pqap_hook) {

		pqap_hook = *vcpu->kvm->arch.crypto.pqap_hook;

		ret = pqap_hook(vcpu);

		if (!ret && vcpu->run->s.regs.gprs[1] & 0x00ff0000)

		if (!ret) {

			if (vcpu->run->s.regs.gprs[1] & 0x00ff0000)

				kvm_s390_set_psw_cc(vcpu, 3);

			else

				kvm_s390_set_psw_cc(vcpu, 0);

		}

		up_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);

		return ret;

	}

arch/s390/kvm/vsie.c

+0 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,6 @@ static int acquire_gmap_shadow(struct kvm_vcpu *vcpu, 
	gmap = gmap_shadow(vcpu->arch.gmap, asce, edat);

	if (IS_ERR(gmap))

		return PTR_ERR(gmap);

	gmap->private = vcpu->kvm;

	vcpu->kvm->stat.gmap_shadow_create++;

	WRITE_ONCE(vsie_page->gmap, gmap);

	return 0;

arch/s390/mm/gmap.c

+1 −0
Original line number Diff line number Diff line
@@ -1691,6 +1691,7 @@ struct gmap *gmap_shadow(struct gmap *parent, unsigned long asce, 
		return ERR_PTR(-ENOMEM);

	new->mm = parent->mm;

	new->parent = gmap_get(parent);

	new->private = parent->private;

	new->orig_asce = asce;

	new->edat_level = edat_level;

	new->initialized = false;