Commit 3cf63825 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/vdso: Refactor 32 bits and 64 bits pages setup 



The setup of VDSO pages is identical for 32 bits VDSO and
64 bits VDSO.

Refactor that setup.

And use &vdsoXX_start which is synonym of vdsoXX_kbase.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/269ffb54c37fc1d46128f77d7a39f88ef4a9957d.1601197618.git.christophe.leroy@csgroup.eu
parent 35c1c7c0

arch/powerpc/kernel/vdso.c

+19 −20
Original line number Diff line number Diff line
@@ -678,10 +678,26 @@ int vdso_getcpu_init(void) 
early_initcall(vdso_getcpu_init);

#endif



static int __init vdso_init(void)

static struct page ** __init vdso_setup_pages(void *start, void *end)

{

	int i;

	struct page **pagelist;

	int pages = (end - start) >> PAGE_SHIFT;



	pagelist = kcalloc(pages + 1, sizeof(struct page *), GFP_KERNEL);

	if (!pagelist)

		panic("%s: Cannot allocate page list for VDSO", __func__);



	for (i = 0; i < pages; i++)

		pagelist[i] = virt_to_page(start + i * PAGE_SIZE);



	pagelist[i] = virt_to_page(vdso_data);



	return pagelist;

}



static int __init vdso_init(void)

{

#ifdef CONFIG_PPC64

	/*

	 * Fill up the "systemcfg" stuff for backward compatibility
@@ -742,28 +758,11 @@ static int __init vdso_init(void) 
	}



#ifdef CONFIG_VDSO32

	/* Make sure pages are in the correct state */

	vdso32_pagelist = kcalloc(vdso32_pages + 1, sizeof(struct page *),

				  GFP_KERNEL);

	BUG_ON(vdso32_pagelist == NULL);

	for (i = 0; i < vdso32_pages; i++) {

		struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE);



		vdso32_pagelist[i] = pg;

	}

	vdso32_pagelist[i++] = virt_to_page(vdso_data);

	vdso32_pagelist = vdso_setup_pages(&vdso32_start, &vdso32_end);

#endif



#ifdef CONFIG_PPC64

	vdso64_pagelist = kcalloc(vdso64_pages + 1, sizeof(struct page *),

				  GFP_KERNEL);

	BUG_ON(vdso64_pagelist == NULL);

	for (i = 0; i < vdso64_pages; i++) {

		struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);



		vdso64_pagelist[i] = pg;

	}

	vdso64_pagelist[i++] = virt_to_page(vdso_data);

	vdso64_pagelist = vdso_setup_pages(&vdso64_start, &vdso64_end);

#endif /* CONFIG_PPC64 */



	smp_wmb();