Skip to contentSkip to conversation

um: move thread info into task

PATCH Superseded Benjamin Berg 2 participants 2 messages Nov 8, 2024 – Nov 9, 2024 User-mode Linux (UML)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 um: move thread info into task

From: Benjamin Berg <[email protected]>

This selects the THREAD_INFO_IN_TASK option for UM and changes the way that the current task is discovered. This is trivial though, as UML already tracks the current task in cpu_tasks[] and this can be used to retrieve it.

Also remove the signal handler code that copies the thread information into the IRQ stack. It is obsolete now, which also means that the mentioned race condition cannot happen anymore.

---
v2:
- Fix circular include (thanks to Hajime Tazaki)
- Make irq stack a static variable and remove unused declaration

---
 arch/um/Kconfig                    |   1 +
 arch/um/include/asm/Kbuild         |   1 -
 arch/um/include/asm/current.h      |  24 +++++++
 arch/um/include/asm/thread_info.h  |  16 -----
 arch/um/include/shared/as-layout.h |   7 +-
 arch/um/kernel/dyn.lds.S           |   2 -
 arch/um/kernel/irq.c               | 112 -----------------------------
 arch/um/kernel/process.c           |   5 +-
 arch/um/kernel/skas/process.c      |   4 +-
 arch/um/kernel/um_arch.c           |   7 +-
 arch/um/kernel/uml.lds.S           |   2 -
 arch/um/os-Linux/signal.c          |  37 +---------
 12 files changed, 35 insertions(+), 183 deletions(-)
 create mode 100644 arch/um/include/asm/current.h
arch/um/Kconfig +1 -0
index a9876bdb5bf9..18051b1cfce0 100644
@@ -34,6 +34,7 @@ config UML
 	select HAVE_RUST
 	select ARCH_HAS_UBSAN
 	select HAVE_ARCH_TRACEHOOK
+	select THREAD_INFO_IN_TASK
 
 config MMU
 	bool
arch/um/include/asm/Kbuild +0 -1
index 18f902da8e99..428f2c5158c2 100644
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 generic-y += bug.h
 generic-y += compat.h
-generic-y += current.h
 generic-y += device.h
 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
arch/um/include/asm/current.h new file +24 -0
new file mode 100644
index 000000000000..51b9c4d097e7
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ASM_CURRENT_H
+#define __ASM_CURRENT_H
+
+#include <linux/compiler.h>
+#include <linux/threads.h>
+
+#ifndef __ASSEMBLY__
+
+struct task_struct;
+extern struct task_struct * cpu_tasks[NR_CPUS];
+
+static __always_inline struct task_struct *get_current(void)
+{
+	return cpu_tasks[0];
+}
+
+
+#define current get_current()
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_CURRENT_H */
+
arch/um/include/asm/thread_info.h +0 -16
index 4d2a768246bc..f9ad06fcc991 100644
@@ -17,33 +17,17 @@
 #include <sysdep/ptrace_user.h>
 
 struct thread_info {
-	struct task_struct	*task;		/* main task structure */
 	unsigned long		flags;		/* low level flags */
 	__u32			cpu;		/* current CPU */
 	int			preempt_count;  /* 0 => preemptable,
 						   <0 => BUG */
-	struct thread_info	*real_thread;    /* Points to non-IRQ stack */
 };
 
 #define INIT_THREAD_INFO(tsk)			\
 {						\
-	.task =		&tsk,			\
 	.flags =		0,		\
 	.cpu =		0,			\
 	.preempt_count = INIT_PREEMPT_COUNT,	\
-	.real_thread = NULL,			\
-}
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-	struct thread_info *ti;
-	unsigned long mask = THREAD_SIZE - 1;
-	void *p;
-
-	asm volatile ("" : "=r" (p) : "0" (&ti));
-	ti = (struct thread_info *) (((unsigned long)p) & ~mask);
-	return ti;
 }
 
 #endif
arch/um/include/shared/as-layout.h +2 -5
index d9679c911e54..0d3f5d022d24 100644
@@ -30,11 +30,8 @@
 
 #include <sysdep/ptrace.h>
 
-struct cpu_task {
-	void *task;
-};
-
-extern struct cpu_task cpu_tasks[];
+struct task_struct;
+extern struct task_struct * cpu_tasks[];
 
 extern unsigned long long physmem_size;
 
arch/um/kernel/dyn.lds.S +0 -2
index dc9d9a68af55..a36b7918a011 100644
@@ -116,8 +116,6 @@ SECTIONS
   .fini_array     : { *(.fini_array) }
   .data           : {
     INIT_TASK_DATA(KERNEL_STACK_SIZE)
-    . = ALIGN(KERNEL_STACK_SIZE);
-    *(.data..init_irqstack)
     DATA_DATA
     *(.data.* .gnu.linkonce.d.*)
     SORT(CONSTRUCTORS)
arch/um/kernel/irq.c +0 -112

115 lines not on this page · raw message

arch/um/kernel/process.c +3 -2
index 56e7e525fc91..5283035fb655 100644
@@ -43,7 +43,8 @@
  * cares about its entry, so it's OK if another processor is modifying its
  * entry.
  */
-struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { NULL } };
+struct task_struct * cpu_tasks[NR_CPUS];
+EXPORT_SYMBOL(cpu_tasks);
 
 void free_stack(unsigned long stack, int order)
 {
@@ -64,7 +65,7 @@ unsigned long alloc_stack(int order, int atomic)
 
 static inline void set_current(struct task_struct *task)
 {
-	cpu_tasks[task_thread_info(task)->cpu] = ((struct cpu_task) { task });
+	cpu_tasks[task_thread_info(task)->cpu] = task;
 }
 
 struct task_struct *__switch_to(struct task_struct *from, struct task_struct *to)
arch/um/kernel/skas/process.c +1 -3
index 68657988c8d1..05dcdc057af9 100644
@@ -22,15 +22,13 @@ static int __init start_kernel_proc(void *unused)
 {
 	block_signals_trace();
 
-	cpu_tasks[0].task = current;
-
 	start_kernel();
 	return 0;
 }
 
 extern int userspace_pid[];
 
-extern char cpu0_irqstack[];
+static char cpu0_irqstack[THREAD_SIZE] __aligned(THREAD_SIZE);
 
 int __init start_uml(void)
 {
arch/um/kernel/um_arch.c +3 -4
index ec17576ce9fc..62ddb865eb91 100644
@@ -65,9 +65,6 @@ struct cpuinfo_um boot_cpu_data = {
 
 EXPORT_SYMBOL(boot_cpu_data);
 
-union thread_union cpu0_irqstack
-	__section(".data..init_irqstack") =
-		{ .thread_info = INIT_THREAD_INFO(init_task) };
 
 /* Changed in setup_arch, which is called in early boot */
 static char host_info[(__NEW_UTS_LEN + 1) * 5];
@@ -244,6 +241,8 @@ static struct notifier_block panic_exit_notifier = {
 
 void uml_finishsetup(void)
 {
+	cpu_tasks[0] = &init_task;
+
 	atomic_notifier_chain_register(&panic_notifier_list,
 				       &panic_exit_notifier);
 
@@ -418,7 +417,7 @@ void __init setup_arch(char **cmdline_p)
 {
 	u8 rng_seed[32];
 
-	stack_protections((unsigned long) &init_thread_info);
+	stack_protections((unsigned long) init_task.stack);
 	setup_physmem(uml_physmem, uml_reserved, physmem_size);
 	mem_total_pages(physmem_size, iomem_size);
 	uml_dtb_init();
arch/um/kernel/uml.lds.S +0 -2
index 5c92d58a78e8..a409d4b66114 100644
@@ -77,8 +77,6 @@ SECTIONS
   .data    :
   {
     INIT_TASK_DATA(KERNEL_STACK_SIZE)
-    . = ALIGN(KERNEL_STACK_SIZE);
-    *(.data..init_irqstack)
     DATA_DATA
     *(.gnu.linkonce.d*)
     CONSTRUCTORS
arch/um/os-Linux/signal.c +1 -36
index 52852018a3ad..9ea7269ffb77 100644
@@ -190,43 +190,8 @@ static void hard_handler(int sig, siginfo_t *si, void *p)
 {
 	ucontext_t *uc = p;
 	mcontext_t *mc = &uc->uc_mcontext;
-	unsigned long pending = 1UL << sig;
 
-	do {
-		int nested, bail;
-
-		/*
-		 * pending comes back with one bit set for each
-		 * interrupt that arrived while setting up the stack,
-		 * plus a bit for this interrupt, plus the zero bit is
-		 * set if this is a nested interrupt.
-		 * If bail is true, then we interrupted another
-		 * handler setting up the stack.  In this case, we
-		 * have to return, and the upper handler will deal
-		 * with this interrupt.
-		 */
-		bail = to_irq_stack(&pending);
-		if (bail)
-			return;
-
-		nested = pending & 1;
-		pending &= ~1;
-
-		while ((sig = ffs(pending)) != 0){
-			sig--;
-			pending &= ~(1 << sig);
-			(*handlers[sig])(sig, (struct siginfo *)si, mc);
-		}
-
-		/*
-		 * Again, pending comes back with a mask of signals
-		 * that arrived while tearing down the stack.  If this
-		 * is non-zero, we just go back, set up the stack
-		 * again, and handle the new interrupts.
-		 */
-		if (!nested)
-			pending = from_irq_stack(nested);
-	} while (pending);
+	(*handlers[sig])(sig, (struct siginfo *)si, mc);
 }
 
 void set_handler(int sig)
Signature · 1 line
2.47.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Benjamin Berg
arch/um/include/asm/current.h new file +1 -0
new file mode 100644
index 000000000000..51b9c4d097e7
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */

arch/um/include/asm/current.h line 11

Quoted 10 lines
arch/um/include/asm/current.h new file +10 -0
+#ifndef __ASM_CURRENT_H
+#define __ASM_CURRENT_H
+
+#include <linux/compiler.h>
+#include <linux/threads.h>
+
+#ifndef __ASSEMBLY__
+
+struct task_struct;
+extern struct task_struct * cpu_tasks[NR_CPUS];

might be

  extern struct task_struct *cpu_tasks[NR_CPUS];
# no space before the variable.
Quoted 5 lines
arch/um/include/asm/current.h new file +5 -0
+static __always_inline struct task_struct *get_current(void)
+{
+	return cpu_tasks[0];
+}
+

(snip)

Quoted 5 lines
arch/um/include/shared/as-layout.h +0 -0
index d9679c911e54..0d3f5d022d24 100644

arch/um/include/shared/as-layout.h line 34

Quoted 10 lines
arch/um/include/shared/as-layout.h +2 -5
@@ -30,11 +30,8 @@
 
 #include <sysdep/ptrace.h>
 
-struct cpu_task {
-	void *task;
-};
-
-extern struct cpu_task cpu_tasks[];
+struct task_struct;
+extern struct task_struct * cpu_tasks[];

ditto.

Quoted 3 lines
arch/um/include/shared/as-layout.h +0 -0
 extern unsigned long long physmem_size;
 
arch/um/kernel/dyn.lds.S +0 -0

(snip)

arch/um/kernel/process.c line 46

Quoted 10 lines
arch/um/kernel/process.c +1 -1
index 56e7e525fc91..5283035fb655 100644
@@ -43,7 +43,8 @@
  * cares about its entry, so it's OK if another processor is modifying its
  * entry.
  */
-struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { NULL } };
+struct task_struct * cpu_tasks[NR_CPUS];

ditto.

The other part is looking good to me.

-- Hajime