Commit 88642907 authored by Robert Hoo's avatar Robert Hoo Committed by Jason Zeng
Browse files

KVM: VMX: Report tertiary_exec_control field in dump_vmcs() 

mainline inclusion
from mainline-v6.0-rc1
commit 0b85baa5
category: feature
feature: IPI Virtualization
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5ODSC
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0b85baa5f46de1c6ad6e4b987905df041f2f80f0



Intel-SIG: commit 0b85baa5 ("KVM: VMX: Report tertiary_exec_control field in dump_vmcs()")

-------------------------------------

KVM: VMX: Report tertiary_exec_control field in dump_vmcs()

Add tertiary_exec_control field report in dump_vmcs(). Meanwhile,
reorganize the dump output of VMCS category as follows.

Before change:
*** Control State ***
 PinBased=0x000000ff CPUBased=0xb5a26dfa SecondaryExec=0x061037eb
 EntryControls=0000d1ff ExitControls=002befff

After change:
*** Control State ***
 CPUBased=0xb5a26dfa SecondaryExec=0x061037eb TertiaryExec=0x0000000000000010
 PinBased=0x000000ff EntryControls=0000d1ff ExitControls=002befff

Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarRobert Hoo <robert.hu@linux.intel.com>
Signed-off-by: default avatarZeng Guang <guang.zeng@intel.com>
Message-Id: <20220419153441.11687-1-guang.zeng@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJason Zeng <jason.zeng@intel.com>
parent d2ad10f2

arch/x86/kvm/vmx/vmx.c

+13 −4
Original line number Diff line number Diff line
@@ -6046,6 +6046,7 @@ void dump_vmcs(void) 
{

	u32 vmentry_ctl, vmexit_ctl;

	u32 cpu_based_exec_ctrl, pin_based_exec_ctrl, secondary_exec_control;

	u64 tertiary_exec_control;

	unsigned long cr4;



	if (!dump_invalid_vmcs) {
@@ -6058,9 +6059,16 @@ void dump_vmcs(void) 
	cpu_based_exec_ctrl = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);

	pin_based_exec_ctrl = vmcs_read32(PIN_BASED_VM_EXEC_CONTROL);

	cr4 = vmcs_readl(GUEST_CR4);

	secondary_exec_control = 0;



	if (cpu_has_secondary_exec_ctrls())

		secondary_exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

	else

		secondary_exec_control = 0;



	if (cpu_has_tertiary_exec_ctrls())

		tertiary_exec_control = vmcs_read64(TERTIARY_VM_EXEC_CONTROL);

	else

		tertiary_exec_control = 0;



	pr_err("*** Guest State ***\n");

	pr_err("CR0: actual=0x%016lx, shadow=0x%016lx, gh_mask=%016lx\n",
@@ -6143,9 +6151,10 @@ void dump_vmcs(void) 
		       vmcs_read64(HOST_IA32_PERF_GLOBAL_CTRL));



	pr_err("*** Control State ***\n");

	pr_err("PinBased=%08x CPUBased=%08x SecondaryExec=%08x\n",

	       pin_based_exec_ctrl, cpu_based_exec_ctrl, secondary_exec_control);

	pr_err("EntryControls=%08x ExitControls=%08x\n", vmentry_ctl, vmexit_ctl);

	pr_err("CPUBased=0x%08x SecondaryExec=0x%08x TertiaryExec=0x%016llx\n",

	       cpu_based_exec_ctrl, secondary_exec_control, tertiary_exec_control);

	pr_err("PinBased=0x%08x EntryControls=%08x ExitControls=%08x\n",

	       pin_based_exec_ctrl, vmentry_ctl, vmexit_ctl);

	pr_err("ExceptionBitmap=%08x PFECmask=%08x PFECmatch=%08x\n",

	       vmcs_read32(EXCEPTION_BITMAP),

	       vmcs_read32(PAGE_FAULT_ERROR_CODE_MASK),