Commit 606e9ad2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clone3-tls-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux 

Pull thread fixes from Christian Brauner:
 "This contains a series of patches to fix CLONE_SETTLS when used with
  clone3().

  The clone3() syscall passes the tls argument through struct clone_args
  instead of a register. This means, all architectures that do not
  implement copy_thread_tls() but still support CLONE_SETTLS via
  copy_thread() expecting the tls to be located in a register argument
  based on clone() are currently unfortunately broken. Their tls value
  will be garbage.

  The patch series fixes this on all architectures that currently define
  __ARCH_WANT_SYS_CLONE3. It also adds a compile-time check to ensure
  that any architecture that enables clone3() in the future is forced to
  also implement copy_thread_tls().

  My ultimate goal is to get rid of the copy_thread()/copy_thread_tls()
  split and just have copy_thread_tls() at some point in the not too
  distant future (Maybe even renaming copy_thread_tls() back to simply
  copy_thread() once the old function is ripped from all arches). This
  is dependent now on all arches supporting clone3().

  While all relevant arches do that now there are still four missing:
  ia64, m68k, sh and sparc. They have the system call reserved, but not
  implemented. Once they all implement clone3() we can get rid of
  ARCH_WANT_SYS_CLONE3 and HAVE_COPY_THREAD_TLS.

  This series also includes a minor fix for the arm64 uapi headers which
  caused __NR_clone3 to be missing from the exported user headers.

  Unfortunately the series came in a little late especially given that
  it touches a range of architectures. Due to the holidays not all arch
  maintainers responded in time probably due to their backlog. Will and
  Arnd have thankfully acked the arm specific changes.

  Given that the changes are straightforward and rather minimal combined
  with the fact the that clone3() with CLONE_SETTLS is broken I decided
  to send them post rc3 nonetheless"

* tag 'clone3-tls-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  um: Implement copy_thread_tls
  clone3: ensure copy_thread_tls is implemented
  xtensa: Implement copy_thread_tls
  riscv: Implement copy_thread_tls
  parisc: Implement copy_thread_tls
  arm: Implement copy_thread_tls
  arm64: Implement copy_thread_tls
  arm64: Move __ARCH_WANT_SYS_CLONE3 definition to uapi headers
parents ac61145a 457677c7

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config ARM 
	select HAVE_ARM_SMCCC if CPU_V7

	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS if MMU

arch/arm/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ void release_thread(struct task_struct *dead_task) 
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");



int

copy_thread(unsigned long clone_flags, unsigned long stack_start,

	    unsigned long stk_sz, struct task_struct *p)

copy_thread_tls(unsigned long clone_flags, unsigned long stack_start,

	    unsigned long stk_sz, struct task_struct *p, unsigned long tls)

{

	struct thread_info *thread = task_thread_info(p);

	struct pt_regs *childregs = task_pt_regs(p);
@@ -261,7 +261,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, 
	clear_ptrace_hw_breakpoint(p);



	if (clone_flags & CLONE_SETTLS)

		thread->tp_value[0] = childregs->ARM_r3;

		thread->tp_value[0] = tls;

	thread->tp_value[1] = get_tpuser();



	thread_notify(THREAD_NOTIFY_COPY, thread);

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ config ARM64 
	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

arch/arm64/include/asm/unistd.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#endif



#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_CLONE3



#ifndef __COMPAT_SYSCALL_NR

#include <uapi/asm/unistd.h>

arch/arm64/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_TIME32_SYSCALLS

#define __ARCH_WANT_SYS_CLONE3



#include <asm-generic/unistd.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE