lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Make shadow pte updates atomic

Browse Source 
With guest smp, a second vcpu might see partial updates when the first
vcpu services a page fault.  So delay all updates until we have figured
out what the pte should look like.

Note that on i386, this is still not completely atomic as a 64-bit write
will be split into two on a 32-bit machine.

Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity
2007-05-31 15:23:35 +03:00
parent a18de5a403
commit 0d551bb698
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/kvm/paging_tmpl.h
View File

@@ -205,11 +205,12 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
{ {
hpa_t paddr; hpa_t paddr;
int dirty = *gpte & PT_DIRTY_MASK; int dirty = *gpte & PT_DIRTY_MASK;
int was_rmapped = is_rmap_pte(*shadow_pte); u64 spte = *shadow_pte;
int was_rmapped = is_rmap_pte(spte);
pgprintk("%s: spte %llx gpte %llx access %llx write_fault %d" pgprintk("%s: spte %llx gpte %llx access %llx write_fault %d"
" user_fault %d gfn %lx\n", " user_fault %d gfn %lx\n",
__FUNCTION__, *shadow_pte, (u64)*gpte, access_bits, __FUNCTION__, spte, (u64)*gpte, access_bits,
write_fault, user_fault, gfn); write_fault, user_fault, gfn);
if (write_fault && !dirty) { if (write_fault && !dirty) {
@@ -218,34 +219,35 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
FNAME(mark_pagetable_dirty)(vcpu->kvm, walker); FNAME(mark_pagetable_dirty)(vcpu->kvm, walker);
} }
*shadow_pte |= *gpte & PT_PTE_COPY_MASK; spte |= *gpte & PT_PTE_COPY_MASK;
*shadow_pte |= access_bits << PT_SHADOW_BITS_OFFSET; spte |= access_bits << PT_SHADOW_BITS_OFFSET;
if (!dirty) if (!dirty)
access_bits &= ~PT_WRITABLE_MASK; access_bits &= ~PT_WRITABLE_MASK;
paddr = gpa_to_hpa(vcpu, gaddr & PT64_BASE_ADDR_MASK); paddr = gpa_to_hpa(vcpu, gaddr & PT64_BASE_ADDR_MASK);
*shadow_pte |= PT_PRESENT_MASK; spte |= PT_PRESENT_MASK;
if (access_bits & PT_USER_MASK) if (access_bits & PT_USER_MASK)
*shadow_pte |= PT_USER_MASK; spte |= PT_USER_MASK;
if (is_error_hpa(paddr)) { if (is_error_hpa(paddr)) {
*shadow_pte |= gaddr; spte |= gaddr;
*shadow_pte |= PT_SHADOW_IO_MARK; spte |= PT_SHADOW_IO_MARK;
*shadow_pte &= ~PT_PRESENT_MASK; spte &= ~PT_PRESENT_MASK;
*shadow_pte = spte;
return; return;
} }
*shadow_pte |= paddr; spte |= paddr;
if (!write_fault && (*shadow_pte & PT_SHADOW_USER_MASK) && if (!write_fault && (spte & PT_SHADOW_USER_MASK) &&
!(*shadow_pte & PT_USER_MASK)) { !(spte & PT_USER_MASK)) {
/* /*
* If supervisor write protect is disabled, we shadow kernel * If supervisor write protect is disabled, we shadow kernel
* pages as user pages so we can trap the write access. * pages as user pages so we can trap the write access.
*/ */
*shadow_pte |= PT_USER_MASK; spte |= PT_USER_MASK;
*shadow_pte &= ~PT_WRITABLE_MASK; spte &= ~PT_WRITABLE_MASK;
access_bits &= ~PT_WRITABLE_MASK; access_bits &= ~PT_WRITABLE_MASK;
} }
@@ -253,7 +255,7 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
|| (write_fault && !is_write_protection(vcpu) && !user_fault)) { || (write_fault && !is_write_protection(vcpu) && !user_fault)) {
struct kvm_mmu_page *shadow; struct kvm_mmu_page *shadow;
*shadow_pte |= PT_WRITABLE_MASK; spte |= PT_WRITABLE_MASK;
if (user_fault) { if (user_fault) {
mmu_unshadow(vcpu, gfn); mmu_unshadow(vcpu, gfn);
goto unshadowed; goto unshadowed;
@@ -264,8 +266,8 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
pgprintk("%s: found shadow page for %lx, marking ro\n", pgprintk("%s: found shadow page for %lx, marking ro\n",
__FUNCTION__, gfn); __FUNCTION__, gfn);
access_bits &= ~PT_WRITABLE_MASK; access_bits &= ~PT_WRITABLE_MASK;
if (is_writeble_pte(*shadow_pte)) { if (is_writeble_pte(spte)) {
*shadow_pte &= ~PT_WRITABLE_MASK; spte &= ~PT_WRITABLE_MASK;
kvm_arch_ops->tlb_flush(vcpu); kvm_arch_ops->tlb_flush(vcpu);
} }
if (write_fault) if (write_fault)
@@ -278,6 +280,7 @@ unshadowed:
if (access_bits & PT_WRITABLE_MASK) if (access_bits & PT_WRITABLE_MASK)
mark_page_dirty(vcpu->kvm, gaddr >> PAGE_SHIFT); mark_page_dirty(vcpu->kvm, gaddr >> PAGE_SHIFT);
*shadow_pte = spte;
page_header_update_slot(vcpu->kvm, shadow_pte, gaddr); page_header_update_slot(vcpu->kvm, shadow_pte, gaddr);
if (!was_rmapped) if (!was_rmapped)
rmap_add(vcpu, shadow_pte); rmap_add(vcpu, shadow_pte);