From nobody Mon Jan 20 12:42:12 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 4Yc92r2FsYz5lJ9q; Mon, 20 Jan 2025 12:42: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 4Yc92r11VPz3v7G; Mon, 20 Jan 2025 12:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737376932; 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=sWCf11Jw/Pdnu4fDwho2PclPPZlM2qSfZkagDMLUMHE=; b=sq3tRJH/vkyw2XonOh6CZeirAuZkd3rj590VjPygVe5nzhs8e9mRZu62C/+b3Tmvtk4TM1 QLMxP2y6sEZGjYgNm4cPBZphaYGplqjBiK1RsRYBd/ZE2AGPu+AizhUj28ypdZwA4zpzRA kPPJIZjxlGxDzufWm9DF44I3xjZh9qhaGKrnOuQPoyByZVT1oPHMgIGXRAf88iXCfV3wLY 7KUWypD4zkMXJh5CWWgobLPjbFfUycfOthG1sR/RmfOVgM6CMk1Ce0cdSwJZw1Sn9+iint wcePejAKAWAM0OghSArOloYEYMPm1mTKkhMiVK2jcvQkNQ1dxk/DOydOGToSEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737376932; 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=sWCf11Jw/Pdnu4fDwho2PclPPZlM2qSfZkagDMLUMHE=; b=bWAFrUb2TtaQpX94xd+RTVBWq3K1ImhFY177n9FidK3Wiuf2E8Uy3lLuLbkWA4JZU7/8Ij BRkAfDY0sbCB2zpr2ZLTnNIQKPNLxmP1M/9wkuckMn450uYIKZaHQvP0wDKXfpd0Qsi8v0 uH+TfWw1oVdStjYZMLLmEMAecI0MivOCgDqO0alTPTGPxQaI17LQWrSrRBx02jGUtBD9Hr 3hHFrNXPp2KIoYaPw2H/RiXQvztLFKznTuFGTGuv8w7Db7NWlaJbLJL4Giref5GSy79Hol fsWVjSzITJY6OhktAmqtRyp6hFGC88ZVeyOYzfv7e2jOU3tQQVBys4S2DwShOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737376932; a=rsa-sha256; cv=none; b=mVuwP6daaq28/zCA4PABnW+ALETd1zSZzGBOoFruI0e4H4e00tWSVtYLuvIfPtfXC1ICYX 1z5B9KVCpIHBLEGPk+HjRd1/T0mVJlq3NGpl94Y7r17fK7HDlL0ErEKrlxGxn1e1fGn5Vr FD8sg116dy5doh7FViUJnvvLG5fdrCzuzvX1gF4DlYZ0ncK6YHUZQkBPB2CySSTvdrLLA6 LS7XmLto/0gmd1cNyoCZ8fseFA21Q/bPkIKcQDx5BfbcVvsyFzkBfC/t1XV8cYNBHlrhht EoUhNjB+BHycgjb+hkKuGbkUFk5exQ1PK7PVHzN7YWJUh5DSyDQVjJu9WcIcjw== 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 4Yc92r0Z7rz5kr; Mon, 20 Jan 2025 12:42:12 +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 50KCgC1j098381; Mon, 20 Jan 2025 12:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KCgCtq098378; Mon, 20 Jan 2025 12:42:12 GMT (envelope-from git) Date: Mon, 20 Jan 2025 12:42:12 GMT Message-Id: <202501201242.50KCgCtq098378@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: 25695358d03b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 25695358d03b4c60344df5b7dead04085350448d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=25695358d03b4c60344df5b7dead04085350448d commit 25695358d03b4c60344df5b7dead04085350448d Author: Zhenlei Huang AuthorDate: 2025-01-15 04:32:31 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-20 12:39:26 +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) (cherry picked from commit 5094faf5dfa860f238f636457563bc0d89013c7a) --- 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 b3be2280eb5e..e850f6d8dae3 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;