From nobody Tue Jul 28 23:28:50 2026 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 4h8s9M6cckz6nSsW for ; Tue, 28 Jul 2026 23:28:55 +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 4h8s9M4pqWz3hd1 for ; Tue, 28 Jul 2026 23:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785281335; 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=EE13UldbeJyFgcVRRAe/pCDP5UJ5T5qTqkORlHnq4ztaeimeLxIrUa5wIQoS67taBtsSii zpGyjHBTMXyVpLKf6hjF3DGOoE6y+2FcmPaLzd/KQKO4fcxZrCr6y/W5ONAbMtcL5rw7PH NQTSYLlRxwOTMh3KcNEHjgcN8wIX+vQ2yirB/alFcpTL/UDGgvSBehSROhVR5/MTD9cIfz 85YdP+T5x5CdgAZE4vd0IP0YhuAKVAaKOtyApv3AFh5me/5kfBQTUoJhSnYX4fqT2J9VAA l/d+EYu4K6LVMeHLxllbMp52wb6ATXkCRRUo2aOKLbRIXFw/JRBj8yTZP5DDIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785281335; a=rsa-sha256; cv=none; b=eZFxfxUPZOsFkgaPZi3SyOSX/ch55OTGLsNqUK8Oin7N+lMG0+AzcGagT5AKsgVCKDVJr0 /7R6AY2DmS3WqJH1OaiA8IWhmwbTclZ8DzC7hPR+aXtAAQZRuOIhmpN81psLSX5OyyuuCH JvJymKGTi6wvyyl1qsyrIggVCK0UEFGG7aT+I4D5KEBeK3N7sQRBwUelWyw/EtyxDOy1Lb cNZAannbVH6qD0R2ubOl4rMSNdRq6iYJ5vOG2Vq9pwrESZlbx5yyyCMcX9WlkzSD+Zg8s5 /Y6KejAVcQ3MrO/AY118Ll7Dzhahs7IkJbTKrGntkxZ+tGSkp+tvG2sm5AiUwQ== 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=1785281335; 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=qvq/nlEK6Nj/Ql8DS2xCziXEtXU2J+oqFMMb/BZYy1P3djpJJONzocVAMa8KGEqWuUTVu1 z9Yfyxfn+H+ZcmL9iYzQy+wUkThf8TD7gtiaUkSGgQySOMxmz9pI3jNBDUjglUBcReLxg2 gjH4WnkUbOsKlU6bYhEaNwtHl+lNLL7sZGeOSUOgDPlPWjHbK3UBFkXrXBOupv+/2qxC52 u1/c6N2ls0xlUc2npAXIPVSaUvP2HwwBsFPGKVZ2F+efCyHR7OK2FtYn3nZkYEl4DBvPeG la4dL+AR+v2rGWI+hgiT4IXtc8afFH3cKnqD+4P9FAo8RijL9Tysd/ubDmU2zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8s9M3htBz119y for ; Tue, 28 Jul 2026 23:28:55 +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 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: