From nobody Mon Aug 7 22:45:42 2023 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 4RKWck5lpCz4mSvh; Mon, 7 Aug 2023 22:45:42 +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 4RKWck3bHNz4P3F; Mon, 7 Aug 2023 22:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448342; 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=/OVC4XmmIh6kMpq9XDPrb8KKygfdwB1zxzV5UTU2Q4g=; b=JFkWhgMOxY+Peq6Fa38z3s571PmKAAjZx9E0b3hHv0qFkTxBRH8Hsij+9uHjq8K8CwcT1o m6MqyQ0RNLtTPPBqvrViEP+YAya4KqmG7b078HUKuVM/iZPArVJmIsWF0hkgXAFCFcDtjE 1mPFG4GM5JoEqK+IT+1CpcM79yl0nCOxrWeKcMcAMVtdw3r27/RJFL/uzcJyPX+6+3k0ZF GW79tlyajME/ClxglzTr22+feAcaRyvaVlLrObH8ZsxGVGWD6o87TSTQ/b++pk+Uwyk2tC 9nE0Q1PhTIoHo0akCSUq/yJEakw/BSn2jgsUXewSEIOVUlJyukqEfKMoTMe0Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448342; 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=/OVC4XmmIh6kMpq9XDPrb8KKygfdwB1zxzV5UTU2Q4g=; b=DtJKoB7iCHELBn84rCz7tGwMkYcGfz4yOzNKW8HhrCa/2b7xCawWjrw+4xNXo5QnCUcwM+ M0cHPHF4JoQ2RI52sDC9KnvcmjGjkjwvF5NFvWX5boxPFI7LZ/6KicwAJZQ5xak0WEdtyu /CN9+ja86i7MbcB09wi8sw/MBlv7SAOdrqhrQClPPjkIMSXO2N4lZI0QteVX2L0M8CJara p8pu5E2NgovjYmYZo2TZ4i4Mcck/ubl4+oGXhhKlOLRzUaklSTAhLNu10EElAF+SfLBTCr O2uC1sgLmB1sfaCcppcRJI+Fp+Umv7dpJvFt5w35ERSg7FA6UGB56xJD+brO1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448342; a=rsa-sha256; cv=none; b=nAmHdAIyPDwunnhrr2KnB9dEZ11NiuZNHYlcx0TuZ1YMX8zvc0fooZp3tnBzbVQNHf+gUz 1nDQdSJ+P2NgzxiBjjdBz+JvWUM6TiQp10CusLWTyG7HHdH7qF2IMk29nVCFo0bZS7IvKG rfvUFeJd94qS8PVbH6BlodX3aFoQkymvoQwNkQ/aW8GtvG2ScGC8D7TFLhq83LhwJ7WUB/ ozXnSc7sfwCzIcauLiCqELa/myKCuEsxVb7v+X2NPiY4U7xNwA6RPJlb9ST7iHKmuL8ez4 v/P8y67ug8UlSRUuWZ+FOMncVXQqel9iwvvNiE71vFduNqGr5T9JfgAO8udR8g== 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 4RKWck2d5pz19DT; Mon, 7 Aug 2023 22:45:42 +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 377MjgXU058676; Mon, 7 Aug 2023 22:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Mjgsp058675; Mon, 7 Aug 2023 22:45:42 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:42 GMT Message-Id: <202308072245.377Mjgsp058675@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: a510dbc848bb - main - nvme: Be less verbose when cancelling I/O or admin commands 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a510dbc848bbc89f4e686c15386b5eb4b35c8236 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a510dbc848bbc89f4e686c15386b5eb4b35c8236 commit a510dbc848bbc89f4e686c15386b5eb4b35c8236 Author: Warner Losh AuthorDate: 2023-08-07 22:35:48 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Be less verbose when cancelling I/O or admin commands When we're resetting, and there's outstanding I/O that we're cancelling, only report we're cancelling the I/O once rather than once per I/O. Likewise when we reschedule the I/O. We don't need to say for each one that we're cancelling/rescheduling something, and then report the I/O that we're doing. Likewise with cancelling admin commands (we never retry them here, so a similar change isn't needed). Sponsored by: Netflix Reviewed by: chuck, mav Differential Revision: https://reviews.freebsd.org/D41313 --- sys/dev/nvme/nvme_qpair.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 34a3633fdb2e..0a0115967eef 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1244,19 +1244,25 @@ nvme_admin_qpair_enable(struct nvme_qpair *qpair) { struct nvme_tracker *tr; struct nvme_tracker *tr_temp; + bool rpt; /* * Manually abort each outstanding admin command. Do not retry - * admin commands found here, since they will be left over from - * a controller reset and its likely the context in which the - * command was issued no longer applies. + * admin commands found here, since they will be left over from + * a controller reset and its likely the context in which the + * command was issued no longer applies. */ - TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { + rpt = !TAILQ_EMPTY(&qpair->outstanding_tr); + if (rpt) nvme_printf(qpair->ctrlr, "aborting outstanding admin command\n"); + TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { nvme_qpair_manual_complete_tracker(tr, NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, DO_NOT_RETRY, ERROR_PRINT_ALL); } + if (rpt) + nvme_printf(qpair->ctrlr, + "done aborting outstanding admin\n"); mtx_lock(&qpair->lock); nvme_qpair_enable(qpair); @@ -1270,17 +1276,22 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) struct nvme_tracker *tr; struct nvme_tracker *tr_temp; struct nvme_request *req; + bool report; /* * Manually abort each outstanding I/O. This normally results in a - * retry, unless the retry count on the associated request has - * reached its limit. + * retry, unless the retry count on the associated request has + * reached its limit. */ - TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { + report = !TAILQ_EMPTY(&qpair->outstanding_tr); + if (report) nvme_printf(qpair->ctrlr, "aborting outstanding i/o\n"); + TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { nvme_qpair_manual_complete_tracker(tr, NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, 0, ERROR_PRINT_NO_RETRY); } + if (report) + nvme_printf(qpair->ctrlr, "done aborting outstanding i/o\n"); mtx_lock(&qpair->lock); @@ -1289,13 +1300,17 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) STAILQ_INIT(&temp); STAILQ_SWAP(&qpair->queued_req, &temp, nvme_request); + report = !STAILQ_EMPTY(&temp); + if (report) + nvme_printf(qpair->ctrlr, "resubmitting queued i/o\n"); while (!STAILQ_EMPTY(&temp)) { req = STAILQ_FIRST(&temp); STAILQ_REMOVE_HEAD(&temp, stailq); - nvme_printf(qpair->ctrlr, "resubmitting queued i/o\n"); nvme_qpair_print_command(qpair, &req->cmd); _nvme_qpair_submit_request(qpair, req); } + if (report) + nvme_printf(qpair->ctrlr, "done resubmitting i/o\n"); mtx_unlock(&qpair->lock); }