Commit 497258df authored by Linus Torvalds's avatar Linus Torvalds Committed by Andrew Morton
Browse files

mm: remove legacy install_special_mapping() code 

All relevant architectures had already been converted to the new interface
(which just has an underscore in front of the name - not very imaginative
naming), this just force-converts the stragglers.

The modern interface is almost identical to the old one, except instead of
the page pointer it takes a "struct vm_special_mapping" that describes the
mapping (and contains the page pointer as one member), and it returns the
resulting 'vma' instead of just the error code.

Getting rid of the old interface also gets rid of some special casing,
which had caused problems with the mremap extensions to "struct
vm_special_mapping".

[akpm@linux-foundation.org: coding-style cleanups]
Link: https://lkml.kernel.org/r/CAHk-=whvR+z=0=0gzgdfUiK70JTa-=+9vxD-4T=3BagXR6dciA@mail.gmail.comTested-by: Rob Landley <rob@landley.net> # arch/sh/
Link: https://lore.kernel.org/all/20240819195120.GA1113263@thelio-3990X/


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Jeff Xu <jeffxu@google.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Pedro Falcato <pedro.falcato@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Rob Landley <rob@landley.net>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent edb4a8bf

arch/csky/kernel/vdso.c

+21 −7
Original line number Diff line number Diff line
@@ -45,9 +45,16 @@ arch_initcall(vdso_init); 
int arch_setup_additional_pages(struct linux_binprm *bprm,

	int uses_interp)

{

	struct vm_area_struct *vma;

	struct mm_struct *mm = current->mm;

	unsigned long vdso_base, vdso_len;

	int ret;

	static struct vm_special_mapping vdso_mapping = {

		.name = "[vdso]",

	};

	static struct vm_special_mapping vvar_mapping = {

		.name = "[vvar]",

	};



	vdso_len = (vdso_pages + 1) << PAGE_SHIFT;
@@ -65,22 +72,29 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 
	 */

	mm->context.vdso = (void *)vdso_base;



	ret =

	   install_special_mapping(mm, vdso_base, vdso_pages << PAGE_SHIFT,

	vdso_mapping.pages = vdso_pagelist;

	vma =

	   _install_special_mapping(mm, vdso_base, vdso_pages << PAGE_SHIFT,

		(VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC),

		vdso_pagelist);

		&vdso_mapping);



	if (unlikely(ret)) {

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		mm->context.vdso = NULL;

		goto end;

	}



	vdso_base += (vdso_pages << PAGE_SHIFT);

	ret = install_special_mapping(mm, vdso_base, PAGE_SIZE,

		(VM_READ | VM_MAYREAD), &vdso_pagelist[vdso_pages]);

	vvar_mapping.pages = &vdso_pagelist[vdso_pages];

	vma = _install_special_mapping(mm, vdso_base, PAGE_SIZE,

		(VM_READ | VM_MAYREAD), &vvar_mapping);



	if (unlikely(ret))

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		mm->context.vdso = NULL;

		goto end;

	}

	ret = 0;

end:

	mmap_write_unlock(mm);

	return ret;

arch/hexagon/kernel/vdso.c

+10 −4
Original line number Diff line number Diff line
@@ -51,7 +51,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 
{

	int ret;

	unsigned long vdso_base;

	struct vm_area_struct *vma;

	struct mm_struct *mm = current->mm;

	static struct vm_special_mapping vdso_mapping = {

		name = "[vdso]",

	};



	if (mmap_write_lock_killable(mm))

		return -EINTR;
@@ -66,16 +70,18 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 
	}



	/* MAYWRITE to allow gdb to COW and set breakpoints. */

	ret = install_special_mapping(mm, vdso_base, PAGE_SIZE,

	vdso_mapping.pages = &vdso_page;

	vma = _install_special_mapping(mm, vdso_base, PAGE_SIZE,

				      VM_READ|VM_EXEC|

				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,

				      &vdso_page);

				      &vdso_mapping);



	if (ret)

	ret = PTR_ERR(vma);

	if (IS_ERR(vma))

		goto up_fail;



	mm->context.vdso = (void *)vdso_base;



	ret = 0;

up_fail:

	mmap_write_unlock(mm);

	return ret;

arch/nios2/mm/init.c

+8 −4
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ void __init mmu_init(void) 
pgd_t swapper_pg_dir[PTRS_PER_PGD] __aligned(PAGE_SIZE);

pte_t invalid_pte_table[PTRS_PER_PTE] __aligned(PAGE_SIZE);

static struct page *kuser_page[1];

static struct vm_special_mapping vdso_mapping = {

	.name = "[vdso]",

	.pages = kuser_page,

};



static int alloc_kuser_page(void)

{
@@ -106,18 +110,18 @@ arch_initcall(alloc_kuser_page); 
int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)

{

	struct mm_struct *mm = current->mm;

	int ret;

	struct vm_area_struct *vma;



	mmap_write_lock(mm);



	/* Map kuser helpers to user space address */

	ret = install_special_mapping(mm, KUSER_BASE, KUSER_SIZE,

	vma = _install_special_mapping(mm, KUSER_BASE, KUSER_SIZE,

				      VM_READ | VM_EXEC | VM_MAYREAD |

				      VM_MAYEXEC, kuser_page);

				      VM_MAYEXEC, &vdso_mapping);



	mmap_write_unlock(mm);



	return ret;

	return IS_ERR(vma) ? PTR_ERR(vma) : 0;

}



const char *arch_vma_name(struct vm_area_struct *vma)

arch/sh/kernel/vsyscall/vsyscall.c

+11 −3
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ __setup("vdso=", vdso_setup); 
 */

extern const char vsyscall_trapa_start, vsyscall_trapa_end;

static struct page *syscall_pages[1];

static struct vm_special_mapping vdso_mapping = {

	.name = "[vdso]",

	.pages = syscall_pages,

};



int __init vsyscall_init(void)

{
@@ -58,6 +62,7 @@ int __init vsyscall_init(void) 
int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)

{

	struct mm_struct *mm = current->mm;

	struct vm_area_struct *vma;

	unsigned long addr;

	int ret;
@@ -70,14 +75,17 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 
		goto up_fail;

	}



	ret = install_special_mapping(mm, addr, PAGE_SIZE,

	vdso_mapping.pages = syscall_pages;

	vma = _install_special_mapping(mm, addr, PAGE_SIZE,

				      VM_READ | VM_EXEC |

				      VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,

				      syscall_pages);

	if (unlikely(ret))

				      &vdso_mapping);

	ret = PTR_ERR(vma);

	if (IS_ERR(vma))

		goto up_fail;



	current->mm->context.vdso = (void *)addr;

	ret = 0;



up_fail:

	mmap_write_unlock(mm);

arch/x86/um/vdso/vma.c

+8 −4
Original line number Diff line number Diff line
@@ -52,8 +52,11 @@ subsys_initcall(init_vdso); 


int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)

{

	int err;

	struct vm_area_struct *vma;

	struct mm_struct *mm = current->mm;

	static struct vm_special_mapping vdso_mapping = {

		.name = "[vdso]",

	};



	if (!vdso_enabled)

		return 0;
@@ -61,12 +64,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 
	if (mmap_write_lock_killable(mm))

		return -EINTR;



	err = install_special_mapping(mm, um_vdso_addr, PAGE_SIZE,

	vdso_mapping.pages = vdsop;

	vma = _install_special_mapping(mm, um_vdso_addr, PAGE_SIZE,

		VM_READ|VM_EXEC|

		VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,

		vdsop);

		&vdso_mapping);



	mmap_write_unlock(mm);



	return err;

	return IS_ERR(vma) ? PTR_ERR(vma) : 0;

}