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

!11132 KVM: x86/mmu: make apf token non-zero to fix bug 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CFV3Y3TFJYLT26XNAGJXKWCFVWQH5LOX/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALPYZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/11132

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 885ac217 f2d67694

arch/x86/kvm/mmu.c

+12 −1
Original line number Diff line number Diff line
@@ -4088,11 +4088,22 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, 
			     error_code, gfn, prefault);

}



static u32 alloc_apf_token(struct kvm_vcpu *vcpu)

{

	/* make sure the token value is not 0 */

	u32 id = vcpu->arch.apf.id;



	if (id << 12 == 0)

		vcpu->arch.apf.id = 1;



	return (vcpu->arch.apf.id++ << 12) | vcpu->vcpu_id;

}



static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn)

{

	struct kvm_arch_async_pf arch;



	arch.token = (vcpu->arch.apf.id++ << 12) | vcpu->vcpu_id;

	arch.token = alloc_apf_token(vcpu);

	arch.gfn = gfn;

	arch.direct_map = vcpu->arch.mmu.direct_map;

	arch.cr3 = vcpu->arch.mmu.get_cr3(vcpu);