From nobody Tue Jul 28 23:28:50 2026 X-Original-To: dev-commits-src-main@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 4h8s9G3CWBz6nSsV for ; Tue, 28 Jul 2026 23:28:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8s9G2j0fz3hdw for ; Tue, 28 Jul 2026 23:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785281330; 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=OoEzMo4aVB9plNL4vbq6hYXDrs8LPrY7JVrHYf1jG2E=; b=wSakAodDSYVa8Ht0PWbJ7kGuiSpaema1X1p/MsYweoAZAm7IsS658z5i1CCH8Y/J+HmGYi C8z9K1WMwEePQEGdBGXK0leLucSSinw5gQsFfbXFBALVyxBRBKUbEDtrRNVykQywTUh00n FVdq5AsMuT14KLxHe86+1eDvs3ifIE1Nmr/LOL/RkleGRzE38lBw826IjhvWO+4EtGKiPH s7wmz0wCL4CvUyTvYTpN72Ybt8+haK4Ztk1a+kOqLVVr/aMcXVUNTbQO77S4D3zaTL+Tom XpEq4itzW2OywcHC4tvNzCq8CNDcpF9HIXEC1YxagGgKA8FSKLJ0k34lzJ7cYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785281330; a=rsa-sha256; cv=none; b=hcdI5UWddUMby99cECr8BIZGpxuTd+/BWzUMIolPbEO6Xr1Nk7LbZqR/WdX9HyTrwygdze HwXYsE9DKMHFHfKRr5AcN9drgPX/KGzOpJxN7XR393C3182Qkl8skV//QzbjbmL5CCuSVq kJ9OwMyoPQhKEI3ecqw99y5vI+cG8bAZXH1smiQffqwfSEosxVj6vRLgI1m408rSKbFRqK gaGo0rCJck0cM+II0v6j+jfeBmputC4eSPS4mRkznoviaIKLALPUXgldLI9CenMpld1H8m ynweok5+uvoENNeWBws+s+oaaXvRA3CmnHxMOtob4Ot840bDQmBcgS7xDNmeug== 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=1785281330; 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=OoEzMo4aVB9plNL4vbq6hYXDrs8LPrY7JVrHYf1jG2E=; b=MyUz5OBperaGR/kz0BDiB79s1jIdVvg3IUivzqfT5HZ8lJFP3sdnNsCRXjiKrN8Smx0wyY TuUjaHvqE77tdlfv0jmrUKaZRly1iQ4500C8WO6+V61kSFRsre66QKF/yJlYFpzql7b/XS txraCQfzblVC2B9qSRhM51e0jkHyVl8efPDjHRcH07xpXPu7BhgfUyjOuJIWRpuhnpevui 07JOEXbbImXXDHrujecnD723JctIa5L0wiJTIeNwQtFNCRfNEFCswvxXKfPmmD5b690OGE ENvN8YYU8Ti5OJQkE67UQBK3fTSCAXjpvQ9teiqUnT6RuyckxSRFHlay+rUCuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8s9G1VWNz10nf for ; Tue, 28 Jul 2026 23:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35db2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 23:28:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4068f3b5f899 - main - nda: Don't sleep with non-sleepable lock held List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4068f3b5f899dd348fd063a5f3c30090eebf9a46 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 23:28:50 +0000 Message-Id: <6a693b32.35db2.4934d9d5@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4068f3b5f899dd348fd063a5f3c30090eebf9a46 commit 4068f3b5f899dd348fd063a5f3c30090eebf9a46 Author: Colin Percival AuthorDate: 2026-07-14 17:17:25 +0000 Commit: Colin Percival CommitDate: 2026-07-28 23:28:36 +0000 nda: Don't sleep with non-sleepable lock held We reach ndaasync with the CAM device lock held, so we must pass M_NOWAIT to disk_* rather than M_WAITOK. Reviewed by: imp Fixes: 628d7a3270b6 ("nda: AC_GETDEV_CHANGED calls media chanaged for sectorsize change") MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D58230 --- sys/cam/nvme/nvme_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index be578bae5da5..ebebe5bbc0a9 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -773,9 +773,9 @@ ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) * do nothing. */ if (sectorsize != softc->disk->d_sectorsize) - disk_media_changed(softc->disk, M_WAITOK); + disk_media_changed(softc->disk, M_NOWAIT); else if (mediasize != softc->disk->d_mediasize) - disk_resize(softc->disk, M_WAITOK); + disk_resize(softc->disk, M_NOWAIT); break; } case AC_ADVINFO_CHANGED: