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

fork: release_thread: fix release of cloned thread

Browse Source 
Change-Id: I390093bdb47a348cfec287cceaff22712df36bd9
This commit is contained in:
TOIDA,Suguru
2019-08-20 14:59:10 +09:00
committed by Masamichi Takagi
parent bb08742467
commit e932f2e70c
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
kernel/process.c
View File

@ -397,6 +397,8 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
} }
memset(thread, 0, sizeof(struct thread)); memset(thread, 0, sizeof(struct thread));
INIT_LIST_HEAD(&thread->hash_list);
INIT_LIST_HEAD(&thread->siblings_list);
ihk_atomic_set(&thread->refcount, 2); ihk_atomic_set(&thread->refcount, 2);
memcpy(&thread->cpu_set, &org->cpu_set, sizeof(thread->cpu_set)); memcpy(&thread->cpu_set, &org->cpu_set, sizeof(thread->cpu_set));
@ -2666,21 +2668,21 @@ release_process(struct process *proc)
{ {
struct process *parent; struct process *parent;
struct mcs_rwlock_node_irqsave lock; struct mcs_rwlock_node_irqsave lock;
struct process_hash *phash;
struct resource_set *rset; struct resource_set *rset;
int hash;
if (!ihk_atomic_dec_and_test(&proc->refcount)) { if (!ihk_atomic_dec_and_test(&proc->refcount)) {
return; return;
} }
rset = cpu_local_var(resource_set); rset = cpu_local_var(resource_set);
phash = rset->process_hash; if (!list_empty(&proc->hash_list)) {
hash = process_hash(proc->pid); struct process_hash *phash = rset->process_hash;
int hash = process_hash(proc->pid);
mcs_rwlock_writer_lock(&phash->lock[hash], &lock); mcs_rwlock_writer_lock(&phash->lock[hash], &lock);
list_del(&proc->hash_list); list_del(&proc->hash_list);
mcs_rwlock_writer_unlock(&phash->lock[hash], &lock); mcs_rwlock_writer_unlock(&phash->lock[hash], &lock);
}
parent = proc->parent; parent = proc->parent;
mcs_rwlock_writer_lock(&parent->children_lock, &lock); mcs_rwlock_writer_lock(&parent->children_lock, &lock);
@ -2700,6 +2702,20 @@ release_process(struct process *proc)
profile_dealloc_proc_events(proc); profile_dealloc_proc_events(proc);
#endif // PROFILE_ENABLE #endif // PROFILE_ENABLE
free_thread_pages(proc->main_thread); free_thread_pages(proc->main_thread);
{
long irqstate = ihk_mc_spinlock_lock(&proc->mckfd_lock);
struct mckfd *cur = proc->mckfd;
while (cur) {
struct mckfd *next = cur->next;
kfree(cur);
cur = next;
}
ihk_mc_spinlock_unlock(&proc->mckfd_lock, irqstate);
}
kfree(proc); kfree(proc);
/* no process left */ /* no process left */
@ -2870,14 +2886,18 @@ void destroy_thread(struct thread *thread)
struct sig_pending *signext; struct sig_pending *signext;
struct mcs_rwlock_node_irqsave lock, updatelock; struct mcs_rwlock_node_irqsave lock, updatelock;
struct process *proc = thread->proc; struct process *proc = thread->proc;
struct resource_set *resource_set = cpu_local_var(resource_set);
int hash;
struct timespec ats; struct timespec ats;
hash = thread_hash(thread->tid); if (!list_empty(&thread->hash_list)) {
mcs_rwlock_writer_lock(&resource_set->thread_hash->lock[hash], &lock); struct resource_set *resource_set = cpu_local_var(resource_set);
list_del(&thread->hash_list); int hash = thread_hash(thread->tid);
mcs_rwlock_writer_unlock(&resource_set->thread_hash->lock[hash], &lock);
mcs_rwlock_writer_lock(&resource_set->thread_hash->lock[hash],
&lock);
list_del(&thread->hash_list);
mcs_rwlock_writer_unlock(&resource_set->thread_hash->lock[hash],
&lock);
}
mcs_rwlock_writer_lock(&proc->update_lock, &updatelock); mcs_rwlock_writer_lock(&proc->update_lock, &updatelock);
tsc_to_ts(thread->system_tsc, &ats); tsc_to_ts(thread->system_tsc, &ats);