From nobody Tue Oct 15 22:21:57 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 4XSpVY2HjXz5Z5Cw; Tue, 15 Oct 2024 22:21:57 +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 4XSpVY1chFz3wgh; Tue, 15 Oct 2024 22:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729030917; 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=m+em0Is6PmS11EUmaLz5ti/Rt1iZcJNUpTzSHpCbG2c=; b=o+AH/No7Ydy9CeF6eJG6I5rzLlrBS85Gi3ou1mi0EizyxGtzcr4zb5krAnZhbjZwxn7xYy JlJwq88mrS8IuDTEeYqTvO1qJ/jYO6HIu820WpvxYihCChoNz15dVvNxSe5LNq4XPAZbdV RWF811xeiQyWxRpdpnEoVfrYSIrn08TbH09dXPRUeGVuvVsPC6fWW39h+k4cDO8nx1hxFG ObXpvS8fh6kzqvmFmXoxZIbxFI6DME32qm4VjUvlACDbI5gq2EE8aYzzmBldm7Jmn5572H 0jP4lrnzzz3Nz137JJvOPuXO55L3EgSKtjwVmXDt3uChcx6BKfSU2D+hvMTnxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729030917; 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=m+em0Is6PmS11EUmaLz5ti/Rt1iZcJNUpTzSHpCbG2c=; b=inGwSo86Tcw9pHtjsSdGlLctsDyAlrUFcW+G2h1lg+SUU0vxXPci4nJQHRipOgyxaVffK0 Khxwjw7+usbA43v2Iac+xQpo+dkNJCZwCZiEAUTAkD0olu1Fdx4WRxL8CGrw+yxDzhpoc1 TwGfREUDndLj9BzA6vjoyBrEu/cyEzdtqroov4F3HfQ6ltXFN1fhglkbu6KWXuoihBnj0U Ro47cnbgzvKlw4YCwS7OqeHHGCnV5N26R9Pf9k7vh3pBIfaRvxqY/dkISUY8AUxF4rKxNY O89WQXlNXZI8eNvFZENfr8UYUB0JzrhzhRwmPlYJeIvuWI/WluD8F0GHbUK7aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729030917; a=rsa-sha256; cv=none; b=dRzFbjFfx5GDLsnjw2uugWZWqJBhxRz2RVTI/LSa4s4A9sOCw4WRQvKv7HF/A+WOVS5qGu p5UFrGXQso/PN5JXJNB+C41Sb5BSox5zoSUpVQsSBu3wacYQOZnPcWALiHhqlqv3IdZfav 7u0Auleax4fFXfZUC24KW8BASHJGmoMnlNB+dMUaz6jkzLjjaG1EVBfvOBh+6Alp9QD2F8 WHozmUX9BWbu6qKUFd4nEtEU4ckNR4JuoLj7qoaXVXNXS34f94+kHeSca9q2NAXtxf3alT 2zC266+53hB8Z98CGiOSxuBjs4RdELgGDMt5SBSZMrSJZDBGCykBkpTleOEdBw== 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 4XSpVY1D1BzgNH; Tue, 15 Oct 2024 22:21:57 +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 49FMLv42038501; Tue, 15 Oct 2024 22:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FMLvET038498; Tue, 15 Oct 2024 22:21:57 GMT (envelope-from git) Date: Tue, 15 Oct 2024 22:21:57 GMT Message-Id: <202410152221.49FMLvET038498@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: 82c96fef52c1 - main - nvme: Export recovery state 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82c96fef52c11b50c3effaa5d3bbe78a692dfd27 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82c96fef52c11b50c3effaa5d3bbe78a692dfd27 commit 82c96fef52c11b50c3effaa5d3bbe78a692dfd27 Author: Warner Losh AuthorDate: 2024-10-15 22:19:30 +0000 Commit: Warner Losh CommitDate: 2024-10-15 22:19:30 +0000 nvme: Export recovery state Export recovery state as a sysctl. This helps, sometimes, diagnose what's going on. Sponsored by: Netflix --- sys/dev/nvme/nvme_sysctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index c66f1ed51c9c..edd1f3e40997 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -333,6 +333,10 @@ nvme_sysctl_initialize_queue(struct nvme_qpair *qpair, CTLFLAG_RD, &qpair->num_recovery_nolock, "Number of times that we failed to lock recovery in the ISR"); + SYSCTL_ADD_UINT(ctrlr_ctx, que_list, OID_AUTO, "recovery", + CTLFLAG_RW, &qpair->recovery_state, 0, + "Current recovery state of the queue"); + SYSCTL_ADD_PROC(ctrlr_ctx, que_list, OID_AUTO, "dump_debug", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, qpair, 0, nvme_sysctl_dump_debug, "IU", "Dump debug data");