diff options
author | kib <kib@FreeBSD.org> | 2017-01-29 10:33:42 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2017-01-29 10:33:42 +0000 |
commit | 903fc3d58f7addb3c7f8ce06708759e9d6608ad1 (patch) | |
tree | 470328da9baf964b66f2a76e70de38d37db58507 | |
parent | 3206c510a7c09ada5305d89f3613454f341f8864 (diff) | |
download | FreeBSD-src-903fc3d58f7addb3c7f8ce06708759e9d6608ad1.zip FreeBSD-src-903fc3d58f7addb3c7f8ce06708759e9d6608ad1.tar.gz |
MFC r312647:
Add comments explaining unobvious td_critnest adjustments in
critical_exit().
-rw-r--r-- | sys/kern/kern_switch.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index d0009b1..f58acd5 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -206,7 +206,22 @@ critical_exit(void) if (td->td_critnest == 1) { td->td_critnest = 0; + + /* + * Interrupt handlers execute critical_exit() on + * leave, and td_owepreempt may be left set by an + * interrupt handler only when td_critnest > 0. If we + * are decrementing td_critnest from 1 to 0, read + * td_owepreempt after decrementing, to not miss the + * preempt. Disallow compiler to reorder operations. + */ + __compiler_membar(); if (td->td_owepreempt && !kdb_active) { + /* + * Microoptimization: we committed to switch, + * disable preemption in interrupt handlers + * while spinning for the thread lock. + */ td->td_critnest = 1; thread_lock(td); td->td_critnest--; |