gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terminate(): clean-up and formatting

Browse Source
This commit is contained in:
Balazs Gerofi
2017-08-08 11:12:55 +09:00
parent 9194742de8
commit 6d4d6440aa
1 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
kernel/syscall.c
View File

@@ -784,8 +784,7 @@ SYSCALL_DECLARE(waitid)
return 0; return 0;
} }
void void terminate(int rc, int sig)
terminate(int rc, int sig)
{ {
struct resource_set *resource_set = cpu_local_var(resource_set); struct resource_set *resource_set = cpu_local_var(resource_set);
struct thread *mythread = cpu_local_var(current); struct thread *mythread = cpu_local_var(current);
@@ -806,12 +805,13 @@ terminate(int rc, int sig)
int exit_status; int exit_status;
// sync perf info // sync perf info
if(proc->monitoring_event) if (proc->monitoring_event)
sync_child_event(proc->monitoring_event); sync_child_event(proc->monitoring_event);
// clean up threads // clean up threads
mcs_rwlock_reader_lock(&proc->threads_lock, &lock); // conflict clone mcs_rwlock_reader_lock(&proc->threads_lock, &lock); // conflict clone
mcs_rwlock_writer_lock_noirq(&proc->update_lock, &updatelock); mcs_rwlock_writer_lock_noirq(&proc->update_lock, &updatelock);
if(proc->status == PS_EXITED){ if (proc->status == PS_EXITED) {
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock); mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
preempt_disable(); preempt_disable();
@@ -822,6 +822,7 @@ terminate(int rc, int sig)
// no return // no return
return; return;
} }
exit_status = mythread->exit_status = ((rc & 0x00ff) << 8) | (sig & 0xff); exit_status = mythread->exit_status = ((rc & 0x00ff) << 8) | (sig & 0xff);
proc->status = PS_EXITED; proc->status = PS_EXITED;
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock); mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
@@ -836,12 +837,13 @@ terminate(int rc, int sig)
list_for_each_entry(thread, &proc->threads_list, siblings_list) { list_for_each_entry(thread, &proc->threads_list, siblings_list) {
n++; n++;
} }
if(n){
if (n) {
ids = kmalloc(sizeof(int) * n, IHK_MC_AP_NOWAIT); ids = kmalloc(sizeof(int) * n, IHK_MC_AP_NOWAIT);
i = 0; i = 0;
if(ids){ if (ids) {
list_for_each_entry(thread, &proc->threads_list, siblings_list) { list_for_each_entry(thread, &proc->threads_list, siblings_list) {
if(thread != mythread){ if (thread != mythread) {
ids[i] = thread->tid; ids[i] = thread->tid;
i++; i++;
} }
@@ -849,17 +851,18 @@ terminate(int rc, int sig)
} }
} }
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
if(ids){
for(i = 0; i < n; i++){ if (ids) {
for (i = 0; i < n; i++) {
do_kill(mythread, proc->pid, ids[i], SIGKILL, NULL, 0); do_kill(mythread, proc->pid, ids[i], SIGKILL, NULL, 0);
} }
kfree(ids); kfree(ids);
ids = NULL; ids = NULL;
} }
for(;;){ for (;;) {
__mcs_rwlock_reader_lock(&proc->threads_lock, &lock); __mcs_rwlock_reader_lock(&proc->threads_lock, &lock);
if(list_empty(&proc->threads_list)){ if (list_empty(&proc->threads_list)) {
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
break; break;
} }
@@ -882,15 +885,17 @@ terminate(int rc, int sig)
n = 0; n = 0;
mcs_rwlock_reader_lock(&proc->children_lock, &lock); mcs_rwlock_reader_lock(&proc->children_lock, &lock);
list_for_each_entry(child, &proc->children_list, siblings_list) { list_for_each_entry(child, &proc->children_list, siblings_list) {
if(child->ptrace & PT_TRACED) if (child->ptrace & PT_TRACED)
n++; n++;
} }
if(n){
if (n) {
ids = kmalloc(sizeof(int) * n, IHK_MC_AP_NOWAIT); ids = kmalloc(sizeof(int) * n, IHK_MC_AP_NOWAIT);
i = 0; i = 0;
if(ids){
if (ids) {
list_for_each_entry(child, &proc->children_list, siblings_list) { list_for_each_entry(child, &proc->children_list, siblings_list) {
if(child->ptrace & PT_TRACED){ if (child->ptrace & PT_TRACED) {
ids[i] = child->pid; ids[i] = child->pid;
i++; i++;
} }
@@ -898,37 +903,40 @@ terminate(int rc, int sig)
} }
} }
mcs_rwlock_reader_unlock(&proc->children_lock, &lock); mcs_rwlock_reader_unlock(&proc->children_lock, &lock);
if(ids){
for(i = 0; i < n; i++){ if (ids) {
for (i = 0; i < n; i++) {
ptrace_detach(ids[i], 0); ptrace_detach(ids[i], 0);
} }
kfree(ids); kfree(ids);
ids = NULL;
} }
if (!list_empty(&proc->children_list)) { if (!list_empty(&proc->children_list)) {
// clean up children // clean up children
for(i = 0; i < HASH_SIZE; i++){ for (i = 0; i < HASH_SIZE; i++) {
mcs_rwlock_writer_lock(&resource_set->process_hash->lock[i], mcs_rwlock_writer_lock(&resource_set->process_hash->lock[i],
&lock); &lock);
list_for_each_entry_safe(child, next, list_for_each_entry_safe(child, next,
&resource_set->process_hash->list[i], &resource_set->process_hash->list[i],
hash_list){ hash_list) {
int free_child = 0; int free_child = 0;
mcs_rwlock_writer_lock_noirq(&child->update_lock, mcs_rwlock_writer_lock_noirq(&child->update_lock,
&updatelock); &updatelock);
if(child->ppid_parent == proc &&
child->status == PS_ZOMBIE){ if (child->ppid_parent == proc &&
child->status == PS_ZOMBIE) {
list_del(&child->hash_list); list_del(&child->hash_list);
list_del(&child->siblings_list); list_del(&child->siblings_list);
free_child = 1; free_child = 1;
} }
else if(child->ppid_parent == proc){ else if (child->ppid_parent == proc) {
mcs_rwlock_writer_lock_noirq(&proc->children_lock, mcs_rwlock_writer_lock_noirq(&proc->children_lock,
&childlock); &childlock);
mcs_rwlock_writer_lock_noirq(&pid1->children_lock, mcs_rwlock_writer_lock_noirq(&pid1->children_lock,
&childlock1); &childlock1);
child->ppid_parent = pid1; child->ppid_parent = pid1;
if(child->parent == proc){ if (child->parent == proc) {
child->parent = pid1; child->parent = pid1;
list_del(&child->siblings_list); list_del(&child->siblings_list);
list_add_tail(&child->siblings_list, list_add_tail(&child->siblings_list,
@@ -944,8 +952,10 @@ terminate(int rc, int sig)
mcs_rwlock_writer_unlock_noirq(&proc->children_lock, mcs_rwlock_writer_unlock_noirq(&proc->children_lock,
&childlock); &childlock);
} }
mcs_rwlock_writer_unlock_noirq(&child->update_lock, mcs_rwlock_writer_unlock_noirq(&child->update_lock,
&updatelock); &updatelock);
if (free_child) if (free_child)
kfree(child); kfree(child);
} }
@@ -961,7 +971,7 @@ terminate(int rc, int sig)
#endif #endif
// clean up memory // clean up memory
if(!proc->nohost){ if (!proc->nohost) {
request.number = __NR_exit_group; request.number = __NR_exit_group;
request.args[0] = exit_status; request.args[0] = exit_status;
do_syscall(&request, ihk_mc_get_processor_id(), proc->pid); do_syscall(&request, ihk_mc_get_processor_id(), proc->pid);