From nobody Mon Mar 6 00:31:31 2023 X-Original-To: dev-commits-src-branches@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 4PVKJN17w4z3w9Mn; Mon, 6 Mar 2023 00:31:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVKJN0dHZz4KVM; Mon, 6 Mar 2023 00:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062692; 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=JYvutkjxw4ggskCGRtmqVCpwVrcruccFMIIrlijjC1g=; b=E/Oh/UjbAXzX2yvfaD3rhSSRzp85geMx22KrBkkYClmsGgcX05OW8EaIMgajBT+l9W2R3u tFeXrN/ZjCyoUcTmQE4loEqK7dj3kVRucZKRGGQJ1yOhV5JNEU9ux/FAYGbJ1+baZpRk8q Y2XsKR6aJM3q5chD0Rcnrqh7BOkIlo4JAwq0PAgJO5E2dj84YJOCaLjngYGcGqNBVO90k5 EPaxZK6b+LnQpEiT0I7FncIlduLD85/2c8o2r+8hoVQ6dZQHVQ/f/4uWy8ucnWnSxknZPJ mPytHT8ae57GSfiSjlIYHF/3PmwsS0cWOATAcKkZbD/lfeZVTdihCyViQznuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062692; 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=JYvutkjxw4ggskCGRtmqVCpwVrcruccFMIIrlijjC1g=; b=iIaWtcPmjeQPuiCqgnJ/VZz6l6zoMmiGTJ/xwBmygkfac4D9eYXDsx++qlFGIe43vVhMzi sbDumwqYFFbrwhHEE0QF/9om+mcfvaswovplTQJgSccyNJCSGPpD2erIlH0sCFOHs5tu6l YtJajhmQQm+8YtaPjiIHp/NaEkXRqrM4sN45Uv+LwTGZRmPo6Y8QeePp1yA0SHO1rA0p2g 6oiPokNQSFmvxIu2Dyr25cLJQ2dqAvyS3MdVXZAgkIxZE+wHnJJJnNYkXD/hRW1WQi2pyD Vkil1gemnJCG7C/uo08+5EwvuAyc4ug0LxybD2ilcn44AceMWQm+jQaPXt0iJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062692; a=rsa-sha256; cv=none; b=otCwoI22rU+y+eAUwrHfTdnCYNKdHyXgXQW3NuVnqsj+di/j+KNvl9KxqfAqBwh1sliicI ZZiPzFvocXTtjnGQt5fgFEabi97Of6hsC5NbaZn1Bl8mxVK2wCvZDY/Ezp0TmiKHHBz9MS OmFEgFimq1WTNxQe+GdB64HW6zoVddgEJu2TJxTH+EEyGskiT3+Ol8hYgI/tM3u0m0o91t hZH/9sxc0SjRXOXWnb2tYLLZO3ln+c/znR/w37smTz0OLJhdcVzDMADX7ENJK2/1wlC6kj GSIspyLgzeE3FiqKiaO/B/bYJ1S34/F7y8nAycR0FOnOtdQgtdYK7V9fflXgsQ== 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 4PVKJM6d5WzhQR; Mon, 6 Mar 2023 00:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260VVNE043808; Mon, 6 Mar 2023 00:31:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VVRa043807; Mon, 6 Mar 2023 00:31:31 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:31 GMT Message-Id: <202303060031.3260VVRa043807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 02a57b183020 - stable/13 - thunderx: fix potential sign extension issue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 02a57b183020d6c889f794f876a0c000597e01b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=02a57b183020d6c889f794f876a0c000597e01b4 commit 02a57b183020d6c889f794f876a0c000597e01b4 Author: Ed Maste AuthorDate: 2023-02-28 19:17:30 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +0000 thunderx: fix potential sign extension issue Coverity reported a sign extension issue on rq->caching << 26 in the Linux ThunderX driver. (It appears Coverity Scan doesn't build arm64 objects in FreeBSD.) As done in Linux, add a cast. Fixes: 3c0086b81391 ("Raw import of ThunderX VNIC networking driver...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 5e95f5f5315083baa7d98d3286f6c0a82621a68e) --- sys/dev/vnic/nicvf_queues.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_queues.c b/sys/dev/vnic/nicvf_queues.c index bb3eacb75fad..84e1d132da5a 100644 --- a/sys/dev/vnic/nicvf_queues.c +++ b/sys/dev/vnic/nicvf_queues.c @@ -1337,7 +1337,7 @@ nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG; mbx.rq.qs_num = qs->vnic_id; mbx.rq.rq_num = qidx; - mbx.rq.cfg = (rq->caching << 26) | (rq->cq_qs << 19) | + mbx.rq.cfg = ((uint64_t)rq->caching << 26) | (rq->cq_qs << 19) | (rq->cq_idx << 16) | (rq->cont_rbdr_qs << 9) | (rq->cont_qs_rbdr_idx << 8) | (rq->start_rbdr_qs << 1) | (rq->start_qs_rbdr_idx);