From nobody Fri Aug 5 15:02:00 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 4Lzpj44LHkz4Y9p1; Fri, 5 Aug 2022 15:02:00 +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 4Lzpj43pg8z3SbQ; Fri, 5 Aug 2022 15:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659711720; 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=zRswoPvuAdXG9mSrlWbEN9OTRbHq59Ix83gRDamhosM=; b=L8Xf33eaCP+ZRm7G5EqT+pT4AxGL04RfGNtyrnf87GAa1JY++SKJdhcytuRBpxzMLt2drI iJ1KTXV226EPUoe6AWsD2ngf6x1e20yJuaRfL48/rfq+DNWWEBaw7OqWeQOc/YnVf73KKy +XsavKx06R72gQ8j3aY1mrAIipKy1eDdUj67OJ5vpcbqnoixPi0GCb0SSZlVZn7jT0T7yr atlzhqSBQ7RCvujPscFHx0mNXDo2vNfGvA7tCGmQjDjpp4kcwDJzGLLJwuVuIzvbP/IY5J 1TlDIPgSOpeMsUSLqKKZ1QpkK4c+5fBQjS7ZRNyoWjOncap62uTpGer/xX/XAw== 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 4Lzpj42tXWzxy2; Fri, 5 Aug 2022 15:02:00 +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 275F20wW006482; Fri, 5 Aug 2022 15:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 275F20Cc006470; Fri, 5 Aug 2022 15:02:00 GMT (envelope-from git) Date: Fri, 5 Aug 2022 15:02:00 GMT Message-Id: <202208051502.275F20Cc006470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a69c0964625f - main - 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/main X-Git-Reftype: branch X-Git-Commit: a69c0964625f4e20a7d5f22d51e036e13eedbeeb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659711720; 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=zRswoPvuAdXG9mSrlWbEN9OTRbHq59Ix83gRDamhosM=; b=hnP39i9CekE2CRaaBAQ/6Z16PeRk6AUeDJzONzP6GUkAPqp+4rw3c8ak3p0BkL+G+bMHKQ eLl4ecW9NMs3fMR/fCrVsEEUpFgeOuuvcNRZZGgj0I0mEF1N+S17ylIyBbeQGVm6/GL5fI Hxzunf9LwTyZDICUHfMJlTme4r0Ba/Y5CAHW0G9MGSB1lX5Cf3NdxhflkSRgAul6oUkklN NpmE41YpGXpEYaqUgEble+EBgX8HJYNaXF/zY678/h8dJhI03SSEjVPGnNo9azFogYdPXD RHRlxA0z0qHXq1qv03RCkSBXggD5wXzhJuG8hCXxUyvgwdSovVVtrPLgvLQfgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659711720; a=rsa-sha256; cv=none; b=dC24i/kmShgc7p7XktvyPvc9fwBz8AhX+dwDbs0vp9AoGqbioj5HTfdONNszMyHNG09Nz5 1XeLWxIyIxPCBrwhzOSO7K3CxrM/nR8rOuAwe29IX8M0zwNoxYYIam5zZbALIY2Au0j3dF PLnatbvgtSB1LR7I8Ismwd/yacMeNj6Ie0goDyq8UiylJg2yLKBFBv4H4MiV0wwWI4PbKN jG+BgDRygAXlD64KI+XPf+vuFSzxo8PtCl9DbCpx8o8yoJwuykpWiQr4LJPc8zKBwGm2AF VhGp/rLmaKLg7WqCgv9zTiJO6aI3Uxdcbmz3Vk9EAexNKktpQHYGcIg/dFjyag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a69c0964625f4e20a7d5f22d51e036e13eedbeeb commit a69c0964625f4e20a7d5f22d51e036e13eedbeeb Author: Alexander Motin AuthorDate: 2022-08-05 14:58:19 +0000 Commit: Alexander Motin CommitDate: 2022-08-05 14:58:19 +0000 nvme: Print CRD, M and DNR status bits on errors. It may help with some issues debugging. MFC after: 1 week --- 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 6ad010dae1b8..fc491eb72f1c 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -98,7 +98,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); @@ -106,13 +106,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 9aefc5c47973..94b20069c12e 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -204,6 +204,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 3b20a7e209fa..e0b3517529d5 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