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

KVM: PPC: Make invalidation code more reliable

Browse Source 
There is a race condition in the pte invalidation code path where we can't
be sure if a pte was invalidated already. So let's move the spin lock around
to get rid of the race.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf
2010-08-02 21:24:48 +02:00
committed by Avi Kivity
parent 2e602847d9
commit e7c1d14e3b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kvm/book3s_mmu_hpte.c
View File

@@ -92,10 +92,6 @@ static void free_pte_rcu(struct rcu_head *head)
static void invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte) static void invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
{ {
/* pte already invalidated? */
if (hlist_unhashed(&pte->list_pte))
return;
trace_kvm_book3s_mmu_invalidate(pte); trace_kvm_book3s_mmu_invalidate(pte);
/* Different for 32 and 64 bit */ /* Different for 32 and 64 bit */
@@ -103,18 +99,24 @@ static void invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
spin_lock(&vcpu->arch.mmu_lock); spin_lock(&vcpu->arch.mmu_lock);
/* pte already invalidated in between? */
if (hlist_unhashed(&pte->list_pte)) {
spin_unlock(&vcpu->arch.mmu_lock);
return;
}
hlist_del_init_rcu(&pte->list_pte); hlist_del_init_rcu(&pte->list_pte);
hlist_del_init_rcu(&pte->list_pte_long); hlist_del_init_rcu(&pte->list_pte_long);
hlist_del_init_rcu(&pte->list_vpte); hlist_del_init_rcu(&pte->list_vpte);
hlist_del_init_rcu(&pte->list_vpte_long); hlist_del_init_rcu(&pte->list_vpte_long);
spin_unlock(&vcpu->arch.mmu_lock);
if (pte->pte.may_write) if (pte->pte.may_write)
kvm_release_pfn_dirty(pte->pfn); kvm_release_pfn_dirty(pte->pfn);
else else
kvm_release_pfn_clean(pte->pfn); kvm_release_pfn_clean(pte->pfn);
spin_unlock(&vcpu->arch.mmu_lock);
vcpu->arch.hpte_cache_count--; vcpu->arch.hpte_cache_count--;
call_rcu(&pte->rcu_head, free_pte_rcu); call_rcu(&pte->rcu_head, free_pte_rcu);
} }