diff options
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index ac55cea..c66de3e 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -74,6 +74,10 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> +#ifdef VIMAGE +#include <net/vnet.h> +#endif + #ifdef XEN #include <vm/vm.h> #include <vm/vm_param.h> @@ -126,6 +130,13 @@ userret(struct thread *td, struct trapframe *frame) sched_userret(td); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); +#ifdef VIMAGE + /* Unfortunately td_vnet_lpush needs VNET_DEBUG. */ + VNET_ASSERT(curvnet == NULL, + ("%s: Returning on td %p (pid %d, %s) with vnet %p set in %s", + __func__, td, p->p_pid, td->td_name, curvnet, + (td->td_vnet_lpush != NULL) ? td->td_vnet_lpush : "N/A")); +#endif #ifdef XEN PT_UPDATES_FLUSH(); #endif @@ -392,9 +403,9 @@ syscallret(struct thread *td, int error, struct syscall_args *sa __unused) */ STOPEVENT(p, S_SCX, sa->code); PTRACESTOP_SC(p, td, S_PT_SCX); - if (traced || (td->td_dbgflags & TDB_EXEC) != 0) { + if (traced || (td->td_dbgflags & (TDB_EXEC | TDB_FORK)) != 0) { PROC_LOCK(p); - td->td_dbgflags &= ~(TDB_SCX | TDB_EXEC); + td->td_dbgflags &= ~(TDB_SCX | TDB_EXEC | TDB_FORK); PROC_UNLOCK(p); } } |
