lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 371/717] powerpc/mm: sanity_check_fault() should work for all, not only BOOK3S
    Date
    From: Christophe Leroy <christophe.leroy@csgroup.eu>

    [ Upstream commit 7ceb40027e19567a0a066e3b380cc034cdd9a124 ]

    The verification and message introduced by commit 374f3f5979f9
    ("powerpc/mm/hash: Handle user access of kernel address gracefully")
    applies to all platforms, it should not be limited to BOOK3S.

    Make the BOOK3S version of sanity_check_fault() the one for all,
    and bail out earlier if not BOOK3S.

    Fixes: 374f3f5979f9 ("powerpc/mm/hash: Handle user access of kernel address gracefully")
    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/fe199d5af3578d3bf80035d203a94d742a7a28af.1607491748.git.christophe.leroy@csgroup.eu
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/mm/fault.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
    index 0add963a849b3..72e1b51beb10c 100644
    --- a/arch/powerpc/mm/fault.c
    +++ b/arch/powerpc/mm/fault.c
    @@ -303,7 +303,6 @@ static inline void cmo_account_page_fault(void)
    static inline void cmo_account_page_fault(void) { }
    #endif /* CONFIG_PPC_SMLPAR */

    -#ifdef CONFIG_PPC_BOOK3S
    static void sanity_check_fault(bool is_write, bool is_user,
    unsigned long error_code, unsigned long address)
    {
    @@ -320,6 +319,9 @@ static void sanity_check_fault(bool is_write, bool is_user,
    return;
    }

    + if (!IS_ENABLED(CONFIG_PPC_BOOK3S))
    + return;
    +
    /*
    * For hash translation mode, we should never get a
    * PROTFAULT. Any update to pte to reduce access will result in us
    @@ -354,10 +356,6 @@ static void sanity_check_fault(bool is_write, bool is_user,

    WARN_ON_ONCE(error_code & DSISR_PROTFAULT);
    }
    -#else
    -static void sanity_check_fault(bool is_write, bool is_user,
    - unsigned long error_code, unsigned long address) { }
    -#endif /* CONFIG_PPC_BOOK3S */

    /*
    * Define the correct "is_write" bit in error_code based
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:54    [W:4.065 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site