From nobody Wed Jan 15 04:34:05 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 4YXtRy0zJrz5ktM0; Wed, 15 Jan 2025 04:34:06 +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 4YXtRy0PVlz3qZt; Wed, 15 Jan 2025 04:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736915646; 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=Oe3FJrslK1SIs2LMevWM609QT6pTlsIB3gO4Uh/yXFE=; b=dpUx0vHd+Gh4K03qVXVt2gEke5qm6mBcLcHnIug5lFulyUx8amgtSzVIzuk2RVk5f7GrhM QQfPlS9prSDd3/ucFCfApFmsiLyDzaE86nTmCN1FZ/2GwL1rZ65yojcZbr2AL1dTgQSd8/ XI+GRj0mys0NEw7lufC0oWX60aInxjwZVHelXCumlsmXpMS+hgDM1VDSdEKqj0ow3ihICp oDXzrKJPf+Xt4cqm8TXrkDlLgNHoERYPuus5nJ/iv647lJbr7DD5/5m3k+5IFjd79XnLrP 2WpWhg7wM16sNP6sYgOLNDHksN2p9z4z2coU4Yh3cf9fm3HFivmWDTvq3KnVEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736915646; 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=Oe3FJrslK1SIs2LMevWM609QT6pTlsIB3gO4Uh/yXFE=; b=LTGRP/c6+DEFwNFfLaJL9zJIjpP0SS3h7jZZ3yJ0kaM4QmMHHu3HIdPWsXhgOfbQbsGpQZ yF21D6FeGOeWftO/E8PbLai5ynoYJK2bzkQMjp9l/3n81XNIWuEfdrLsShO62k3X2z4LM/ gxVtx3zeKtUzJPRYgkqDlPwRSdxcNCzCfQTAUmgTLCPpX7s6IGPnb66LPMAKiBAf3X7CTy 77JAnAo8tW34F5BzZ0Qw/MX01u4nQ3l514vGKptQDbiodfP/jm9Ul1rojRm+J1icKRSLuZ j27+Tr3iGggug2/H4FllY0UiByPh/Znff8qgUHbZbFL0Ry3oBWjoJEoiAfo7qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736915646; a=rsa-sha256; cv=none; b=FvKhedz2hC0rJBDdmbmusc+x10YDINHWwEMSf4GWR3kiuNy3UmSbeW9UFfJLP9+8axnorA Sfekf/dhCz//zWP7e/12NpB2gRue5c/te3yh7fd0C3gmmt8bPLeaGTHYLmsmwbo4x7EhyL 2UP6BUtUBOjt5vry0CDLz9uCqZYxrTewn3YWaFvufXQ1jGeK4XTXCt47b2khQp7hG5HFF1 Zr5Jvr+/2skiuLCFw+DNwf0AtwOU0phXM+kcFcOYf9lb0ETUBkYpkVD7/zWkSvIsH4udPc LCeQXhRXYrEJgObYBtFCqbScEvmBC8b/aCRoG+s163PsaHa1PGGS1ZKqGM3zVw== 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 4YXtRx75W5zVbK; Wed, 15 Jan 2025 04:34:05 +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 50F4Y5o9073148; Wed, 15 Jan 2025 04:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50F4Y5VY073145; Wed, 15 Jan 2025 04:34:05 GMT (envelope-from git) Date: Wed, 15 Jan 2025 04:34:05 GMT Message-Id: <202501150434.50F4Y5VY073145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 7befd68335a0 - main - pvscsi: Explicitly mask out CTS_SAS_VALID_SPEED bit 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7befd68335a0b34405b6293f30cc47cabc46ab06 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7befd68335a0b34405b6293f30cc47cabc46ab06 commit 7befd68335a0b34405b6293f30cc47cabc46ab06 Author: Zhenlei Huang AuthorDate: 2025-01-15 04:32:31 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-15 04:32:31 +0000 pvscsi: Explicitly mask out CTS_SAS_VALID_SPEED bit This driver prefers connection speed over sas port speed. On stable/13 branch the stack-allocated CCB is not cleared thus the cam layer may report weird speed on boot. ``` da0: Fixed Direct Access SPC-4 SCSI device da0: 4294967.295MB/s transfers ``` -current and stable/14 have the change [1] which clears stack-allocated CCB thus are not affected, but I want -current and stable/14 to have this fix in to reduce drift between branches. 1. ec5325dbca62 cam: make sure to clear even more CCBs allocated on the stack Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48438 --- sys/dev/vmware/pvscsi/pvscsi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/vmware/pvscsi/pvscsi.c b/sys/dev/vmware/pvscsi/pvscsi.c index 111330e4f17f..08bdb8c3f108 100644 --- a/sys/dev/vmware/pvscsi/pvscsi.c +++ b/sys/dev/vmware/pvscsi/pvscsi.c @@ -1444,6 +1444,10 @@ finish_ccb: cts->proto_specific.scsi.flags = CTS_SCSI_FLAGS_TAG_ENB; cts->proto_specific.scsi.valid = CTS_SCSI_VALID_TQ; + /* Prefer connection speed over sas port speed */ + cts->xport_specific.sas.valid &= ~CTS_SAS_VALID_SPEED; + cts->xport_specific.sas.bitrate = 0; + ccb_h->status = CAM_REQ_CMP; xpt_done(ccb); } break;