From nobody Sun Feb 8 15:07:41 2026 Received: from mail-yx1-f67.google.com (mail-yx1-f67.google.com [74.125.224.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 637B22749C1 for ; Mon, 26 Jan 2026 19:38:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769456308; cv=none; b=rBOVuOAtPAW6+TYBqVn+3bc2LJlgU7Bib+0/IjzqF99QDZjWi8m3P10cRyaNYsRDrURtfxQGiSIruWwYia+OYUV33AlmYlZiXtboCuys/Vz0+2jQ2bnMRjzj6RLWDDWPMuTXGVSmoDmPR0bO8mwt5CrUc015cgOV4LyvJtELI6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769456308; c=relaxed/simple; bh=KE5ceNF2zDqw8LnnABdcfLeNarTK90DNj06IOU74ZGQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=puVGZoYEmfqrVIPlK+rC8HoFdE64tssO7id4j/FgT2epKYIiwMfQwIjS6TpKLFv45+bC8iT4Yd43aVRrRJcKREQDkVtlU2pbWKoyccRLete1vOcWxmQwSBA9vdk4bS+S8aOrgSBHJob0fcEyiuNBWNoh4XIKnXwBiM/VL4F8qkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cAMYRbsd; arc=none smtp.client-ip=74.125.224.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cAMYRbsd" Received: by mail-yx1-f67.google.com with SMTP id 956f58d0204a3-64965ee303dso2356821d50.0 for ; Mon, 26 Jan 2026 11:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769456306; x=1770061106; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=2+aNIXln8blsmbOccfH89nynTXB7Mbf5xzL4onU0SVg=; b=cAMYRbsd+L5bRr+zw3z+k9CFSWmTQE1wKX0/5tehT9Lfo3hRmFeC8TopY9W1gcd7Uf 9GjmymYgiQit1MBfFTSKIw+0ZDZJNPMc7mLxsc03/XVPOlJcXYBROfROWRCVr5idrcJa c+mbYbOaWjJHitxS/pRW4mVEcX2ccInIesczksVu9I8Jhikvc+zWSicqr1I4PCximlgT 7un5I8/TalngCmta3ptUZCikUSFSmEmxi6EndcrucS8grk6Cd6xN9MjntddEOxjG5qeJ CbR49wxl15xkKPs2O9Nrod9ofYNQQOM15fgsHg3cra4A7UxAGl6VVTAuZCbAhmkLLmlF UmlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769456306; x=1770061106; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2+aNIXln8blsmbOccfH89nynTXB7Mbf5xzL4onU0SVg=; b=sFZCZg49WQI+oWrjYaUs2WAbz0xVm3lJT2SOytDEW6Nv1cA51Rvwni3vEdx84eWyvR jWNCil8wdZKUMHufdVLyF80jJ2N9gV2wUmGwWE3gAfx6PWfJUvxRWy0ykmV0hLaGHXqV LQIcpRunO1D7ldonW1KCz8Rbj+n8M6Oc+GL1MHtLQGHB9wEWv8+c5Og2cHHtUizVQg85 KGCqlZbfe5eSiGDQc3qMJQHjvH7YcyiJdX+C/kIeYDwvDpEcYcfy7uc0dV1irAhJmeiN PapFSoXdOyJdA3qLw883i+muavgirRIXXtCfXOIsUke/Ob8NGLrchf48ZPD68yX09pz/ 9ojQ== X-Forwarded-Encrypted: i=1; AJvYcCVqfYfsdWfutvLG7DjPsRyuVeo2jDaI6z0/2DwwF7L/mN3ftGbtAZrh91oy/vMssQaBiX+edoC4Oh7XmNw=@vger.kernel.org X-Gm-Message-State: AOJu0YxVp1xJi7+uDNKKO0SpK1pwVjgGAGdoPYA+APvAk9yoz4oqePcj PEtolVKYRPknbj4JHjr8wnYf3ILI6HQ4pxO9tdPwfLsXtQjVSpQy7rtL X-Gm-Gg: AZuq6aLx2DyH4pDQ582kmHpHTNkzJMlgumgtdvyMc3YAzZPIOb7dLurasXvDbK6hIxr AVRssAf+VdqWzwcdFxKgUEiQACoRTRuKcruA5ka+naSCm4m5MqzSsNrJq3lg5ZU6tUulWILpqR4 Y4IxY8GuZrOl720UooSFXCM682CeXIbDFDJm0a4y6ucwRyZkaYDKMMqvGi5mlC2vh7XLcNOZgIQ KoYENDUe0/tek88gPz4pBpYmml6/lEtpPgMtEFHT5rYjziy9zl61o4BU1d+iaGTCYIbcxG0FF1A 0RCizdjPXt1B2XOqswkPGEeN74nV7gOjvU/APNzX/S3OEBYQC7TYnx2aXGYZwlsC3wyYYwIVlQA bG3b9sTlrs7wtosIXBrrpifYJWMmimU7F1Pu8nUi0alQGLjVcPSvym4mKjEGslolysevlPPpMKI VVbJNE0vg= X-Received: by 2002:a05:690e:120e:b0:649:39e1:6498 with SMTP id 956f58d0204a3-64970c9dedcmr4255047d50.60.1769456306319; Mon, 26 Jan 2026 11:38:26 -0800 (PST) Received: from localhost ([2a03:2880:25ff:1::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7943b2a2ed1sm51516537b3.30.2026.01.26.11.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 11:38:25 -0800 (PST) From: Daniel Zahka Date: Mon, 26 Jan 2026 11:38:17 -0800 Subject: [PATCH v2] net/mlx5e: don't assume psp tx skbs are ipv6 csum handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260126-dzahka-fix-tx-csum-partial-v2-1-0a905590ea5f@gmail.com> X-B4-Tracking: v=1; b=H4sIAKjCd2kC/33NTQ6CMBCG4auQWTumnQYorriHYVFLhYn8pUWCE u5uJXHr8v0yeWaD4Dy7AJdkA+8WDjwOMeiUgG3N0DjkOjaQoExIIqzfpn0YvPOK84o2PHucjJ/ ZdFik5HRtSas8hQhM3sWzA79WsVsO8+hfx69Fftcfq/6xi0SJ+U1IkWeF0lqVTW+4O9uxh2rf9 w+HsDvtxAAAAA== To: Boris Pismenny , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rahul Rameshbabu , Raed Salem , Cosmin Ratiu Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Zahka X-Mailer: b4 0.13.0 mlx5e_psp_handle_tx_skb() assumes skbs are ipv6 when doing a partial TCP checksum with tso. Make correctly mlx5e_psp_handle_tx_skb() handle ipv4 packets. Fixes: e5a1861a298e ("net/mlx5e: Implement PSP Tx data path") Signed-off-by: Daniel Zahka Reviewed-by: Cosmin Ratiu Reviewed-by: Eric Dumazet --- This is a bug when an ipv4 tx skb passes through mlx5e_psp_handle_tx_skb() and tso is requested. It was previously undetected in my testing because my setup involves cx7's on both ends, and mlx5e_handle_csum() marks PSP rx skb's with csum_unnecessary. To reproduce the problem just turn off NETIF_F_RXCSUM and observe: nstat -a | grep TcpInCsumErrors --- Changes in v2: - move declarations down into branches where they are used. - Link to v1: https://lore.kernel.org/r/20260123-dzahka-fix-tx-csum-partial= -v1-1-7b0107693883@gmail.com --- .../net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c | 17 +++++++++++--= ---- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c b/= drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c index c17ea0fcd8ef..ef7f5338540f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c @@ -177,8 +177,6 @@ bool mlx5e_psp_handle_tx_skb(struct net_device *netdev, { struct mlx5e_priv *priv =3D netdev_priv(netdev); struct net *net =3D sock_net(skb->sk); - const struct ipv6hdr *ip6; - struct tcphdr *th; =20 if (!mlx5e_psp_set_state(priv, skb, psp_st)) return true; @@ -190,11 +188,18 @@ bool mlx5e_psp_handle_tx_skb(struct net_device *netde= v, return false; } if (skb_is_gso(skb)) { - ip6 =3D ipv6_hdr(skb); - th =3D inner_tcp_hdr(skb); + int len =3D skb_shinfo(skb)->gso_size + inner_tcp_hdrlen(skb); + struct tcphdr *th =3D inner_tcp_hdr(skb); =20 - th->check =3D ~tcp_v6_check(skb_shinfo(skb)->gso_size + inner_tcp_hdrlen= (skb), &ip6->saddr, - &ip6->daddr, 0); + if (skb->protocol =3D=3D htons(ETH_P_IP)) { + const struct iphdr *ip =3D ip_hdr(skb); + + th->check =3D ~tcp_v4_check(len, ip->saddr, ip->daddr, 0); + } else { + const struct ipv6hdr *ip6 =3D ipv6_hdr(skb); + + th->check =3D ~tcp_v6_check(len, &ip6->saddr, &ip6->daddr, 0); + } } =20 return true; --- base-commit: 709bbb015538dfd5c97308b77c950d41a4d95cd3 change-id: 20260122-dzahka-fix-tx-csum-partial-952e8dc28375 Best regards, --=20 Daniel Zahka