From nobody Fri Sep 11 05:32:36 2026 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 4hh38h379Zz6rdxN for ; Fri, 11 Sep 2026 05:32:36 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hh38h2WcTz4Ns0 for ; Fri, 11 Sep 2026 05:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789104756; 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=6wsESuqWOniIlmal91EsUYUBrwGOn1Mt8KYdv0muRiQ=; b=sAD4d0BjJQB2toAaKR+/3iCZ3yyzqW5iAx8HuDaPYQ/VowOPEEUWPW/Umca9JsT20FbWas GsqZOesKy7wVfiOcrfwYjT0lYD/zKA47cDQzVIImWn6Z3F/pI3+HqpSMMSl58PfwtEFFNQ oZ6cJNHuacM0vZUn5EHFMqJVE+ujG2sU6fvIDNCajefDAhFZv0apydE8dq0qq9Nplq9RMK EE/yruW3l7/RqkROC9ABWBZneiB2pcGT4nBhHNfXbyL9htyCuB6Qv7rasWjs/XEzDm4zxH Rup3nCyXgmJw3fCJMer5CXut57PsMBoN4gZgJHZ8Dc9V1L8u6MVkpH4pcQ8RwQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789104756; b=lBAUarP7Z2CLh4Ndid32fP6KEr4RojRsi1GPJr/tP89ZrEDy3387L2atqru+MiSvXPMFAQ 6Xmlg7tI0jTrVW9xQA4nXRqjUI1wEo2Oj9gMmpJbhPAwgud0HPxnzTLHd4zMTizoP1X75K QAkv4ZY0sdTUZXcXfBov48J/1UyGLDCgqLk6AejhWq0oc7Q3s8CkbAZJU3CJLzPG96uVhl 13qo+F3NZItjX67Zu+ky8Y5xlm+GRSNm198E3j3VzjwvezTEUOdUzuJTWOn9Z0Ux4LqNvb 2gT7cVZbSdV9gmdor4Fy9mdpWJINiGAcsnL5OeNW0srRgM9fCjV1vW1MUxW6rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789104756; 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=6wsESuqWOniIlmal91EsUYUBrwGOn1Mt8KYdv0muRiQ=; b=MKesIruLbKPZ6mtMskuQWIDgSGOa6kfCpK4C6Jgauhmfm7UN4kk3W1h76ozp8pCqsiQ8/V JvvBXtkBqxMGb2i+uZjEvBCOjZ7xr9FUbbpfKQk+4CRKBP0rB0r94WF0HSBmi1tP5dSg7w Jjq0SyeLy4XVrR73OTlwZsYOm23DMKEY8pjIEb5I57g8Tp2aIP06FutZ+hv2mhAtQIu+BO hri18xovo4siO7f/aPXOBNXVIjEaIVORqRynfGlu930lscfWH+BzetherzJcDZvEkLjdlP kc7TAvCB6IY1xWWB/tFL0d8aB1ytJZ4lNZrS3IbjfVA+/MAV6iJmH3i/ecMqWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hh38h1Z7xz10yd for ; Fri, 11 Sep 2026 05:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dd64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 11 Sep 2026 05:32:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0bc6c9279e51 - main - da: Stop the probing when periph invalidated in dadone_proberc 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0bc6c9279e51ee6dddb7fe307121cd9a54176e81 Auto-Submitted: auto-generated Date: Fri, 11 Sep 2026 05:32:36 +0000 Message-Id: <6aa39274.3dd64.160bf1cc@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bc6c9279e51ee6dddb7fe307121cd9a54176e81 commit 0bc6c9279e51ee6dddb7fe307121cd9a54176e81 Author: Warner Losh AuthorDate: 2026-09-11 05:12:29 +0000 Commit: Warner Losh CommitDate: 2026-09-11 05:12:29 +0000 da: Stop the probing when periph invalidated in dadone_proberc When READ CAPACITY fails, we call cam_periph_invalidate() for some hopeless ASC/ASCQ combinations and then fall through to test the cache state. This results in excess commands to the abandoned device that may take a while to timeout and/or report confusing errors. Instead, call daprobedone() when the periph is invalid to terminate the probe. Fixes: d78d04b17cb24 Sponsored by: Netflix MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D58524 --- sys/cam/scsi/scsi_da.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7b47beeeccdd..ab88467f0834 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -5140,6 +5140,12 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) } } free(csio->data_ptr, M_SCSIDA); + + if ((periph->flags & CAM_PERIPH_INVALID) != 0) { + daprobedone(periph, done_ccb); + return; + } + if (announce_buf != NULL && ((softc->flags & DA_FLAG_ANNOUNCED) == 0)) { struct sbuf sb;