lkml.org 
[lkml]   [2018]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/pti] x86/pti: Fix boot problems from Global-bit setting
    Commit-ID:  16dce603adc9de4237b7bf2ff5c5290f34373e7b
    Gitweb: https://git.kernel.org/tip/16dce603adc9de4237b7bf2ff5c5290f34373e7b
    Author: Dave Hansen <dave.hansen@linux.intel.com>
    AuthorDate: Fri, 20 Apr 2018 15:20:19 -0700
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Tue, 24 Apr 2018 09:50:53 +0200

    x86/pti: Fix boot problems from Global-bit setting

    Part of the global bit _setting_ patches also includes clearing the
    Global bit when it should not be enabled. That is done with
    set_memory_nonglobal(), which uses change_page_attr_clear() in
    pageattr.c under the covers.

    The TLB flushing code inside pageattr.c has has checks like
    BUG_ON(irqs_disabled()), looking for interrupt disabling that might
    cause deadlocks. But, these also trip in early boot on certain
    preempt configurations. Just copy the existing BUG_ON() sequence from
    cpa_flush_range() to the other two sites and check for early boot.

    Fixes: 39114b7a7 (x86/pti: Never implicitly clear _PAGE_GLOBAL for kernel image)
    Reported-by: Mariusz Ceier <mceier@gmail.com>
    Reported-by: Aaro Koskinen <aaro.koskinen@nokia.com>
    Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com>
    Acked-by: Ingo Molnar <mingo@kernel.org>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: Juergen Gross <jgross@suse.com>
    Cc: Nadav Amit <namit@vmware.com>
    Cc: Kees Cook <keescook@google.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: linux-mm@kvack.org
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Link: https://lkml.kernel.org/r/20180420222019.20C4A410@viggo.jf.intel.com

    ---
    arch/x86/mm/pageattr.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
    index 0f3d50f4c48c..4fadfd2b7017 100644
    --- a/arch/x86/mm/pageattr.c
    +++ b/arch/x86/mm/pageattr.c
    @@ -172,7 +172,7 @@ static void __cpa_flush_all(void *arg)

    static void cpa_flush_all(unsigned long cache)
    {
    - BUG_ON(irqs_disabled());
    + BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);

    on_each_cpu(__cpa_flush_all, (void *) cache, 1);
    }
    @@ -236,7 +236,7 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
    unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */
    #endif

    - BUG_ON(irqs_disabled());
    + BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);

    on_each_cpu(__cpa_flush_all, (void *) do_wbinvd, 1);

    \
     
     \ /
      Last update: 2018-04-24 10:14    [W:2.939 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site