Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34b439f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: CPA: avoid double checking of alias ranges 



When the CPA code is called with an virtual address in the range of
the direct mapping or the high alias then we do not need to run
through the alias check for this range.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent af96e443

arch/x86/mm/pageattr.c

+19 −4
Original line number Diff line number Diff line
@@ -594,19 +594,34 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias); 
static int cpa_process_alias(struct cpa_data *cpa)

{

	struct cpa_data alias_cpa;

	int ret;

	int ret = 0;



	if (cpa->pfn > max_pfn_mapped)

		return 0;



	/*

	 * No need to redo, when the primary call touched the direct

	 * mapping already:

	 */

	if (!within(cpa->vaddr, PAGE_OFFSET,

		    PAGE_OFFSET + (max_pfn_mapped << PAGE_SHIFT))) {



		alias_cpa = *cpa;

		alias_cpa.vaddr = (unsigned long) __va(cpa->pfn << PAGE_SHIFT);



		ret = __change_page_attr_set_clr(&alias_cpa, 0);

	}



#ifdef CONFIG_X86_64

	if (ret)

		return ret;

	/*

	 * No need to redo, when the primary call touched the high

	 * mapping already:

	 */

	if (within(cpa->vaddr, (unsigned long) _text, (unsigned long) _end))

		return 0;



	/*

	 * If the physical address is inside the kernel map, we need

	 * to touch the high mapped kernel as well: