d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not clear robust lists pointers on fork. The forked child thread

Browse Source 
lists must be functional.

Reported by:	Daniel Engberg <daniel.engberg.lists@pyret.net>,
	Guy Yur <guyyur@gmail.com>
Tested by:	Guy Yur <guyyur@gmail.com>
Sponsored by:	The FreeBSD Foundation
Approved by:	re (gjb), including the KBI change
This commit is contained in:
Konstantin Belousov 2016-06-25 11:31:25 +00:00
parent a068480247
commit 8a06de9e92
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/kern/kern_thr.c
View File

@ -234,6 +234,7 @@ thread_create(struct thread *td, struct rtprio *rtp,
bcopy(&td->td_startcopy, &newtd->td_startcopy, bcopy(&td->td_startcopy, &newtd->td_startcopy,
__rangeof(struct thread, td_startcopy, td_endcopy)); __rangeof(struct thread, td_startcopy, td_endcopy));
newtd->td_proc = td->td_proc; newtd->td_proc = td->td_proc;
newtd->td_rb_list = newtd->td_rbp_list = newtd->td_rb_inact = 0;
thread_cow_get(newtd, td); thread_cow_get(newtd, td);
error = initialize_thread(newtd, thunk); error = initialize_thread(newtd, thunk);

6
sys/sys/proc.h
View File

@ -282,9 +282,6 @@ struct thread {
int td_no_sleeping; /* (k) Sleeping disabled count. */ int td_no_sleeping; /* (k) Sleeping disabled count. */
int td_dom_rr_idx; /* (k) RR Numa domain selection. */ int td_dom_rr_idx; /* (k) RR Numa domain selection. */
void *td_su; /* (k) FFS SU private */ void *td_su; /* (k) FFS SU private */
uintptr_t td_rb_list; /* (k) Robust list head. */
uintptr_t td_rbp_list; /* (k) Robust priv list head. */
uintptr_t td_rb_inact; /* (k) Current in-action mutex loc. */
#define td_endzero td_sigmask #define td_endzero td_sigmask
/* Copied during fork1() or create_thread(). */ /* Copied during fork1() or create_thread(). */
@ -298,6 +295,9 @@ struct thread {
u_char td_base_user_pri; /* (t) Base user pri */ u_char td_base_user_pri; /* (t) Base user pri */
u_int td_dbg_sc_code; /* (c) Syscall code to debugger. */ u_int td_dbg_sc_code; /* (c) Syscall code to debugger. */
u_int td_dbg_sc_narg; /* (c) Syscall arg count to debugger.*/ u_int td_dbg_sc_narg; /* (c) Syscall arg count to debugger.*/
uintptr_t td_rb_list; /* (k) Robust list head. */
uintptr_t td_rbp_list; /* (k) Robust priv list head. */
uintptr_t td_rb_inact; /* (k) Current in-action mutex loc. */
#define td_endcopy td_pcb #define td_endcopy td_pcb
/* /*