From nobody Thu Mar 13 16:03:20 2025 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 4ZDC2x0Wjrz5qs2b; Thu, 13 Mar 2025 16:03:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDC2w56XVz3QSq; Thu, 13 Mar 2025 16:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741881800; 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=GDNiid7eRFnUTd1cMxD9qVZaddke4ZSaPONbqhroXY8=; b=nmgk8BrjSbwG2UH6oCQi1bF/zR0gmrfzYZoDyn+UnCnG0v6HBxbIqCzYvDdTU5u6N7DMVJ OnpEIBZcaaGtB04sCKQvLOmlEEbVsDAprQl6QNyayR6oIXWthY3Om9gymYmlF6+QB2yw5Z 7wXyYQ3IRa5D/0ibAA5TGBvdm/NLhId78tzgLKHKHc5ORzOoK+IWQjvWvQhbuA4CFlkfRi oaO8kaP45dW4UYPG5MbYmwY7LCOD7v+t4ejhQfvXUA2ckt3NhwJnnmSe2hd5HZaHh1xdZs FYuf91D+bmuS5JnvzCLWVmRihRNXb9RJAY1IvbMFBcV6qyPt5N0oLMWZJHwYxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741881800; a=rsa-sha256; cv=none; b=XD4VaWIyY16fkp+WKIEWsDDhDkvBvSNoolNl4yZV7wQVH7zdaq8vRNdKY7wzqklQLGQNhp X1nBpKIJZuXFjvwEZp17hBVhfnF2ssRSKQZggDUEMzejmL88nxDIuMD2UmyrLwEZqpw2HW ShpA172saRuFauXuHYkzpiJobhWOpYI9nJx7EHLA5rBr8SgjCs5XWzONDgIQMvKVgQVsXW tWkWOcCgOwfgJaCPVmL1wqyvSxrPVomGxqV6YarKTqW/ZKads+O3MSJzWoqX0cp1pRG67X NFPDu21nKceJdRY/vEdg7hyA3Hq12YCEX587NLW9ajbvkowt+HLiG0xvh6Ts0g== 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=1741881800; 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=GDNiid7eRFnUTd1cMxD9qVZaddke4ZSaPONbqhroXY8=; b=h2sUh+GZ5faW6wn65IewguP9XoFgGjz9mDqIeSsNqZ1MXysND2T8hHjxH+PTnFhDOSxWvI ZJfFIgg7HhfdPtq2B32WmEjNGs7TtSdmhvm/cpntxVfG+o0lCydkR5j/lFpjG6qw0YBWNj zDq9y9eOFkv2rLveyE+Ht2OLE0VglF7JQ4MwFWdRhO0cIS3vAK6A8Vw8zKf3EKR7y5G8oj QV6IckCxNdwELRsNW3E/3mfu1gn6KNw0eMIGgi9cFmqwxiS/AYZN4XppeXw7kpMG9nz89I Vf2pV6RyvGWu5B6P9MEZaill+E8vlEn+ZA24xFKN7x3j/qkc0nrVYSDp/D9wFw== 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 4ZDC2w4bXrz13tG; Thu, 13 Mar 2025 16:03:20 +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 52DG3KZu048728; Thu, 13 Mar 2025 16:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DG3KgQ048725; Thu, 13 Mar 2025 16:03:20 GMT (envelope-from git) Date: Thu, 13 Mar 2025 16:03:20 GMT Message-Id: <202503131603.52DG3KgQ048725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 903996760d19 - main - mlx5: correct the predicate asserted in __predict_true() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 903996760d1903a7bb594b7f2ed8072e9e6cef9f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=903996760d1903a7bb594b7f2ed8072e9e6cef9f commit 903996760d1903a7bb594b7f2ed8072e9e6cef9f Author: Konstantin Belousov AuthorDate: 2025-02-09 10:25:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-13 16:00:42 +0000 mlx5: correct the predicate asserted in __predict_true() Reviewed by: Ariel Ehrenberg , Slava Shwartsman Sponsored by: NVidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 77e6a6b77c58..a9b3a883f32d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -210,9 +210,9 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) * +--------+--------+--------+--------+ */ if (get_cqe_lro_timestamp_valid(cqe) && - (__predict_true(*ts_ptr) == ntohl(TCPOPT_NOP << 24 | + (__predict_true(*ts_ptr == ntohl(TCPOPT_NOP << 24 | TCPOPT_NOP << 16 | TCPOPT_TIMESTAMP << 8 | - TCPOLEN_TIMESTAMP))) { + TCPOLEN_TIMESTAMP)))) { /* * cqe->timestamp is 64bit long. * [0-31] - timestamp.