Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit22fbc03

Browse files
committed
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini: "Two bugfixes"* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: VMX: update PFEC_MASK/PFEC_MATCH together with PF intercept KVM: arm64: Restore missing ISB on nVHE __tlb_switch_to_guest
2 parents5ee5613 +e2e1a1c commit22fbc03

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

‎arch/arm64/kvm/hyp/nvhe/tlb.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ static void __tlb_switch_to_guest(struct kvm_s2_mmu *mmu,
3131
isb();
3232
}
3333

34+
/*
35+
* __load_guest_stage2() includes an ISB only when the AT
36+
* workaround is applied. Take care of the opposite condition,
37+
* ensuring that we always have an ISB, but not two ISBs back
38+
* to back.
39+
*/
3440
__load_guest_stage2(mmu);
41+
asm(ALTERNATIVE("isb","nop",ARM64_WORKAROUND_SPECULATIVE_AT));
3542
}
3643

3744
staticvoid__tlb_switch_to_host(structtlb_inv_context*cxt)

‎arch/x86/kvm/vmx/vmx.c‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,18 @@ void update_exception_bitmap(struct kvm_vcpu *vcpu)
794794
*/
795795
if (is_guest_mode(vcpu))
796796
eb |=get_vmcs12(vcpu)->exception_bitmap;
797+
else {
798+
/*
799+
* If EPT is enabled, #PF is only trapped if MAXPHYADDR is mismatched
800+
* between guest and host. In that case we only care about present
801+
* faults. For vmcs02, however, PFEC_MASK and PFEC_MATCH are set in
802+
* prepare_vmcs02_rare.
803+
*/
804+
boolselective_pf_trap=enable_ept&& (eb& (1u <<PF_VECTOR));
805+
intmask=selective_pf_trap ?PFERR_PRESENT_MASK :0;
806+
vmcs_write32(PAGE_FAULT_ERROR_CODE_MASK,mask);
807+
vmcs_write32(PAGE_FAULT_ERROR_CODE_MATCH,mask);
808+
}
797809

798810
vmcs_write32(EXCEPTION_BITMAP,eb);
799811
}
@@ -4355,16 +4367,6 @@ static void init_vmcs(struct vcpu_vmx *vmx)
43554367
vmx->pt_desc.guest.output_mask=0x7F;
43564368
vmcs_write64(GUEST_IA32_RTIT_CTL,0);
43574369
}
4358-
4359-
/*
4360-
* If EPT is enabled, #PF is only trapped if MAXPHYADDR is mismatched
4361-
* between guest and host. In that case we only care about present
4362-
* faults.
4363-
*/
4364-
if (enable_ept) {
4365-
vmcs_write32(PAGE_FAULT_ERROR_CODE_MASK,PFERR_PRESENT_MASK);
4366-
vmcs_write32(PAGE_FAULT_ERROR_CODE_MATCH,PFERR_PRESENT_MASK);
4367-
}
43684370
}
43694371

43704372
staticvoidvmx_vcpu_reset(structkvm_vcpu*vcpu,boolinit_event)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp