From nobody Wed Jun 4 15:14:41 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 4bCB2T2428z5x9QR; Wed, 04 Jun 2025 15:14:41 +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 4bCB2T1X7Wz47PM; Wed, 04 Jun 2025 15:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749050081; 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=v5AfkkdQib7aiGXDVyv1vGpi7sEV44AkrWHhTYk01/0=; b=E15cMrwxvdrwDzkQ9VdBXHjDIXobXK/Gnbs/j/gbYM68zCI+K1jzd855RYITfdNGS2OUrR M8Lofft7ATkOxd65ja1pCyjLdLfk4oluR5oS3ZoUZEpt69qVL+5YLWxETgKIlVD7+omDNn LWayySVTHcWJk7TMJypKzyTOGV452jTS6IDb4tpWwru/kA8fSPN/0S1fjMCTK1LoPKzvVi o0Irla+Dnf0s/OnC6ytUUJdusYz7QyD4lEMTNBA03yIjQ/2TT/vCdDRHcILD6Uz08XCukK rkMdg3vYwqR8A93/Ee/VEjE0LgwVCYvnmNznppB1WEmDslh6Ta6FeRrl+w18DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749050081; 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=v5AfkkdQib7aiGXDVyv1vGpi7sEV44AkrWHhTYk01/0=; b=kmpkXX1eOwHO4irl0vm1KmAvQGZDstPrjIcWzcny0y2oJbPXMimZwZas2jYn2d73obHxHz R7p9ekLN0MsEK2wZrABDvBXY+1WCiGi4H3z6XF3B0d8zaMsG0sDSFD/3QkuxHkjiERowpx 8PcSzx7hBIc85azb/5TQ2cc1AOB9VvyaiBDy9x7mANzcq9FVusmNjkE3C/hPYwux6sT1Kv U03otb02OeAebxzLyKfigifqvJZpqWgV2NqkhWx4BsEJY8UDhGRxy0VrLsAUNffdxefVvD ZEt52wWvoDsaDe01ErW+NNftkK21Eou2pYtwvc5c3O6zGiAxOLeGsDQCKSqSww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749050081; a=rsa-sha256; cv=none; b=DBy3s7g0btqK/FLpFrEuLb2EWA+BPtpHZVQCiIGP5tMUiXejgmxfmhfz1CBz9epEd12gJK qff1pfyaUUJW0ao8QG5mvUqB1WRECfyzZRnYFWqnjBq7+eJVhy96vthWApj2nC5EOFP/RJ gpyBSzg3MoKUp5Oo9DULiNymBkAumkpN+fDgsHJNNmIns6kvAEOAvAlLpBPBfV/49navPJ CWTyJ6aMubs1AciO7kB+zcwXrzjMlKNA0Qy4sZSsFi4+qbN4b9WTPJ+YZvSayPUy2VdIBk gOJrwEjmAvFQyIbh/Mok8kYvqQbSssDJMvn93s1oJbuvJfEKh5/XSZvswHxMeQ== 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 4bCB2T14b8zDTg; Wed, 04 Jun 2025 15:14:41 +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 554FEfPE030005; Wed, 4 Jun 2025 15:14:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554FEfef030002; Wed, 4 Jun 2025 15:14:41 GMT (envelope-from git) Date: Wed, 4 Jun 2025 15:14:41 GMT Message-Id: <202506041514.554FEfef030002@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: 5304a20ff148 - main - cam nvme: Add nvme_command_string 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: 5304a20ff148ddd82e39dbc1ca6bc08dc5deffa4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5304a20ff148ddd82e39dbc1ca6bc08dc5deffa4 commit 5304a20ff148ddd82e39dbc1ca6bc08dc5deffa4 Author: John Baldwin AuthorDate: 2025-06-04 15:14:13 +0000 Commit: John Baldwin CommitDate: 2025-06-04 15:14:13 +0000 cam nvme: Add nvme_command_string Replace nvme_cmd_string and nvme_opcode_string with a single function. nvme_cmd_string was already using an sbuf around a caller-supplied string, so use the same pattern for the entire command string. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50651 --- sys/cam/nvme/nvme_all.c | 19 ++----------------- sys/cam/nvme/nvme_all.h | 3 +-- sys/cam/nvme/nvme_xpt.c | 7 +++---- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index 3f264e2ff6eb..4145aa16ed49 100644 --- a/sys/cam/nvme/nvme_all.c +++ b/sys/cam/nvme/nvme_all.c @@ -269,22 +269,7 @@ nvme_print_ident_short(const struct nvme_controller_data *cdata, } const char * -nvme_op_string(const struct nvme_command *cmd, int admin) -{ - const char *s; - - if (admin) - s = admin_opcode[cmd->opc]; - else - s = nvm_opcode[cmd->opc]; - if (s == NULL) - return ("UNKNOWN"); - else - return (s); -} - -const char * -nvme_cmd_string(const struct nvme_command *cmd, char *cmd_string, size_t len) +nvme_command_string(struct ccb_nvmeio *nvmeio, char *cmd_string, size_t len) { struct sbuf sb; int error; @@ -293,7 +278,7 @@ nvme_cmd_string(const struct nvme_command *cmd, char *cmd_string, size_t len) return (""); sbuf_new(&sb, cmd_string, len, SBUF_FIXEDLEN); - nvme_cmd_sbuf(cmd, &sb); + nvme_command_sbuf(nvmeio, &sb); error = sbuf_finish(&sb); if (error != 0 && diff --git a/sys/cam/nvme/nvme_all.h b/sys/cam/nvme/nvme_all.h index a32668ddc1fb..17c068b825be 100644 --- a/sys/cam/nvme/nvme_all.h +++ b/sys/cam/nvme/nvme_all.h @@ -42,11 +42,10 @@ struct sbuf; void nvme_print_ident(const struct nvme_controller_data *, const struct nvme_namespace_data *, struct sbuf *); void nvme_print_ident_short(const struct nvme_controller_data *, const struct nvme_namespace_data *, struct sbuf *); -const char *nvme_op_string(const struct nvme_command *, int admin); -const char *nvme_cmd_string(const struct nvme_command *, char *, size_t); void nvme_opcode_sbuf(bool admin, uint8_t opc, struct sbuf *sb); void nvme_cmd_sbuf(const struct nvme_command *, struct sbuf *sb); int nvme_command_sbuf(struct ccb_nvmeio *nvmeio, struct sbuf *sb); +const char *nvme_command_string(struct ccb_nvmeio *nvmeio, char *, size_t); void nvme_cpl_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); int nvme_status_sbuf(struct ccb_nvmeio *nvmeio, struct sbuf *sb); const void *nvme_get_identify_cntrl(struct cam_periph *); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 47c0bde1df37..bac9e6441040 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -833,14 +833,13 @@ nvme_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) static void nvme_proto_debug_out(union ccb *ccb) { - char cdb_str[(sizeof(struct nvme_command) * 3) + 1]; + char command_str[128]; if (ccb->ccb_h.func_code != XPT_NVME_IO && ccb->ccb_h.func_code != XPT_NVME_ADMIN) return; CAM_DEBUG(ccb->ccb_h.path, - CAM_DEBUG_CDB,("%s. NCB: %s\n", nvme_op_string(&ccb->nvmeio.cmd, - ccb->ccb_h.func_code == XPT_NVME_ADMIN), - nvme_cmd_string(&ccb->nvmeio.cmd, cdb_str, sizeof(cdb_str)))); + CAM_DEBUG_CDB,("%s\n", nvme_command_string(&ccb->nvmeio, + command_str, sizeof(command_str)))); }