d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hold the mutex when releasing a callout.

Browse Source 
In xpt_release_device(), callout_stop() was being called without
holding the mutex (send_mtx) that is used to protect the callout.

So, move the mtx_unlock() call so that it is protected.

MFC after:	1 week
Sponsored by:	Spectra Logic
This commit is contained in:
Kenneth D. Merry 2020-07-16 20:43:28 +00:00
parent f903a308a1
commit 03caca368a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cam/cam_xpt.c
View File

@ -4959,16 +4959,18 @@ xpt_release_device(struct cam_ed *device)
devq = bus->sim->devq;
mtx_lock(&devq->send_mtx);
cam_devq_resize(devq, devq->send_queue.array_size - 1);
mtx_unlock(&devq->send_mtx);
KASSERT(SLIST_EMPTY(&device->periphs),
("destroying device, but periphs list is not empty"));
KASSERT(device->devq_entry.index == CAM_UNQUEUED_INDEX,
("destroying device while still queued for ccbs"));
/* The send_mtx must be held when accessing the callout */
if ((device->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0)
callout_stop(&device->callout);
mtx_unlock(&devq->send_mtx);
xpt_release_target(device->target);
cam_ccbq_fini(&device->ccbq);