[PATCH 1/9] powerpc,kvm: fix imbalance srcu_read_[un]lock()

At the point of up_out label in kvmppc_hv_setup_htab_rma(),
srcu read lock is still held.

We have to release it before return.

Signed-off-by: Lai Jiangshan <redacted>
Cc: Marcelo Tosatti <redacted>
Cc: Gleb Natapov <redacted>
Cc: Alexander Graf <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: kvm@vger.kernel.org
Cc: kvm-ppc@vger.kernel.org
---
 arch/powerpc/kvm/book3s_hv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 80dcc53..c26740e 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c

@@ -1799,7 +1799,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
 
  up_out:
 	up_read(&current->mm->mmap_sem);
-	goto out;
+	goto out_srcu;
 }
 
 int kvmppc_core_init_vm(struct kvm *kvm)

-- 
1.7.4.4

On Sat, Mar 16, 2013 at 12:50:49AM +0800, Lai Jiangshan wrote:

Acked-by: Paul Mackerras <redacted>

On Mon, Mar 18, 2013 at 08:26:48AM +1100, Paul Mackerras wrote:

On Sat, Mar 16, 2013 at 12:50:49AM +0800, Lai Jiangshan wrote:

quoted

At the point of up_out label in kvmppc_hv_setup_htab_rma(),
srcu read lock is still held.

We have to release it before return.

Signed-off-by: Lai Jiangshan <redacted>
Cc: Marcelo Tosatti <redacted>
Cc: Gleb Natapov <redacted>
Cc: Alexander Graf <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: kvm@vger.kernel.org
Cc: kvm-ppc@vger.kernel.org
---
 arch/powerpc/kvm/book3s_hv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 80dcc53..c26740e 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c

@@ -1799,7 +1799,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
 
  up_out:
 	up_read(&current->mm->mmap_sem);
-	goto out;
+	goto out_srcu;

Acked-by: Paul Mackerras <redacted>

Thank you both, queued for 3.11 (assuming no one has beat me to it).

							Thanx, Paul