Mercurial > illumos > illumos-gate
changeset 14104:7b07c85f3831
3917 panic in turnstile_block() on unowned mutex
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
| author | Bryan Cantrill <bryan@joyent.com> |
|---|---|
| date | Sat, 27 Jul 2013 11:12:12 -0700 |
| parents | f0150cf47680 |
| children | b7147f4e608b |
| files | usr/src/uts/intel/ia32/ml/swtch.s |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/intel/ia32/ml/swtch.s Thu Aug 01 17:47:00 2013 -0800 +++ b/usr/src/uts/intel/ia32/ml/swtch.s Sat Jul 27 11:12:12 2013 -0700 @@ -23,7 +23,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2013, Joyent, Inc. All rights reserved. + */ /* * Process switching routines. @@ -355,6 +357,7 @@ #endif /* __xpv */ movq %r12, CPU_THREAD(%r13) /* set CPU's thread pointer */ + mfence /* synchronize with mutex_exit() */ xorl %ebp, %ebp /* make $<threadlist behave better */ movq T_LWP(%r12), %rax /* set associated lwp to */ movq %rax, CPU_LWP(%r13) /* CPU's lwp ptr */ @@ -519,6 +522,7 @@ #endif /* __xpv */ movl %edi, CPU_THREAD(%esi) /* set CPU's thread pointer */ + mfence /* synchronize with mutex_exit() */ xorl %ebp, %ebp /* make $<threadlist behave better */ movl T_LWP(%edi), %eax /* set associated lwp to */ movl %eax, CPU_LWP(%esi) /* CPU's lwp ptr */ @@ -768,6 +772,7 @@ movq %gs:CPU_THREAD, %r13 /* %r13 = curthread */ movq %r12, %gs:CPU_THREAD /* set CPU's thread pointer */ + mfence /* synchronize with mutex_exit() */ movq T_SP(%r12), %rsp /* restore resuming thread's sp */ xorl %ebp, %ebp /* make $<threadlist behave better */ @@ -817,6 +822,7 @@ #endif movl %gs:CPU_THREAD, %esi /* %esi = curthread */ movl %edi, %gs:CPU_THREAD /* set CPU's thread pointer */ + mfence /* synchronize with mutex_exit() */ movl T_SP(%edi), %esp /* restore resuming thread's sp */ xorl %ebp, %ebp /* make $<threadlist behave better */