From nobody Thu Mar 20 03:14:06 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 4ZJ9f70g0Hz5r9vR; Thu, 20 Mar 2025 03:14:07 +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 4ZJ9f62Z2jz3wJr; Thu, 20 Mar 2025 03:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440446; 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=X19gBmm+oPAWH8PZgrwoTBkGkiV1knoyuVrGN1hu8GQ=; b=NORjLGRPXgB19s1c45SttS8Is9zASUcjVPytc1ukQ6+6RustygDWl+7YNm7k+UFbLe6eae vKbMgTZqP9Fd6PeKbzDWcQiOFAfK1nIG8KDXOc1l/t8Z2tshxzZRKubMwhttE3jxyzxoR1 bFssM7ld2nykk7lm1uQHt6GcyxkEb0RkDn+LLXTf50jmapLt7zBjHX/0+lAjv9/Aym4vKV E7dod50OcuQZe4kUSi2B+m9/aG0z1IXotbSWGUYNAAvAYmwWSKXpefq8mRA+GlUatUJrJp g3pJaq8rP1A7MssgGsnolCN7Jeani1nuia45cHcypdw3JWWfm0PjzwwFckTItQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440446; a=rsa-sha256; cv=none; b=mPzjr7N+WapF5IE0P73T4DsJLLzTqhlr3ibRh/NhtuseN8/frSYqzr8Z2vS0YL6nECbnjt UDLRYiR5XJ1MGcjyVqsDHNG/b4dPiuwVjqLBV83cRZj+MuzSdQOhcRD4XuJV9vZYGUeopb SruuMNvgGlpP6RF/BSMjQUoA7W5piesNryDh5ZvZ47N9ZCUll29+h7yuFDW3x5Y1pN8ThY X6iCfjSIJfMxSrkH/yBZPNPUk5c7r+tmGpoF4cFQoHTVMR/3guganLb01+gzKTcyv2dD/O O4sqJVpbnfwfI4mQ4QmP9uKiHxvwyIMi4RlNsz7JNU6XeZ6DG6Fn4PKJhJVb7w== 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=1742440446; 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=X19gBmm+oPAWH8PZgrwoTBkGkiV1knoyuVrGN1hu8GQ=; b=bIVHdxIl//z5GJOXmVrITrRygNmPa43pcR0v/BgpOeMLxg24vHUy+ooUAJyMeP7I8BpFM+ a1S3/6Dx75f9ascsHkkW7iK8DLLu9lSnKUr6H5NChOtBhQ1Lr+v72NgCA+6AJ/bnR4Ke2d qkhTTc0FTHK0CRpAShiBCQ2oEX2aCfPcHdfgC7H75dKUmxc9Y4DtxkyiIioMatgfkB22nv 5LK/3dMh6O/1xevAYSOo415r2jh2c7fyDS6FF29lAs4LsqSUUE6pgV9t68V2zVmCaRru0q xZjrHacPmLOXpkeHt4M3MPWKqf8I9jl+KSGIL9ai65/1hrvrkZ79/tgoUqfpXw== 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 4ZJ9f61zp9zpBj; Thu, 20 Mar 2025 03:14:06 +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 52K3E69h086292; Thu, 20 Mar 2025 03:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E6H7086289; Thu, 20 Mar 2025 03:14:06 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:06 GMT Message-Id: <202503200314.52K3E6H7086289@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: 3c5bf8d9d935 - stable/14 - mlx5: recalculate tcp checksum for ipv4 hw lro coalesced packet 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: 3c5bf8d9d9352d38393aac222451f638d6791499 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5bf8d9d9352d38393aac222451f638d6791499 commit 3c5bf8d9d9352d38393aac222451f638d6791499 Author: Konstantin Belousov AuthorDate: 2025-02-08 07:21:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5: recalculate tcp checksum for ipv4 hw lro coalesced packet (cherry picked from commit 3eb6d4b4a25a13b9ea9d825ee44c641b91669d06) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 42 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 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 73ac24f55f45..266e8e804259 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -27,6 +27,7 @@ #include "opt_ratelimit.h" #include +#include #include static inline int @@ -124,6 +125,27 @@ mlx5e_post_rx_wqes(struct mlx5e_rq *rq) mlx5_wq_ll_update_db_record(&rq->wq); } +static uint32_t +csum_reduce(uint32_t val) +{ + while (val > 0xffff) + val = (val >> 16) + (val & 0xffff); + return (val); +} + +static u_short +csum_buf(uint32_t val, void *buf, int len) +{ + u_short x; + + MPASS(len % 2 == 0); + for (int i = 0; i < len; i += 2) { + bcopy((char *)buf + i, &x, 2); + val = csum_reduce(val + x); + } + return (val); +} + static void mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) { @@ -135,6 +157,7 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) struct ip *ip4 = NULL; struct tcphdr *th; uint32_t *ts_ptr; + uint32_t tcp_csum; uint8_t l4_hdr_type; int tcp_ack; @@ -196,17 +219,34 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) } } if (ip4) { + struct ipovly io; + ip4->ip_ttl = cqe->lro_min_ttl; ip4->ip_len = cpu_to_be16(tot_len); ip4->ip_sum = 0; ip4->ip_sum = in_cksum_skip(mb, (ip4->ip_hl << 2) + ETHER_HDR_LEN, ETHER_HDR_LEN); + + /* TCP checksum: data */ + tcp_csum = cqe->check_sum; + + /* TCP checksum: IP pseudoheader */ + bzero(io.ih_x1, sizeof(io.ih_x1)); + io.ih_pr = IPPROTO_TCP; + io.ih_len = htons(ntohs(ip4->ip_len) - sizeof(*ip4)); + io.ih_src = ip4->ip_src; + io.ih_dst = ip4->ip_dst; + tcp_csum = csum_buf(tcp_csum, &io, sizeof(io)); + + /* TCP checksum: TCP header */ + th->th_sum = 0; + tcp_csum = csum_buf(tcp_csum, th, th->th_off * 4); + th->th_sum = ~tcp_csum & 0xffff; } else { ip6->ip6_hlim = cqe->lro_min_ttl; ip6->ip6_plen = cpu_to_be16(tot_len - sizeof(struct ip6_hdr)); } - /* TODO: handle tcp checksum */ } static uint64_t