mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-18 02:22:10 -05:00
67c5ec7092
removed upstreamed patches: generic/backport-6.6/621-proc-fix-missing-pde_set_flags.patch [1] generic/pending-6.6/742-net-ethernet-mtk_eth_soc-fix-tx-vlan-tag-for-llc-pac.patch [2] all other patches autorefreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=698abcf08818cb7bafb978f4c9f6674d6a825d10 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=61b80fbdc0726317f72f9074e10126e0eb0e49c5 Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20013 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
103 lines
2.8 KiB
Diff
103 lines
2.8 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 3 Nov 2022 12:38:49 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: work around issue with sending
|
|
small fragments
|
|
|
|
When lots of frames are sent with a number of very small fragments, an
|
|
internal FIFO can overflow, causing the DMA engine to lock up lock up and
|
|
transmit attempts time out.
|
|
|
|
Fix this on MT7986 by increasing the reserved FIFO space.
|
|
Fix this on older chips by detecting the presence of small fragments and use
|
|
skb_gso_segment + skb_linearize to deal with them.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -26,6 +26,7 @@
|
|
#include <linux/bitfield.h>
|
|
#include <net/dsa.h>
|
|
#include <net/dst_metadata.h>
|
|
+#include <net/gso.h>
|
|
#include <net/page_pool/helpers.h>
|
|
|
|
#include "mtk_eth_soc.h"
|
|
@@ -1606,12 +1607,28 @@ static void mtk_wake_queue(struct mtk_et
|
|
}
|
|
}
|
|
|
|
+static bool mtk_skb_has_small_frag(struct sk_buff *skb)
|
|
+{
|
|
+ int min_size = 16;
|
|
+ int i;
|
|
+
|
|
+ if (skb_headlen(skb) < min_size)
|
|
+ return true;
|
|
+
|
|
+ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
|
|
+ if (skb_frag_size(&skb_shinfo(skb)->frags[i]) < min_size)
|
|
+ return true;
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct mtk_mac *mac = netdev_priv(dev);
|
|
struct mtk_eth *eth = mac->hw;
|
|
struct mtk_tx_ring *ring = ð->tx_ring;
|
|
struct net_device_stats *stats = &dev->stats;
|
|
+ struct sk_buff *segs, *next;
|
|
bool gso = false;
|
|
int tx_num;
|
|
|
|
@@ -1640,6 +1657,18 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
return NETDEV_TX_BUSY;
|
|
}
|
|
|
|
+ if (mtk_is_netsys_v1(eth) &&
|
|
+ skb_is_gso(skb) && mtk_skb_has_small_frag(skb)) {
|
|
+ segs = skb_gso_segment(skb, dev->features & ~NETIF_F_ALL_TSO);
|
|
+ if (IS_ERR(segs))
|
|
+ goto drop;
|
|
+
|
|
+ if (segs) {
|
|
+ consume_skb(skb);
|
|
+ skb = segs;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* TSO: fill MSS info in tcp checksum field */
|
|
if (skb_is_gso(skb)) {
|
|
if (skb_cow_head(skb, 0)) {
|
|
@@ -1655,8 +1684,14 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
}
|
|
}
|
|
|
|
- if (mtk_tx_map(skb, dev, tx_num, ring, gso) < 0)
|
|
- goto drop;
|
|
+ skb_list_walk_safe(skb, skb, next) {
|
|
+ if ((mtk_is_netsys_v1(eth) &&
|
|
+ mtk_skb_has_small_frag(skb) && skb_linearize(skb)) ||
|
|
+ mtk_tx_map(skb, dev, tx_num, ring, gso) < 0) {
|
|
+ stats->tx_dropped++;
|
|
+ dev_kfree_skb_any(skb);
|
|
+ }
|
|
+ }
|
|
|
|
if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
|
|
netif_tx_stop_all_queues(dev);
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -278,7 +278,7 @@
|
|
#define MTK_CHK_DDONE_EN BIT(28)
|
|
#define MTK_DMAD_WR_WDONE BIT(26)
|
|
#define MTK_WCOMP_EN BIT(24)
|
|
-#define MTK_RESV_BUF (0x40 << 16)
|
|
+#define MTK_RESV_BUF (0x80 << 16)
|
|
#define MTK_MUTLI_CNT (0x4 << 12)
|
|
#define MTK_LEAKY_BUCKET_EN BIT(11)
|
|
|