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

fix: getrusage's u|stime race-condition caused by release_thread() and getrusage()

Browse Source
This commit is contained in:
Ken Sato
2018-03-15 14:26:39 +09:00
parent 9da9e755fa
commit bc89a51e00
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/process.c
View File

@@ -2627,21 +2627,30 @@ void destroy_thread(struct thread *thread)
{ {
struct sig_pending *pending; struct sig_pending *pending;
struct sig_pending *signext; struct sig_pending *signext;
struct mcs_rwlock_node_irqsave lock; 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); struct resource_set *resource_set = cpu_local_var(resource_set);
int hash; int hash;
struct timespec ats;
hash = thread_hash(thread->tid); hash = thread_hash(thread->tid);
mcs_rwlock_writer_lock(&resource_set->thread_hash->lock[hash], &lock); mcs_rwlock_writer_lock(&resource_set->thread_hash->lock[hash], &lock);
list_del(&thread->hash_list); list_del(&thread->hash_list);
mcs_rwlock_writer_unlock(&resource_set->thread_hash->lock[hash], &lock); mcs_rwlock_writer_unlock(&resource_set->thread_hash->lock[hash], &lock);
mcs_rwlock_writer_lock(&proc->update_lock, &updatelock);
tsc_to_ts(thread->system_tsc, &ats);
ts_add(&thread->proc->stime, &ats);
tsc_to_ts(thread->user_tsc, &ats);
ts_add(&thread->proc->utime, &ats);
mcs_rwlock_writer_lock(&proc->threads_lock, &lock); mcs_rwlock_writer_lock(&proc->threads_lock, &lock);
list_del(&thread->siblings_list); list_del(&thread->siblings_list);
__release_tid(proc, thread); __release_tid(proc, thread);
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock); mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
mcs_rwlock_writer_unlock(&proc->update_lock, &updatelock);
cpu_clear(thread->cpu_id, &thread->vm->address_space->cpu_set, cpu_clear(thread->cpu_id, &thread->vm->address_space->cpu_set,
&thread->vm->address_space->cpu_set_lock); &thread->vm->address_space->cpu_set_lock);
list_for_each_entry_safe(pending, signext, &thread->sigpending, list){ list_for_each_entry_safe(pending, signext, &thread->sigpending, list){
@@ -2670,20 +2679,11 @@ void destroy_thread(struct thread *thread)
void release_thread(struct thread *thread) void release_thread(struct thread *thread)
{ {
struct process_vm *vm; struct process_vm *vm;
struct mcs_rwlock_node_irqsave lock;
struct timespec ats;
if (!ihk_atomic_dec_and_test(&thread->refcount)) { if (!ihk_atomic_dec_and_test(&thread->refcount)) {
return; return;
} }
mcs_rwlock_writer_lock(&thread->proc->update_lock, &lock);
tsc_to_ts(thread->system_tsc, &ats);
ts_add(&thread->proc->stime, &ats);
tsc_to_ts(thread->user_tsc, &ats);
ts_add(&thread->proc->utime, &ats);
mcs_rwlock_writer_unlock(&thread->proc->update_lock, &lock);
vm = thread->vm; vm = thread->vm;
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE