diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2023-10-07 00:31:03 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2023-10-14 15:29:11 +0000 |
| commit | 29de7af6ee47a3a251763e4220203a0d960ea532 (patch) | |
| tree | a160bfb93fb71c083dd94b9c5e446815820aa89f | |
| parent | bdd19ce53c07bc44b9d8f46dcedda0fceca8e069 (diff) | |
| download | src-29de7af6ee47a3a251763e4220203a0d960ea532.tar.gz src-29de7af6ee47a3a251763e4220203a0d960ea532.zip | |
mrsas: Fix callout locking in mrsas_complete_cmd()
callout_stop() requires the associated lock to be held.
This is a bit hacky, but I believe it's safe since the subsequent
mrsas_cmd_done() call will also acquire the SIM lock to stop a different
callout.
PR: 265484
Reviewed by: imp
Tested by: Jérémie Jourdin <jeremie.jourdin@advens.fr>
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D39559
(cherry picked from commit 4640df1b0a49697840b81f6bcd269a483514c6aa)
| -rw-r--r-- | sys/dev/mrsas/mrsas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 1241f44761c4..e362d4b455fc 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -1732,11 +1732,13 @@ mrsas_complete_cmd(struct mrsas_softc *sc, u_int32_t MSIxIndex) data_length = r1_cmd->io_request->DataLength; sense = r1_cmd->sense; } + mtx_lock(&sc->sim_lock); r1_cmd->ccb_ptr = NULL; if (r1_cmd->callout_owner) { callout_stop(&r1_cmd->cm_callout); r1_cmd->callout_owner = false; } + mtx_unlock(&sc->sim_lock); mrsas_release_mpt_cmd(r1_cmd); mrsas_atomic_dec(&sc->fw_outstanding); mrsas_map_mpt_cmd_status(cmd_mpt, cmd_mpt->ccb_ptr, status, |