From nobody Fri Nov 13 19:08:30 2026 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 4jR6H24p2tz716Qd for ; Fri, 13 Nov 2026 19:08:30 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jR6H243q5z4YRR for ; Fri, 13 Nov 2026 19:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794596910; 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=wt5OW+w+p+OpGCPVAQND32SA5gFonYWjFufBl3hxzZ4=; b=EPe+b3z3EiCMzPOai2JI+r/o6QBNcy1/0ZaPeY7eyOdKeUinyvEeS/kBrPrmzobt84Vnlh 2AWaXmQuPYRlfopsBiV71YySNIFtP7BATCbXIdsKEIJ2v67tIpClHkBv7cG9nPMrPdPzsy hWQCCAIxr8RQDAKqpzgCR58UW0DPWu+RgpnMIaf+oIAoA7jO0nWe1EOrLCXPKu2Hrjlpyb M/CTaww5okIkjqFQMa3gM9j+XHw5NiBQv4WLfCXgp1zDa9OIbRIiEXN4fG/rPB1pVeGGnK WDmbkX/NWXfK3rh0P3PifAoRa7HJIVhU8rhuUTWXTXeAQpwxuZznx0mCD8ysQg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794596910; b=iFJdh1I5BrIpgTfiwcqOIFkbE0FtSZcRRz3Z4F6cuOtcq494cUPDg98IWPg38daJKKI1vf jfF0tz511FhX239SBLSwkVbl8/YpHGHiAbl6LSsvA3KuzzkfRAhjYQSRjxoHNAUJAlG018 MSJIfoH8osbQztia/94qj5NsiUpoevTbX/nANFvNWk3MS28O6gulQQpCc/KpTQsZPinkJY DzHLzxgVSsYvIi0yhDu+/ZKxBYTG3lwcVhlvTKWYn1M+A8SJpwvXwgZ/yzLIXslp0Wj49A 3CwKipWqIl64bHx8y7axC0QOrkcItEoFiCMfS3fnyUJh2XUNWkItbMZOEuqSGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794596910; 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=wt5OW+w+p+OpGCPVAQND32SA5gFonYWjFufBl3hxzZ4=; b=DXyf7N8TajOQpqlmOufcNavok3RGpJGo+3mm5QGU+0ivFC8yvYp57w3OBkKPqORGMHedZC ZyFGwcTbMEREOFZCj3V4Rhem2ti0TzqXh+mwWPoM7X56Zo2QCHg44AvXdLaxYTOM/rF5mU AhuRQ972xs9Hzgr7QT5vwaAApEFw0wftNkyFfKdxPFbrhBJD4DkD2NiYBWBVwC/mzXBStU lUMCaMQwl4vXIYiITs3AINb5pWWnq1+IWbDUMxWQmGSDQl6jv2oqBNulEuk+JhMf53Ifrv 4IqbNmBoso2/PiddilqmbYVbZsIgKRTm8PgOGICNMr5j4yy+qIME958XX1B9cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jR6H23jPGzpH5 for ; Fri, 13 Nov 2026 19:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20db6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 19:08:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: c91485376bb0 - main - nvme: enforce the Abort Command Limit List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c91485376bb07990abe24ccdbbbf330820f35e7c Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 19:08:30 +0000 Message-Id: <6af7602e.20db6.25092f8f@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=c91485376bb07990abe24ccdbbbf330820f35e7c commit c91485376bb07990abe24ccdbbbf330820f35e7c Author: Abdelkader Boudih AuthorDate: 2026-11-13 18:24:11 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-13 19:06:20 +0000 nvme: enforce the Abort Command Limit Each watchdog pass submitted an Abort for every timed-out command with nothing counting them against the controller's ACL. A controller may complete excess Aborts with Abort Command Limit Exceeded status. Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D59636 --- sys/dev/nvme/nvme_private.h | 1 + sys/dev/nvme/nvme_qpair.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 7ed3d61bd6ce..2244ae6b7d96 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -270,6 +270,7 @@ struct nvme_controller { int msi_count; bool is_msix; uint32_t enable_aborts; + int outstanding_aborts; uint32_t num_io_queues; uint32_t max_hw_pend_io; diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 1fd853513fcb..c581cbb39ffb 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -818,6 +818,7 @@ nvme_abort_complete(void *arg, const struct nvme_completion *status) * a deferred abort: the tracker stays live to keep its CID * reserved, and the timeout handler escalates to a reset. */ + atomic_subtract_int(&tr->qpair->ctrlr->outstanding_aborts, 1); mtx_lock(&tr->qpair->lock); if ((nvme_completion_is_error(status) || (status->cdw0 & 1) == 1) && tr->qpair->act_tr[tr->cid] == tr && @@ -978,6 +979,13 @@ do_reset: if (ctrlr->enable_aborts && tr->abort_state == NVME_ABORT_NONE && tr->req->cb_fn != nvme_abort_complete) { + if (atomic_fetchadd_int( + &ctrlr->outstanding_aborts, 1) > + (int)ctrlr->cdata.acl) { + atomic_subtract_int( + &ctrlr->outstanding_aborts, 1); + continue; + } /* * This isn't an abort command, ask for a * hardware abort. This goes to the admin