[PATCH] arch: mips: kvm: Enable after disabling interrupt

[PATCH] arch: mips: kvm: Enable after disabling interrupt

[Tapasweni Pathak]

Enable disabled interrupt, on unsuccessful operation.

Found by Coccinelle.

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
 arch/mips/kvm/tlb.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
index bbcd822..b6beb0e 100644
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@ -216,6 +216,7 @@ int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,
 	if (idx > current_cpu_data.tlbsize) {
 		kvm_err("%s: Invalid Index: %d\n", __func__, idx);
 		kvm_mips_dump_host_tlbs();
+		local_irq_restore(flags);
 		return -1;
 	}

--
1.7.9.5

Re: [PATCH] arch: mips: kvm: Enable after disabling interrupt

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

On Sun, Feb 22, 2015 at 09:48:21PM +0530, Tapasweni Pathak wrote:
> Enable disabled interrupt, on unsuccessful operation.
> 
> Found by Coccinelle.
> 
> Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>

Reviewed-by: James Hogan <james.hogan@imgtec.com>

Cheers
James

> ---
>  arch/mips/kvm/tlb.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
> index bbcd822..b6beb0e 100644
> --- a/arch/mips/kvm/tlb.c
> +++ b/arch/mips/kvm/tlb.c
> @@ -216,6 +216,7 @@ int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,
>  	if (idx > current_cpu_data.tlbsize) {
>  		kvm_err("%s: Invalid Index: %d\n", __func__, idx);
>  		kvm_mips_dump_host_tlbs();
> +		local_irq_restore(flags);
>  		return -1;
>  	}
> 
> --
> 1.7.9.5
> 
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] arch: mips: kvm: Enable after disabling interrupt

[Marcelo Tosatti]

On Sun, Feb 22, 2015 at 09:48:21PM +0530, Tapasweni Pathak wrote:
> Enable disabled interrupt, on unsuccessful operation.
> 
> Found by Coccinelle.
> 
> Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
>  arch/mips/kvm/tlb.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
> index bbcd822..b6beb0e 100644
> --- a/arch/mips/kvm/tlb.c
> +++ b/arch/mips/kvm/tlb.c
> @@ -216,6 +216,7 @@ int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,
>  	if (idx > current_cpu_data.tlbsize) {
>  		kvm_err("%s: Invalid Index: %d\n", __func__, idx);
>  		kvm_mips_dump_host_tlbs();
> +		local_irq_restore(flags);
>  		return -1;
>  	}
> 

Applied, thanks.