From nobody Thu Mar 20 03:14:05 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 4ZJ9f55WYjz5r9rt; Thu, 20 Mar 2025 03:14:05 +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 4ZJ9f51v2Pz3wJk; Thu, 20 Mar 2025 03:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440445; 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=Y7DrEOyL7XMn8NlXW2In5fOwm2/aNvBulXLBXYQIxdw=; b=xFrZEtpF72sMqrJKzJE1Eirz+/IiUJbuwP/Ho3I5YVTry82+G+eZVhbyhxmwiqc+/hn1LX fgec+tu1ZY1fc34DCHlRG3m6gPNtFJOeBBQUHMVpvyWh25euIKd57aruUGtqybuKiYIHM1 tic2YQrWiQF1lZWBdyyLt5a1Zgk4ftAWz+eoS9eU6SYGgPCtCwihPfPpINASVocXbBiROk IM/b5dckugy+xt3CceSCpwHJiWUhdMdWECzjpJ4Q8lm1W4HVswgLNhm+5RBXNL+nkL2ing K0QDDa/2eQ6XttgqfuTT0oPPFhGvxtwY/mnRWVueEFi+GnCaoIVegg2sWklUaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440445; a=rsa-sha256; cv=none; b=fUoDV1cZ0aoAbJJgfk6oAQoUvYSIcB8qG20glCFxPh6ZJ2Qs36BvKtAxeqbgrV45BpjbWc FFnHCG/oBhmUfjeCAv6BOUPn7Y8O6pRV63bjk5I6rcXpQDtN6Ol/000+mAcyENbQQLAg8C /uI36C8E51K09voXvAK2zm8X+kBm3+uSIohA89rBnyf1CXjn1aJErHq03RuVIAPSLbwAZs jiBE3ZmjSNi0Sg/cb8xAMEq4otKay3bwWum1Z8GOB/dc5rGrXZ0vDYSeyKvVGxn01xNWjf XTXdLvViC1h5k8c50MOdLiEOfSaoKKKxj2BGONLkATsMRLqtYDIIYAj/pvf7JA== 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=1742440445; 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=Y7DrEOyL7XMn8NlXW2In5fOwm2/aNvBulXLBXYQIxdw=; b=Zeb9iAgoo4pSTzlQY4jFh1YxbXN+IPXDcC8UWZKLh94D4BbBbfUyX9+TzXspFOLck89Pmn nd520T+zd1VxzGeMxNMys+2byVlEKaePgD9lD/8d5DHinKBzIE7d7UZRgEIZ9PBMH1j96M msP2WAOokUYJA45/BhWy1cYCgtuM1T3NxCWvYcUWhbilZj9P8k92IoP5ZcFbicRYE3+mEU wZaNcNDFaz4kz7JND5uYmCgQS6IcxhKAHIsyRkwbV23ME0vWsB+ANV0nlz/5mByV/nFg9N 2brK+mwbr3zRt5ylrrDZ6hp6KfKEbDwTgP5OGUVzQO/ciM9ViDgF7kvmeygx/A== 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 4ZJ9f50k1XzpBh; Thu, 20 Mar 2025 03:14:05 +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 52K3E5nC086259; Thu, 20 Mar 2025 03:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E5a0086256; Thu, 20 Mar 2025 03:14:05 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:05 GMT Message-Id: <202503200314.52K3E5a0086256@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: 7ebbf9f756e7 - stable/14 - mlx5_en: correct recalculation of the ipv4 checksum for hw lro packet 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ebbf9f756e742a4859da6233b243adb4f6612ad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7ebbf9f756e742a4859da6233b243adb4f6612ad commit 7ebbf9f756e742a4859da6233b243adb4f6612ad Author: Konstantin Belousov AuthorDate: 2025-02-11 15:43:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5_en: correct recalculation of the ipv4 checksum for hw lro packet (cherry picked from commit dd1bd0ec5c91c21f1f60bb8bc58b2f5e794df43f) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index b52dee102a3d..73ac24f55f45 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -199,7 +199,8 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) ip4->ip_ttl = cqe->lro_min_ttl; ip4->ip_len = cpu_to_be16(tot_len); ip4->ip_sum = 0; - ip4->ip_sum = in_cksum(mb, ip4->ip_hl << 2); + ip4->ip_sum = in_cksum_skip(mb, (ip4->ip_hl << 2) + + ETHER_HDR_LEN, ETHER_HDR_LEN); } else { ip6->ip6_hlim = cqe->lro_min_ttl; ip6->ip6_plen = cpu_to_be16(tot_len -