From nobody Thu Feb 20 15:40: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 4YzHXW0lqsz5p3dy; Thu, 20 Feb 2025 15:40: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 4YzHXV6cGnz4Hhh; Thu, 20 Feb 2025 15:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740066042; 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=kWzHj9FI3LAy6oEqaSF0YTjLiOugTlZlJOazA/owy14=; b=iskULi5eGAikE+0SpgMBZ8PtsbvvsciBXwIeMHdyzZq+GRLKt4oJBDlExjCbS6XlZK7IcA nbB1lBdIGxCetXp5tB3MrPnWzkx68/sVurnmK6toqlluC7Yw/3FEishx2EiSZySQouyCRr aajRP2ToF7wfCF741iF+fcRIhNoNV1YsebMMtPwlhl2jS0GuzGbF783nicvKXQ5nnYpOSI Y/6SUM7UZoeTA5JaNcRxGEp02BYdxmSOohbaXDWVWAFVVTkGxJ2/zy/ncoNZ2YqksJGpiy 4KAqxbZXlp2J4EkhRmr5MqwdiuPV/bjAEhwKYkn8iy67wnZkTYTC/hm270nodg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740066042; a=rsa-sha256; cv=none; b=D++gghafMVaY9MxnyxwbLzX7FaCkkgZpFJvflZWBCxjw5YMCzF5t61lVW8D30vUerwWkOc bh8W2JYbt/3ChtLG3tqt2Zh5n9mnqk7f5P+Nc24WjpQ+O68l5OuNcdJxHt6IFXFjr6Sn/X 51sfPF8ctygYoMY4Ashmdq2TzuypA+STXMz9Hzd0ae3pVz1tjFdrBeZifDpO8u5pJZHcGB BexJrc2xmGCVN44a0F1gsDozm0Rex+p6dBt273ZqF7j8jf0LVYrqdlu8iFEdlsOWXU4zUA hBgnvSWU38Z3j1ZPTEpjdWWh0U1IALaCyP6e50VaplapgqpD/ae0J5A5aSAyLA== 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=1740066042; 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=kWzHj9FI3LAy6oEqaSF0YTjLiOugTlZlJOazA/owy14=; b=orRXc2Fgmg36b6hmK5wo6OTi43d7h7rQ0GQRK872Ilo2VQucYPrVvCNbzwBw56+xXlRFoD BkSL+4hLMzkXQKHjLktgu9PVRtL7PF5dQy+HjPFF6EPvbHTjP7FjDP/KE4OXMoY0nKWJQ1 BaRAx3DJ9KclEzrZ/NwXNMqAmEFzzpgGWSrTQxV9tLnt1e7GgP4nJZs1vbxeJV7D7yomUU /a6BdHu5M7GhTsUOn0pn9KbeZbjw9JsAkRcacPEYdMNTOQSwW+q65pqmFQLLaWG24KQQVl ojodRsnuRb/EIz8NwGunNHtvAT+G3/4PDL7gfe7ktT75JyUrohbX+BBkUtYmew== 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 4YzHXV5cCNzxtT; Thu, 20 Feb 2025 15:40:42 +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 51KFegSt016935; Thu, 20 Feb 2025 15:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KFegPO016932; Thu, 20 Feb 2025 15:40:42 GMT (envelope-from git) Date: Thu, 20 Feb 2025 15:40:42 GMT Message-Id: <202502201540.51KFegPO016932@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: 11509c6ef2fb - main - nvmft: Export more info for a ctl port for use by ctladm 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: 11509c6ef2fb3e6a83211109cba98da7560b5e12 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11509c6ef2fb3e6a83211109cba98da7560b5e12 commit 11509c6ef2fb3e6a83211109cba98da7560b5e12 Author: John Baldwin AuthorDate: 2025-02-20 15:14:42 +0000 Commit: John Baldwin CommitDate: 2025-02-20 15:31:20 +0000 nvmft: Export more info for a ctl port for use by ctladm In particular, export a "port" entry as well as an array of "host" entries for each active connection. Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48775 --- sys/dev/nvmf/controller/ctl_frontend_nvmf.c | 26 ++++++++++++++++++++++++++ sys/dev/nvmf/controller/nvmft_var.h | 1 + 2 files changed, 27 insertions(+) diff --git a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c index a28a613e23aa..658b47699c1d 100644 --- a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c +++ b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c @@ -95,6 +95,30 @@ nvmft_offline(void *arg) mtx_unlock(&np->lock); } +static int +nvmft_info(void *arg, struct sbuf *sb) +{ + struct nvmft_port *np = arg; + struct nvmft_controller *ctrlr; + int retval; + + mtx_lock(&np->lock); + retval = sbuf_printf(sb, "\t%s,p,%u\n", np->cdata.subnqn, + np->portid); + if (retval != 0) + goto out; + + TAILQ_FOREACH(ctrlr, &np->controllers, link) { + retval = sbuf_printf(sb, "\t%s\n", + ctrlr->cntlid, ctrlr->hostnqn); + if (retval != 0) + break; + } +out: + mtx_unlock(&np->lock); + return (retval); +} + static int nvmft_lun_enable(void *arg, int lun_id) { @@ -803,6 +827,7 @@ nvmft_port_create(struct ctl_req *req) np = malloc(sizeof(*np), M_NVMFT, M_WAITOK | M_ZERO); refcount_init(&np->refs, 1); + np->portid = portid; np->max_io_qsize = max_io_qsize; np->cap = _nvmf_controller_cap(max_io_qsize, enable_timeout / 500); mtx_init(&np->lock, "nvmft port", NULL, MTX_DEF); @@ -834,6 +859,7 @@ nvmft_port_create(struct ctl_req *req) port->virtual_port = 0; port->port_online = nvmft_online; port->port_offline = nvmft_offline; + port->port_info = nvmft_info; port->onoff_arg = np; port->lun_enable = nvmft_lun_enable; port->lun_disable = nvmft_lun_disable; diff --git a/sys/dev/nvmf/controller/nvmft_var.h b/sys/dev/nvmf/controller/nvmft_var.h index 6d20e2c8ac11..85032b2dc55f 100644 --- a/sys/dev/nvmf/controller/nvmft_var.h +++ b/sys/dev/nvmf/controller/nvmft_var.h @@ -33,6 +33,7 @@ struct nvmft_port { struct nvme_firmware_page fp; uint64_t cap; uint32_t max_io_qsize; + uint16_t portid; bool online; struct mtx lock;