Merge "ARM: 8203/1: mm: try to re-use old ASID assignments following a rollover"

	u64 asid = atomic64_read(&mm->context.id);

	u64 generation = atomic64_read(&asid_generation);

	if (asid != 0 && is_reserved_asid(asid)) {

	if (asid != 0) {

		/*

		 * Our current ASID was active during a rollover, we can

		 * continue to use it and this was just a false alarm.

		 * If our current ASID was active during a rollover, we

		 * can continue to use it and this was just a false alarm.

		 */

		asid = generation | (asid & ~ASID_MASK);

	} else {

		if (is_reserved_asid(asid))

			return generation | (asid & ~ASID_MASK);

		/*

		 * We had a valid ASID in a previous life, so try to re-use

		 * it if possible.,

		 */

		asid &= ~ASID_MASK;

		if (!__test_and_set_bit(asid, asid_map))

			goto bump_gen;

	}

	/*

		 * Allocate a free ASID. If we can't find one, take a

		 * note of the currently active ASIDs and mark the TLBs

		 * as requiring flushes. We always count from ASID #1,

		 * as we reserve ASID #0 to switch via TTBR0 and to

		 * avoid speculative page table walks from hitting in

		 * any partial walk caches, which could be populated

		 * from overlapping level-1 descriptors used to map both

		 * the module area and the userspace stack.

	 * Allocate a free ASID. If we can't find one, take a note of the

	 * currently active ASIDs and mark the TLBs as requiring flushes.

	 * We always count from ASID #1, as we reserve ASID #0 to switch

	 * via TTBR0 and to avoid speculative page table walks from hitting

	 * in any partial walk caches, which could be populated from

	 * overlapping level-1 descriptors used to map both the module

	 * area and the userspace stack.

	 */

	asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);

	if (asid == NUM_USER_ASIDS) {

		flush_context(cpu);

		asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);

	}

	__set_bit(asid, asid_map);

	cur_idx = asid;

bump_gen:

	asid |= generation;

	cpumask_clear(mm_cpumask(mm));

	}

	return asid;

}