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

Commit 992f4c1c authored by Tejun Heo's avatar Tejun Heo
Browse files

x86: reorganize cpa_process_alias() 



Reorganize cpa_process_alias() so that new alias condition can be
added easily.

Jan Beulich spotted problem in the original cleanup thread which
incorrectly assumed the two existing conditions were mutially
exclusive.

[ Impact: code reorganization ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
parent 0ff2587f

arch/x86/mm/pageattr.c

+23 −27
Original line number Diff line number Diff line
@@ -681,8 +681,9 @@ 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 = 0;

	unsigned long temp_cpa_vaddr, vaddr;

	unsigned long laddr = (unsigned long)__va(cpa->pfn << PAGE_SHIFT);

	unsigned long vaddr;

	int ret;



	if (cpa->pfn >= max_pfn_mapped)

		return 0;
@@ -706,42 +707,37 @@ static int cpa_process_alias(struct cpa_data *cpa) 
		    PAGE_OFFSET + (max_pfn_mapped << PAGE_SHIFT)))) {



		alias_cpa = *cpa;

		temp_cpa_vaddr = (unsigned long) __va(cpa->pfn << PAGE_SHIFT);

		alias_cpa.vaddr = &temp_cpa_vaddr;

		alias_cpa.vaddr = &laddr;

		alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);





		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(vaddr, (unsigned long) _text, _brk_end))

		return 0;

	}



#ifdef CONFIG_X86_64

	/*

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

	 * If the primary call didn't touch the high mapping already

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

	 * to touch the high mapped kernel as well:

	 */

	if (!within(cpa->pfn, highmap_start_pfn(), highmap_end_pfn()))

		return 0;



	if (!within(vaddr, (unsigned long)_text, _brk_end) &&

	    within(cpa->pfn, highmap_start_pfn(), highmap_end_pfn())) {

		unsigned long temp_cpa_vaddr = (cpa->pfn << PAGE_SHIFT) +

					       __START_KERNEL_map - phys_base;

		alias_cpa = *cpa;

	temp_cpa_vaddr = (cpa->pfn << PAGE_SHIFT) + __START_KERNEL_map - phys_base;

		alias_cpa.vaddr = &temp_cpa_vaddr;

		alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);



		/*

	 * The high mapping range is imprecise, so ignore the return value.

		 * The high mapping range is imprecise, so ignore the

		 * return value.

		 */

		__change_page_attr_set_clr(&alias_cpa, 0);

	}

#endif

	return ret;



	return 0;

}



static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)