From nobody Tue Oct 10 22:26:15 2023 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 4S4r8m00jzz4wQMj; Tue, 10 Oct 2023 22:26:16 +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 4S4r8l6bCqz4H03; Tue, 10 Oct 2023 22:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696976775; 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=j8t7NuDxKUOIQPFSAJXIgqI/qY1IiWhRE4VPdqWnLpk=; b=aNgtkMPYyfXjyYA6FJHzVes1LXIDFXPGJ+tmv/6s6O1gY/3NSYCdA9K0uQePaOv56V9kYr rH8jlegRWOxxV39KDe/XtaHwi5rfgir72Chq5tWRHco/WKiY7pghOPXVtySJIsME4QgduG T2U5uI7vRqCnrbTWfy4LwirbfkaSw+4e2t59JuJ/bBApwpJ917kknaQVZjAyK7OLkirKWE SxAjdGN5AYVxjwSFz38ljMIDKgzqsmHUsXhbS9k2NcVNzi2Qoy5C00sG6vYE8W42z7GbJl R8FAeJiKtxamy8bagOzTajuFngSGItG0aIFVXAQiXBdYcdbh41YGxssJdTipRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696976775; a=rsa-sha256; cv=none; b=ppNa8rhlx3Fl73+bXLZZAS+q3WyzSHrE7lZFid8Et6LRYTd9r0BVuw8De0n+PID6lzv3WH b5Gh0DXx/BfuOHzRxwpsvrKm6mUnerH0GVrKAg86A7OBy+8VPyiRt/pv6AfXy2nuM4kdy7 WYiJKJRzBuKZ7JyczfgioiSt4ICEImIOzkwMVVVCrP7s0vimUvIwsTfvw+rCW/nDk8UJZL qehZOpXqUhixLltgyRIYuA6PgHFOJ4u5HSj9djqMBV2P+OdQnNfSfC4fcFJb9n46mNb94M SoqV3Vb2ArOsy5a06CRDNbI9qGZVDIRYaqRZ601B4TEAYfSAkr5w1UcXvo7PhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696976775; 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=j8t7NuDxKUOIQPFSAJXIgqI/qY1IiWhRE4VPdqWnLpk=; b=IxroeahufxSdtfJNQUgcFcPJ5hNvLMX5SPpnsz3C/liyVHQFXMvd4pgP00DC+0tbz5/Sh4 KZz4dY3ga2Fy6myJw2ARRW3kbfZs31FcBQ+LlR7Uu4CYQukJy4KTGLpLZiOiaed9mDtiup hf1gL4P3vBZOOUOpDWyKrnWaz6sWIqLgVTcgjwLc1t0cPuBtclRcbNiu9X6ymGdfvrGEyI YK3l5e5hPsRj8O7hVxLwJn15SQGVu8HOkHlKPJN2/jlFIHPij/7p57AJAcs9ZX26yLZC+Y S7yCX5UmX1SxZx3E1kFXtVus/SnIeddJqYTvTtGACKmViAON+jUPY2N0b5k26g== 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 4S4r8l5WxzzwTw; Tue, 10 Oct 2023 22:26:15 +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 39AMQFRL085364; Tue, 10 Oct 2023 22:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AMQF2N085362; Tue, 10 Oct 2023 22:26:15 GMT (envelope-from git) Date: Tue, 10 Oct 2023 22:26:15 GMT Message-Id: <202310102226.39AMQF2N085362@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: bc85cd303c44 - main - nvme: gc nvme_ctrlr_post_failed_request and related task stuff 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc85cd303c448b5006975024c4b468f5614507c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bc85cd303c448b5006975024c4b468f5614507c5 commit bc85cd303c448b5006975024c4b468f5614507c5 Author: Warner Losh AuthorDate: 2023-10-10 17:09:24 +0000 Commit: Warner Losh CommitDate: 2023-10-10 22:13:56 +0000 nvme: gc nvme_ctrlr_post_failed_request and related task stuff In 4b977e6dda92 we removed the call to nvme_ctrlr_post_failed_request because we can now directly fail requests in this context since we're in the reset task already. No need to queue it. I left it in place against future need, but it's been two years and no panics have resulted. Since the static analysis (code checking) and the dyanmic analysis (surviving in the field for 2 years, including at $WORK where we know we've gone through this path when we've failed drives) both signal that it's not really needed, go ahead and GC it. If we discover at a later date a flaw in this analysis, we can add it back easily enough by reverting this and 4b977e6dda92. Sponsored by: Netflix Reviewed by: chuck, gallatin, jhb Differential Revision: https://reviews.freebsd.org/D42048 --- sys/dev/nvme/nvme_ctrlr.c | 30 ------------------------------ sys/dev/nvme/nvme_private.h | 3 --- 2 files changed, 33 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ef4d7daa6efa..968c873fe06c 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -232,35 +232,6 @@ nvme_ctrlr_fail(struct nvme_controller *ctrlr) nvme_notify_fail_consumers(ctrlr); } -void -nvme_ctrlr_post_failed_request(struct nvme_controller *ctrlr, - struct nvme_request *req) -{ - - mtx_lock(&ctrlr->lock); - STAILQ_INSERT_TAIL(&ctrlr->fail_req, req, stailq); - mtx_unlock(&ctrlr->lock); - if (!ctrlr->is_dying) - taskqueue_enqueue(ctrlr->taskqueue, &ctrlr->fail_req_task); -} - -static void -nvme_ctrlr_fail_req_task(void *arg, int pending) -{ - struct nvme_controller *ctrlr = arg; - struct nvme_request *req; - - mtx_lock(&ctrlr->lock); - while ((req = STAILQ_FIRST(&ctrlr->fail_req)) != NULL) { - STAILQ_REMOVE_HEAD(&ctrlr->fail_req, stailq); - mtx_unlock(&ctrlr->lock); - nvme_qpair_manual_complete_request(req->qpair, req, - NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST); - mtx_lock(&ctrlr->lock); - } - mtx_unlock(&ctrlr->lock); -} - /* * Wait for RDY to change. * @@ -1487,7 +1458,6 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) ctrlr->is_initialized = 0; ctrlr->notification_sent = 0; TASK_INIT(&ctrlr->reset_task, 0, nvme_ctrlr_reset_task, ctrlr); - TASK_INIT(&ctrlr->fail_req_task, 0, nvme_ctrlr_fail_req_task, ctrlr); STAILQ_INIT(&ctrlr->fail_req); ctrlr->is_failed = false; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 496bd8229e0a..c573fbfd572f 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -255,7 +255,6 @@ struct nvme_controller { uint32_t queues_created; struct task reset_task; - struct task fail_req_task; struct taskqueue *taskqueue; /* For shared legacy interrupt. */ @@ -410,8 +409,6 @@ void nvme_ctrlr_submit_admin_request(struct nvme_controller *ctrlr, struct nvme_request *req); void nvme_ctrlr_submit_io_request(struct nvme_controller *ctrlr, struct nvme_request *req); -void nvme_ctrlr_post_failed_request(struct nvme_controller *ctrlr, - struct nvme_request *req); int nvme_qpair_construct(struct nvme_qpair *qpair, uint32_t num_entries, uint32_t num_trackers,