From nobody Fri Jan 31 20:49:42 2025 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 4Yl7LH5NTlz5n4gt; Fri, 31 Jan 2025 20:49:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yl7LH1NLTz3VRR; Fri, 31 Jan 2025 20:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738356583; 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=4cuyCoLqPUsHvIETPLGW/veNP/98SBh/GOQgOTNhmbQ=; b=tp14jRXjIZNBvRBs4XwKVjb7cvTCFqhTVvu0ZYvSgIc+mhswpEUHPQHOyNWN1Tl9gPjnUz FfDPp5PO6Y1CpSAISuqD+B1DhkyPYHkT3qs07KnsaIcpT9jn5STU50zwKcTGP1Erk7ew6v /t74EKl3zasEWa3x3zhww9Zqa+JpK634yUVTc+SFzUbIlgQjSZUTG5PqfdUUJsjAvMdmmD 5MpBMgWMqqIgclPNobsyXb9wbfScqf8kulZzXW9O3HKCFQcvgu5cz1q1RvSVCGtXnuzayD UZHZwFdyzyPKl/OpMa2TMNtDXBTlxsfrL4agkVeXLdXDsFPkJMvu4f96zkEEiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738356583; 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=4cuyCoLqPUsHvIETPLGW/veNP/98SBh/GOQgOTNhmbQ=; b=rxqgdkgkesx/N7XMCGFhlKdEUyRuHBSK1FAiJdn9iyK8pLpvGy6/DuLL6fvvGAwB7vxbMs 3SRNUrJJBp+6kMnNTNfZwtvNR8XTC+LSMb+LFUTYNkcWos4G+hoRAo5J4Vxgxx7ypUKm+a pR6kFbk63O7TfmVp9y9Be5V8y9Yn7DP6coiiq66+6fQuu+GeQMmNrmukcp87cQX1DPetLd 66iFcd9X/LfyKJkqg17dc4PJ22ZiQSk6m3PqWHWwEKBJpr0j9YN++0BBfrdVC4WsZlNd/C 2jU6CCGSE0iJLawokDrWvSVG8kul31eFVVZsMXBAdUQmlqLIID3o1h1YUkOxeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738356583; a=rsa-sha256; cv=none; b=GxeFAO51/wgevjZV610lITnRQGH02Qu7DIBT4ZAZPwKkHMo6/b8LjznU7fACquQkB+0fkV 5xmyAOw5t5GBqOXApMs9fx26NHKIjAjp44vgD9p+pO1hpKjRrq7e4LTFs9597LL505eWL0 nf/eTnUVv2pAkYn7IaaQ1mW1NEyA+6LMLLBvM/p4N0uCj47X/TS/0dbuUH6DbcikXvLGqd SEn7OXG7Z0Ps0MbLkCwlSXreO1AODk521VeKjZe9hG5gMT3Gdx6uyKnva5qeHuBgDInUwz Fx5P50sy1GEjpldGr0P5H1vP4ce0IIEjz5h18HUUR4lgsaNWfLsFTgd+ObATJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yl7LH0BfxzZpZ; Fri, 31 Jan 2025 20:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50VKngIJ063434; Fri, 31 Jan 2025 20:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VKngLA063431; Fri, 31 Jan 2025 20:49:42 GMT (envelope-from git) Date: Fri, 31 Jan 2025 20:49:42 GMT Message-Id: <202501312049.50VKngLA063431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 858280e60f05 - main - nvmecontrol devlist: Annotate connected Fabrics hosts 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 858280e60f0505a2fcf26920ef0b8c9e20cd2d49 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=858280e60f0505a2fcf26920ef0b8c9e20cd2d49 commit 858280e60f0505a2fcf26920ef0b8c9e20cd2d49 Author: John Baldwin AuthorDate: 2025-01-31 20:49:11 +0000 Commit: John Baldwin CommitDate: 2025-01-31 20:49:11 +0000 nvmecontrol devlist: Annotate connected Fabrics hosts If a Fabrics host is connected, use the discovery log entry from the reconnect parameters to output the transport type and address. Reviewed by: chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48731 --- sbin/nvmecontrol/devlist.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index 31445a2ef920..7bf6bc6f097c 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -152,7 +152,23 @@ print_controller_info(const char *name, int fd) nvme_strvis(mn, cdata.mn, sizeof(mn), NVME_MODEL_NUMBER_LENGTH); printf("%6s: %s", name, mn); - if (!connected) { + if (connected) { + const struct nvme_discovery_log_entry *dle; + size_t len; + + nvlist_destroy(nvl); + if (nvmf_reconnect_params(fd, &nvl) == 0) { + dle = nvlist_get_binary(nvl, "dle", &len); + if (len == sizeof(*dle)) { + printf(" (connected via %s %.*s:%.*s)", + nvmf_transport_type(dle->trtype), + (int)sizeof(dle->traddr), dle->traddr, + (int)sizeof(dle->trsvcid), dle->trsvcid); + } + } else { + nvl = NULL; + } + } else { if (now.tv_sec == 0) clock_gettime(CLOCK_REALTIME, &now);