From nobody Thu Oct 19 21:24:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLLp6vr2z4xtkF; Thu, 19 Oct 2023 21:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBLLp6Lwdz4Lbd; Thu, 19 Oct 2023 21:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uS0lEeP0wGPVKiVWjQcWRetVU2rBPManr4Td6XmcxIA=; b=DB76ZD9ex2V8j4+wfnCG3YuAS9g8vaDl+13e/+zbfdVp4FRd54S+6b1L0dSgqxXg8Ndfc8 VjqnWWLS44j4FDzlGuA1vLt3ulmApi0Gk/sKtHkcWdNJI76xtgwTQkDQxRXT82HGpBrQT/ /7yf1fT3Cx5f6fotSY5tMutIS0hqU1J8gMhGAobk36p5mp4sxLS4F+Gx/og8jMMS4k2LUJ 2fHnBKKsuzLpEvsK3bawBSg6RPJX0P9r1n6l4NJCXwGY0alB5PGyKd4ZG0TsweW0rfmEAn Xjz+ONc1Y/6hoJ1TDOIWO2xuOuBMHWDAIUn3Mwx82RyZsCDVRODviQfAMjoF4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750642; a=rsa-sha256; cv=none; b=baTvbx7CS/sEUXJqRmGgTUo/EL7Ysl+PLzO7pLT34lbxpAdnDlvRuuFGFWngmcZdHxOa5F 5a6EdfmBGxsVV26hI/pIQdo04CPTd/KqnQR01YQtilDRNQGayBImbXkGOVqDOOAxlJbBS8 PXY9edZc2uAvZ9svMP9NkGJjUU5ZZC6nkGIO1ld7+5Xqy9z2DdMtvuLSS5/wCbfUcWXa9m 3jXhUku2h22FxXPSOgP5K/5VuGDvchl6anJZoaI8jO4w2dCOrABlR6oXhA6oPpxCg/5R3r RvVL32bNycLkoHzbuTh7GYiHaV88qfwFPxjEJQfw9ZPLTluZAZrDDUtXEY2X9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uS0lEeP0wGPVKiVWjQcWRetVU2rBPManr4Td6XmcxIA=; b=CgPSLOfj+IlmvlT7WRE5rMwMdJOFjv+ozAuTqlan3keYCDE4g5eAMEPFq/wv/dvR1Jypdh 9yqIxa9cyOjZMuA/lZ8pwgTGfziv/TFcbLphvXWi29DlLk8ZcREUxiOmyatXWXZrH+TKAf 4WyCtUxjmswfol/32BtoPm3ogdCOrK4IZ9SKdevtfpGYeUkbYCgq7tmmFg7XaMrnt+rlPl bIhdH1OhZTSzIFbx/ShAb5Nw+ppO3ktCxHzggKc+QVbp/IQyfb8hzapx9EO4du9sq3dgui /5mODOUnxRrKLKAvQBkmoT7dd45Zk3Efvl5xW1y6ymG4MdaK8l3yRc6bzbeuQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLLp5PHkz14dX; Thu, 19 Oct 2023 21:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JLO2fY076695; Thu, 19 Oct 2023 21:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLO22g076692; Thu, 19 Oct 2023 21:24:02 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:24:02 GMT Message-Id: <202310192124.39JLO22g076692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1ad148a68ae7 - stable/14 - smartpqi: Drop spinlock before freeing memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ad148a68ae74f3372b12b6e66fadf5ade384144 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad148a68ae74f3372b12b6e66fadf5ade384144 commit 1ad148a68ae74f3372b12b6e66fadf5ade384144 Author: John F. Carr AuthorDate: 2023-10-19 03:25:31 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:21:11 +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) --- 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); - }