From nobody Thu Mar 20 03:14:08 2025 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 4ZJ9f91Nc2z5r9bY; Thu, 20 Mar 2025 03:14:09 +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 4ZJ9f842Gdz3wKD; Thu, 20 Mar 2025 03:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440448; 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=uwSiz55HeCE64xSnAdMkPpIkK4uPcHTAtbinJcW1pU8=; b=pfyFCiuCEfJATcvG2B6NvzUHPRXynaUlmBh59YwCV38HWht1irQJu8mvYZM9ElJ38yirP1 ECpd3JD01wn7xzxqwxvWcnf0gQGOk5VMJlDPhwNcZ/Y0vGNtT0KyGy/YNEsWK6xoGMJo/M 80ayn4BxParfK5uYAs+PTGun4QHQs/BIhuhqpbPC6qnTk00g4pS2gbrh2sZNCwrMbjHAQz JXqeyFKXro7jEHt/frbOjlWMj+UeltvqYOJVWolyhp21iyMc7pINIxKMezvF4cMGsQYBeB MARlbTXx9HVqCYmETVSX9ZB6loEt1zzHq4uS+vEWFUp8pqhpGOHlov1MJQJ9CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440448; a=rsa-sha256; cv=none; b=bGnGk1eG89zQBQ2T3pf4bAqoY+A2YIRK9gDVsVHbdazEbj5Er0qRoOCxYQyDdq3eYVcLQe Rj1ZnNHjJ+LjJe5fA1u5+59g1te35ly3vmzNw+CMLI9K6iFWTIitowg7NCn0tJXq13cpLW jruoE5VuWeVYOWoVhO1D/VKlekW9q/H0+5iEJpfQdoF4jv3FZtPt7JgD6JWiLzUi/O7UYd v64hM9MoqWtEC/e246kINASDYcqb53v9JG7G1gWF1lS1ViNCR1JyT1d6kYPIRrAeZVAPl8 fqajHbeD8QNHaYKJUfpcGQkr8We+DQ1AMtcN8kUtKk0VsvG593qYTkRAd2+whQ== 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=1742440448; 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=uwSiz55HeCE64xSnAdMkPpIkK4uPcHTAtbinJcW1pU8=; b=XTvkdRiwFeonJCpBt0AfWrpguY2W1oBhCIJ6US57/g1PUVWvphbSoQg7HKp5y0iuZYlwnX fxpjmCzs2OBPhQtyTR52Oxh6tJdoq51el+ofGGoTBx/mnXgSpOECRBuRJRXvDGPmTBH8YF wPzL+DzifWUNBiLOIxKK38+0ubAUMkcBVuYlQGdZOPD1UrtILCgSj0eWUbezKdPWxZ/sTO hZ/fmZjqhIqjWuDQQFsvqQDCbHVtJ7BqThEIKusa6RrZ2dKUKU1XHfvd63xH1vdgCJjJRv 00aKHFNYXCIgg8Koozc5enW4LptuX3eMPepqHBK6VU+zV8GWIBMmUGiaOvqXTw== 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 4ZJ9f83XLczp1g; Thu, 20 Mar 2025 03:14:08 +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 52K3E8xk086366; Thu, 20 Mar 2025 03:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E8Pm086363; Thu, 20 Mar 2025 03:14:08 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:08 GMT Message-Id: <202503200314.52K3E8Pm086363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ec551188213e - stable/14 - mlx5: correct the predicate asserted in __predict_true() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ec551188213e7c5c52abb7d4c06d46540ef1d840 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec551188213e7c5c52abb7d4c06d46540ef1d840 commit ec551188213e7c5c52abb7d4c06d46540ef1d840 Author: Konstantin Belousov AuthorDate: 2025-02-09 10:25:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5: correct the predicate asserted in __predict_true() (cherry picked from commit 903996760d1903a7bb594b7f2ed8072e9e6cef9f) --- 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 0a1cd2bc4aee..d82718ed3bb5 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -206,9 +206,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.