Commit fa4b5588 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Consolidate reset_rsvds_bits_mask() calls 



Move calls to reset_rsvds_bits_mask() out of the various mode statements
and under a more generic CR0.PG=1 check.  This will allow for additional
code consolidation in the future.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210622175739.3610207-42-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 87e99d7d

arch/x86/kvm/mmu/mmu.c

+10 −11
Original line number Diff line number Diff line
@@ -4637,18 +4637,18 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) 
	} else if (is_long_mode(vcpu)) {

		context->root_level = ____is_cr4_la57(&regs) ?

				PT64_ROOT_5LEVEL : PT64_ROOT_4LEVEL;

		reset_rsvds_bits_mask(vcpu, context);

		context->gva_to_gpa = paging64_gva_to_gpa;

	} else if (is_pae(vcpu)) {

		context->root_level = PT32E_ROOT_LEVEL;

		reset_rsvds_bits_mask(vcpu, context);

		context->gva_to_gpa = paging64_gva_to_gpa;

	} else {

		context->root_level = PT32_ROOT_LEVEL;

		reset_rsvds_bits_mask(vcpu, context);

		context->gva_to_gpa = paging32_gva_to_gpa;

	}



	if (is_cr0_pg(context))

		reset_rsvds_bits_mask(vcpu, context);



	update_permission_bitmask(context, false);

	update_pkru_bitmask(context);

	update_last_nonleaf_level(context);
@@ -4890,18 +4890,17 @@ static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu) 
	 * nested page tables as the second level of translation. Basically

	 * the gva_to_gpa functions between mmu and nested_mmu are swapped.

	 */

	if (!is_paging(vcpu)) {

	if (!is_paging(vcpu))

		g_context->gva_to_gpa = nonpaging_gva_to_gpa_nested;

	} else if (is_long_mode(vcpu)) {

		reset_rsvds_bits_mask(vcpu, g_context);

	else if (is_long_mode(vcpu))

		g_context->gva_to_gpa = paging64_gva_to_gpa_nested;

	} else if (is_pae(vcpu)) {

		reset_rsvds_bits_mask(vcpu, g_context);

	else if (is_pae(vcpu))

		g_context->gva_to_gpa = paging64_gva_to_gpa_nested;

	} else {

		reset_rsvds_bits_mask(vcpu, g_context);

	else

		g_context->gva_to_gpa = paging32_gva_to_gpa_nested;

	}



	if (is_cr0_pg(g_context))

		reset_rsvds_bits_mask(vcpu, g_context);



	update_permission_bitmask(g_context, false);

	update_pkru_bitmask(g_context);