ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlib: use pthread_attr_setstack() to set thread stack

Browse Source 
Type: improvement
Change-Id: I4c7f2f63651df4362ce1e0e36d885fedf55595c6
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2022-03-28 01:47:33 +02:00
committed by Beno�t Ganne
parent 87997686ee
commit 7bf2317b45
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/vlib/threads.c
View File

@ -404,23 +404,28 @@ vlib_worker_thread_init (vlib_worker_thread_t * w)
void * void *
vlib_worker_thread_bootstrap_fn (void *arg) vlib_worker_thread_bootstrap_fn (void *arg)
{ {
void *rv;
vlib_worker_thread_t *w = arg; vlib_worker_thread_t *w = arg;
vlib_main_t *vm = 0;
w->lwp = syscall (SYS_gettid); w->lwp = syscall (SYS_gettid);
w->thread_id = pthread_self (); w->thread_id = pthread_self ();
__os_thread_index = w - vlib_worker_threads; __os_thread_index = w - vlib_worker_threads;
vm = vlib_global_main.vlib_mains[__os_thread_index]; if (CLIB_DEBUG > 0)
{
void *frame_addr = __builtin_frame_address (0);
if (frame_addr < (void *) w->thread_stack ||
frame_addr > (void *) w->thread_stack + VLIB_THREAD_STACK_SIZE)
{
/* heap is not set yet */
fprintf (stderr, "thread stack is not set properly\n");
exit (1);
}
}
vlib_process_start_switch_stack (vm, 0); w->thread_function (arg);
rv = (void *) clib_calljmp
((uword (*)(uword)) w->thread_function, return 0;
(uword) arg, w->thread_stack + VLIB_THREAD_STACK_SIZE);
/* NOTREACHED, we hope */
return rv;
} }
void void
@ -463,6 +468,7 @@ vlib_launch_thread_int (void *fp, vlib_worker_thread_t * w, unsigned cpu_id)
clib_mem_main_t *mm = &clib_mem_main; clib_mem_main_t *mm = &clib_mem_main;
vlib_thread_main_t *tm = &vlib_thread_main; vlib_thread_main_t *tm = &vlib_thread_main;
pthread_t worker; pthread_t worker;
pthread_attr_t attr;
cpu_set_t cpuset; cpu_set_t cpuset;
void *(*fp_arg) (void *) = fp; void *(*fp_arg) (void *) = fp;
void *numa_heap; void *numa_heap;
@ -493,12 +499,22 @@ vlib_launch_thread_int (void *fp, vlib_worker_thread_t * w, unsigned cpu_id)
CPU_ZERO (&cpuset); CPU_ZERO (&cpuset);
CPU_SET (cpu_id, &cpuset); CPU_SET (cpu_id, &cpuset);
if (pthread_create (&worker, NULL /* attr */ , fp_arg, (void *) w)) if (pthread_attr_init (&attr))
return clib_error_return_unix (0, "pthread_attr_init");
if (pthread_attr_setstack (&attr, w->thread_stack,
VLIB_THREAD_STACK_SIZE))
return clib_error_return_unix (0, "pthread_attr_setstack");
if (pthread_create (&worker, &attr, fp_arg, (void *) w))
return clib_error_return_unix (0, "pthread_create"); return clib_error_return_unix (0, "pthread_create");
if (pthread_setaffinity_np (worker, sizeof (cpu_set_t), &cpuset)) if (pthread_setaffinity_np (worker, sizeof (cpu_set_t), &cpuset))
return clib_error_return_unix (0, "pthread_setaffinity_np"); return clib_error_return_unix (0, "pthread_setaffinity_np");
if (pthread_attr_destroy (&attr))
return clib_error_return_unix (0, "pthread_attr_destroy");
return 0; return 0;
} }
@ -1514,8 +1530,6 @@ vlib_worker_thread_fn (void *arg)
vlib_main_t *vm = vlib_get_main (); vlib_main_t *vm = vlib_get_main ();
clib_error_t *e; clib_error_t *e;
vlib_process_finish_switch_stack (vm);
ASSERT (vm->thread_index == vlib_get_thread_index ()); ASSERT (vm->thread_index == vlib_get_thread_index ());
vlib_worker_thread_init (w); vlib_worker_thread_init (w);