Skip to content

Commit 6035152

Browse files
anadavIngo Molnar
authored andcommitted
x86/mm/tlb: Open-code on_each_cpu_cond_mask() for tlb_is_not_lazy()
Open-code on_each_cpu_cond_mask() in native_flush_tlb_others() to optimize the code. Open-coding eliminates the need for the indirect branch that is used to call is_lazy(), and in CPUs that are vulnerable to Spectre v2, it eliminates the retpoline. In addition, it allows to use a preallocated cpumask to compute the CPUs that should be. This would later allow us not to adapt on_each_cpu_cond_mask() to support local and remote functions. Note that calling tlb_is_not_lazy() for every CPU that needs to be flushed, as done in native_flush_tlb_multi() might look ugly, but it is equivalent to what is currently done in on_each_cpu_cond_mask(). Actually, native_flush_tlb_multi() does it more efficiently since it avoids using an indirect branch for the matter. Signed-off-by: Nadav Amit <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Dave Hansen <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 4c1ba39 commit 6035152

File tree

1 file changed

+32
-5
lines changed

1 file changed

+32
-5
lines changed

arch/x86/mm/tlb.c

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -788,11 +788,13 @@ static void flush_tlb_func(void *info)
788788
nr_invalidate);
789789
}
790790

791-
static bool tlb_is_not_lazy(int cpu, void *data)
791+
static bool tlb_is_not_lazy(int cpu)
792792
{
793793
return !per_cpu(cpu_tlbstate.is_lazy, cpu);
794794
}
795795

796+
static DEFINE_PER_CPU(cpumask_t, flush_tlb_mask);
797+
796798
STATIC_NOPV void native_flush_tlb_others(const struct cpumask *cpumask,
797799
const struct flush_tlb_info *info)
798800
{
@@ -813,12 +815,37 @@ STATIC_NOPV void native_flush_tlb_others(const struct cpumask *cpumask,
813815
* up on the new contents of what used to be page tables, while
814816
* doing a speculative memory access.
815817
*/
816-
if (info->freed_tables)
818+
if (info->freed_tables) {
817819
smp_call_function_many(cpumask, flush_tlb_func,
818820
(void *)info, 1);
819-
else
820-
on_each_cpu_cond_mask(tlb_is_not_lazy, flush_tlb_func,
821-
(void *)info, 1, cpumask);
821+
} else {
822+
/*
823+
* Although we could have used on_each_cpu_cond_mask(),
824+
* open-coding it has performance advantages, as it eliminates
825+
* the need for indirect calls or retpolines. In addition, it
826+
* allows to use a designated cpumask for evaluating the
827+
* condition, instead of allocating one.
828+
*
829+
* This code works under the assumption that there are no nested
830+
* TLB flushes, an assumption that is already made in
831+
* flush_tlb_mm_range().
832+
*
833+
* cond_cpumask is logically a stack-local variable, but it is
834+
* more efficient to have it off the stack and not to allocate
835+
* it on demand. Preemption is disabled and this code is
836+
* non-reentrant.
837+
*/
838+
struct cpumask *cond_cpumask = this_cpu_ptr(&flush_tlb_mask);
839+
int cpu;
840+
841+
cpumask_clear(cond_cpumask);
842+
843+
for_each_cpu(cpu, cpumask) {
844+
if (tlb_is_not_lazy(cpu))
845+
__cpumask_set_cpu(cpu, cond_cpumask);
846+
}
847+
smp_call_function_many(cond_cpumask, flush_tlb_func, (void *)info, 1);
848+
}
822849
}
823850

824851
void flush_tlb_others(const struct cpumask *cpumask,

0 commit comments

Comments
 (0)