From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753145AbdATSXP (ORCPT ); Fri, 20 Jan 2017 13:23:15 -0500 Received: from mout.web.de ([217.72.192.78]:55037 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752013AbdATSXN (ORCPT ); Fri, 20 Jan 2017 13:23:13 -0500 Subject: [PATCH 04/11] KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq() To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <68158b48-c85b-4da8-1ef7-c996de1db5da@users.sourceforge.net> Date: Fri, 20 Jan 2017 19:22:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:wn9GmJDr6kXYyCaQlWX3RI6ztyyoAVTO11bmMhJSAFv221uiGsv SEE7mcrbnXlJ57dpIrwONzsnMph9iEtibGjBuoZidkJjvglfeV2l45BSumRG5ZR8vONJxlD 7+9WbPvi7FU0MmwduBwZrnJI4rID+y4vikN5LgMTSGJCSdhfGD5xEjCUP9z2Z+AgsjzfRbW Uk29LtcpeBMWxFoj1Z1jg== X-UI-Out-Filterresults: notjunk:1;V01:K0:wbJ0zJYbxcc=:+ZwDuNwuhQrq8tfh2YWNng FNv4IylGdZkQw0Oy6t+cisCGgLRq12vVCuUK9o/db6cSV+wuUEUirJyCsaTgsbzkslZn7RUeJ HtSOAOo+TGnf1GGrZMMUWJY4HBPVpyLi22Er2D6gCWpUQx+fIKu0GN9KwGa4NjI6naiPlSxn2 9FkSZ+OELgGS0GgZBCTqcMtixE35JhOIijO25onmjeGF4PcZu+KfZCjKpidrIpT6OlbEOcjXJ f8NNNmJAzr3ejnB5HyrjyxzM/rA7ZRgjR5SXeUOGAs3S2Wr7eINDGU+TTUZ7A5BuYB4LlQNrp x1cLwUan6ZnC9g+262ngxAjGJ0hFEf6ITpRNmHGmRk98nMYuVAadInmuUwuFpb7Ui3zXJo9CY j196XS0Ngl26u8LykWTiH00vfJigA9ZAOXU+oLty7fe5WpZZ15RVWMO7itfKLPkYJdCXOHY1D 0DuSeqM8BK3Dxz/HLJlmCXj/z6jCzKFupBvNh4Q96XhHh09Rz4Q2By5sakZN1dYBRibyzdcnn XTqDX7CmckJuM6wUjIMD/Eqcg1rAlYCg2SaLE5KGF/vi31Hvj6+/KY7ARDlRRqTMTKleaBZuc EeKlBm8hDOcfnxkcLaVB6oA0tnrJwRqLR7ZOzkISvc1bbJEOzHeBEjU4XWg/xCSFCemJUOuWX d8YhOPKdJ3fqxSHUiYhzvLy5soMrAjLRSySwZJtlRouulNgkeFcCJb6WUU+wKDyW/RJnpmtuh G1nTtgZHFSoZrylY9sjwRMnzWrHRocnktfKY+yQ6Kq146FjlNyvwUmyP55kQQT9+j/sqsIC6h kdNTkwW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 20 Jan 2017 11:00:08 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- arch/powerpc/kvm/book3s_hv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index a93e1c4445da..cfc7699d05df 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -3509,11 +3509,9 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi) return -EIO; mutex_lock(&kvm->lock); + if (!kvm->arch.pimap) + goto unlock; - if (kvm->arch.pimap == NULL) { - mutex_unlock(&kvm->lock); - return 0; - } pimap = kvm->arch.pimap; for (i = 0; i < pimap->n_mapped; i++) { @@ -3535,7 +3533,7 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi) * We don't free this structure even when the count goes to * zero. The structure is freed when we destroy the VM. */ - +unlock: mutex_unlock(&kvm->lock); return 0; } -- 2.11.0