time/namespace: Refactor copy-pasted helper into one copy
PATCH 1/1 time/namespace: Refactor copy-pasted helper into one copy
find_timens_vvar_page() is not arch-specific, as can be seen from how all five per-architecture versions of it are the same.
(arm64, powerpc and riscv are exactly the same; x86 and s390 have two characters difference inside a comment, less blank lines, and mark the !CONFIG_TIME_NS version as inline.)
Refactor the five copies into a central copy in kernel/time/namespace.c.
--- arch/arm64/kernel/vdso.c | 22 ---------------------- arch/powerpc/kernel/vdso.c | 22 ---------------------- arch/riscv/kernel/vdso.c | 22 ---------------------- arch/s390/kernel/vdso.c | 20 -------------------- arch/x86/entry/vdso/vma.c | 23 ----------------------- include/linux/time_namespace.h | 6 ++++++ kernel/time/namespace.c | 20 ++++++++++++++++++++ 7 files changed, 26 insertions(+), 109 deletions(-)
arch/arm64/kernel/vdso.c +0 -22
@@ -151,28 +151,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/powerpc/kernel/vdso.c +0 -22
@@ -129,28 +129,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/riscv/kernel/vdso.c +0 -22
@@ -137,28 +137,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/s390/kernel/vdso.c +0 -20
@@ -44,21 +44,6 @@ struct vdso_data *arch_get_vdso_data(void *vvar_page)return (struct vdso_data *)(vvar_page); } -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops(). -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); -return NULL ; -} -/* * The VVAR page layout depends on whether a task belongs to the root or * non-root time namespace. Whenever a task changes its namespace, the VVAR
@@ -84,11 +69,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } -#else -static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/x86/entry/vdso/vma.c +0 -23
@@ -98,24 +98,6 @@ static int vdso_mremap(const struct vm_special_mapping *sm, }#ifdef CONFIG_TIME_NS -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops(). -* For more details check_vma_flags() and __access_remote_vm() -*/ - -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -/* * The vvar page layout depends on whether a task belongs to the root or * non-root time namespace. Whenever a task changes its namespace, the VVAR
@@ -140,11 +122,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)return 0 ; } -#else -static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
include/linux/time_namespace.h +6 -0
@@ -45,6 +45,7 @@ struct time_namespace *copy_time_ns(unsigned long flags,void free_time_ns (struct time_namespace *ns);void timens_on_fork (struct nsproxy *nsproxy,struct task_struct *tsk);struct vdso_data *arch_get_vdso_data (void *vvar_page); +struct page *find_timens_vvar_page (struct vm_area_struct *vma);static inline void put_time_ns (struct time_namespace *ns) {
@@ -141,6 +142,11 @@ static inline void timens_on_fork(struct nsproxy *nsproxy,return ; } +static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +return NULL ; +} +static inline void timens_add_monotonic (struct timespec64 *ts) { }static inline void timens_add_boottime (struct timespec64 *ts) { }
kernel/time/namespace.c +20 -0
@@ -192,6 +192,26 @@ static void timens_setup_vdso_data(struct vdso_data *vdata, offset[CLOCK_BOOTTIME_ALARM ] = boottime; } +struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +if (likely (vma->vm_mm == current->mm)) +return current->nsproxy->time_ns->vvar_page; + +/* +* VM_PFNMAP | VM_IO protect .fault() handler from being called +* through interfaces like /proc/$pid/mem or +* process_vm_{readv,writev}() as long as there's no .access() +* in special_mapping_vmops(). +* For more details check_vma_flags() and __access_remote_vm() +*/ + +WARN (1 ,"vvar_page accessed remotely" ); + +return NULL ; +} + + +/* * Protects possibly multiple offsets writers racing each other * and tasks entering the namespace.
base-commit: ca57f02295f188d6c65ec02202402979880fa6d8
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
[tip: timers/core] vdso/timens: Refactor copy-pasted find_timens_vvar_page() helper into one copy
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: d6c494e8ee932b2b21ff4b718eebb378e91b3da0 Gitweb: https://git.kernel.org/tip/d6c494e8ee932b2b21ff4b718eebb378e91b3da0 Author: Jann Horn <[email protected]> AuthorDate: Wed, 30 Nov 2022 12:53:20 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 01 Dec 2022 11:35:40 +01:00
vdso/timens: Refactor copy-pasted find_timens_vvar_page() helper into one copy
find_timens_vvar_page() is not architecture-specific, as can be seen from how all five per-architecture versions of it are the same.
(arm64, powerpc and riscv are exactly the same; x86 and s390 have two characters difference inside a comment, less blank lines, and mark the !CONFIG_TIME_NS version as inline.)
Refactor the five copies into a central copy in kernel/time/namespace.c.
--- arch/arm64/kernel/vdso.c | 22 ---------------------- arch/powerpc/kernel/vdso.c | 22 ---------------------- arch/riscv/kernel/vdso.c | 22 ---------------------- arch/s390/kernel/vdso.c | 20 -------------------- arch/x86/entry/vdso/vma.c | 23 ----------------------- include/linux/time_namespace.h | 6 ++++++ kernel/time/namespace.c | 18 ++++++++++++++++++ 7 files changed, 24 insertions(+), 109 deletions(-)
arch/arm64/kernel/vdso.c +0 -22
@@ -151,28 +151,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/powerpc/kernel/vdso.c +0 -22
@@ -129,28 +129,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/riscv/kernel/vdso.c +0 -22
@@ -137,28 +137,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } - -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops. -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -#else -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/s390/kernel/vdso.c +0 -20
@@ -44,21 +44,6 @@ struct vdso_data *arch_get_vdso_data(void *vvar_page)return (struct vdso_data *)(vvar_page); } -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops(). -* For more details check_vma_flags() and __access_remote_vm() -*/ -WARN (1 ,"vvar_page accessed remotely" ); -return NULL ; -} -/* * The VVAR page layout depends on whether a task belongs to the root or * non-root time namespace. Whenever a task changes its namespace, the VVAR
@@ -84,11 +69,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)mmap_read_unlock (mm);return 0 ; } -#else -static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
arch/x86/entry/vdso/vma.c +0 -23
@@ -98,24 +98,6 @@ static int vdso_mremap(const struct vm_special_mapping *sm, }#ifdef CONFIG_TIME_NS -static struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -if (likely (vma->vm_mm == current->mm)) -return current->nsproxy->time_ns->vvar_page; - -/* -* VM_PFNMAP | VM_IO protect .fault() handler from being called -* through interfaces like /proc/$pid/mem or -* process_vm_{readv,writev}() as long as there's no .access() -* in special_mapping_vmops(). -* For more details check_vma_flags() and __access_remote_vm() -*/ - -WARN (1 ,"vvar_page accessed remotely" ); - -return NULL ; -} -/* * The vvar page layout depends on whether a task belongs to the root or * non-root time namespace. Whenever a task changes its namespace, the VVAR
@@ -140,11 +122,6 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)return 0 ; } -#else -static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) -{ -return NULL ; -}#endif static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
include/linux/time_namespace.h +6 -0
@@ -45,6 +45,7 @@ struct time_namespace *copy_time_ns(unsigned long flags,void free_time_ns (struct time_namespace *ns);void timens_on_fork (struct nsproxy *nsproxy,struct task_struct *tsk);struct vdso_data *arch_get_vdso_data (void *vvar_page); +struct page *find_timens_vvar_page (struct vm_area_struct *vma);static inline void put_time_ns (struct time_namespace *ns) {
@@ -141,6 +142,11 @@ static inline void timens_on_fork(struct nsproxy *nsproxy,return ; } +static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +return NULL ; +} +static inline void timens_add_monotonic (struct timespec64 *ts) { }static inline void timens_add_boottime (struct timespec64 *ts) { }
kernel/time/namespace.c +18 -0
@@ -192,6 +192,24 @@ static void timens_setup_vdso_data(struct vdso_data *vdata, offset[CLOCK_BOOTTIME_ALARM ] = boottime; } +struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +if (likely (vma->vm_mm == current->mm)) +return current->nsproxy->time_ns->vvar_page; + +/* +* VM_PFNMAP | VM_IO protect .fault() handler from being called +* through interfaces like /proc/$pid/mem or +* process_vm_{readv,writev}() as long as there's no .access() +* in special_mapping_vmops(). +* For more details check_vma_flags() and __access_remote_vm() +*/ + +WARN (1 ,"vvar_page accessed remotely" ); + +return NULL ; +} +/* * Protects possibly multiple offsets writers racing each other * and tasks entering the namespace.