From nobody Wed Nov 19 21:44:39 2025 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 4dBZkv6fztz6JKD7 for ; Wed, 19 Nov 2025 21:44:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkv3m3jz3CFW for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=ogjgXkIr5ZnVrqTL8iHR4r5jgHSalmlbqNCtKolqwuNJ0DmMarSBMGvBc3zBLMsw8l9PAm BvlDXUcU+n3bUQYbrXllpAJswUeaRz5HDcWMAIDHVk+bDbmQR2v9lwZfCkxls7loZthWUc gzXDUxIPsO9/dUna2tofZYwfPVPXiEn9aJQh8X+giVovA26gSgbRk8MzphFemy1yqJknxG G2QgybFBRg2IVDhdbZIYRLWOQfzRHE8nRN4VHECB7VhNESz2QSi2YfdhiNF3R4VypP9KFp eARd0vI+Ml59HoLq7j83TXraNmuG07nSmBhoO6ZMPHAWdwJW9OyNeiHpmfS6LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=PEyyjBjBVpqRif7wR+3LIpTQshqFuLaAiLmwX47Aw++99vloHkFswbiVH3xeRn8xtTlgMJ gw7faSMcRpvmQT8bgSM4h5f0g9exWGQovOmz3Es7QF27i22NXU4xsHccDynYEW3IIytkmd 4EMi2aS26owE4PxTAhGTa5x+stO/oZ9HALl6Qc+3AbaQG7zYMIIvWWdvpnI48d6abogU1f VaJ4PJGeV3Dgg4neoVdae8yCs9qCp0fsjSrj8G1MH5YXThp/xRWC+ooeUzVOKQlja9byWr scZtrmQt4tY6pW1ZcJ7d/hniEiEyZ7yQjQ9vjaPWm0TrRweVkvwfWoLpODRR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588679; a=rsa-sha256; cv=none; b=grCtExOdnaFSdmCTNFk8YIuqJoDZEcDjAy8rrq952M+ngBI3BxitCsF3Dg8ikcPxw5DKqY h3tffbmjmh1WGseGqJjnoLC+JQTcl2rlSZJdjLBpFb6ilbvTB7KGgTaHwMw1U6U9taIWu7 OD58LxyJ/vcc/C9nHq/+UQq0S+OZEYeYUzgO8zdjtD94WgsEwurXflHwA2fF/PtUJ1ZyYz tnGc7jbEzbhTwW8QvsajyT/DUnKqG3JStviys2P67RL/xkT7UH49G7ZxtaUcn8fGX9s0B7 sTYBtY13ynH1rKThg7dwUxUkUBaOYn+BgvF75u5th4QcSP5EHaBtSguJtkUNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkv31pvzxfy for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33542 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: e4416d1e95c4 - releng/15.0 - nvme_sim: signal namespace depature 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 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e4416d1e95c40b772dbb6889f468538f4ea9f711 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:39 +0000 Message-Id: <691e3a47.33542.8fca695@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e4416d1e95c40b772dbb6889f468538f4ea9f711 commit e4416d1e95c40b772dbb6889f468538f4ea9f711 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:21 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 4640f5008922c5b189d2f7b63edf73300277e6df) (cherry picked from commit b7ffac04541f98d3d8c6078092d59f0fed88b1ef) --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a06774a64761..f7fd0cee931b 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg);