From nobody Mon Jan 20 10:15:35 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 4Yc5ng3C0Nz5l7n8; Mon, 20 Jan 2025 10:15:35 +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 4Yc5ng2Nynz3kMk; Mon, 20 Jan 2025 10:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737368135; 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=vyP3Rw8szAR7AfRy1I0y0ISgbZ1uGo5X9Smbjbocj84=; b=m8Ikmy5otqWd+a8bC5dxJ6azvuUEx3NNa8YKuLT1wQGWxhWFTJIa9ybu5uDwaKeu+h/fgy zuvWhOimc+H4S+ghSdVo1Ko4cewPtg4iABtPzoOBnMJ3W++BnVRUJA006Jswjdutf6jic9 2jl4vFShOYN7aEoFsrY4PHvqdvNHY1ylqBjY/FSyTdiGCAEfQlppkQnF4tifczaQBulpZm Sm+b7tpm9mUhqCneizHT2+4Jug35WzSlPJnRTvkbb0r+Mk2TRD4FY3qP8WZyVtt6OLLhGf LsH78eyItMLu2dcluIrT9rwA2Z3EvzTMcLFXu1r2oujRYHzJ7wxHc5czwDdEyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737368135; 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=vyP3Rw8szAR7AfRy1I0y0ISgbZ1uGo5X9Smbjbocj84=; b=r9uWDZsiOCTTQceV/0Ic4pVc19+CuMnildLmB60RidiGmBqomycgHsoDWd4ot8uigLCH0J Kh2WKjb37Othsy06qH5mMLq/N5/mh2uKZoRKMXvtqVoVAnSGNlu+EmJpDf/bEXyWyvjQHo 8J/n98TsCd3jSeo0+Dl1laYvfW6CN6aKrfmCHC7gasnrmhCg5hx8ANRthQ7T2lhakO2e+s 6Hq4bm2gaP28FL8N/cMDfwqZvZOyvdfvpxK/bhQ3tOR5EEKuVwSDIqur7xyo2b1Pq9fo54 Czs5r2XnUoOUM8B4VkREpdY6ZUgkZ3bLZkVNaFAaMBmCcjG77dkRqZdFvztr+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737368135; a=rsa-sha256; cv=none; b=BJnTwS3WqFVbMn2HpEzcFCIozAB7wiJ8iYbEoQZBIgQtNveLzhqZcw+JLfpopZuveehUN7 c6Jgpi0DT+/zR40IFtI+7eSaSiKkUh3XyLPRFuybUmsfq3B0QoibprxnuKgSQ2r3S4iE8a 3x5m6oPmLT9bfglLH/wVEgsx/MT/mZ6jL2vWAECw0a6beN0DdpJ7R34Tn8D7pefRrspxQE mUIVX/QkwIDL94vZo7nluYoGCV+BDyTTj0gGFtem/Up6U5qXfso2VhNIPLCDFR2Aa4kJEp O8bWsMK3FNUqSCWKoFK1I097wYRxGx9+7+RodUBzsV7yyHA0jqPzSlKuTzjShQ== 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 4Yc5ng1z6Dz1TB; Mon, 20 Jan 2025 10:15:35 +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 50KAFZRB019356; Mon, 20 Jan 2025 10:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KAFZot019353; Mon, 20 Jan 2025 10:15:35 GMT (envelope-from git) Date: Mon, 20 Jan 2025 10:15:35 GMT Message-Id: <202501201015.50KAFZot019353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5094faf5dfa8 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5094faf5dfa860f238f636457563bc0d89013c7a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5094faf5dfa860f238f636457563bc0d89013c7a commit 5094faf5dfa860f238f636457563bc0d89013c7a Author: Zhenlei Huang AuthorDate: 2025-01-15 04:32:31 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-20 10:14:43 +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 (cherry picked from commit 7befd68335a0b34405b6293f30cc47cabc46ab06) --- 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 74c515c9fca0..c8b79485efc7 100644 --- a/sys/dev/vmware/pvscsi/pvscsi.c +++ b/sys/dev/vmware/pvscsi/pvscsi.c @@ -1445,6 +1445,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;