From nobody Sun Apr 24 02:32:02 2022 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 BC8CF1990E13; Sun, 24 Apr 2022 02:32:02 +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 4KmBxG4l56z4Vwl; Sun, 24 Apr 2022 02:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650767522; 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=zi5dLbPJiIIb61X3ewbQZHAEy1zyPDO3uwsaIx5eu1s=; b=huOoN0o3mLj/Hu7PNFQ7JSWeCHlhf88MNcI27CSTrulCsdyMGC6AcM+3xeepwMt4KFgKt8 5xvqPS2uw6z2ZjVABYdV5y4/9tD2DeqEgWsC0hGgifoptDVrdRDTObyEnV13u0jEhFrYbm AwG5UpPXfUaZizQAcxywjAcCP5bGo2EATrp5Ham4+Fgn7U/tjEZ/UL0sI8CxBADxL06AQl zn3Q5H4xE/xCYgL9j4px0JecMMo0C4z7EITZJeYKMtwkwFw9wkHBB0ptvYwXUIk9nexYT4 epiRBBl3MK7k6ehXJQ4GkCkp7HJvrw4aGsG1e/Y5243eWMbemh2gMfEIeOVseg== 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 8420F1DBB6; Sun, 24 Apr 2022 02:32:02 +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 23O2W2Yo030932; Sun, 24 Apr 2022 02:32:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23O2W2TY030931; Sun, 24 Apr 2022 02:32:02 GMT (envelope-from git) Date: Sun, 24 Apr 2022 02:32:02 GMT Message-Id: <202204240232.23O2W2TY030931@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: c08ceddbf735 - main - nda: Fix comment 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: c08ceddbf7352887ed71338f02117d07286ee66c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650767522; 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=zi5dLbPJiIIb61X3ewbQZHAEy1zyPDO3uwsaIx5eu1s=; b=fv5vJO5sSPCYWzWI2lNNp8WpXtcAiRcR14q0E+sOfyZhzfzsaeRUGZLnxdnZIJoJl44MIy Leng+NGq1WSlh3MIeC7B+NAgSYy0L2sxiOe+QREYxJosIsm0+shx9EbOHm99YGU2r5ibhU N0qvV0O7HBAItwZlEEDz2TMxwh1Rs0VVHhtoA3tpJxjpLu0O11KZ+VDuxVS8hmiPFpOejc rd2U9va62RTHhPNZla7bjUdOrZCJwYId7+d336+mlCvVH2xTI01HDSEikdpp7ZYJ3uLyyT /ejj+l1W6ZApjR3ChEqZrqv58zXJ1KFaum6SSPS31qSoqFG0/Bb6n3ATl99OWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650767522; a=rsa-sha256; cv=none; b=eDAwsrhvnj/b7KcQFCifiFKt16v4MG+1eO7ehbT2TvolskueDdp/L9dHYI/JZOr7dN1NXa 1+QllqYBav4IujNC2Papk48xgJIr8BSWl69YKx34EAX1EHqfnXnOzl5sU9WOA1eH/0Su7l YFYmLsIrdvJV24MnZgGdfzwGG0oakpgr2U1lc7Dbj8w1Y+eLf4og9I0yKIi7SFB6E0pY5q 7hyb5zo8k84o7lHPmNFv2Lbrknfdab83fNcvg257ma1TF32YeZ6G0/vvqQZQzU4RXPeneV 5o9OK+YGZ/qhr0KrCWWlQaME+KU018/uQeKTZp3VSIoZKSwZrISwhiE4DygPGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c08ceddbf7352887ed71338f02117d07286ee66c commit c08ceddbf7352887ed71338f02117d07286ee66c Author: Warner Losh AuthorDate: 2022-04-23 23:08:39 +0000 Commit: Warner Losh CommitDate: 2022-04-24 02:31:46 +0000 nda: Fix comment Fix a comment that was left over from the orignial implementation. Explain how pending transactions in hardware are completed/aborted in the SIM prior to ndacleanup being called. Sponsored by: Netflix --- sys/cam/nvme/nvme_da.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 84270143cbe6..f47a7f9e2271 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -601,9 +601,10 @@ ndaoninvalidate(struct cam_periph *periph) #endif /* - * Return all queued I/O with ENXIO. - * XXX Handle any transactions queued to the card - * with XPT_ABORT_CCB. + * Return all queued I/O with ENXIO. Transactions may be queued up here + * for retry (since we are called while there's other transactions + * pending). Any requests in the hardware will drain before ndacleanup + * is called. */ cam_iosched_flush(softc->cam_iosched, NULL, ENXIO);