Commit 8f2c0577 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fix from Catalin Marinas:
 "Fix the TLBI RANGE operand calculation causing live migration under
  KVM/arm64 to miss dirty pages due to stale TLB entries"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: tlb: Fix TLBI RANGE operand
parents 678e14c7 e3ba51ab

arch/arm64/include/asm/tlbflush.h

+11 −9
Original line number Diff line number Diff line
@@ -161,12 +161,18 @@ static inline unsigned long get_trans_granule(void) 
#define MAX_TLBI_RANGE_PAGES		__TLBI_RANGE_PAGES(31, 3)



/*

 * Generate 'num' values from -1 to 30 with -1 rejected by the

 * __flush_tlb_range() loop below.

 * Generate 'num' values from -1 to 31 with -1 rejected by the

 * __flush_tlb_range() loop below. Its return value is only

 * significant for a maximum of MAX_TLBI_RANGE_PAGES pages. If

 * 'pages' is more than that, you must iterate over the overall

 * range.

 */

#define TLBI_RANGE_MASK			GENMASK_ULL(4, 0)

#define __TLBI_RANGE_NUM(pages, scale)					\

	((((pages) >> (5 * (scale) + 1)) & TLBI_RANGE_MASK) - 1)

	({								\

		int __pages = min((pages),				\

				  __TLBI_RANGE_PAGES(31, (scale)));	\

		(__pages >> (5 * (scale) + 1)) - 1;			\

	})



/*

 *	TLB Invalidation
@@ -379,10 +385,6 @@ static inline void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) 
 * 3. If there is 1 page remaining, flush it through non-range operations. Range

 *    operations can only span an even number of pages. We save this for last to

 *    ensure 64KB start alignment is maintained for the LPA2 case.

 *

 * Note that certain ranges can be represented by either num = 31 and

 * scale or num = 0 and scale + 1. The loop below favours the latter

 * since num is limited to 30 by the __TLBI_RANGE_NUM() macro.

 */

#define __flush_tlb_range_op(op, start, pages, stride,			\

				asid, tlb_level, tlbi_user, lpa2)	\