lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 473/477] powerpc/64s: Fix KVM interrupt using wrong save area
    Date
    From: Nicholas Piggin <npiggin@gmail.com>

    commit 0bdcfa182506526fbe4e088ff9ca86a31b81828d upstream.

    The CTR register reload in the KVM interrupt path used the wrong save
    area for SLB (and NMI) interrupts.

    Fixes: 9600f261acaa ("powerpc/64s/exception: Move KVM test to common code")
    Cc: stable@vger.kernel.org # v5.7+
    Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
    Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
    Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20200615061247.1310763-1-npiggin@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/kernel/exceptions-64s.S | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/powerpc/kernel/exceptions-64s.S
    +++ b/arch/powerpc/kernel/exceptions-64s.S
    @@ -270,7 +270,7 @@ BEGIN_FTR_SECTION
    END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
    .endif

    - ld r10,PACA_EXGEN+EX_CTR(r13)
    + ld r10,IAREA+EX_CTR(r13)
    mtctr r10
    BEGIN_FTR_SECTION
    ld r10,IAREA+EX_PPR(r13)
    @@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)

    .if IKVM_SKIP
    89: mtocrf 0x80,r9
    - ld r10,PACA_EXGEN+EX_CTR(r13)
    + ld r10,IAREA+EX_CTR(r13)
    mtctr r10
    ld r9,IAREA+EX_R9(r13)
    ld r10,IAREA+EX_R10(r13)

    \
     
     \ /
      Last update: 2020-06-23 23:23    [W:2.659 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site