From patchwork Sun Nov 5 20:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13446148 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44CE7C4332F for ; Sun, 5 Nov 2023 20:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XB+WaGcfc6RG/2zzXI8Sm0FU+HpGqR+UEg+pSEdj4zo=; b=b/B9CtDBXSDQ5m bMV+wCQMV5Ra+dBstebAeY4K7V+SmuVFboH7E9GNIQQBFJbxmyvgEACI5t79u8yOCicX9EifI8E5A H9szMLlUHq+WzxXP+d7hF3Y2ByzhF6uODivT2maJ1sI07kKPnFEfsVFBhlNGtI2ZFgQlq1BHxoyaU jpqxqwwls09HDTgS4yM3U8tsdqXgb6JrQXxK8lTHBR7HN79OpFLJV26J0blf2oeDE2nd6lTFwGnP6 KryWBTJun2J7mx/E8nBeXJX6XN4qLVgXQej4dVpGlhIlet32DJZG3snQaTOQ90cw3FcNa9kuF4PDm 7/Z9EknA5ZLc1iaFFj1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qzkBe-00FVzE-26; Sun, 05 Nov 2023 20:57:38 +0000 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qzkBa-00FVvL-1G for linux-arm-kernel@lists.infradead.org; Sun, 05 Nov 2023 20:57:36 +0000 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2c504a5e1deso51221401fa.2 for ; Sun, 05 Nov 2023 12:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699217851; x=1699822651; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SkmUkmLoK96BNboao7deauYFXBoeWm6vYd1S1QHVdg4=; b=qXrxfkyHVRQ967Ei5rcqrv/PFpv5tckvaqXryoeOMFxOlwJ3NDQsI+qjMoBbpdmPBj m8i3FGkzq/p8gs/taO1dLdzmo5bnsq7oRoAOqH8L6vHEl+QwNWGHMO+nnXSyvZxA/5SN wEg2lcFBEvTOpoqKgLTZhKDbek/6HjQgzPlT3OfJPelgVBtuzhLgAwFaMQIb4T36Ru5t Xn/d++lKXwiyzSOOtWojvP8rSq+ZmNiBzjuBIuBUDVmEmKQc1ztGOfwpY4k3h/NupKX8 Zm7fMTCh1tvvHO+jpP6x69XCEKzGl0C9JR3HvEHgss69RQhAtTx/3umP4Ipv/qnf9aJO tLUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699217851; x=1699822651; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SkmUkmLoK96BNboao7deauYFXBoeWm6vYd1S1QHVdg4=; b=ZOfsBimnUTTzz8OmzMD47hd5t2/InKIxvmqFqDlltV3S3ZoabQXuCjDFsDVVWUBl6i 5QE24MCL4lF/UqJ672XufGqqjYT8px1//FzpACckKz7802xucUrsBoMFjblBqTQnJPpx /L6LSR6ZTSyl2E0WTZhsOxknD2wwSuYgsjMTzZOgugDq/3ZZoiM7hJSAHBTL867AMmBb EzzSI+sdsfBorD/W1Zu/Dbp8KBU/yKxj1vbjjf0ZUy2YRCGG41ksJC4bywSoOoRXJeJv 3l2BqW+lDmWZRawtaHS6MTwEGf2e4bHbg/yy3cQdOp58zUQaq2BBHlvPNrLR/1isUBWj +EgQ== X-Gm-Message-State: AOJu0YwzY6E/J3/wVnyxZORLnhQJLDaUDXpOcRuuWfLtv3ZHtYny1qK7 4APZUzUBE4ffvU7PaUpiF6RR6A== X-Google-Smtp-Source: AGHT+IEZ5yfK1828ZFfg1z0JEcil3ZmjTYmj62YIDKrrJea9QiYH64N281WrNe7UIF3CYVdtagRcqg== X-Received: by 2002:ac2:522c:0:b0:507:9dfd:f846 with SMTP id i12-20020ac2522c000000b005079dfdf846mr19156590lfl.69.1699217851479; Sun, 05 Nov 2023 12:57:31 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id d12-20020ac24c8c000000b00507c72697d0sm931873lfl.303.2023.11.05.12.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 12:57:31 -0800 (PST) From: Linus Walleij Date: Sun, 05 Nov 2023 21:57:26 +0100 Subject: [PATCH net v2 4/4] net: ethernet: cortina: Handle large frames MIME-Version: 1.0 Message-Id: <20231105-gemini-largeframe-fix-v2-4-cd3a5aa6c496@linaro.org> References: <20231105-gemini-largeframe-fix-v2-0-cd3a5aa6c496@linaro.org> In-Reply-To: <20231105-gemini-largeframe-fix-v2-0-cd3a5aa6c496@linaro.org> To: Hans Ulli Kroll , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= , Vladimir Oltean , Andrew Lunn Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231105_125734_431276_8CDFA1D5 X-CRM114-Status: GOOD ( 19.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Gemini ethernet controller provides hardware checksumming for frames up to 1514 bytes including ethernet headers but not FCS. If we start sending bigger frames (after first bumping up the MTU on both interfaces sending and receiveing the frames), truncated packets start to appear on the target such as in this tcpdump resulting from ping -s 1474: 23:34:17.241983 14:d6:4d:a8:3c:4f (oui Unknown) > bc:ae:c5:6b:a8:3d (oui Unknown), ethertype IPv4 (0x0800), length 1514: truncated-ip - 2 bytes missing! (tos 0x0, ttl 64, id 32653, offset 0, flags [DF], proto ICMP (1), length 1502) OpenWrt.lan > Fecusia: ICMP echo request, id 1672, seq 50, length 1482 If we bypass the hardware checksumming and provide a software fallback, everything starts working fine up to the max TX MTU of 2047 bytes, for example ping -s2000 192.168.1.2: 00:44:29.587598 bc:ae:c5:6b:a8:3d (oui Unknown) > 14:d6:4d:a8:3c:4f (oui Unknown), ethertype IPv4 (0x0800), length 2042: (tos 0x0, ttl 64, id 51828, offset 0, flags [none], proto ICMP (1), length 2028) Fecusia > OpenWrt.lan: ICMP echo reply, id 1683, seq 4, length 2008 The bit enabling to bypass hardware checksum (or any of the "TSS" bits) are undocumented in the hardware reference manual. The entire hardware checksum unit appears undocumented. The conclusion that we need to use the "bypass" bit was found by trial-and-error. Since no hardware checksum will happen, we slot in a software checksum fallback. Check for the condition where we need to compute checksum on the skb with either hardware or software using == CHECKSUM_PARTIAL instead of != CHECKSUM_NONE which is an incomplete check according to . On the D-Link DIR-685 router this fixes a bug on the conduit interface to the RTL8366RB DSA switch: as the switch needs to add space for its tag it increases the MTU on the conduit interface to 1504 and that means that when the router sends packages of 1500 bytes these get an extra 4 bytes of DSA tag and the transfer fails because of the erroneous hardware checksumming, affecting such basic functionality as the LuCI web interface. Suggested-by: Vladimir Oltean Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Signed-off-by: Linus Walleij --- drivers/net/ethernet/cortina/gemini.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 576174a862a9..84295c1b87e6 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1145,6 +1145,7 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, dma_addr_t mapping; unsigned short mtu; void *buffer; + int ret; mtu = ETH_HLEN; mtu += netdev->mtu; @@ -1165,7 +1166,19 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, word3 |= mtu; } - if (skb->ip_summed != CHECKSUM_NONE) { + if (skb->len >= ETH_FRAME_LEN) { + /* Hardware offloaded checksumming isn't working on frames + * bigger than 1514 bytes. Perhaps the buffer is only 1518 + * bytes fitting a normal frame and a checksum? + * Just use software checksumming and bypass on bigger frames. + */ + if (skb->ip_summed == CHECKSUM_PARTIAL) { + ret = skb_checksum_help(skb); + if (ret) + return ret; + } + word1 |= TSS_BYPASS_BIT; + } else if (skb->ip_summed == CHECKSUM_PARTIAL) { int tcp = 0; if (skb->protocol == htons(ETH_P_IP)) {