mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 01:40:53 +07:00
task_struct cleanup: move binfmt field to mm_struct
Because the binfmt is not different between threads in the same process, it can be moved from task_struct to mm_struct. And binfmt moudle is handled per mm_struct instead of task_struct. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Acked-by: Oleg Nesterov <oleg@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2fa4341074
commit
801460d0cf
10
fs/exec.c
10
fs/exec.c
@ -1397,10 +1397,12 @@ int do_execve(char * filename,
|
||||
|
||||
void set_binfmt(struct linux_binfmt *new)
|
||||
{
|
||||
if (current->binfmt)
|
||||
module_put(current->binfmt->module);
|
||||
struct mm_struct *mm = current->mm;
|
||||
|
||||
current->binfmt = new;
|
||||
if (mm->binfmt)
|
||||
module_put(mm->binfmt->module);
|
||||
|
||||
mm->binfmt = new;
|
||||
if (new)
|
||||
__module_get(new->module);
|
||||
}
|
||||
@ -1770,7 +1772,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
|
||||
|
||||
audit_core_dumps(signr);
|
||||
|
||||
binfmt = current->binfmt;
|
||||
binfmt = mm->binfmt;
|
||||
if (!binfmt || !binfmt->core_dump)
|
||||
goto fail;
|
||||
|
||||
|
@ -240,6 +240,8 @@ struct mm_struct {
|
||||
|
||||
unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
|
||||
|
||||
struct linux_binfmt *binfmt;
|
||||
|
||||
cpumask_t cpu_vm_mask;
|
||||
|
||||
/* Architecture-specific MM context */
|
||||
|
@ -1271,7 +1271,6 @@ struct task_struct {
|
||||
struct mm_struct *mm, *active_mm;
|
||||
|
||||
/* task state */
|
||||
struct linux_binfmt *binfmt;
|
||||
int exit_state;
|
||||
int exit_code, exit_signal;
|
||||
int pdeath_signal; /* The signal sent when the parent dies */
|
||||
|
@ -976,8 +976,6 @@ NORET_TYPE void do_exit(long code)
|
||||
disassociate_ctty(1);
|
||||
|
||||
module_put(task_thread_info(tsk)->exec_domain->module);
|
||||
if (tsk->binfmt)
|
||||
module_put(tsk->binfmt->module);
|
||||
|
||||
proc_exit_connector(tsk);
|
||||
|
||||
|
@ -518,6 +518,8 @@ void mmput(struct mm_struct *mm)
|
||||
spin_unlock(&mmlist_lock);
|
||||
}
|
||||
put_swap_token(mm);
|
||||
if (mm->binfmt)
|
||||
module_put(mm->binfmt->module);
|
||||
mmdrop(mm);
|
||||
}
|
||||
}
|
||||
@ -643,9 +645,14 @@ struct mm_struct *dup_mm(struct task_struct *tsk)
|
||||
mm->hiwater_rss = get_mm_rss(mm);
|
||||
mm->hiwater_vm = mm->total_vm;
|
||||
|
||||
if (mm->binfmt && !try_module_get(mm->binfmt->module))
|
||||
goto free_pt;
|
||||
|
||||
return mm;
|
||||
|
||||
free_pt:
|
||||
/* don't put binfmt in mmput, we haven't got module yet */
|
||||
mm->binfmt = NULL;
|
||||
mmput(mm);
|
||||
|
||||
fail_nomem:
|
||||
@ -1037,9 +1044,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
|
||||
if (!try_module_get(task_thread_info(p)->exec_domain->module))
|
||||
goto bad_fork_cleanup_count;
|
||||
|
||||
if (p->binfmt && !try_module_get(p->binfmt->module))
|
||||
goto bad_fork_cleanup_put_domain;
|
||||
|
||||
p->did_exec = 0;
|
||||
delayacct_tsk_init(p); /* Must remain after dup_task_struct() */
|
||||
copy_flags(clone_flags, p);
|
||||
@ -1327,9 +1331,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
|
||||
#endif
|
||||
cgroup_exit(p, cgroup_callbacks_done);
|
||||
delayacct_tsk_free(p);
|
||||
if (p->binfmt)
|
||||
module_put(p->binfmt->module);
|
||||
bad_fork_cleanup_put_domain:
|
||||
module_put(task_thread_info(p)->exec_domain->module);
|
||||
bad_fork_cleanup_count:
|
||||
atomic_dec(&p->cred->user->processes);
|
||||
|
Loading…
Reference in New Issue
Block a user