Re: [PATCH v2 09/19] s390/vdso: Remove vdso_base pointer from mm->context

[Christophe Leroy]

Le 24/11/2020 à 01:29, Dmitry Safonov a écrit :
> Not used any more.

Same, what about mremap(), why can it be removed ?

> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
> Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
> Cc: linux-s390@xxxxxxxxxxxxxxx
> Signed-off-by: Dmitry Safonov <dima@xxxxxxxxxx>
> ---
>   arch/s390/include/asm/mmu.h |  1 -
>   arch/s390/kernel/vdso.c     | 10 ----------
>   2 files changed, 11 deletions(-)
>
> diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
> index e12ff0f29d1a..095d0596f700 100644
> --- a/arch/s390/include/asm/mmu.h
> +++ b/arch/s390/include/asm/mmu.h
> @@ -15,7 +15,6 @@ typedef struct {
>   	unsigned long gmap_asce;
>   	unsigned long asce;
>   	unsigned long asce_limit;
> -	unsigned long vdso_base;
>   	/* The mmu context belongs to a secure guest. */
>   	atomic_t is_protected;
>   	/*
> diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
> index 810b72f8985c..3f07711a07c1 100644
> --- a/arch/s390/kernel/vdso.c
> +++ b/arch/s390/kernel/vdso.c
> @@ -58,18 +58,9 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,
>   	return 0;
>   }
>   
> -static int vdso_mremap(const struct vm_special_mapping *sm,
> -		       struct vm_area_struct *vma)
> -{
> -	current->mm->context.vdso_base = vma->vm_start;
> -
> -	return 0;
> -}
> -
>   static const struct vm_special_mapping vdso_mapping = {
>   	.name = "[vdso]",
>   	.fault = vdso_fault,
> -	.mremap = vdso_mremap,
>   };
>   
>   static int __init vdso_setup(char *str)
> @@ -204,7 +195,6 @@ int arch_setup_additional_pages(unsigned long *sysinfo_ehdr)
>   		goto out_up;
>   	}
>   
> -	current->mm->context.vdso_base = vdso_base;
>   	*sysinfo_ehdr = vdso_base;
>   	rc = 0;
>