[PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[Mahesh J Salgaonkar]

From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>

commit id 2ba9f0d has changed CONFIG_KVM_BOOK3S_64_HV to tristate to allow
HV/PR bits to be built as modules. But the MCE code still depends on
CONFIG_KVM_BOOK3S_64_HV which is wrong. When user selects
CONFIG_KVM_BOOK3S_64_HV=m to build HV/PR bits as a separate module the
relevant MCE code gets excluded.

This patch fixes the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER. This
makes sure that the relevant MCE code is included when HV/PR bits
are built as a separate modules.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
---
Hi Michael,
	This patch should also goto stable.

 arch/powerpc/kernel/exceptions-64s.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index c2df815..9519e6b 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1408,7 +1408,7 @@ machine_check_handle_early:
 	bne	9f			/* continue in V mode if we are. */
 
 5:
-#ifdef CONFIG_KVM_BOOK3S_64_HV
+#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
 	/*
 	 * We are coming from kernel context. Check if we are coming from
 	 * guest. if yes, then we can continue. We will fall through

Re: [PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[Paul Mackerras]

On Tue, Mar 17, 2015 at 04:14:41PM +0530, Mahesh J Salgaonkar wrote:
> From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
> 
> commit id 2ba9f0d has changed CONFIG_KVM_BOOK3S_64_HV to tristate to allow
> HV/PR bits to be built as modules. But the MCE code still depends on
> CONFIG_KVM_BOOK3S_64_HV which is wrong. When user selects
> CONFIG_KVM_BOOK3S_64_HV=m to build HV/PR bits as a separate module the
> relevant MCE code gets excluded.
> 
> This patch fixes the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER. This
> makes sure that the relevant MCE code is included when HV/PR bits
> are built as a separate modules.
> 
> Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
> ---
> Hi Michael,
> 	This patch should also goto stable.
> 
>  arch/powerpc/kernel/exceptions-64s.S |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
> index c2df815..9519e6b 100644
> --- a/arch/powerpc/kernel/exceptions-64s.S
> +++ b/arch/powerpc/kernel/exceptions-64s.S
> @@ -1408,7 +1408,7 @@ machine_check_handle_early:
>  	bne	9f			/* continue in V mode if we are. */
>  
>  5:
> -#ifdef CONFIG_KVM_BOOK3S_64_HV
> +#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
>  	/*
>  	 * We are coming from kernel context. Check if we are coming from
>  	 * guest. if yes, then we can continue. We will fall through

Acked-by: Paul Mackerras <paulus@samba.org>
Cc: stable@vger.kernel.org  # v3.14+

Re: [PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[Alexander Graf]

On 17.03.15 11:44, Mahesh J Salgaonkar wrote:
> From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
> 
> commit id 2ba9f0d has changed CONFIG_KVM_BOOK3S_64_HV to tristate to allow
> HV/PR bits to be built as modules. But the MCE code still depends on
> CONFIG_KVM_BOOK3S_64_HV which is wrong. When user selects
> CONFIG_KVM_BOOK3S_64_HV=m to build HV/PR bits as a separate module the
> relevant MCE code gets excluded.
> 
> This patch fixes the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER. This
> makes sure that the relevant MCE code is included when HV/PR bits
> are built as a separate modules.
> 
> Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>

Please CC the kvm@vger and kvm-ppc@vger mailing lists on patches that
are KVM related.

In this case, please resend with the proper CCs, so that I can pick it
up into my queue :). Also on resend add the lines that Paul suggested
(CC: stable, Acked-by) after your SoB line.


Alex

Re: [PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[Michael Ellerman]

On 23 March 2015 19:36:44 GMT+11:00, Alexander Graf <agraf@suse.de> wrote:
>
>
>On 17.03.15 11:44, Mahesh J Salgaonkar wrote:
>> From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
>> 
>> commit id 2ba9f0d has changed CONFIG_KVM_BOOK3S_64_HV to tristate to
>allow
>> HV/PR bits to be built as modules. But the MCE code still depends on
>> CONFIG_KVM_BOOK3S_64_HV which is wrong. When user selects
>> CONFIG_KVM_BOOK3S_64_HV=m to build HV/PR bits as a separate module
>the
>> relevant MCE code gets excluded.
>> 
>> This patch fixes the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER.
>This
>> makes sure that the relevant MCE code is included when HV/PR bits
>> are built as a separate modules.
>> 
>> Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
>
>Please CC the kvm@vger and kvm-ppc@vger mailing lists on patches that
>are KVM related.
>
>In this case, please resend with the proper CCs, so that I can pick it
>up into my queue :). Also on resend add the lines that Paul suggested
>(CC: stable, Acked-by) after your SoB line.

I already picked this up into my fixes branch.

cheers

-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.