]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
powerpc/kvm/book3s: switch from raw_spin_*lock to arch_spin_lock.
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Tue, 5 May 2020 07:17:15 +0000 (12:47 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 5 May 2020 11:20:14 +0000 (21:20 +1000)
These functions can get called in realmode. Hence use low level
arch_spin_lock which is safe to be called in realmode.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200505071729.54912-9-aneesh.kumar@linux.ibm.com
arch/powerpc/kvm/book3s_hv_rm_mmu.c

index 220305454c23c9e8e8a2b3d975682de53615c93f..03f8347de48be47fe6cb72c5f735d28b94fe0b5e 100644 (file)
@@ -948,7 +948,7 @@ static long kvmppc_do_h_page_init_zero(struct kvm_vcpu *vcpu,
                return ret;
 
        /* Check if we've been invalidated */
-       raw_spin_lock(&kvm->mmu_lock.rlock);
+       arch_spin_lock(&kvm->mmu_lock.rlock.raw_lock);
        if (mmu_notifier_retry(kvm, mmu_seq)) {
                ret = H_TOO_HARD;
                goto out_unlock;
@@ -960,7 +960,7 @@ static long kvmppc_do_h_page_init_zero(struct kvm_vcpu *vcpu,
        kvmppc_update_dirty_map(memslot, dest >> PAGE_SHIFT, PAGE_SIZE);
 
 out_unlock:
-       raw_spin_unlock(&kvm->mmu_lock.rlock);
+       arch_spin_unlock(&kvm->mmu_lock.rlock.raw_lock);
        return ret;
 }
 
@@ -984,7 +984,7 @@ static long kvmppc_do_h_page_init_copy(struct kvm_vcpu *vcpu,
                return ret;
 
        /* Check if we've been invalidated */
-       raw_spin_lock(&kvm->mmu_lock.rlock);
+       arch_spin_lock(&kvm->mmu_lock.rlock.raw_lock);
        if (mmu_notifier_retry(kvm, mmu_seq)) {
                ret = H_TOO_HARD;
                goto out_unlock;
@@ -996,7 +996,7 @@ static long kvmppc_do_h_page_init_copy(struct kvm_vcpu *vcpu,
        kvmppc_update_dirty_map(dest_memslot, dest >> PAGE_SHIFT, PAGE_SIZE);
 
 out_unlock:
-       raw_spin_unlock(&kvm->mmu_lock.rlock);
+       arch_spin_unlock(&kvm->mmu_lock.rlock.raw_lock);
        return ret;
 }