Commit 4d461333 authored Jul 10, 2017 by Andrey Ryabinin Committed by Linus Torvalds Jul 10, 2017

x86/kasan: don't allocate extra shadow memory

We used to read several bytes of the shadow memory in advance.
Therefore additional shadow memory mapped to prevent crash if
speculative load would happen near the end of the mapped shadow memory.

Now we don't have such speculative loads, so we no longer need to map
additional shadow memory.

Link: http://lkml.kernel.org/r/20170601162338.23540-2-aryabinin@virtuozzo.com


Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c634d807

arch/x86/mm/kasan_init_64.c

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -23,12 +23,7 @@ static int __init map_range(struct range *range)
	start = (unsigned long)kasan_mem_to_shadow(pfn_to_kaddr(range->start));		start = (unsigned long)kasan_mem_to_shadow(pfn_to_kaddr(range->start));
	end = (unsigned long)kasan_mem_to_shadow(pfn_to_kaddr(range->end));		end = (unsigned long)kasan_mem_to_shadow(pfn_to_kaddr(range->end));

	/*		return vmemmap_populate(start, end, NUMA_NO_NODE);
	* end + 1 here is intentional. We check several shadow bytes in advance
	* to slightly speed up fastpath. In some rare cases we could cross
	* boundary of mapped shadow, so we just map some more here.
	*/
	return vmemmap_populate(start, end + 1, NUMA_NO_NODE);
	}		}

	static void __init clear_pgds(unsigned long start,		static void __init clear_pgds(unsigned long start,