Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce4a4e56 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/mm: Remove the UP asm/tlbflush.h code, always use the (formerly) SMP code 



The UP asm/tlbflush.h generates somewhat nicer code than the SMP version.
Aside from that, it's fallen quite a bit behind the SMP code:

 - flush_tlb_mm_range() didn't flush individual pages if the range
   was small.

 - The lazy TLB code was much weaker.  This usually wouldn't matter,
   but, if a kernel thread flushed its lazy "active_mm" more than
   once (due to reclaim or similar), it wouldn't be unlazied and
   would instead pointlessly flush repeatedly.

 - Tracepoints were missing.

Aside from that, simply having the UP code around was a maintanence
burden, since it means that any change to the TLB flush code had to
make sure not to break it.

Simplify everything by deleting the UP code.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3f79e4c7

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config X86 
	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH

	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select BUILDTIME_EXTABLE_SORT

arch/x86/include/asm/hardirq.h

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ typedef struct { 
#ifdef CONFIG_SMP

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

	unsigned int irq_tlb_count;

#endif

	unsigned int irq_tlb_count;

#ifdef CONFIG_X86_THERMAL_VECTOR

	unsigned int irq_thermal_count;

#endif

arch/x86/include/asm/mmu.h

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ typedef struct { 
#endif

} mm_context_t;



#ifdef CONFIG_SMP

void leave_mm(int cpu);

#else

static inline void leave_mm(int cpu)

{

}

#endif



#endif /* _ASM_X86_MMU_H */

arch/x86/include/asm/mmu_context.h

+0 −2
Original line number Diff line number Diff line
@@ -99,10 +99,8 @@ static inline void load_mm_ldt(struct mm_struct *mm) 


static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)

{

#ifdef CONFIG_SMP

	if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)

		this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);

#endif

}



static inline int init_new_context(struct task_struct *tsk,

arch/x86/include/asm/tlbbatch.h

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <linux/cpumask.h>



#ifdef CONFIG_SMP

struct arch_tlbflush_unmap_batch {

	/*

	 * Each bit set is a CPU that potentially has a TLB entry for one of
@@ -11,6 +10,5 @@ struct arch_tlbflush_unmap_batch { 
	 */

	struct cpumask cpumask;

};

#endif



#endif /* _ARCH_X86_TLBBATCH_H */