From nobody Mon Jun 22 14:08:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A8ADC433FE for ; Tue, 22 Mar 2022 22:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238402AbiCVWw5 (ORCPT ); Tue, 22 Mar 2022 18:52:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbiCVWw4 (ORCPT ); Tue, 22 Mar 2022 18:52:56 -0400 X-Greylist: delayed 528 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 22 Mar 2022 15:51:27 PDT Received: from postfix01.core.dcmtl.stgraber.net (postfix01.core.dcmtl.stgraber.net [IPv6:2602:fc62:a:1001:216:3eff:feb3:6927]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE5AC5DA5E; Tue, 22 Mar 2022 15:51:27 -0700 (PDT) Received: from dakara.stgraber.net (unknown [IPv6:2602:fc62:b:1000:5436:5b25:64e4:d81a]) by postfix01.core.dcmtl.stgraber.net (Postfix) with ESMTP id 41FD41FD94; Tue, 22 Mar 2022 22:42:36 +0000 (UTC) From: =?UTF-8?q?St=C3=A9phane=20Graber?= To: kuba@kernel.org Cc: davem@davemloft.net, iyappan@os.amperecomputing.com, keyur@os.amperecomputing.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, quan@os.amperecomputing.com, stable@vger.kernel.org, stgraber@ubuntu.com, toan@os.amperecomputing.com Subject: [PATCH v2] drivers: net: xgene: Fix regression in CRC stripping Date: Tue, 22 Mar 2022 18:42:06 -0400 Message-Id: <20220322224205.752795-1-stgraber@ubuntu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220318141207.284972b7@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> References: <20220318141207.284972b7@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Stephane Graber All packets on ingress (except for jumbo) are terminated with a 4-bytes CRC checksum. It's the responsability of the driver to strip those 4 bytes. Unfortunately a change dating back to March 2017 re-shuffled some code and made the CRC stripping code effectively dead. This change re-orders that part a bit such that the datalen is immediately altered if needed. Fixes: 4902a92270fb ("drivers: net: xgene: Add workaround for errata 10GE_8= /ENET_11") Signed-off-by: Stephane Graber Tested-by: Stephane Graber Cc: Jakub Kicinski Cc: stable@vger.kernel.org --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net= /ethernet/apm/xgene/xgene_enet_main.c index ff2d099aab21..53dc8d5fede8 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -696,6 +696,12 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_= ring *rx_ring, buf_pool->rx_skb[skb_index] =3D NULL; =20 datalen =3D xgene_enet_get_data_len(le64_to_cpu(raw_desc->m1)); + + /* strip off CRC as HW isn't doing this */ + nv =3D GET_VAL(NV, le64_to_cpu(raw_desc->m0)); + if (!nv) + datalen -=3D 4; + skb_put(skb, datalen); prefetch(skb->data - NET_IP_ALIGN); skb->protocol =3D eth_type_trans(skb, ndev); @@ -717,12 +723,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_= ring *rx_ring, } } =20 - nv =3D GET_VAL(NV, le64_to_cpu(raw_desc->m0)); - if (!nv) { - /* strip off CRC as HW isn't doing this */ - datalen -=3D 4; + if (!nv) goto skip_jumbo; - } =20 slots =3D page_pool->slots - 1; head =3D page_pool->head; --=20 2.34.1