From nobody Mon Aug 7 22:45:45 2023 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 4RKWcn6pdrz4mSZv; Mon, 7 Aug 2023 22:45:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWcn61Yrz4PKh; Mon, 7 Aug 2023 22:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448345; 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=EOw5k/8PcbWi8AQvA4pzdCVA2RB8QgI9R6y1/VnGEMc=; b=JrFKgMBFwtwSj3cK2mWAdXwXrs0hhMdC9FN3qkLuZXYS8ba0VbAPgu0MuU4ZkErvoJLNt/ XSHuvjcAx5SgOMTrfhEuIsnBD9lsjaIUiARvNoG6KBmQa1LThsvSmfHsrGoZosHHK2a4It NEX628RkO0/A6RHafv/au4N9dQs4WINBUEOmIwWfhZUJ+TggfIjQEOFN9yx3MBCS9ZZLvH AKpA/EBqd0TpwHLTSrgl8SYVr/zymVUwCB9t/A5gIxV36a3icKXPIaxYu7O9v5xfsn1zQA BR9kLCkjLmMst78Tv1zZnGEMvozTew2HLZONVsRlQx6UqW+2roIuyKEnCJ6pAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448345; 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=EOw5k/8PcbWi8AQvA4pzdCVA2RB8QgI9R6y1/VnGEMc=; b=X8Tiel8Rs14G7eKtMtOgPJdq1BvA8OdQPlb4VpmI9Y6HZqYLRV8tk/3Wxm7wHg6R59Md9K Ez5PwsIRV/Zrk7XPp7vjIJVS+YDlZ4ad971KE73Kd7TcC91v6qW/JFHx6j6JnvuSkqBnpJ NP+hlp17sL6og//iFTYGVONuW9LlmrMS6ea2MRqYh9G4/ZhX1I6oogAbeoHetXd+xrH4Md jJhc8jVGGw/t4zGFs4nKOZmO8CRM2UTHGOqvGU947bPUyZfJLrQAW6yv1vyqa10xpTSRqM eI/4qd2k1v7U4GOjE7tjJmb+7pS20/+nc61ju8n0pRAakj/bJCP4d1qEFYPM+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448345; a=rsa-sha256; cv=none; b=YoGui5/iPdRIB89dJa0xyvzijl/TKHzsQRUCOld4VdO6QZXWUoplw5YSi+ZmjLBiWxtkN2 9LBUkFwe5PlDp7WkwPDPTQaxQIshU3vxOLc3RTsXxQ9wUfjUHQCF+XfjqX6E9AnnceQmHi AJfu5wsU3RBr3wCmskABH2BDZoC6LisTNHRSa73vsQ6FT/TTrJ6bQ7jWH2V7WRmJSw7BMF KcQYSLN+ehafwkKv/VrkFp8XxgSC6Ubdnaw/N9TLPytsvYGIiRutO0wmx5MHmXiFPFjJwS 3TfrxtpdV21HLqmbNDAYeWaQpFmZ3Y+ZDKpl7YQISl8WHU1wT/d9b4NhbfQORQ== 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 4RKWcn55W1z18xr; Mon, 7 Aug 2023 22:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MjjeQ058737; Mon, 7 Aug 2023 22:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjjU9058736; Mon, 7 Aug 2023 22:45:45 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:45 GMT Message-Id: <202308072245.377MjjU9058736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2ad9a815fd58 - main - nvme: Directly lookup op code 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a commit 2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a Author: Warner Losh AuthorDate: 2023-08-07 22:36:45 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:32 +0000 nvme: Directly lookup op code Rather than have a table to walk through, use a sparse array. Suggested by: jhb Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D41353 --- sys/dev/nvme/nvme_qpair.c | 114 ++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 878df6183eea..9e15749d1bca 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -46,71 +46,67 @@ static void _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req); static void nvme_qpair_destroy(struct nvme_qpair *qpair); -struct nvme_opcode_string { - uint16_t opc; - const char * str; -}; - -static struct nvme_opcode_string admin_opcode[] = { - { NVME_OPC_DELETE_IO_SQ, "DELETE IO SQ" }, - { NVME_OPC_CREATE_IO_SQ, "CREATE IO SQ" }, - { NVME_OPC_GET_LOG_PAGE, "GET LOG PAGE" }, - { NVME_OPC_DELETE_IO_CQ, "DELETE IO CQ" }, - { NVME_OPC_CREATE_IO_CQ, "CREATE IO CQ" }, - { NVME_OPC_IDENTIFY, "IDENTIFY" }, - { NVME_OPC_ABORT, "ABORT" }, - { NVME_OPC_SET_FEATURES, "SET FEATURES" }, - { NVME_OPC_GET_FEATURES, "GET FEATURES" }, - { NVME_OPC_ASYNC_EVENT_REQUEST, "ASYNC EVENT REQUEST" }, - { NVME_OPC_NAMESPACE_MANAGEMENT, "NAMESPACE MANAGEMENT" }, - { NVME_OPC_FIRMWARE_ACTIVATE, "FIRMWARE ACTIVATE" }, - { NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD, "FIRMWARE IMAGE DOWNLOAD" }, - { NVME_OPC_DEVICE_SELF_TEST, "DEVICE SELF-TEST" }, - { NVME_OPC_NAMESPACE_ATTACHMENT, "NAMESPACE ATTACHMENT" }, - { NVME_OPC_KEEP_ALIVE, "KEEP ALIVE" }, - { NVME_OPC_DIRECTIVE_SEND, "DIRECTIVE SEND" }, - { NVME_OPC_DIRECTIVE_RECEIVE, "DIRECTIVE RECEIVE" }, - { NVME_OPC_VIRTUALIZATION_MANAGEMENT, "VIRTUALIZATION MANAGEMENT" }, - { NVME_OPC_NVME_MI_SEND, "NVME-MI SEND" }, - { NVME_OPC_NVME_MI_RECEIVE, "NVME-MI RECEIVE" }, - { NVME_OPC_CAPACITY_MANAGEMENT, "CAPACITY MANAGEMENT" }, - { NVME_OPC_LOCKDOWN, "LOCKDOWN" }, - { NVME_OPC_DOORBELL_BUFFER_CONFIG, "DOORBELL BUFFER CONFIG" }, - { NVME_OPC_FABRICS_COMMANDS, "FABRICS COMMANDS" }, - { NVME_OPC_FORMAT_NVM, "FORMAT NVM" }, - { NVME_OPC_SECURITY_SEND, "SECURITY SEND" }, - { NVME_OPC_SECURITY_RECEIVE, "SECURITY RECEIVE" }, - { NVME_OPC_SANITIZE, "SANITIZE" }, - { NVME_OPC_GET_LBA_STATUS, "GET LBA STATUS" }, - { 0xFFFF, "ADMIN COMMAND" } +#define DEFAULT_INDEX 256 +#define DEFAULT_ENTRY(x) [DEFAULT_INDEX] = x +#define OPC_ENTRY(x) [NVME_OPC_ ## x] = #x + +static const char *admin_opcode[DEFAULT_INDEX + 1] = { + OPC_ENTRY(DELETE_IO_SQ), + OPC_ENTRY(CREATE_IO_SQ), + OPC_ENTRY(GET_LOG_PAGE), + OPC_ENTRY(DELETE_IO_CQ), + OPC_ENTRY(CREATE_IO_CQ), + OPC_ENTRY(IDENTIFY), + OPC_ENTRY(ABORT), + OPC_ENTRY(SET_FEATURES), + OPC_ENTRY(GET_FEATURES), + OPC_ENTRY(ASYNC_EVENT_REQUEST), + OPC_ENTRY(NAMESPACE_MANAGEMENT), + OPC_ENTRY(FIRMWARE_ACTIVATE), + OPC_ENTRY(FIRMWARE_IMAGE_DOWNLOAD), + OPC_ENTRY(DEVICE_SELF_TEST), + OPC_ENTRY(NAMESPACE_ATTACHMENT), + OPC_ENTRY(KEEP_ALIVE), + OPC_ENTRY(DIRECTIVE_SEND), + OPC_ENTRY(DIRECTIVE_RECEIVE), + OPC_ENTRY(VIRTUALIZATION_MANAGEMENT), + OPC_ENTRY(NVME_MI_SEND), + OPC_ENTRY(NVME_MI_RECEIVE), + OPC_ENTRY(CAPACITY_MANAGEMENT), + OPC_ENTRY(LOCKDOWN), + OPC_ENTRY(DOORBELL_BUFFER_CONFIG), + OPC_ENTRY(FABRICS_COMMANDS), + OPC_ENTRY(FORMAT_NVM), + OPC_ENTRY(SECURITY_SEND), + OPC_ENTRY(SECURITY_RECEIVE), + OPC_ENTRY(SANITIZE), + OPC_ENTRY(GET_LBA_STATUS), + DEFAULT_ENTRY("ADMIN COMMAND"), }; -static struct nvme_opcode_string io_opcode[] = { - { NVME_OPC_FLUSH, "FLUSH" }, - { NVME_OPC_WRITE, "WRITE" }, - { NVME_OPC_READ, "READ" }, - { NVME_OPC_WRITE_UNCORRECTABLE, "WRITE UNCORRECTABLE" }, - { NVME_OPC_COMPARE, "COMPARE" }, - { NVME_OPC_WRITE_ZEROES, "WRITE ZEROES" }, - { NVME_OPC_DATASET_MANAGEMENT, "DATASET MANAGEMENT" }, - { NVME_OPC_VERIFY, "VERIFY" }, - { NVME_OPC_RESERVATION_REGISTER, "RESERVATION REGISTER" }, - { NVME_OPC_RESERVATION_REPORT, "RESERVATION REPORT" }, - { NVME_OPC_RESERVATION_ACQUIRE, "RESERVATION ACQUIRE" }, - { NVME_OPC_RESERVATION_RELEASE, "RESERVATION RELEASE" }, - { NVME_OPC_COPY, "COPY" }, - { 0xFFFF, "IO COMMAND" } +static const char *io_opcode[DEFAULT_INDEX + 1] = { + OPC_ENTRY(FLUSH), + OPC_ENTRY(WRITE), + OPC_ENTRY(READ), + OPC_ENTRY(WRITE_UNCORRECTABLE), + OPC_ENTRY(COMPARE), + OPC_ENTRY(WRITE_ZEROES), + OPC_ENTRY(DATASET_MANAGEMENT), + OPC_ENTRY(VERIFY), + OPC_ENTRY(RESERVATION_REGISTER), + OPC_ENTRY(RESERVATION_REPORT), + OPC_ENTRY(RESERVATION_ACQUIRE), + OPC_ENTRY(RESERVATION_RELEASE), + OPC_ENTRY(COPY), + DEFAULT_ENTRY("IO COMMAND"), }; static const char * -get_opcode_string(struct nvme_opcode_string *entry, uint16_t opc) +get_opcode_string(const char *op[DEFAULT_INDEX + 1], uint16_t opc) { - while (entry->opc != 0xFFFF) { - if (entry->opc == opc) - return (entry->str); - entry++; - } - return (entry->str); + const char *nm = opc < DEFAULT_INDEX ? op[opc] : op[DEFAULT_INDEX]; + + return (nm != NULL ? nm : op[DEFAULT_INDEX]); } static const char *