From nobody Sun Apr 24 21:12:23 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 24BE21A8A2D1; Sun, 24 Apr 2022 21:12:24 +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 4Kmgnz5k6rz53cx; Sun, 24 Apr 2022 21:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650834743; 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=WyVs/Go7S9zmE9g1yiuzjw/KBnszcwu+kRS3gUdcUmQ=; b=jozB5TNVtf5SH/wsgLoceGF4Lb2EJGHVQ30Oo0RxHoqVvWfo9FM3XbBmB9JODG6VynUD3P Sa4TL7OEpSoPyodibCKeXwj+Xcwg3lW/gHB/4a6vDJiwgqRJ2nY9r9J4uX3xNZMTIO46yQ HALVb+SwSWYWMra+YeyEKWKYzLw3ajt88sM3CKS3e2AmHoh7qU1vWcWCE5yXQjCqNumHq4 x46SgoBd8jF6k2Qo/e9eptNcf0SlP7g2YRrx24g/sshcoTJbZ4tB6sKw+M4h/Th0lC0LVz qNfNzo5ok6xoJpoQ15Fa+8v4TC7VBI0ZAY2r5IHKKN0vu3wykMwMwrM0RxeBgQ== 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 9D1035CA7; Sun, 24 Apr 2022 21:12:23 +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 23OLCNNw043912; Sun, 24 Apr 2022 21:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OLCNVp043911; Sun, 24 Apr 2022 21:12:23 GMT (envelope-from git) Date: Sun, 24 Apr 2022 21:12:23 GMT Message-Id: <202204242112.23OLCNVp043911@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: b43cfe717130 - main - ada/da: Borrow comment from nda about cleanup 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: b43cfe717130606a2dce85bcd22c362dfe598733 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650834743; 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=WyVs/Go7S9zmE9g1yiuzjw/KBnszcwu+kRS3gUdcUmQ=; b=MZme6C4w99FzSLXYS0Wk4c6bfrWjY6xJd60fM4qXngMbIMRTlIyxqBUr+OpeUrD8Q8crbf 0H7Se1avhJ6Tt7xYV5OkjEUa6u+gnrYNTloCQ6b/Eusbqn202f5pBc1ZH0kEBnIUMuxbHO lZHkY41Sk3RhZFF1AC47r5KVRMPk4HODxmYUothQ3seC2LM3t+4qxsGTvPXRb8wMk3EHnG rDjLSZFRplIkE/Kgexb4gDcGOqGBUNtW97Mn0hnlZmSabX/W6R0YgXY8cmkW+u9mZRc2m3 UiOgYIa4Hy8XVDdVZ+cvrE1UBVKMsjQNlGm9vxwCSFfMHEDGIaVRGNKnvDUpNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650834743; a=rsa-sha256; cv=none; b=bdAeTMLdiof9Bncku4UiOFqXqC7eycwJaM8HRtwwqim8pEsICB8NGf5umq6IGcqUBbQrmd /Uzw51AKxWi8xZq1/pgBg20d9kjU76VdhIi/yjYgaaZZGiougEB9/8bZkPw6A0WkDZmLmy WTN4p4cWX1GQyTxk6Ja2Nn7sqQwMI7fsu0RzAK/a2CQc6JRtgZxz4P89nVxwuYVPiAJMEN XccfYdY2m6BtmpgtuSi9QMuAEho2XUs7sEJWf35BQ93N6cQEaV0gL1gWhZByLpnCb3Pwer a8WhP/BtqWNzKE1WXGKchLdtHh51wq1J1+6f6AdL8ilO/7p//AVhSILMQqztrw== 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=b43cfe717130606a2dce85bcd22c362dfe598733 commit b43cfe717130606a2dce85bcd22c362dfe598733 Author: Warner Losh AuthorDate: 2022-04-24 21:11:56 +0000 Commit: Warner Losh CommitDate: 2022-04-24 21:11:56 +0000 ada/da: Borrow comment from nda about cleanup Remove a XXX comment and replace it with a more accurate comment about what happens to I/O queued to the hardware. Sponsored by: Netflix --- sys/cam/ata/ata_da.c | 7 ++++--- sys/cam/scsi/scsi_da.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 2623d8919e06..efca987b39b4 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1240,9 +1240,10 @@ adaoninvalidate(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); diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 6531a7fa9d12..ed71a25cd657 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2055,9 +2055,10 @@ daoninvalidate(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 dacleanup + * is called. */ cam_iosched_flush(softc->cam_iosched, NULL, ENXIO);