From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18EDD38D6A8 for ; Wed, 9 Sep 2026 17:46:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788976016; cv=none; b=anjdUQrwZqpCMmHnix65atvaY3uDymUSHY5mj2EDujazf3Fd1oQUJpgybiu3Bbaz8AJc1DqVvjWJa+0q8P1YdcVphPeNjAHr2qHJcSKK9seaGYi591TfF1A+YaFyFgbtKwPoP216cHC+ZkMYyipYF3fTcOmUqWEH3kPa2Gr7t2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788976016; c=relaxed/simple; bh=58lX8aPUuBxOO+Vd0ZfWIk0FE3iBil28diYXYD+w/yU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IQTiET3nwvJZq2XKvPShVCuihOTZSJUjH1OD1R1dVr7gLoltgIohF8C/sxRmWeclwG5cQOCoBVHECCOH7fHqsrPKRtZwYpgYRwMruMqqYiW7Ro/kn3P56mACrlef9a1g9gN9iYkhbKztToF/OYZ2Pox1V82HNYxd0EdUm85L14U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EG6hFjLy; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EG6hFjLy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 619B41F00898; Wed, 9 Sep 2026 17:46:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788976015; bh=AzkGSZmJzU+1AWVEN89CIkKpxKER7Its5gFaFC2i7VM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EG6hFjLyKxUBKScDlYywd4dJgrFtL1SU57NeSMjxvjKR7/spU7EEvQzET3Sz6kmAq clmZFaZrHeTuY3YKwnc4GsEneNquGk25u3r1KW+5LuB8LlJREvSxYUFK/3nvyAtacH CxvxujNH18je9wcfF/aRg2xlInwZZVhq1E+tC5Y4blbYzk1hQvnKjSJt5Mpjs2J8lF LAQ+9XxudkdYQxyL0WyVQeOQe0m2Rp+eGXicExo99dX0tI9Xn6kgPqTKvRcoo5FO/z sWPpL40/oJJwtDe8whsROynQj0c5Pf5CARICrMkGfj+QErgyRy5b8ypncOVG9iFrxK E1rGCrcI3WTAw== From: Sasha Levin To: stable@vger.kernel.org Cc: Glenn Judd , Tariq Toukan , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y 4/4] net/mlx5e: do not HW-GRO coalesce small frames Date: Wed, 9 Sep 2026 13:46:50 -0400 Message-ID: <20260909174650.3344905-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909174650.3344905-1-sashal@kernel.org> References: <2026090309-herbicide-eaten-1f09@gregkh> <20260909174650.3344905-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Glenn Judd [ Upstream commit e2466392a0b8496000e12181cb1ee1535eb0da25 ] When hardware GRO (SHAMPO) coalesces a small IPv4/TCP segment that was padded up to the 60-byte minimum Ethernet frame, the trailing padding is folded into the merged payload causing padding to be delivered to the user as payload. Detecting and reproducing the issue: the selftest tools/testing/selftests/drivers/net/gro.py subtest hw_ipv4_data_lrg_1byte sends {100, 1} expecting to receive {101}. In current code, it receives {106} (100 + 1 payload + 5 pad) instead. This patch avoids giving the user padding as payload by simply not coalescing small packets (which fails the subtest; the same approach and behavior as sw gro). This gains code simplicity at the cost of more computation (passing an extra skb up the stack) for small packets that could be coalesced. The threshold is chosen as ETH_ZLEN + 2 * VLAN_HLEN. This is the largest frame that may still contain minimum-frame padding (+ 2 VLAN tags), so anything larger is safe to consider for coalesce. (We do not include ETH_FCS_LEN in that threshold computation as netdev_fix_features() drops NETIF_F_GRO_HW whenever NETIF_F_RXFCS is set, so retained FCS can't reach this path.) Fixes: 92552d3abd32 ("net/mlx5e: HW_GRO cqe handler implementation") Cc: stable@vger.kernel.org Signed-off-by: Glenn Judd Signed-off-by: Tariq Toukan Link: https://patch.msgid.link/20260816064259.3279548-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 19dc7ccfdcb7b..e923081995662 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -2378,6 +2378,11 @@ static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cq data_offset = wqe_offset & (page_size - 1); page_idx = wqe_offset >> rq->mpwqe.page_shift; + if (unlikely(cqe_bcnt <= ETH_ZLEN + 2 * VLAN_HLEN)) { + match = false; + flush = true; + } + if (*skb && !(match && mlx5e_hw_gro_skb_has_enough_space(*skb, data_bcnt, page_size))) { -- 2.53.0