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

!7295 KVM: s390: vsie: fix race during shadow creation 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FT4HUFQWXBZ53Y4CZI3GH2YFW3WA44N2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2GQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/7295

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 42514171 a9b0ea1f

arch/s390/kvm/vsie.c

+0 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,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;

	WRITE_ONCE(vsie_page->gmap, gmap);

	return 0;

}

arch/s390/mm/gmap.c

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