Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/mm: Do not flush last cacheline twice in clflush_cache_range()

The current algorithm used in clflush_cache_range() can cause
the last cache line of the buffer to be flushed twice. Fix that
algorithm so that each cache line will only be flushed once.

Reported-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Link: http://lkml.kernel.org/r/1430259192-18802-1-git-send-email-ross.zwisler@linux.intel.com
Link: http://lkml.kernel.org/r/1431332153-18566-5-git-send-email-bp@alien8.de
[ Changed it to 'void *' to simplify the type conversions. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Ross Zwisler and committed by
Ingo Molnar
6c434d61 030bbdbf

+6 -7
+6 -7
arch/x86/mm/pageattr.c
··· 129 129 */ 130 130 void clflush_cache_range(void *vaddr, unsigned int size) 131 131 { 132 - void *vend = vaddr + size - 1; 132 + unsigned long clflush_mask = boot_cpu_data.x86_clflush_size - 1; 133 + void *vend = vaddr + size; 134 + void *p; 133 135 134 136 mb(); 135 137 136 - for (; vaddr < vend; vaddr += boot_cpu_data.x86_clflush_size) 137 - clflushopt(vaddr); 138 - /* 139 - * Flush any possible final partial cacheline: 140 - */ 141 - clflushopt(vend); 138 + for (p = (void *)((unsigned long)vaddr & ~clflush_mask); 139 + p < vend; p += boot_cpu_data.x86_clflush_size) 140 + clflushopt(p); 142 141 143 142 mb(); 144 143 }