diff options
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_mod.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 54a2a29..9e82a34 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -4248,7 +4248,7 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) ("[pmc,%d] cpu %d didn't find a sample to collect", __LINE__, cpu)); - KASSERT(td->td_pinned > 0, + KASSERT(td->td_pinned == 1, ("[pmc,%d] invalid td_pinned value", __LINE__)); sched_unpin(); /* Can migrate safely now. */ diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 70df8a1..22cabcb 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -145,6 +145,11 @@ userret(struct thread *td, struct trapframe *frame) /* * Check for misbehavior. + * + * In case there is a callchain tracing ongoing because of + * hwpmc(4), skip the scheduler pinning check. + * hwpmc(4) subsystem, infact, will collect callchain informations + * at ast() checkpoint, which is past userret(). */ WITNESS_WARN(WARN_PANIC, NULL, "userret: returning"); KASSERT(td->td_critnest == 0, @@ -155,7 +160,7 @@ userret(struct thread *td, struct trapframe *frame) ("userret: Returning with pagefaults disabled")); KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0, ("userret: Returning with sleep disabled")); - KASSERT(td->td_pinned == 0, + KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, ("userret: Returning with with pinned thread")); KASSERT(td->td_vp_reserv == 0, ("userret: Returning while holding vnode reservation")); |
