From nobody Sat Nov 02 13:54:52 2024 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 4XgfP83pGDz5c492; Sat, 02 Nov 2024 13:54:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgfP83BNNz40Ft; Sat, 2 Nov 2024 13:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730555692; 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=uQs6TvLIWDRGlUYoFDVacYhI2WNoatgWNXz/WgyKMPM=; b=wixmFgx00AkwNPQyTOWY7dA4n+mhMNuRFjwh2Gsm4RbH2yy/lWkREGJ2ZwyagiAgfoNPyw la6g+dXOkwr1oIID436HgM7FTfIKxW9S1MWTbGQRGfLqaBXcYdTwPPJQS7zPZ8VR7259Vc PqoH8UMBVbcPvfAcoTqzlthOmYHcjucJ+rHBsCU8mgTYopsMRnc5+18rv0/R6zgxF9v2K3 GzNMIfqLmTIAlckGfYdUo8oH3sDfjSpth6Lz4yeBW28N7bEg+8R/jICDuofS5CkXwriHUY PDNtAMl6nmgvCvxdbZnLvOxgSFxZWwps3cXfR5rD7msbhiVL9Uaxzf1si2AnRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730555692; 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=uQs6TvLIWDRGlUYoFDVacYhI2WNoatgWNXz/WgyKMPM=; b=exdG1Jso+i4sHy2T4a6gVzZfFyx/gGlUOjKH20I82a2z8GqWGV8ypIBZ9/uMLn5nhOKIaN FTK/1ipPkc1Gyjebk9xARZuXj4phR4BluekimUxik1O955UKJtcDJLQJJ9uBofXVM/djuM kDzGNq573vblBcSTIS8y5pdbkSlB3G8oo+5MNhHv6jgLGBlepBhFg4dXhbXIQEEbWLLSUu 4Oj9b5j2I6U/Z+akptdPWpCld1XB/vj+cp0lDZEDe1cl/GhbtojF71aPnbsup/n1QwR4uu FGBiBG6ptK5V+2mnO/AKg6m81w5bVEz7zrRWQ6XBIRGpIlg8CwFh2GxmxaHGiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730555692; a=rsa-sha256; cv=none; b=y0y05+l6MA33ddQS3beW1eM1lYV2lotmOto4ucirqWf8zNQyO+FRuwXhhPos2GFaccF+9k uwOtujrit+poPbryMTRQRD7s/JfF1msy4ASoPiGNlpE5u56s5o1gVXqRU1H3G0nwI7VCDl Qqp6Bix1mO2BQ7cz0cSc4O1oxQaLee78CpCmNJPMzMIr/wSUB8Wk7NceguG+/cj+dte+PQ Cjn3lDpqbhprVmJ6wDgDFsZuBKuH9XQ0UTcINaVDFjaOH/Xb1jSpdDde08SQ+6KgWpbHrW fqW/fcpfmL+eRnyXvHKhTClRk8Vi5YbM3hg7IRh/r3FWCIbAvOk0Kt/T0jnFLg== 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 4XgfP82ngGz16mX; Sat, 2 Nov 2024 13:54:52 +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 4A2DsqZx098789; Sat, 2 Nov 2024 13:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2Dsq1k098786; Sat, 2 Nov 2024 13:54:52 GMT (envelope-from git) Date: Sat, 2 Nov 2024 13:54:52 GMT Message-Id: <202411021354.4A2Dsq1k098786@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: bd2fc1e7d0ff - main - nvme: Rename the per-I/O queue sysctl device nodes 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: bd2fc1e7d0fff1becd781645366f8e0ef5ca68df Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bd2fc1e7d0fff1becd781645366f8e0ef5ca68df commit bd2fc1e7d0fff1becd781645366f8e0ef5ca68df Author: John Baldwin AuthorDate: 2024-11-02 13:53:28 +0000 Commit: John Baldwin CommitDate: 2024-11-02 13:53:28 +0000 nvme: Rename the per-I/O queue sysctl device nodes Switch from dev.nvme.X.ioqY to dev.nvme.X.ioq.Y. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D47400 --- sys/dev/nvme/nvme_sysctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index f3566e75225d..a5a44721f9f9 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -346,8 +346,8 @@ void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) { struct sysctl_ctx_list *ctrlr_ctx; - struct sysctl_oid *ctrlr_tree, *que_tree; - struct sysctl_oid_list *ctrlr_list; + struct sysctl_oid *ctrlr_tree, *que_tree, *ioq_tree; + struct sysctl_oid_list *ctrlr_list, *ioq_list; #define QUEUE_NAME_LENGTH 16 char queue_name[QUEUE_NAME_LENGTH]; int i; @@ -441,9 +441,13 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) * of the sysctls to diagnose things. */ if (ctrlr->ioq != NULL) { + ioq_tree = SYSCTL_ADD_NODE(ctrlr_ctx, ctrlr_list, OID_AUTO, + "ioq", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "I/O Queues"); + ioq_list = SYSCTL_CHILDREN(ioq_tree); + for (i = 0; i < ctrlr->num_io_queues; i++) { - snprintf(queue_name, QUEUE_NAME_LENGTH, "ioq%d", i); - que_tree = SYSCTL_ADD_NODE(ctrlr_ctx, ctrlr_list, OID_AUTO, + snprintf(queue_name, QUEUE_NAME_LENGTH, "%d", i); + que_tree = SYSCTL_ADD_NODE(ctrlr_ctx, ioq_list, OID_AUTO, queue_name, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "IO Queue"); nvme_sysctl_initialize_queue(&ctrlr->ioq[i], ctrlr_ctx, que_tree);