lkml.org 
[lkml]   [2019]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/9] x86/mm/tlb: Remove reason as argument for flush_tlb_func_local()
    Date
    To use flush_tlb_func_local() as an argument to
    __smp_call_function_many() we need it to have a single (void *)
    parameter. Eliminate the second parameter and deduce the reason for the
    flush.

    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Rik van Riel <riel@surriel.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Signed-off-by: Nadav Amit <namit@vmware.com>
    ---
    arch/x86/mm/tlb.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
    index 91f6db92554c..8a957b58525f 100644
    --- a/arch/x86/mm/tlb.c
    +++ b/arch/x86/mm/tlb.c
    @@ -635,9 +635,12 @@ static void flush_tlb_func_common(const struct flush_tlb_info *f,
    this_cpu_write(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen, mm_tlb_gen);
    }

    -static void flush_tlb_func_local(const void *info, enum tlb_flush_reason reason)
    +static void flush_tlb_func_local(void *info)
    {
    const struct flush_tlb_info *f = info;
    + enum tlb_flush_reason reason;
    +
    + reason = (f->mm == NULL) ? TLB_LOCAL_SHOOTDOWN : TLB_LOCAL_MM_SHOOTDOWN;

    flush_tlb_func_common(f, true, reason);
    }
    @@ -790,7 +793,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
    if (mm == this_cpu_read(cpu_tlbstate.loaded_mm)) {
    lockdep_assert_irqs_enabled();
    local_irq_disable();
    - flush_tlb_func_local(info, TLB_LOCAL_MM_SHOOTDOWN);
    + flush_tlb_func_local(info);
    local_irq_enable();
    }

    @@ -862,7 +865,7 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
    if (cpumask_test_cpu(cpu, &batch->cpumask)) {
    lockdep_assert_irqs_enabled();
    local_irq_disable();
    - flush_tlb_func_local(&full_flush_tlb_info, TLB_LOCAL_SHOOTDOWN);
    + flush_tlb_func_local(&full_flush_tlb_info);
    local_irq_enable();
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2019-07-03 09:15    [W:5.936 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site