From nobody Mon Apr 25 18:54:54 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 D4DDA1A8F86B; Mon, 25 Apr 2022 18:54:54 +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 4KnDht5ccfz4WhJ; Mon, 25 Apr 2022 18:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650912894; 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=vDiWvibz/xgfsY10WqwjqHfDLYnN1OgnAqnGexkxVHc=; b=JJ777sDtgmubaBKtmnudQdo0UdFRR527ccUrMbiyS0LOe48EnuJOXwsiL9/UBtND1GX3tH Z0kmbUpz9/d8+WQm2OlQuguCDp3OZ1ABdN51uAvhFu1G0629YQlFmURTOeqerXxcgHOY5o 7dxnnP7YQDvuuXb2iKSGyCou6nxzyOavuMw4hBF76uwC/ejo13jtIs1AQOcYptl5kMMWYH 1g0je7fuVMo59P4H+bTqtBGWJcMvd742cE6E25uQSTmbxtMUwsqcqcIMo5QW2q+WQIi/xb Gqsn5HrcBJZA+sTyjoa2cZE97+dY5rMKx3HaOKmaE7stP7cuTSc06APax3+jvQ== 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 A093A200D9; Mon, 25 Apr 2022 18:54:54 +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 23PIssgv098181; Mon, 25 Apr 2022 18:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PIssqM098180; Mon, 25 Apr 2022 18:54:54 GMT (envelope-from git) Date: Mon, 25 Apr 2022 18:54:54 GMT Message-Id: <202204251854.23PIssqM098180@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: 9d899bbcb788 - main - cam: Small reorg of ata xpt async code 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: 9d899bbcb78830cee527818813640e2ce1324ff4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650912894; 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=vDiWvibz/xgfsY10WqwjqHfDLYnN1OgnAqnGexkxVHc=; b=uYAistITz+T7OwhoWeE834hrNqtM8PvjiCXZr4k7kuqLRpYMALd0Dhd1qHdaZ0twvdl4lY DFei/j9NAaFSxXFO112tAb9nhp/J4mb3Hdt65Z2JOUyAB3D9woJ9UT+kPvpuO7rUIkWnDC a9ZR++GVnXoTPW0hP4s9d8l1Qq465o7l/GOvM0WI5Njv0a/jun5AdfGdE0HDphsZVdpnEx Ytz1X4EQ/n/iXcHWnvNcvZB2/MrdPd67CdQJd9FooszDlNZCwQlwCnC1NTa5KcSMHAKRjq A0g/RhYR2I3Jm+8Cb8+ZANH5aGf1JBgz5ZmY69jVwHE4bLf07Ha4F4yNjibVeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650912894; a=rsa-sha256; cv=none; b=IQ9bBk7dOpxz2k4M7ooP3p4lWNdM+73Ig+p4pb3npgXqzo9QpdDDtYppwskrttj0iYexhs KP9khCwVXO/cY9S2uBmzJkYPQTrdE+d3kUX5pfRWSSK6qgxCru2M4x4pcb+31xM/l3jbzO KqdWpvL0fMuc2VoPIQUyKGKFevzF1omoKOYrRECfv5QU5dwWINVWOxOrpzAC+w3Vu+N3yY xnMeJTMSDcKa9bWR1im7Mh+K3Aj4Ri7XIxCtKuJZQuscRJRhiipcNc3Y8c6mSOj/Lxg4QS vXc0crFjr8sYHmQUJyza3kMSXz9mdspRE/O34JENz95wCPyQooLZiUi0SWtW1g== 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=9d899bbcb78830cee527818813640e2ce1324ff4 commit 9d899bbcb78830cee527818813640e2ce1324ff4 Author: Warner Losh AuthorDate: 2022-04-25 18:54:26 +0000 Commit: Warner Losh CommitDate: 2022-04-25 18:55:04 +0000 cam: Small reorg of ata xpt async code Use a switch rather than a nested if to simplify the async event processing code. No functional changes intended. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D35038 --- sys/cam/ata/ata_xpt.c | 72 ++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 5d47f27e7779..2b299412b48e 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -2039,52 +2039,46 @@ static void ata_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target, struct cam_ed *device, void *async_arg) { - cam_status status; - struct cam_path newpath; - /* * We only need to handle events for real devices. */ - if (target->target_id == CAM_TARGET_WILDCARD - || device->lun_id == CAM_LUN_WILDCARD) + if (target->target_id == CAM_TARGET_WILDCARD || + device->lun_id == CAM_LUN_WILDCARD) return; - /* - * We need our own path with wildcards expanded to - * handle certain types of events. - */ - if ((async_code == AC_SENT_BDR) - || (async_code == AC_BUS_RESET) - || (async_code == AC_INQ_CHANGED)) + switch (async_code) { + case AC_SENT_BDR: + case AC_BUS_RESET: + case AC_INQ_CHANGED: { + cam_status status; + struct cam_path newpath; + cam_flags flags; + + /* + * We need our own path with wildcards expanded to handle these + * events. + */ status = xpt_compile_path(&newpath, NULL, bus->path_id, target->target_id, device->lun_id); - else - status = CAM_REQ_CMP_ERR; + if (status != CAM_REQ_CMP) + break; /* fail safe and just drop it */ - if (status == CAM_REQ_CMP) { - if (async_code == AC_INQ_CHANGED) { - /* - * We've sent a start unit command, or - * something similar to a device that - * may have caused its inquiry data to - * change. So we re-scan the device to - * refresh the inquiry data for it. - */ - ata_scan_lun(newpath.periph, &newpath, - CAM_EXPECT_INQ_CHANGE, NULL); - } else { - /* We need to reinitialize device after reset. */ - ata_scan_lun(newpath.periph, &newpath, - 0, NULL); - } + /* + * For AC_INQ_CHANGED, we've sent a start unit command, or + * something similar to a device that may have caused its + * inquiry data to change. So we re-scan the device to refresh + * the inquiry data for it, allowing changes. Otherwise we rescan + * without allowing changes to respond to the reset, not allowing + * changes. + */ + flags = async_code == AC_INQ_CHANGED ? CAM_EXPECT_INQ_CHANGE : 0; + ata_scan_lun(newpath.periph, &newpath, flags, NULL); xpt_release_path(&newpath); - } else if (async_code == AC_LOST_DEVICE && - (device->flags & CAM_DEV_UNCONFIGURED) == 0) { - device->flags |= CAM_DEV_UNCONFIGURED; - xpt_release_device(device); - } else if (async_code == AC_TRANSFER_NEG) { + break; + } + case AC_TRANSFER_NEG: { struct ccb_trans_settings *settings; struct cam_path path; @@ -2094,6 +2088,14 @@ ata_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target, ata_set_transfer_settings(settings, &path, /*async_update*/TRUE); xpt_release_path(&path); + break; + } + case AC_LOST_DEVICE: + if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) { + device->flags |= CAM_DEV_UNCONFIGURED; + xpt_release_device(device); + } + break; } }