From nobody Wed Feb 5 01:37:48 2025 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 4YnjXs2bRqz5mr5w; Wed, 05 Feb 2025 01:37:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnjXs0VHNz3qwg; Wed, 05 Feb 2025 01:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738719469; 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=ZwEDtiE/WAX8zvmHCyJoTAgoLYmZdDJbL7lYYAU2xoU=; b=IGgkuJXkiqv7XGwR2QUEBtsjQ9MdEpzulpl+iZym8VwtoyUrad/nCWVSAyeH1ztV1ewar8 ydWwx3YpLTSXiVgBycVftKMWucUkamQvJZSuD2Yb8t4xrRn5Dj8YFMw5T8v31TlRxOV2U3 wpaVFJ/uTekx1Y6nStrGFJMZsQuIsvTRe8us2+5vMMc6gRWacUX3iZN7IiHuT6sF5NiWdd wberoOwTqnM5Uj67/X30Ekvq5t1H60jRHri8oeGRT7PZbnoKX4Ydlk9Nfo0e1h8p9gI/I3 0NeYp9bFSQIYsPZPJoulN+IR3XaopnzJkk3GlX3WAg1C6mw/4E3T6rZycDHXzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738719469; 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=ZwEDtiE/WAX8zvmHCyJoTAgoLYmZdDJbL7lYYAU2xoU=; b=dWeFb3jVwUiYfYm5fVk1yW1TFdZfVGsNV1EFe5VtV+fcTcDB0mNWsFqaQLvrEGRXw7y1Ui 2sMSaGw+iRPwabg1kCRsre9R5sAegvM8vtiR5Mu1tZULacb7O0kF2khOqHMBZObwyzJKjx fQq/EP6LJLdlKhnb+6RLV9FJWmfavOkje9TVi6Qir/7okEWQ8HEyW4k4YGP3Mvv+R4f4FG VXhlzHYslYHS2AXPNGccEYflky8H302Itwm+OUNuFz3T4ikn/IR26MY2zQ9hCDr6+AmO6R p6+119HI7DvHe5fq8W4pnvN77OMmYXA0TAmz1u1qV8PimIMf8XupUmZPSyujew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738719469; a=rsa-sha256; cv=none; b=x2P4wv0KAPr4HkHhoC0GHmASkp7HYYv7R3CmVDNoIS89brMlCjCvN0u3aypuzRtedfnU5f kYfl3hVJc+yN2zLsyf5LO7vo5gvjpoNqG4BU8SUEEdnw4Rfpi3SRhg9aHlvNAJDYYX36kx +DHdFFwGRiSN+nuCoBUXDIP3gEETG3EFGC2yz+VhSoThXAd7o3iswia6YSfIdAeS4w85FS 2iecmafRmXKKdehzBXoaEcZ2gOLSnrMsAGDLNHRY9X/wfEUUTGkLgqIloaulVM4ZuzKUr3 xpQCb88XzemjWcRQ6oeMLWFZAj3V8QqKpUlCDmfwCnp27JGWx0oyly92KNmj8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnjXr752LzXGC; Wed, 05 Feb 2025 01:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5151bmWQ026298; Wed, 5 Feb 2025 01:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5151bmCw026295; Wed, 5 Feb 2025 01:37:48 GMT (envelope-from git) Date: Wed, 5 Feb 2025 01:37:48 GMT Message-Id: <202502050137.5151bmCw026295@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: f52154a2044a - main - hptrr: Better error recovery 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f52154a2044a4d1f324952af05542f93fdf0a088 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f52154a2044a4d1f324952af05542f93fdf0a088 commit f52154a2044a4d1f324952af05542f93fdf0a088 Author: Warner Losh AuthorDate: 2025-02-05 01:31:25 +0000 Commit: Warner Losh CommitDate: 2025-02-05 01:38:02 +0000 hptrr: Better error recovery This bug and https://www.mail-archive.com/freebsd-stable@freebsd.org/msg124458.html both have this fix. It turns unknown errors into an autosense failure, which causes us to grab the sense buffer manually. It also sets a condition that we use to retry timed out commands that jmg reports as being helpful. I'm torn on committing it. The code seems fine in terms of fixing things. But this is a 10-year-old bug with few other bugs and a short CC list for a driver that might go away in 15 anyway. I'm going to commit and close the bug, and MFC it in a week, unless someone complains (which seems unliekly, given the age of this hardware, I susepct most of it is out of service). Suggested by: jmg, Scott Long PR: 191135 MFC After: 1 week Reviewed by: imp --- sys/dev/hptrr/hptrr_osm_bsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 42866c1d4297..78a051d54cf8 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -463,7 +463,7 @@ static void os_cmddone(PCOMMAND pCmd) ccb->ccb_h.status = CAM_BUSY; break; default: - ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR; + ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; break; } @@ -557,7 +557,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb) ccb->ccb_h.target_id >= osm_max_targets || (ccb->ccb_h.flags & CAM_CDB_PHYS)) { - ccb->ccb_h.status = CAM_TID_INVALID; + ccb->ccb_h.status = CAM_SEL_TIMEOUT; xpt_done(ccb); return; }