Commit 0dbf7028 authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen
Browse files

[PATCH] x86: __pa and __pa_symbol address space separation 



Currently __pa_symbol is for use with symbols in the kernel address
map and __pa is for use with pointers into the physical memory map.
But the code is implemented so you can usually interchange the two.

__pa which is much more common can be implemented much more cheaply
if it is it doesn't have to worry about any other kernel address
spaces.  This is especially true with a relocatable kernel as
__pa_symbol needs to peform an extra variable read to resolve
the address.

There is a third macro that is added for the vsyscall data
__pa_vsymbol for finding the physical addesses of vsyscall pages.

Most of this patch is simply sorting through the references to
__pa or __pa_symbol and using the proper one.  A little of
it is continuing to use a physical address when we have it
instead of recalculating it several times.

swapper_pgd is now NULL.  leave_mm now uses init_mm.pgd
and init_mm.pgd is initialized at boot (instead of compile time)
to the physmem virtual mapping of init_level4_pgd.  The
physical address changed.

Except for the for EMPTY_ZERO page all of the remaining references
to __pa_symbol appear to be during kernel initialization.  So this
should reduce the cost of __pa in the common case, even on a relocated
kernel.

As this is technically a semantic change we need to be on the lookout
for anything I missed.  But it works for me (tm).

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 1b29c164

arch/i386/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ void __init alternative_instructions(void) 
						_text, _etext);

		}

		free_init_pages("SMP alternatives",

				(unsigned long)__smp_alt_begin,

				(unsigned long)__smp_alt_end);

				__pa_symbol(&__smp_alt_begin),

				__pa_symbol(&__smp_alt_end));

	} else {

		alternatives_smp_save(__smp_alt_instructions,

				      __smp_alt_instructions_end);

arch/i386/mm/init.c

+8 −7
Original line number Diff line number Diff line
@@ -774,10 +774,11 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	unsigned long addr;



	for (addr = begin; addr < end; addr += PAGE_SIZE) {

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		free_page(addr);

		struct page *page = pfn_to_page(addr >> PAGE_SHIFT);

		ClearPageReserved(page);

		init_page_count(page);

		memset(page_address(page), POISON_FREE_INITMEM, PAGE_SIZE);

		__free_page(page);

		totalram_pages++;

	}

	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
@@ -786,14 +787,14 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
void free_initmem(void)

{

	free_init_pages("unused kernel memory",

			(unsigned long)(&__init_begin),

			(unsigned long)(&__init_end));

			__pa_symbol(&__init_begin),

			__pa_symbol(&__init_end));

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

	free_init_pages("initrd memory", start, end);

	free_init_pages("initrd memory", __pa(start), __pa(end));

}

#endif

arch/x86_64/kernel/machine_kexec.c

+7 −7
Original line number Diff line number Diff line
@@ -191,19 +191,19 @@ NORET_TYPE void machine_kexec(struct kimage *image) 


	page_list[PA_CONTROL_PAGE] = __pa(control_page);

	page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel;

	page_list[PA_PGD] = __pa(kexec_pgd);

	page_list[PA_PGD] = __pa_symbol(&kexec_pgd);

	page_list[VA_PGD] = (unsigned long)kexec_pgd;

	page_list[PA_PUD_0] = __pa(kexec_pud0);

	page_list[PA_PUD_0] = __pa_symbol(&kexec_pud0);

	page_list[VA_PUD_0] = (unsigned long)kexec_pud0;

	page_list[PA_PMD_0] = __pa(kexec_pmd0);

	page_list[PA_PMD_0] = __pa_symbol(&kexec_pmd0);

	page_list[VA_PMD_0] = (unsigned long)kexec_pmd0;

	page_list[PA_PTE_0] = __pa(kexec_pte0);

	page_list[PA_PTE_0] = __pa_symbol(&kexec_pte0);

	page_list[VA_PTE_0] = (unsigned long)kexec_pte0;

	page_list[PA_PUD_1] = __pa(kexec_pud1);

	page_list[PA_PUD_1] = __pa_symbol(&kexec_pud1);

	page_list[VA_PUD_1] = (unsigned long)kexec_pud1;

	page_list[PA_PMD_1] = __pa(kexec_pmd1);

	page_list[PA_PMD_1] = __pa_symbol(&kexec_pmd1);

	page_list[VA_PMD_1] = (unsigned long)kexec_pmd1;

	page_list[PA_PTE_1] = __pa(kexec_pte1);

	page_list[PA_PTE_1] = __pa_symbol(&kexec_pte1);

	page_list[VA_PTE_1] = (unsigned long)kexec_pte1;



	page_list[PA_TABLE_PAGE] =

arch/x86_64/kernel/setup.c

+5 −4
Original line number Diff line number Diff line
@@ -243,11 +243,12 @@ void __init setup_arch(char **cmdline_p) 
	init_mm.end_code = (unsigned long) &_etext;

	init_mm.end_data = (unsigned long) &_edata;

	init_mm.brk = (unsigned long) &_end;

	init_mm.pgd = __va(__pa_symbol(&init_level4_pgt));



	code_resource.start = virt_to_phys(&_text);

	code_resource.end = virt_to_phys(&_etext)-1;

	data_resource.start = virt_to_phys(&_etext);

	data_resource.end = virt_to_phys(&_edata)-1;

	code_resource.start = __pa_symbol(&_text);

	code_resource.end = __pa_symbol(&_etext)-1;

	data_resource.start = __pa_symbol(&_etext);

	data_resource.end = __pa_symbol(&_edata)-1;



	early_identify_cpu(&boot_cpu_data);

arch/x86_64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static inline void leave_mm(int cpu) 
	if (read_pda(mmu_state) == TLBSTATE_OK)

		BUG();

	cpu_clear(cpu, read_pda(active_mm)->cpu_vm_mask);

	load_cr3(swapper_pg_dir);

	load_cr3(init_mm.pgd);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE