Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109779
b: refs/heads/master
c: 534e38b
h: refs/heads/master
i:
  109777: f3a21ae
  109775: bc657af
v: v3
  • Loading branch information
Sheng Yang authored and Avi Kivity committed Sep 11, 2008
1 parent 72cb429 commit 00ec624
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e5eab0cede4b1ffaca4ad857d840127622038e55
refs/heads/master: 534e38b447df47f129a6d3ec3af6705c1e3f651e
4 changes: 4 additions & 0 deletions trunk/arch/x86/kvm/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,10 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp)
u64 *spte;
int young = 0;

/* always return old for EPT */
if (!shadow_accessed_mask)
return 0;

spte = rmap_next(kvm, rmapp, NULL);
while (spte) {
int _young;
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/x86/kvm/vmx.c
Original file line number Diff line number Diff line change
Expand Up @@ -3301,8 +3301,7 @@ static int __init vmx_init(void)
kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
VMX_EPT_WRITABLE_MASK |
VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT);
kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,
VMX_EPT_FAKE_DIRTY_MASK, 0ull,
kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull,
VMX_EPT_EXECUTABLE_MASK);
kvm_enable_tdp();
} else
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/x86/kvm/vmx.h
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,6 @@ enum vmcs_field {
#define VMX_EPT_READABLE_MASK 0x1ull
#define VMX_EPT_WRITABLE_MASK 0x2ull
#define VMX_EPT_EXECUTABLE_MASK 0x4ull
#define VMX_EPT_FAKE_ACCESSED_MASK (1ull << 62)
#define VMX_EPT_FAKE_DIRTY_MASK (1ull << 63)

#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul

Expand Down

0 comments on commit 00ec624

Please sign in to comment.