From nobody Sat Jun 20 20:58:58 2026 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 4gjRdv1fk3z6hb5V for ; Sat, 20 Jun 2026 20:58:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjRdv0sZvz4Fk5 for ; Sat, 20 Jun 2026 20:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781989139; 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=oMx0F+fOFiR6lUrorvuIYFYkQdz1iS3zG98HE/KwXpI=; b=lrv5ZqfsH8+2aTbquoFJIxi6HsqtdoZVECIn1OgnNuth3FFECvUWW2MHRQVTMY5RNmUrjF xEx6FAalvFyj1cJec9uDpPALfoQB/6d89zvOA5/inafQUTrQTAywSbzv2ZGBORsmmDUkfe gdlttgevlYRsDYrPdXlOS+qa4g6M+b4/Nyw5hVvXZVnQuPFcIaLINlKVgYWbIdOmQRDD3L pXKI/mTuJo8FbL5wi7J5nCZ+2IHnsRde58FV1kPxuiB/GbAm7dOkjbxa5LWo+pRdAL5Tn+ DjvP7bQsJ7MYKM9kmlqUHsX6H/m5edVMxMOpHGoVB5UMPrXp6YNC29NvHottLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781989139; a=rsa-sha256; cv=none; b=rkjOvF/NlAiIfstb3w4xeCnLf6Oj9WPOAClSH0g35aIJFjlGZ7Gn1M+bsEpysN2mENpq/4 xKp+mDuNzUDQdcVteWEaf06Vrk/1S2Kv+K+Vb5aioCXt+IDdznGTxEWHHI/a8eKcRfT2cI iSc7CVlzdeFKL2LjK8bU4K8Ug+ABSaflYGU8FEnGZCVHP0a0OzQ4TY0xvVrBfLMV6rW9+b CXUPlL0sRwcqZHpXH6vw/yb0QkqNlD/QbwLD3Ez4FDLAldNsth2LovyteRYfbY32wftQsL dRXhBE1Pn+T/fecGP5K2g1gZL4lLdBtZZFDeth8/DdUiQesa+RGUc8WD6B5jhg== 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=1781989139; 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=oMx0F+fOFiR6lUrorvuIYFYkQdz1iS3zG98HE/KwXpI=; b=Usf+/S6K+wAHGaiwrEGcwSnsvFldiP9SLjFiNrqpoEisjI+ptnKN9qeEbKxt7Ruoi9ovNb UDrl3kWBbT4EkazP26pBp2AvHH/AJgyA2opHbTu/uCB0BYxtBXbk9JOAE+3bqKEIe7H3M0 NxKE196ht/1ZR+OFgZiEOT2TKPPfbxOs5XRmUhSlN3sKPNVFqfoTJr187K9ujlHYj6YaPJ 5sMCAm7wPm1NJElLAjaT/baKmKhL4XGZTbpXJjlBm4C8FKXT7ZGuGSJswfP6Z7ZIAvmlKs gg6Kdoc5AXepNew1rxCHs8aHDVhz7zFVsjNeXgGhkVrqDiiU64uLW6rC+7dnNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjRdt6SbYzmrh for ; Sat, 20 Jun 2026 20:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d44d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 20:58:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: eafa181d51f7 - main - da: Put the SYNC CACHE probing behind bootverbose 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: eafa181d51f712f189ae4558014d8d00de7c5624 Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 20:58:58 +0000 Message-Id: <6a36ff12.3d44d.4c850abb@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eafa181d51f712f189ae4558014d8d00de7c5624 commit eafa181d51f712f189ae4558014d8d00de7c5624 Author: Warner Losh AuthorDate: 2026-06-20 20:53:32 +0000 Commit: Warner Losh CommitDate: 2026-06-20 20:57:24 +0000 da: Put the SYNC CACHE probing behind bootverbose These have turned out to be too noisy, so put them behind bootverbose Event: BSDCan 2026 (noticed during UFS demo) Sponsored by: Netflix MFC After: 2 weeks --- sys/cam/scsi/scsi_da.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 3f18817030c1..7b47beeeccdd 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -5461,24 +5461,27 @@ dadone_probecache(struct cam_periph *periph, union ccb *done_ccb) */ if (sense_hdr->data_length + 1 < sense_hdr->blk_desc_len + sizeof(*cache_page)) { - xpt_print(done_ccb->ccb_h.path, - "CACHE PAGE TOO SHORT data len %d desc len %d\n", - sense_hdr->data_length, - sense_hdr->blk_desc_len); + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, + "CACHE PAGE TOO SHORT data len %d desc len %d\n", + sense_hdr->data_length, + sense_hdr->blk_desc_len); goto bad; } if ((cache_page->page_code & ~SMS_PAGE_CTRL_MASK) != SMS_CACHE_PAGE) { - xpt_print(done_ccb->ccb_h.path, - "Bad cache page %#x\n", - cache_page->page_code); + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, + "Bad cache page %#x\n", + cache_page->page_code); goto bad; } if (cache_page->page_length != sizeof(*cache_page) - offsetof(struct scsi_caching_page, flags1)) { - xpt_print(done_ccb->ccb_h.path, - "CACHE PAGE length bogus %#x\n", - cache_page->page_length); + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, + "CACHE PAGE length bogus %#x\n", + cache_page->page_length); goto bad; } /* @@ -5495,7 +5498,8 @@ dadone_probecache(struct cam_periph *periph, union ccb *done_ccb) */ if (softc->quirks & DA_Q_NO_SYNC_CACHE && cache_page->flags1 & SCP_WCE) - xpt_print(done_ccb->ccb_h.path, + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, "Devices quirked NO_SYNC_CACHE, but WCE=1 enabling write cache.\n"); } else { int error, error_code, sense_key, asc, ascq; @@ -5536,8 +5540,9 @@ dadone_probecache(struct cam_periph *periph, union ccb *done_ccb) /*getcount_only*/0); } } - xpt_print(done_ccb->ccb_h.path, - "MODE SENSE for CACHE page command failed.\n"); + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, + "MODE SENSE for CACHE page command failed.\n"); /* * There's no cache page, the command wasn't @@ -5549,10 +5554,12 @@ dadone_probecache(struct cam_periph *periph, union ccb *done_ccb) */ if (mark_bad) { bad: - xpt_print(done_ccb->ccb_h.path, + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, "Mode page 8 missing, disabling SYNCHRONIZE CACHE\n"); if (softc->quirks & DA_Q_NO_SYNC_CACHE) - xpt_print(done_ccb->ccb_h.path, + if (bootverbose) + xpt_print(done_ccb->ccb_h.path, "Devices already quirked for NO_SYNC_CACHE, maybe remove quirk table\n"); softc->quirks |= DA_Q_NO_SYNC_CACHE; softc->disk->d_flags &= ~DISKFLAG_CANFLUSHCACHE;