Date: Thu, 19 Oct 2023 21:41:00 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8fe059425a09 - releng/14.0 - smartpqi: Drop spinlock before freeing memory Message-ID: <202310192141.39JLf0Ox002592@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8fe059425a0919274e2c5b25a6af0568d147518d commit 8fe059425a0919274e2c5b25a6af0568d147518d Author: John F. Carr <jfc@mit.edu> AuthorDate: 2023-10-19 03:25:31 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-10-19 21:37:29 +0000 smartpqi: Drop spinlock before freeing memory pqisrc_free_device frees the device softc with the os spinlock held. This causes crashes when devices are removed because the memory free might sleep (which is prohibited with spin locks held). Drop the spinlock before releasing the memory. MFC After: 2 days PR: 273289 Reviewed by: imp (cherry picked from commit b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547) (cherry picked from commit 1ad148a68ae74f3372b12b6e66fadf5ade384144) Approved-by: re (gjb) --- sys/dev/smartpqi/smartpqi_discovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index 7e084a81cd89..ac37c2233762 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1671,11 +1671,11 @@ pqisrc_free_device(pqisrc_softstate_t * softs, pqi_scsi_dev_t *device) pqisrc_delete_softs_entry(softs, device); DBG_NOTE("Removed memory for device : B %d: T %d: L %d\n", device->bus, device->target, device->lun); + OS_RELEASE_SPINLOCK(&softs->devlist_lock); pqisrc_device_mem_free(softs, device); + } else { + OS_RELEASE_SPINLOCK(&softs->devlist_lock); } - - OS_RELEASE_SPINLOCK(&softs->devlist_lock); - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310192141.39JLf0Ox002592>