aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Hansen <dave.hansen@linux.intel.com>2014-07-31 11:40:58 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-07-31 11:48:51 -0400
commita23421f111bb256cdbf23dcfe15f35567ab88e98 (patch)
tree181287ab975772263281de86819eacc30cd278c2
parent9dfa6dee5355f200cf19528ca7c678ef4007cec5 (diff)
x86/mm: Unify remote INVLPG code
There are currently three paths through the remote flush code: 1. full invalidation 2. single page invalidation using invlpg 3. ranged invalidation using invlpg This takes 2 and 3 and combines them in to a single path by making the single-page one just be the start and end be start plus a single page. This makes placement of our tracepoint easier. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: http://lkml.kernel.org/r/20140731154058.E0F90408@viggo.jf.intel.com Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@suse.de> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/mm/tlb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index ae584d09e8b0..add5a0fc3c5f 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -102,13 +102,13 @@ static void flush_tlb_func(void *info)
102 102
103 if (f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm)) 103 if (f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))
104 return; 104 return;
105 if (!f->flush_end)
106 f->flush_end = f->flush_start + PAGE_SIZE;
105 107
106 count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED); 108 count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
107 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) { 109 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
108 if (f->flush_end == TLB_FLUSH_ALL) 110 if (f->flush_end == TLB_FLUSH_ALL)
109 local_flush_tlb(); 111 local_flush_tlb();
110 else if (!f->flush_end)
111 __flush_tlb_single(f->flush_start);
112 else { 112 else {
113 unsigned long addr; 113 unsigned long addr;
114 addr = f->flush_start; 114 addr = f->flush_start;