lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: reorganize cpa_process_alias()

Browse Source 
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: Tejun Heo <tj@kernel.org>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Tejun Heo
2009-06-22 11:56:24 +09:00
parent 0ff2587fd5
commit 992f4c1c2c
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
arch/x86/mm/pageattr.c
View File

@@ -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) static int cpa_process_alias(struct cpa_data *cpa)
{ {
struct cpa_data alias_cpa; struct cpa_data alias_cpa;
int ret = 0; unsigned long laddr = (unsigned long)__va(cpa->pfn << PAGE_SHIFT);
unsigned long temp_cpa_vaddr, vaddr; unsigned long vaddr;
int ret;
if (cpa->pfn >= max_pfn_mapped) if (cpa->pfn >= max_pfn_mapped)
return 0; return 0;
@@ -706,42 +707,37 @@ static int cpa_process_alias(struct cpa_data *cpa)
PAGE_OFFSET + (max_pfn_mapped << PAGE_SHIFT)))) { PAGE_OFFSET + (max_pfn_mapped << PAGE_SHIFT)))) {
alias_cpa = *cpa; alias_cpa = *cpa;
temp_cpa_vaddr = (unsigned long) __va(cpa->pfn << PAGE_SHIFT); alias_cpa.vaddr = &laddr;
alias_cpa.vaddr = &temp_cpa_vaddr;
alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY); alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);
ret = __change_page_attr_set_clr(&alias_cpa, 0); ret = __change_page_attr_set_clr(&alias_cpa, 0);
if (ret)
return ret;
} }
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
if (ret)
return ret;
/* /*
* No need to redo, when the primary call touched the high * If the primary call didn't touch the high mapping already
* mapping already: * and the physical address is inside the kernel map, we need
*/
if (within(vaddr, (unsigned long) _text, _brk_end))
return 0;
/*
* If the physical address is inside the kernel map, we need
* to touch the high mapped kernel as well: * to touch the high mapped kernel as well:
*/ */
if (!within(cpa->pfn, highmap_start_pfn(), highmap_end_pfn())) if (!within(vaddr, (unsigned long)_text, _brk_end) &&
return 0; 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;
alias_cpa.vaddr = &temp_cpa_vaddr;
alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY);
alias_cpa = *cpa; /*
temp_cpa_vaddr = (cpa->pfn << PAGE_SHIFT) + __START_KERNEL_map - phys_base; * The high mapping range is imprecise, so ignore the
alias_cpa.vaddr = &temp_cpa_vaddr; * return value.
alias_cpa.flags &= ~(CPA_PAGES_ARRAY | CPA_ARRAY); */
__change_page_attr_set_clr(&alias_cpa, 0);
/* }
* The high mapping range is imprecise, so ignore the return value.
*/
__change_page_attr_set_clr(&alias_cpa, 0);
#endif #endif
return ret;
return 0;
} }
static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias) static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)