From nobody Mon Aug 15 17:57:25 2022 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 4M626t1ld0z4Zcqt; Mon, 15 Aug 2022 17:57:26 +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 4M626t1JySz42MS; Mon, 15 Aug 2022 17:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660586246; 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=oxU+JlosTJvVqJn0kEyZiNZvLWT37l7vJgFjGKLaNFk=; b=YBD6qoMwrYU98g0GcfYL7w03XuVnGJrQJBAqfC/eAZiZm7IMpFiCL9V+IygQBMOPAjN3uj PUNS/Q+ehkOsNKgS5iuEpYUDhkACUFyu9ZEpA2pW83i+E37upJoWeBDOcymemjfY6ahQyE 9XM+vCMO1GfdTGXuROBYqewqucUTrrilQuk3LVpRWLn8uk1bp9ZR5u1oBqOrpAgLLJBlqu 72Yga0dMujlauYkgpAh/q4HU1HhKYsuVtONdkgq2oU47LzwmBBZ2YBDGn2yyeDWs1VZAta WKAvmn7eq6KU9pQHwgKNrrgv65jEH+/ApA3ZIBZPwnanI87sotxfUsJYFELK2g== 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 4M626t0PCGzdd7; Mon, 15 Aug 2022 17:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27FHvP0n055891; Mon, 15 Aug 2022 17:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FHvPqk055890; Mon, 15 Aug 2022 17:57:25 GMT (envelope-from git) Date: Mon, 15 Aug 2022 17:57:25 GMT Message-Id: <202208151757.27FHvPqk055890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: bdd4dbb070ac - stable/13 - nvme: Print CRD, M and DNR status bits on errors. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bdd4dbb070ac7369d058ab2e59cc4b1df6d7d6cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660586246; 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=oxU+JlosTJvVqJn0kEyZiNZvLWT37l7vJgFjGKLaNFk=; b=FKIkYaa1s0IuHBAfqNwmfP/gmXN/GGZvIYrk/o8dp6rhA82rLWyBYojgOdb/ntbVYP+H43 gCT2Fs9xV3rmFGhlClJvw5ZjrkQlNHsWjtiTjqlbdlbG2CENGkc1JJ309Wf4jSgi3y51Eq RUERZhmnE2zxQovEVhSJ7ZNIsMOMOscZ5qD7ph9polbIHrxd4TgdMR0Nriq4/IwKav/IN3 SOE8UDX1zxax0CUMBQvAl5rLxq8OD8JdkoaLz8WE798M3GyrwjoRR6aJ34Jx6hu6VMLbTf EXY0AcQVhKlJv3gfnC5Qmyve9dVQQ9BdlFFlYBwLDN5C7MubJyYCino53/5fFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660586246; a=rsa-sha256; cv=none; b=VctAT0XM14PI7c+J2gKF3BpFsOd0idEmplCrwUhq4yY2Jp9IP6XXnZ9eVzxCcacG2dPfDp ltXHwVnrfNd15sCjGGaSHmEnE83WNPbgvfS2OubUIIzp5WynVT1X+KHqrjW/rk6sfwlIea 0iDPnYCtUXuzpxwouq47Ex0imOoKBq0jRZvb1EVJCE7ZFrw2IcoQOZvGjqwsncfbuXbqhS Q+jmmKnBYwjnV/N092XTUreQdUNNgpy6XgucGDl0TPY8BDNxYPDx5+N/HMgz/nkFGOKiPh 0kcfUV2zfoSuThymzjpYGbj7DiGYhi5uNlLntEyX6oG137DtO/uUIVHAS+KYcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=bdd4dbb070ac7369d058ab2e59cc4b1df6d7d6cb commit bdd4dbb070ac7369d058ab2e59cc4b1df6d7d6cb Author: Alexander Motin AuthorDate: 2022-08-05 14:58:19 +0000 Commit: Alexander Motin CommitDate: 2022-08-15 17:34:48 +0000 nvme: Print CRD, M and DNR status bits on errors. It may help with some issues debugging. MFC after: 1 week (cherry picked from commit a69c0964625f4e20a7d5f22d51e036e13eedbeeb) --- sys/dev/nvme/nvme.c | 7 ++++--- sys/dev/nvme/nvme.h | 1 + sys/dev/nvme/nvme_qpair.c | 14 +++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index f36125ba247b..512345ac9d8e 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -100,7 +100,7 @@ nvme_dump_command(struct nvme_command *cmd) void nvme_dump_completion(struct nvme_completion *cpl) { - uint8_t p, sc, sct, m, dnr; + uint8_t p, sc, sct, crd, m, dnr; uint16_t status; status = le16toh(cpl->status); @@ -108,13 +108,14 @@ nvme_dump_completion(struct nvme_completion *cpl) p = NVME_STATUS_GET_P(status); sc = NVME_STATUS_GET_SC(status); sct = NVME_STATUS_GET_SCT(status); + crd = NVME_STATUS_GET_CRD( status); m = NVME_STATUS_GET_M(status); dnr = NVME_STATUS_GET_DNR(status); printf("cdw0:%08x sqhd:%04x sqid:%04x " - "cid:%04x p:%x sc:%02x sct:%x m:%x dnr:%x\n", + "cid:%04x p:%x sc:%02x sct:%x crd:%x m:%x dnr:%x\n", le32toh(cpl->cdw0), le16toh(cpl->sqhd), le16toh(cpl->sqid), - cpl->cid, p, sc, sct, m, dnr); + cpl->cid, p, sc, sct, crd, m, dnr); } int diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index f2ef2467c9b1..177f18f916c1 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -201,6 +201,7 @@ #define NVME_STATUS_GET_P(st) (((st) >> NVME_STATUS_P_SHIFT) & NVME_STATUS_P_MASK) #define NVME_STATUS_GET_SC(st) (((st) >> NVME_STATUS_SC_SHIFT) & NVME_STATUS_SC_MASK) #define NVME_STATUS_GET_SCT(st) (((st) >> NVME_STATUS_SCT_SHIFT) & NVME_STATUS_SCT_MASK) +#define NVME_STATUS_GET_CRD(st) (((st) >> NVME_STATUS_CRD_SHIFT) & NVME_STATUS_CRD_MASK) #define NVME_STATUS_GET_M(st) (((st) >> NVME_STATUS_M_SHIFT) & NVME_STATUS_M_MASK) #define NVME_STATUS_GET_DNR(st) (((st) >> NVME_STATUS_DNR_SHIFT) & NVME_STATUS_DNR_MASK) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 175975b2b3ac..ad6c1be91c3f 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -344,14 +344,18 @@ static void nvme_qpair_print_completion(struct nvme_qpair *qpair, struct nvme_completion *cpl) { - uint16_t sct, sc; + uint8_t sct, sc, crd, m, dnr; sct = NVME_STATUS_GET_SCT(cpl->status); sc = NVME_STATUS_GET_SC(cpl->status); - - nvme_printf(qpair->ctrlr, "%s (%02x/%02x) sqid:%d cid:%d cdw0:%x\n", - get_status_string(sct, sc), sct, sc, cpl->sqid, cpl->cid, - cpl->cdw0); + crd = NVME_STATUS_GET_CRD(cpl->status); + m = NVME_STATUS_GET_M(cpl->status); + dnr = NVME_STATUS_GET_DNR(cpl->status); + + nvme_printf(qpair->ctrlr, "%s (%02x/%02x) crd:%x m:%x dnr:%x " + "sqid:%d cid:%d cdw0:%x\n", + get_status_string(sct, sc), sct, sc, crd, m, dnr, + cpl->sqid, cpl->cid, cpl->cdw0); } static bool