| Message ID | 1403106305-11565-1-git-send-email-mihai.caraman@freescale.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
> -----Original Message----- > From: Mihai Caraman [mailto:mihai.caraman@freescale.com] > Sent: Wednesday, June 18, 2014 9:15 PM > To: kvm-ppc@vger.kernel.org > Cc: kvm@vger.kernel.org; linuxppc-dev@lists.ozlabs.org; Caraman Mihai Claudiu- > B02008; Bhushan Bharat-R65777 > Subject: [PATCH] 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> > Cc: Bharat Bhushan <bharat.bhushan@freescale.com> Thanks mike for fixing this; I am curious to know how you reached to this point :) Reviewed-by: Bharat Bhushan <bharat.bhushan@freescale.com> Regards -Bharat > --- > arch/powerpc/kvm/e500_mmu_host.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c > index 0528fe5..54144c7 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); > > -- > 1.7.11.7
On 18.06.14 17:45, Mihai Caraman wrote: > 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> > Cc: Bharat Bhushan <bharat.bhushan@freescale.com> Thanks, applied to for-3.16. Alex
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 0528fe5..54144c7 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);
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> Cc: Bharat Bhushan <bharat.bhushan@freescale.com> --- arch/powerpc/kvm/e500_mmu_host.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)