arm64: add the time namespace support
Subsystems (2)
v3 cover arm64: add the time namespace support
Allocate the time namespace page among VVAR pages and add the logic to handle faults on VVAR properly.
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
v2: Code cleanups suggested by Vincenzo.
v3: add a comment in __arch_get_timens_vdso_data.
v3 on github (if someone prefers git pull to git am):
https://github.com/avagin/linux-task-diag/tree/arm64/timens-v3
Andrei Vagin (6):
arm64/vdso: use the fault callback to map vvar pages arm64/vdso: Zap vvar pages when switching to a time namespace arm64/vdso: Add time napespace page
arm64/vdso: Handle faults on timens page arm64/vdso: Restrict splitting VVAR VMA
arm64: enable time namespace support
arch/arm64/Kconfig | 1 + .../include/asm/vdso/compat_gettimeofday.h | 11 ++ arch/arm64/include/asm/vdso/gettimeofday.h | 8 ++ arch/arm64/kernel/vdso.c | 134 ++++++++++++++++-- arch/arm64/kernel/vdso/vdso.lds.S | 3 +- arch/arm64/kernel/vdso32/vdso.lds.S | 3 +- include/vdso/datapage.h | 1 + 7 files changed, 147 insertions(+), 14 deletions(-)
Signature · 1 line
2.24.1
PATCH v3 2/6 arm64/vdso: Zap vvar pages when switching to a time namespace
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 page tables are cleared and then they will be re-faulted with a corresponding layout.
--- arch/arm64/kernel/vdso.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm64/kernel/vdso.c +32 -0
@@ -131,6 +131,38 @@ static int __vdso_init(enum arch_vdso_type arch_index)return 0 ; } +#ifdef CONFIG_TIME_NS +/* +* 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 +* page tables are cleared and then they will re-faulted with a +* corresponding layout. +* See also the comment near timens_setup_vdso_data() for details. +*/ +int vdso_join_timens (struct task_struct *task,struct time_namespace *ns) +{ +struct mm_struct *mm = task->mm; +struct vm_area_struct *vma; + +if (down_write_killable (&mm->mmap_sem)) +return -EINTR ; + +for (vma = mm->mmap; vma; vma = vma->vm_next) { +unsigned long size = vma->vm_end - vma->vm_start; + +if (vma_is_special_mapping (vma, vdso_lookup[ARM64_VDSO ].dm)) +zap_page_range (vma, vma->vm_start, size); +#ifdef CONFIG_COMPAT_VDSO +if (vma_is_special_mapping (vma, vdso_lookup[ARM64_VDSO32 ].dm)) +zap_page_range (vma, vma->vm_start, size); +#endif + } + +up_write (&mm->mmap_sem); +return 0 ; +} +#endif +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {
Signature · 1 line
2.24.1
PATCH v3 1/6 arm64/vdso: use the fault callback to map vvar pages
In reply to Andrei VaginThis is required to support time namespaces where a time namespace data page is different for each namespace.
--- arch/arm64/kernel/vdso.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
arch/arm64/kernel/vdso.c +15 -9
@@ -114,28 +114,32 @@ static int __vdso_init(enum arch_vdso_type arch_index)PAGE_SHIFT ;/* Allocate the vDSO pagelist, plus a page for the data. */ - vdso_pagelist =kcalloc (vdso_lookup[arch_index].vdso_pages +1 , + vdso_pagelist =kcalloc (vdso_lookup[arch_index].vdso_pages,sizeof (struct page *),GFP_KERNEL );if (vdso_pagelist ==NULL )return -ENOMEM ; -/* Grab the vDSO data page. */ - vdso_pagelist[0 ] =phys_to_page (__pa_symbol (vdso_data)); - -/* Grab the vDSO code pages. */ pfn =sym_to_pfn (vdso_lookup[arch_index].vdso_code_start);for (i =0 ; i < vdso_lookup[arch_index].vdso_pages; i++) - vdso_pagelist[i +1 ] =pfn_to_page (pfn + i); + vdso_pagelist[i] =pfn_to_page (pfn + i); - vdso_lookup[arch_index].dm->pages = &vdso_pagelist[0 ]; - vdso_lookup[arch_index].cm->pages = &vdso_pagelist[1 ]; + vdso_lookup[arch_index].cm->pages = vdso_pagelist;return 0 ; } +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm, +struct vm_area_struct *vma,struct vm_fault *vmf) +{ +if (vmf->pgoff ==0 ) +return vmf_insert_pfn (vma, vmf->address, +sym_to_pfn (vdso_data)); +return VM_FAULT_SIGBUS ; +} + static int __setup_additional_pages(enum arch_vdso_type arch_index, struct mm_struct *mm, struct linux_binprm *bprm,
@@ -155,7 +159,7 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index, } ret =_install_special_mapping (mm, vdso_base,PAGE_SIZE , -VM_READ |VM_MAYREAD , +VM_READ |VM_MAYREAD |VM_PFNMAP , vdso_lookup[arch_index].dm);if (IS_ERR (ret)) goto up_fail;
@@ -215,6 +219,7 @@ static struct vm_special_mapping aarch32_vdso_spec[C_PAGES] = { #ifdef CONFIG_COMPAT_VDSO { .name = "[vvar]", + .fault = vvar_fault, }, { .name = "[vdso]",
@@ -385,6 +390,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm,static struct vm_special_mapping vdso_spec[A_PAGES ]__ro_after_init = { { .name ="[vvar]" , + .fault = vvar_fault, }, { .name ="[vdso]" ,
Signature · 1 line
2.24.1
PATCH v3 6/6 arm64: enable time namespace support
In reply to Andrei VaginCONFIG_TIME_NS is dependes on GENERIC_VDSO_TIME_NS.
--- arch/arm64/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/Kconfig +1 -0
@@ -111,6 +111,7 @@ config ARM64 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY + select GENERIC_VDSO_TIME_NS select HANDLE_DOMAIN_IRQ select HARDIRQS_SW_RESEND select HAVE_PCI
Signature · 1 line
2.24.1
PATCH v3 5/6 arm64/vdso: Restrict splitting VVAR VMA
In reply to Andrei VaginForbid splitting VVAR VMA resulting in a stricter ABI and reducing the amount of corner-cases to consider while working further on VDSO time namespace support.
As the offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed.
--- arch/arm64/kernel/vdso.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/kernel/vdso.c +13 -0
@@ -235,6 +235,17 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,return vmf_insert_pfn (vma, vmf->address, pfn); } +static int vvar_mremap (const struct vm_special_mapping *sm, +struct vm_area_struct *new_vma) +{ +unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + +if (new_size !=VVAR_NR_PAGES *PAGE_SIZE ) +return -EINVAL ; + +return 0 ; +} + static int __setup_additional_pages(enum arch_vdso_type arch_index, struct mm_struct *mm, struct linux_binprm *bprm,
@@ -317,6 +328,7 @@ static struct vm_special_mapping aarch32_vdso_spec[C_PAGES] = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]",
@@ -488,6 +500,7 @@ static struct vm_special_mapping vdso_spec[A_PAGES] __ro_after_init = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]",
Signature · 1 line
2.24.1
PATCH v3 4/6 arm64/vdso: Handle faults on timens page
In reply to Andrei VaginIf a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page.
--- arch/arm64/kernel/vdso.c | 57 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 4 deletions(-)
arch/arm64/kernel/vdso.c +53 -4
@@ -18,6 +18,7 @@#include <linux/sched.h> #include <linux/signal.h> #include <linux/slab.h> +#include <linux/time_namespace.h> #include <linux/timekeeper_internal.h> #include <linux/vmalloc.h> #include <vdso/datapage.h>
@@ -175,15 +176,63 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)up_write (&mm->mmap_sem);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 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,struct vm_area_struct *vma,struct vm_fault *vmf) { -if (vmf->pgoff ==0 ) -return vmf_insert_pfn (vma, vmf->address, -sym_to_pfn (vdso_data)); -return VM_FAULT_SIGBUS ; +struct page *timens_page =find_timens_vvar_page (vma); +unsigned long pfn; + +switch (vmf->pgoff) { +case VVAR_DATA_PAGE_OFFSET : +if (timens_page) + pfn =page_to_pfn (timens_page); +else + pfn =sym_to_pfn (vdso_data); +break ; +#ifdef CONFIG_TIME_NS +case VVAR_TIMENS_PAGE_OFFSET : +/* +* If a task belongs to a time namespace then a namespace +* specific VVAR is mapped with the VVAR_DATA_PAGE_OFFSET and +* the real VVAR page is mapped with the VVAR_TIMENS_PAGE_OFFSET +* offset. +* See also the comment near timens_setup_vdso_data(). +*/ +if (!timens_page) +return VM_FAULT_SIGBUS ; + pfn =sym_to_pfn (vdso_data); +break ; +#endif /* CONFIG_TIME_NS */ +default : +return VM_FAULT_SIGBUS ; + } + +return vmf_insert_pfn (vma, vmf->address, pfn); } static int __setup_additional_pages(enum arch_vdso_type arch_index,
Signature · 1 line
2.24.1
PATCH v3 3/6 arm64/vdso: Add time namespace page
In reply to Andrei VaginAllocate the time namespace page among VVAR pages. Provide __arch_get_timens_vdso_data() helper for VDSO code to get the code-relative position of VVARs on that special page.
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
--- arch/arm64/include/asm/vdso.h | 6 +++++ .../include/asm/vdso/compat_gettimeofday.h | 12 ++++++++++ arch/arm64/include/asm/vdso/gettimeofday.h | 8 +++++++ arch/arm64/kernel/vdso.c | 22 ++++++++++++++++--- arch/arm64/kernel/vdso/vdso.lds.S | 5 ++++- arch/arm64/kernel/vdso32/vdso.lds.S | 5 ++++- include/vdso/datapage.h | 1 + 7 files changed, 54 insertions(+), 5 deletions(-)
arch/arm64/include/asm/vdso.h +6 -0
@@ -12,6 +12,12 @@*/ #define VDSO_LBASE 0x0 +#ifdef CONFIG_TIME_NS +#define __VVAR_PAGES 2 +#else +#define __VVAR_PAGES 1 +#endif +#ifndef __ASSEMBLY__#include <generated/vdso-offsets.h>
arch/arm64/include/asm/vdso/compat_gettimeofday.h +12 -0
@@ -152,6 +152,18 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void)return ret; } +#ifdef CONFIG_TIME_NS +static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +const struct vdso_data *ret; + +/* See __arch_get_vdso_data(). */ + asmvolatile ("mov %0, %1" :"=r" (ret) :"r" (_timens_data)); + +return ret; +} +#endif +#endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
arch/arm64/include/asm/vdso/gettimeofday.h +8 -0
@@ -96,6 +96,14 @@ const struct vdso_data *__arch_get_vdso_data(void)return _vdso_data; } +#ifdef CONFIG_TIME_NS +static __always_inline +const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +return _timens_data; +} +#endif +#endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
arch/arm64/kernel/vdso.c +19 -3
@@ -46,6 +46,14 @@ enum arch_vdso_type {#define VDSO_TYPES (ARM64_VDSO + 1)#endif /* CONFIG_COMPAT_VDSO */ +enum vvar_pages { +VVAR_DATA_PAGE_OFFSET , +#ifdef CONFIG_TIME_NS +VVAR_TIMENS_PAGE_OFFSET , +#endif /* CONFIG_TIME_NS */ +VVAR_NR_PAGES , +}; +struct __vdso_abi {const char *name;const char *vdso_code_start;
@@ -81,6 +89,12 @@ static union { }vdso_data_store __page_aligned_data;struct vdso_data *vdso_data = vdso_data_store.data; + +struct vdso_data *arch_get_vdso_data (void *vvar_page) +{ +return (struct vdso_data *)(vvar_page); +} +static int __vdso_remap (enum arch_vdso_type arch_index,const struct vm_special_mapping *sm,struct vm_area_struct *new_vma)
@@ -180,9 +194,11 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index,unsigned long vdso_base, vdso_text_len, vdso_mapping_len;void *ret; +BUILD_BUG_ON (VVAR_NR_PAGES != __VVAR_PAGES); + vdso_text_len = vdso_lookup[arch_index].vdso_pages <<PAGE_SHIFT ;/* Be sure to map the data page */ - vdso_mapping_len = vdso_text_len +PAGE_SIZE ; + vdso_mapping_len = vdso_text_len +VVAR_NR_PAGES *PAGE_SIZE ; vdso_base =get_unmapped_area (NULL ,0 , vdso_mapping_len,0 ,0 );if (IS_ERR_VALUE (vdso_base)) {
@@ -190,13 +206,13 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index, goto up_fail; } - ret =_install_special_mapping (mm, vdso_base,PAGE_SIZE , + ret =_install_special_mapping (mm, vdso_base,VVAR_NR_PAGES *PAGE_SIZE ,VM_READ |VM_MAYREAD |VM_PFNMAP , vdso_lookup[arch_index].dm);if (IS_ERR (ret)) goto up_fail; - vdso_base +=PAGE_SIZE ; + vdso_base +=VVAR_NR_PAGES *PAGE_SIZE ; mm->context.vdso = (void *)vdso_base; ret = _install_special_mapping(mm, vdso_base, vdso_text_len, VM_READ|VM_EXEC|
arch/arm64/kernel/vdso/vdso.lds.S +4 -1
@@ -17,7 +17,10 @@ OUTPUT_ARCH(aarch64) SECTIONS { - PROVIDE(_vdso_data = . - PAGE_SIZE); + PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); +#ifdef CONFIG_TIME_NS + PROVIDE(_timens_data = _vdso_data + PAGE_SIZE); +#endif . = VDSO_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
arch/arm64/kernel/vdso32/vdso.lds.S +4 -1
@@ -17,7 +17,10 @@ OUTPUT_ARCH(arm) SECTIONS { - PROVIDE_HIDDEN(_vdso_data = . - PAGE_SIZE); + PROVIDE_HIDDEN(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); +#ifdef CONFIG_TIME_NS + PROVIDE_HIDDEN(_timens_data = _vdso_data + PAGE_SIZE); +#endif . = VDSO_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
include/vdso/datapage.h +1 -0
@@ -109,6 +109,7 @@ struct vdso_data {* relocation, and this is what we need. */ extern struct vdso_data _vdso_data[CS_BASES] __attribute__((visibility("hidden"))); +extern struct vdso_data _timens_data[CS_BASES] __attribute__((visibility("hidden")));/* * The generic vDSO implementation requires that gettimeofday.h
Signature · 1 line
2.24.1
Re: [PATCH 3/6] arm64/vdso: Add time namespace page
Hi Andrei,
On 6/2/20 7:02 PM, Andrei Vagin wrote:
[..]
arch/arm64/include/asm/vdso.h line 21
Quoted 13 lines
arch/arm64/include/asm/vdso.h +6
-0@@ -12,6 +12,12 @@*/ #define VDSO_LBASE 0x0 +#ifdef CONFIG_TIME_NS +#define __VVAR_PAGES 2 +#else +#define __VVAR_PAGES 1 +#endif +#ifndef __ASSEMBLY__
Not an issue as-is, but:
on x86 vdso+vvar is always the same size with/without CONFIG_TIME_NAMESPACE.
Timens page isn't allocated on !CONFIG_TIME_NAMESPACE, but vma is the same size. Which simplifies criu/vdso migration between different kernel configs.
Not any critical, but just to note..
Thanks,
Dima
Hi Andrei,
Quoted 22 lines · Andrei Vagin
Allocate the time namespace page among VVAR pages and add the logic to handle faults on VVAR properly.
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has
vdso_data->seqset to 1 to enforce the slow path andvdso_data->clock_modeset toVCLOCK_TIMENSto enforce the time namespace handling path.The extra check in the case that
vdso_data->seqis odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish andvdso_data->seqto become even again.If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
v2: Code cleanups suggested by Vincenzo.
v3: add a comment in__arch_get_timens_vdso_data.
Quoted 6 lines
Reviewed-by Vincenzo Frascino <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Dmitry Safonov <[email protected]>v3 on github (if someone prefers
git pulltogit am):
https://github.com/avagin/linux-task-diag/tree/arm64/timens-v3
Thanks for adding arm64 support, I've looked through patches and don't see any major problems.
Quoted 9 lines
Andrei Vagin (6):
arm64/vdso: use the fault callback to map vvar pages arm64/vdso: Zap vvar pages when switching to a time namespace arm64/vdso: Add time napespace page
arm64/vdso: Handle faults on timens page arm64/vdso: Restrict splitting VVAR VMA
arm64: enable time namespace support
Quoted 9 lines
arch/arm64/Kconfig | 1 + .../include/asm/vdso/compat_gettimeofday.h | 11 ++ arch/arm64/include/asm/vdso/gettimeofday.h | 8 ++ arch/arm64/kernel/vdso.c | 134 ++++++++++++++++-- arch/arm64/kernel/vdso/vdso.lds.S | 3 +- arch/arm64/kernel/vdso32/vdso.lds.S | 3 +- include/vdso/datapage.h | 1 + 7 files changed, 147 insertions(+), 14 deletions(-)
Thanks,
Dmitry
kbuild test robot
build botRe: [PATCH 3/6] arm64/vdso: Add time namespace page
In reply to Andrei VaginThank you for the patch! Perhaps something to improve:
Hi Andrei,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on soc/for-next]
[also build test WARNING on arm/for-next kvmarm/next v5.7]
[cannot apply to arm64/for-next/core next-20200602]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Andrei-Vagin/arm64-add-the-time-namespace-support/20200603-020504 base: https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git for-next config: arm64-randconfig-r004-20200602 (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 2388a096e7865c043e83ece4e26654bd3d1a20d5)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>, old ones prefixed by <<):
>> arch/arm64/kernel/vdso.c:93:19: warning: no previous prototype for function 'arch_get_vdso_data' [-Wmissing-prototypes]
struct vdso_data *arch_get_vdso_data(void *vvar_page)
^arch/arm64/kernel/vdso.c:93:1: note: declare 'static' if the function is not intended to be used outside of this translation unit struct vdso_data *arch_get_vdso_data(void *vvar_page)
^
static
1 warning generated.
vim +/arch_get_vdso_data +93 arch/arm64/kernel/vdso.c
91
92
> 93 struct vdso_data *arch_get_vdso_data(void *vvar_page)
94 {
95 return (struct vdso_data *)(vvar_page);
96 }
97 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kbuild test robot
build botRe: [PATCH 3/6] arm64/vdso: Add time namespace page
In reply to Andrei VaginThank you for the patch! Perhaps something to improve:
Hi Andrei,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on soc/for-next]
[also build test WARNING on arm/for-next xlnx/master kvmarm/next v5.7] [cannot apply to arm64/for-next/core next-20200602]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Andrei-Vagin/arm64-add-the-time-namespace-support/20200603-020504 base: https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git for-next config: arm64-allnoconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>, old ones prefixed by <<):
>> arch/arm64/kernel/vdso.c:93:19: warning: no previous prototype for 'arch_get_vdso_data' [-Wmissing-prototypes]
93 | struct vdso_data *arch_get_vdso_data(void *vvar_page)
| ^~~~~~~~~~~~~~~~~~
vim +/arch_get_vdso_data +93 arch/arm64/kernel/vdso.c
91
92
> 93 struct vdso_data *arch_get_vdso_data(void *vvar_page)
94 {
95 return (struct vdso_data *)(vvar_page);
96 }
97 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v4 3/6 arm64/vdso: Add time namespace page
In reply to Andrei VaginAllocate the time namespace page among VVAR pages. Provide __arch_get_timens_vdso_data() helper for VDSO code to get the code-relative position of VVARs on that special page.
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
---
v4: - fix an issue reported by the lkp robot.
- vvar has the same size with/without CONFIG_TIME_NAMESPACE, but the timens page isn't allocated on !CONFIG_TIME_NAMESPACE. This simplifies criu/vdso migration between different kernel configs.
arch/arm64/include/asm/vdso.h | 2 ++ .../include/asm/vdso/compat_gettimeofday.h | 12 +++++++++++ arch/arm64/include/asm/vdso/gettimeofday.h | 8 ++++++++ arch/arm64/kernel/vdso.c | 20 ++++++++++++++++--- arch/arm64/kernel/vdso/vdso.lds.S | 5 ++++- arch/arm64/kernel/vdso32/vdso.lds.S | 5 ++++- include/vdso/datapage.h | 1 + 7 files changed, 48 insertions(+), 5 deletions(-)
arch/arm64/include/asm/vdso.h +2 -0
@@ -12,6 +12,8 @@*/ #define VDSO_LBASE 0x0 +#define __VVAR_PAGES 2 +#ifndef __ASSEMBLY__#include <generated/vdso-offsets.h>
arch/arm64/include/asm/vdso/compat_gettimeofday.h +12 -0
@@ -152,6 +152,18 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void)return ret; } +#ifdef CONFIG_TIME_NS +static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +const struct vdso_data *ret; + +/* See __arch_get_vdso_data(). */ + asmvolatile ("mov %0, %1" :"=r" (ret) :"r" (_timens_data)); + +return ret; +} +#endif +#endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
arch/arm64/include/asm/vdso/gettimeofday.h +8 -0
@@ -96,6 +96,14 @@ const struct vdso_data *__arch_get_vdso_data(void)return _vdso_data; } +#ifdef CONFIG_TIME_NS +static __always_inline +const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +return _timens_data; +} +#endif +#endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
arch/arm64/kernel/vdso.c +17 -3
@@ -46,6 +46,12 @@ enum arch_vdso_type {#define VDSO_TYPES (ARM64_VDSO + 1)#endif /* CONFIG_COMPAT_VDSO */ +enum vvar_pages { +VVAR_DATA_PAGE_OFFSET , +VVAR_TIMENS_PAGE_OFFSET , +VVAR_NR_PAGES , +}; +struct __vdso_abi {const char *name;const char *vdso_code_start;
@@ -81,6 +87,7 @@ static union { }vdso_data_store __page_aligned_data;struct vdso_data *vdso_data = vdso_data_store.data; +static int __vdso_remap (enum arch_vdso_type arch_index,const struct vm_special_mapping *sm,struct vm_area_struct *new_vma)
@@ -132,6 +139,11 @@ static int __vdso_init(enum arch_vdso_type arch_index) }#ifdef CONFIG_TIME_NS +struct vdso_data *arch_get_vdso_data (void *vvar_page) +{ +return (struct vdso_data *)(vvar_page); +} +/* * 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
@@ -180,9 +192,11 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index,unsigned long vdso_base, vdso_text_len, vdso_mapping_len;void *ret; +BUILD_BUG_ON (VVAR_NR_PAGES != __VVAR_PAGES); + vdso_text_len = vdso_lookup[arch_index].vdso_pages <<PAGE_SHIFT ;/* Be sure to map the data page */ - vdso_mapping_len = vdso_text_len +PAGE_SIZE ; + vdso_mapping_len = vdso_text_len +VVAR_NR_PAGES *PAGE_SIZE ; vdso_base =get_unmapped_area (NULL ,0 , vdso_mapping_len,0 ,0 );if (IS_ERR_VALUE (vdso_base)) {
@@ -190,13 +204,13 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index, goto up_fail; } - ret =_install_special_mapping (mm, vdso_base,PAGE_SIZE , + ret =_install_special_mapping (mm, vdso_base,VVAR_NR_PAGES *PAGE_SIZE ,VM_READ |VM_MAYREAD |VM_PFNMAP , vdso_lookup[arch_index].dm);if (IS_ERR (ret)) goto up_fail; - vdso_base +=PAGE_SIZE ; + vdso_base +=VVAR_NR_PAGES *PAGE_SIZE ; mm->context.vdso = (void *)vdso_base; ret = _install_special_mapping(mm, vdso_base, vdso_text_len, VM_READ|VM_EXEC|
arch/arm64/kernel/vdso/vdso.lds.S +4 -1
@@ -17,7 +17,10 @@ OUTPUT_ARCH(aarch64) SECTIONS { - PROVIDE(_vdso_data = . - PAGE_SIZE); + PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); +#ifdef CONFIG_TIME_NS + PROVIDE(_timens_data = _vdso_data + PAGE_SIZE); +#endif . = VDSO_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
arch/arm64/kernel/vdso32/vdso.lds.S +4 -1
@@ -17,7 +17,10 @@ OUTPUT_ARCH(arm) SECTIONS { - PROVIDE_HIDDEN(_vdso_data = . - PAGE_SIZE); + PROVIDE_HIDDEN(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); +#ifdef CONFIG_TIME_NS + PROVIDE_HIDDEN(_timens_data = _vdso_data + PAGE_SIZE); +#endif . = VDSO_LBASE + SIZEOF_HEADERS; .hash : { *(.hash) } :text
include/vdso/datapage.h +1 -0
@@ -109,6 +109,7 @@ struct vdso_data {* relocation, and this is what we need. */ extern struct vdso_data _vdso_data[CS_BASES] __attribute__((visibility("hidden"))); +extern struct vdso_data _timens_data[CS_BASES] __attribute__((visibility("hidden")));/* * The generic vDSO implementation requires that gettimeofday.h
Signature · 1 line
2.24.1
Mark Rutland
reviewerHi Andrei,
As a heads up, in mainline the arm64 vdso code has been refactored since v5.7, and this series will need to be rebased atop. Given we're in the middle of the merge window, I would suggest waiting until rc1 before posting a rebased series.
In the meantime, the relevant patches can be found in arm64's for-next/core branch:
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/core
... which was merged into mainline in commit:
533b220f7be4e461 ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux")
Thanks,
Mark.
Quoted 49 lines · Andrei Vagin
Allocate the time namespace page among VVAR pages and add the logic to handle faults on VVAR properly.
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has
vdso_data->seqset to 1 to enforce the slow path andvdso_data->clock_modeset toVCLOCK_TIMENSto enforce the time namespace handling path.The extra check in the case that
vdso_data->seqis odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish andvdso_data->seqto become even again.If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
v2: Code cleanups suggested by Vincenzo.
v3: add a comment in__arch_get_timens_vdso_data.Reviewed-by Vincenzo Frascino <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Dmitry Safonov <[email protected]>v3 on github (if someone prefers
git pulltogit am):
https://github.com/avagin/linux-task-diag/tree/arm64/timens-v3Andrei Vagin (6):
arm64/vdso: use the fault callback to map vvar pages arm64/vdso: Zap vvar pages when switching to a time namespace arm64/vdso: Add time napespace page
arm64/vdso: Handle faults on timens page arm64/vdso: Restrict splitting VVAR VMA
arm64: enable time namespace supportarch/arm64/Kconfig | 1 + .../include/asm/vdso/compat_gettimeofday.h | 11 ++ arch/arm64/include/asm/vdso/gettimeofday.h | 8 ++ arch/arm64/kernel/vdso.c | 134 ++++++++++++++++-- arch/arm64/kernel/vdso/vdso.lds.S | 3 +- arch/arm64/kernel/vdso32/vdso.lds.S | 3 +- include/vdso/datapage.h | 1 + 7 files changed, 147 insertions(+), 14 deletions(-)Signature · 1 line
2.24.1
Quoted 6 lines · Mark Rutland
Hi Andrei,
As a heads up, in mainline the arm64 vdso code has been refactored since v5.7, and this series will need to be rebased atop. Given we're in the middle of the merge window, I would suggest waiting until rc1 before posting a rebased series.
Ok. I will resend this series after rc1. Thanks!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel