um: Remove userspace_pid[]
Subsystems (2)
v2 cover um: Remove userspace_pid[]
From: Tiwei Bie <[email protected]>
v2:
- Remove all declarations of userspace_pid[] from .h and .c files;
- Update the reference to userspace_pid[] in the comment;
v1:
https://lore.kernel.org/linux-um/[email protected]/
Tiwei Bie (3):
um: Use err consistently in userspace()
um: Remove the pid parameter of handle_trap()
um: Stop tracking stub's PID via userspace_pid[]
arch/um/include/asm/mmu_context.h | 9 +------- arch/um/include/shared/skas/mm_id.h | 2 -- arch/um/include/shared/skas/skas.h | 1 - arch/um/kernel/exec.c | 2 -- arch/um/kernel/skas/process.c | 2 -- arch/um/os-Linux/skas/process.c | 33 ++++++++++++----------------- arch/x86/um/tls_32.c | 2 +- 7 files changed, 16 insertions(+), 35 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/3 um: Use err consistently in userspace()
From: Tiwei Bie <[email protected]>
Avoid declaring a new variable 'ret' inside the 'if (using_seccomp)' block, as the existing 'err' variable declared at the top of the function already serves the same purpose.
--- arch/um/os-Linux/skas/process.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
arch/um/os-Linux/skas/process.c +6 -7
@@ -592,12 +592,11 @@ void userspace(struct uml_pt_regs *regs)if (using_seccomp) {struct mm_id *mm_id =current_mm_id ();struct stub_data *proc_data = (void *) mm_id->stack; -int ret; - ret =set_stub_state (regs, proc_data,singlestepping ()); -if (ret) { + err =set_stub_state (regs, proc_data,singlestepping ()); +if (err) {printk (UM_KERN_ERR "%s - failed to set regs: %d" , - __func__, ret); + __func__, err);fatal_sigsegv (); }
@@ -623,10 +622,10 @@ void userspace(struct uml_pt_regs *regs) mm_id->syscall_data_len =0 ; mm_id->syscall_fd_num =0 ; - ret =get_stub_state (regs, proc_data,NULL ); -if (ret) { + err =get_stub_state (regs, proc_data,NULL ); +if (err) {printk (UM_KERN_ERR "%s - failed to get regs: %d" , - __func__, ret); + __func__, err);fatal_sigsegv (); }
Signature · 1 line
2.34.1
PATCH v2 2/3 um: Remove the pid parameter of handle_trap()
In reply to Tiwei BieFrom: Tiwei Bie <[email protected]>
It's no longer used. Remove it.
--- arch/um/os-Linux/skas/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/um/os-Linux/skas/process.c +2 -2
@@ -267,7 +267,7 @@ static void get_skas_faultinfo(int pid, struct faultinfo *fi)memcpy (fi, (void *)current_stub_stack (),sizeof (*fi)); } -static void handle_trap (int pid,struct uml_pt_regs *regs) +static void handle_trap (struct uml_pt_regs *regs) {if ((UPT_IP (regs) >=STUB_START ) && (UPT_IP (regs) <STUB_END ))fatal_sigsegv ();
@@ -755,7 +755,7 @@ void userspace(struct uml_pt_regs *regs)handle_syscall (regs);break ;case SIGTRAP +0x80 : -handle_trap (pid, regs); +handle_trap (regs);break ;case SIGTRAP :relay_signal (SIGTRAP , (struct siginfo *)si, regs,NULL );
Signature · 1 line
2.34.1
PATCH v2 3/3 um: Stop tracking stub's PID via userspace_pid[]
In reply to Tiwei BieFrom: Tiwei Bie <[email protected]>
The PID of the stub process can be obtained from current_mm_id(). There is no need to track it via userspace_pid[]. Stop doing that to simplify the code.
--- arch/um/include/asm/mmu_context.h | 9 +-------- arch/um/include/shared/skas/mm_id.h | 2 -- arch/um/include/shared/skas/skas.h | 1 - arch/um/kernel/exec.c | 2 -- arch/um/kernel/skas/process.c | 2 -- arch/um/os-Linux/skas/process.c | 16 ++++++---------- arch/x86/um/tls_32.c | 2 +- 7 files changed, 8 insertions(+), 26 deletions(-)
arch/um/include/asm/mmu_context.h +1 -8
@@ -16,11 +16,6 @@#define activate_mm activate_mmstatic inline void activate_mm (struct mm_struct *old,struct mm_struct *new) { -/* -* This is called by fs/exec.c and sys_unshare() -* when the new ->mm is used for the first time. -*/ -__switch_mm (&new->context.id); } static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
@@ -28,11 +23,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, {unsigned cpu =smp_processor_id (); -if (prev != next){ +if (prev != next) {cpumask_clear_cpu (cpu,mm_cpumask (prev));cpumask_set_cpu (cpu,mm_cpumask (next)); -if (next != &init_mm) -__switch_mm (&next->context.id); } }
arch/um/include/shared/skas/mm_id.h +0 -2
@@ -19,8 +19,6 @@ struct mm_id { int syscall_fd_map[STUB_MAX_FDS]; }; -void __switch_mm (struct mm_id *mm_idp); -void notify_mm_kill (int pid);#endif
arch/um/include/shared/skas/skas.h +0 -1
@@ -9,7 +9,6 @@#include <sysdep/ptrace.h> extern int using_seccomp; -extern int userspace_pid[];extern void new_thread_handler (void );extern void handle_syscall (struct uml_pt_regs *regs);
arch/um/kernel/exec.c +0 -2
@@ -26,8 +26,6 @@ void flush_thread(void)get_safe_registers (current_pt_regs ()->regs.gp,current_pt_regs ()->regs.fp); - -__switch_mm (¤t->mm->context.id); }void start_thread (struct pt_regs *regs,unsigned long eip,unsigned long esp)
arch/um/kernel/skas/process.c +0 -2
@@ -26,8 +26,6 @@ static int __init start_kernel_proc(void *unused)return 0 ; } -extern int userspace_pid[]; -static char cpu0_irqstack[THREAD_SIZE ]__aligned(THREAD_SIZE) ;int __init start_uml (void )
arch/um/os-Linux/skas/process.c +6 -10
@@ -434,7 +434,6 @@ static int __init init_stub_exe_fd(void)__initcall (init_stub_exe_fd);int using_seccomp; -int userspace_pid[NR_CPUS ];/** * start_userspace() - prepare a new userspace process
@@ -553,7 +552,7 @@ extern unsigned long tt_extra_sched_jiffies;void userspace (struct uml_pt_regs *regs) { -int err, status, op, pid = userspace_pid[0 ]; +int err, status, op;siginfo_t si_ptrace;siginfo_t *si;int sig;
@@ -562,6 +561,8 @@ void userspace(struct uml_pt_regs *regs)interrupt_end ();while (1 ) { +struct mm_id *mm_id =current_mm_id (); +/* * When we are in time-travel mode, userspace can theoretically * do a *lot* of work without being scheduled. The problem with
@@ -590,7 +591,6 @@ void userspace(struct uml_pt_regs *regs)current_mm_sync ();if (using_seccomp) { -struct mm_id *mm_id =current_mm_id ();struct stub_data *proc_data = (void *) mm_id->stack; err =set_stub_state (regs, proc_data,singlestepping ());
@@ -644,8 +644,10 @@ void userspace(struct uml_pt_regs *regs)GET_FAULTINFO_FROM_MC (regs->faultinfo, mcontext); } }else { +int pid = mm_id->pid; +/* Flush out any pending syscalls */ - err =syscall_stub_flush (current_mm_id ()); + err =syscall_stub_flush (mm_id);if (err) {if (err == -ENOMEM )report_enomem ();
@@ -776,7 +778,6 @@ void userspace(struct uml_pt_regs *regs) __func__, sig);fatal_sigsegv (); } - pid = userspace_pid[0 ];interrupt_end ();/* Avoid -ERESTARTSYS handling in host */
@@ -901,8 +902,3 @@ void reboot_skas(void)block_signals_trace ();UML_LONGJMP (&initial_jmpbuf, noreboot ?INIT_JMP_HALT :INIT_JMP_REBOOT ); } - -void __switch_mm (struct mm_id *mm_idp) -{ - userspace_pid[0 ] = mm_idp->pid; -}
arch/x86/um/tls_32.c +1 -1
@@ -186,7 +186,7 @@ int arch_switch_tls(struct task_struct *to)/* * We have no need whatsoever to switch TLS for kernel threads; beyond * that, that would also result in us calling os_set_thread_area with -* userspace_pid[cpu] == 0, which gives an error. +* task->mm == NULL, which would cause a crash. */ if (likely (to->mm))return load_TLS (O_FORCE , to);
Signature · 1 line
2.34.1
Johannes Berg
maintainerRe: [PATCH v2 3/3] um: Stop tracking stub's PID via userspace_pid[]
Quoted 5 lines · Tiwei Bie
From: Tiwei Bie <[email protected]>
The PID of the stub process can be obtained from
current_mm_id(). There is no need to track it via userspace_pid[]. Stop doing that to simplify the code.
So that is really obvious cleanups, and I can go apply them on that grounds, but I started wondering if we're not separately being inconsistent here, which perhaps didn't matter due to non-SMP:
arch/um/include/asm/mmu_context.h line 19
Quoted 9 lines
#define
activate_mmactivate_mm
static inline voidactivate_mm(struct mm_struct *old, struct mm_struct *new){arch/um/include/asm/mmu_context.h +0
-5-/* -* This is called by fs/exec.c and sys_unshare() -* when the new ->mm is used for the first time. -*/ -__switch_mm (&new->context.id); }
This is now empty, so I wondered if we can just remove it _entirely_.
But the generic version calls switch_mm():
arch/um/include/asm/mmu_context.h static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, · line 30
Quoted 13 lines
static inline void switch_mm(struct
mm_struct*prev, structmm_struct*next,arch/um/include/asm/mmu_context.h +1
-3@@ -28,11 +23,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, {unsigned cpu =smp_processor_id (); -if (prev != next){ +if (prev != next) {cpumask_clear_cpu (cpu,mm_cpumask (prev));cpumask_set_cpu (cpu,mm_cpumask (next)); -if (next != &init_mm) -__switch_mm (&next->context.id); } }
which plays with the CPU mask, but realistically being non-SMP the CPU mask is never really used?
Certainly removing activate_mm() entirely seems to _work_, but of course it never does anything since smp_processor_id() eventually is just macros that expand to "0" (unless preempt debug is enabled). Any thoughts?
johannes
Re: [PATCH v2 3/3] um: Stop tracking stub's PID via userspace_pid[]
Quoted 23 lines · Johannes Berg
Quoted 5 lines · Tiwei Bie
From: Tiwei Bie <[email protected]>
The PID of the stub process can be obtained from
current_mm_id(). There is no need to track it via userspace_pid[]. Stop doing that to simplify the code.So that is really obvious cleanups, and I can go apply them on that grounds, but I started wondering if we're not separately being inconsistent here, which perhaps didn't matter due to non-SMP:
Review
Quoted 9 lines
#define
activate_mmactivate_mm
static inline voidactivate_mm(struct mm_struct *old, struct mm_struct *new){(quoted diff) +0
-5- /* - * This is called by fs/exec.c and sys_unshare() - * when the new ->mm is used for the first time. - */ - __switch_mm(&new->context.id); }This is now empty, so I wondered if we can just remove it _entirely_.
Quoted 1 line
But the generic version calls
switch_mm():
Yeah, removing activate_mm() will cause it to call switch_mm(). This is somewhat a behavior change beyond the scope of this patchset, so I kept it as is.
Quoted 18 lines
Quoted 4 lines
static inline void switch_mm(struct
mm_struct*prev, structmm_struct*next,(quoted diff) +0
-0@@ -28,11 +23,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, {Review static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, · line 30
Quoted 10 lines
(quoted diff) +1
-3unsigned cpu = smp_processor_id(); - if(prev != next){ + if (prev != next) { cpumask_clear_cpu(cpu, mm_cpumask(prev)); cpumask_set_cpu(cpu, mm_cpumask(next)); - if(next != &init_mm) - __switch_mm(&next->context.id); } }which plays with the CPU mask, but realistically being non-SMP the CPU mask is never really used?
Quoted 4 lines
Certainly removing
activate_mm()entirely seems to _work_, but of course it never does anything sincesmp_processor_id()eventually is just macros that expand to "0" (unless preempt debug is enabled). Any thoughts?
Yeah, things are a bit messy here and need to be sorted out.
IIUC, activate_mm() and switch_mm() are primarily used to update the page table and manage the TLBs on the CPU for each user address space. However, in UML, each user address space is represented by a separate stub process, and the host kernel already takes care of that. So, I'm not entirely sure why we need to maintain the mm_cpumask. Perhaps we could just do this:
arch/um/include/asm/mmu_context.h +0 -11
@@ -13,20 +13,9 @@#include <asm/mm_hooks.h> #include <asm/mmu.h> -#define activate_mm activate_mm -static inline void activate_mm (struct mm_struct *old,struct mm_struct *new) -{ -} -static inline void switch_mm (struct mm_struct *prev,struct mm_struct *next,struct task_struct *tsk) { -unsigned cpu =smp_processor_id (); - -if (prev != next) { -cpumask_clear_cpu (cpu,mm_cpumask (prev)); -cpumask_set_cpu (cpu,mm_cpumask (next)); - } }#define init_new_context init_new_context
Regards,
Tiwei