diff options
| author | Mihai Caraman <mihai.caraman@freescale.com> | 2014-06-18 17:45:05 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-06-24 15:37:25 +0200 |
| commit | 511c66818d87db2a8931e7f7f92c7904bdd84f72 (patch) | |
| tree | 219a85965f525787f2c291fab6af86ef37b8e8d8 /arch | |
| parent | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-511c66818d87db2a8931e7f7f92c7904bdd84f72.tar.xz linux-511c66818d87db2a8931e7f7f92c7904bdd84f72.zip | |
KVM: PPC: Book3E: Unlock mmu_lock when setting caching atttribute
The patch 08c9a188d0d0fc0f0c5e17d89a06bb59c493110f
kvm: powerpc: use caching attributes as per linux pte
do not handle properly the error case, letting mmu_lock locked. The lock
will further generate a RCU stall from kvmppc_e500_emul_tlbwe() caller.
In case of an error go to out label.
Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kvm/e500_mmu_host.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index dd2cc03f406f..86903d3f5a03 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -473,7 +473,8 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, if (printk_ratelimit()) pr_err("%s: pte not present: gfn %lx, pfn %lx\n", __func__, (long)gfn, pfn); - return -EINVAL; + ret = -EINVAL; + goto out; } kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg); |