Commit e3ebadd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "[PATCH] x86: __pa and __pa_symbol address space separation" 



This was broken.  It adds complexity, for no good reason.  Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.

However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa().  That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.

Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 15700770

arch/i386/kernel/alternative.c

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

		}

		free_init_pages("SMP alternatives",

				__pa_symbol(&__smp_locks),

				__pa_symbol(&__smp_locks_end));

				(unsigned long)__smp_locks,

				(unsigned long)__smp_locks_end);

	} else {

		alternatives_smp_module_add(NULL, "core kernel",

					    __smp_locks, __smp_locks_end,

arch/i386/mm/init.c

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



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

		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);

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

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

		free_page(addr);

		totalram_pages++;

	}

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

{

	free_init_pages("unused kernel memory",

			__pa_symbol(&__init_begin),

			__pa_symbol(&__init_end));

			(unsigned long)(&__init_begin),

			(unsigned long)(&__init_end));

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

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

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

}

#endif

arch/x86_64/kernel/machine_kexec.c

+8 −8
Original line number Diff line number Diff line
@@ -189,21 +189,21 @@ NORET_TYPE void machine_kexec(struct kimage *image) 
	control_page = page_address(image->control_code_page) + PAGE_SIZE;

	memcpy(control_page, relocate_kernel, PAGE_SIZE);



	page_list[PA_CONTROL_PAGE] = __pa(control_page);

	page_list[PA_CONTROL_PAGE] = virt_to_phys(control_page);

	page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel;

	page_list[PA_PGD] = __pa_symbol(&kexec_pgd);

	page_list[PA_PGD] = virt_to_phys(&kexec_pgd);

	page_list[VA_PGD] = (unsigned long)kexec_pgd;

	page_list[PA_PUD_0] = __pa_symbol(&kexec_pud0);

	page_list[PA_PUD_0] = virt_to_phys(&kexec_pud0);

	page_list[VA_PUD_0] = (unsigned long)kexec_pud0;

	page_list[PA_PMD_0] = __pa_symbol(&kexec_pmd0);

	page_list[PA_PMD_0] = virt_to_phys(&kexec_pmd0);

	page_list[VA_PMD_0] = (unsigned long)kexec_pmd0;

	page_list[PA_PTE_0] = __pa_symbol(&kexec_pte0);

	page_list[PA_PTE_0] = virt_to_phys(&kexec_pte0);

	page_list[VA_PTE_0] = (unsigned long)kexec_pte0;

	page_list[PA_PUD_1] = __pa_symbol(&kexec_pud1);

	page_list[PA_PUD_1] = virt_to_phys(&kexec_pud1);

	page_list[VA_PUD_1] = (unsigned long)kexec_pud1;

	page_list[PA_PMD_1] = __pa_symbol(&kexec_pmd1);

	page_list[PA_PMD_1] = virt_to_phys(&kexec_pmd1);

	page_list[VA_PMD_1] = (unsigned long)kexec_pmd1;

	page_list[PA_PTE_1] = __pa_symbol(&kexec_pte1);

	page_list[PA_PTE_1] = virt_to_phys(&kexec_pte1);

	page_list[VA_PTE_1] = (unsigned long)kexec_pte1;



	page_list[PA_TABLE_PAGE] =

arch/x86_64/kernel/setup.c

+4 −5
Original line number Diff line number Diff line
@@ -245,12 +245,11 @@ 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 = __pa_symbol(&_text);

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

	data_resource.start = __pa_symbol(&_etext);

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

	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;



	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(init_mm.pgd);

	load_cr3(swapper_pg_dir);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE