From nobody Wed Feb 19 00:19:11 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 4YyH7h1QxGz5nPts; Wed, 19 Feb 2025 00:19:12 +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 4YyH7g5SVtz3nZc; Wed, 19 Feb 2025 00:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739924351; 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=UHo7JjcxGd/zdvn6ubKe4lu9pe+B4k4V8oS9gjhQjMc=; b=GTpxCr5FhajCEmB1Lh5ufcXjecM2NKMLlvjNQFYmZeJ3A244NlEM2xjSnCnuARX+OLA7AM MTDr/qJlVwRbVYL3JUXToR6RJ6Hus41V3L1zzwVOHWzgZgizZILkjpc0sX6QT9HrgxhE43 JqubBTSpsZhGuVeHbKnazdnV7WGtRVlajyqRZQ2TqFotCNcX5Xkd23/ZfxkjfwAlT/BNLx 15RLMhP8xFtAt4tXxGmNAMmYOLcelCLleI1XePOH5/YhtPUeFin4jfaqzu9QNKTtMXrCAy VYqtNEyKeo0a+qGbs2bNV9eP1QeNtpyBH27KSpS4VjSi3Dk4RdF9B2UrtRJC2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739924351; a=rsa-sha256; cv=none; b=TqdHXhVwV8iMwPzA8RoSWiyV5ongpajzLYmtBm3hVNtDR/d/on2hrwszKZkFOTt+WP1nyc BObha36M7mGS3wUbUjMhWIYIWrRMP4QczUJYVJTjhNT7D0SteIstiiq3/esM7YHKxA+SRO ob3vGtL8tpuQkY60LYmxQGZlwOPgF2FsK7GiuwZYnyrv3/kAa81RDkzUjWlgnWNojbEx1J DTJXWD5KXhBbPgjcnCfrKBKTUIdPupKXMyuv4bgVjptxWVMMeLLCwMSj0r3xxcwX7r/TNm lzOdL0BQK5+iQT0CqkPKtODikEp9kQKw0Al64jf3fsmtW/6WARiYUnPaYhiepQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739924351; 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=UHo7JjcxGd/zdvn6ubKe4lu9pe+B4k4V8oS9gjhQjMc=; b=hvXTYdkSQb3PZs2oXIgmA9BJra4OVdhy4UvJHmZGaWuLiDE0Wpm/QZ7M5uwhuZZuTOjjBC hw4hc8tTrAbz3YQHogQ/GUHvmw8QGGcu02LT9+hbcGZ5QJr5MzU+YsvTpakXC9srJBDxl7 B81wNE0Jk2Ps5ErCDOYoyR59YVgNq6OzoA2cA2eN2ii7MvtR73+aiFNCKzDjcl5Ca0H9cF gKZtvDzXQNUIZAXligISJ9FBVo3nich8WxNYxrm4KVnbKrOsqUTUXDO3+Xb6zSFfjsVaNE UxIDJ2Xde/TF1b2Upld10ND2a9dy/zUIV29MP09hKqkHng0jMgxgthTx+3j8Cg== 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 4YyH7g53GTzjdS; Wed, 19 Feb 2025 00:19:11 +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 51J0JBYT052986; Wed, 19 Feb 2025 00:19:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J0JBwv052983; Wed, 19 Feb 2025 00:19:11 GMT (envelope-from git) Date: Wed, 19 Feb 2025 00:19:11 GMT Message-Id: <202502190019.51J0JBwv052983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 417e57b4764a - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 417e57b4764ae29e3fbcb7e17466fa6c55fa95a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=417e57b4764ae29e3fbcb7e17466fa6c55fa95a1 commit 417e57b4764ae29e3fbcb7e17466fa6c55fa95a1 Author: Warner Losh AuthorDate: 2025-02-05 01:31:25 +0000 Commit: Warner Losh CommitDate: 2025-02-18 23:59:44 +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 (cherry picked from commit f52154a2044a4d1f324952af05542f93fdf0a088) --- 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 055ad13b14cb..8061f7bcafb7 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; }