mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-11 06:11:53 +08:00
a72a2fd7e0
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.88 Manually rebased: - bcm27xx/patches-6.6/950-0327-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch[1] - bcm27xx/patches-6.6/950-0521-PCI-brcmstb-Add-BCM2712-support.patch[2] - generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch[3] - generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch[4] All other patches automatically rebased. 1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=f249c05416ea0bef24c9dbed0e653d2fad87b127 2. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=1fea7726276e5d6526ecd4e7ccb4c91a6135deb5 3. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=95f17738b86fd198924d874a5639bcdc49c7e5b8 4. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=a2874f0dff63829d1f540003e2d83adb610ee64a Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/18607 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
123 lines
3.5 KiB
Diff
123 lines
3.5 KiB
Diff
From 788d30daa8f97f06166b6a63f0e51f2a4c2f036a Mon Sep 17 00:00:00 2001
|
|
From: Hayes Wang <hayeswang@realtek.com>
|
|
Date: Tue, 26 Sep 2023 19:17:14 +0800
|
|
Subject: [PATCH] r8152: use napi_gro_frags
|
|
|
|
Use napi_gro_frags() for the skb of fragments when the work_done is less
|
|
than budget.
|
|
|
|
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
|
|
Link: https://lore.kernel.org/r/20230926111714.9448-434-nic_swsd@realtek.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/usb/r8152.c | 67 ++++++++++++++++++++++++++++++-----------
|
|
1 file changed, 50 insertions(+), 17 deletions(-)
|
|
|
|
--- a/drivers/net/usb/r8152.c
|
|
+++ b/drivers/net/usb/r8152.c
|
|
@@ -2585,8 +2585,9 @@ static int rx_bottom(struct r8152 *tp, i
|
|
while (urb->actual_length > len_used) {
|
|
struct net_device *netdev = tp->netdev;
|
|
struct net_device_stats *stats = &netdev->stats;
|
|
- unsigned int pkt_len, rx_frag_head_sz;
|
|
+ unsigned int pkt_len, rx_frag_head_sz, len;
|
|
struct sk_buff *skb;
|
|
+ bool use_frags;
|
|
|
|
WARN_ON_ONCE(skb_queue_len(&tp->rx_queue) >= 1000);
|
|
|
|
@@ -2599,45 +2600,77 @@ static int rx_bottom(struct r8152 *tp, i
|
|
break;
|
|
|
|
pkt_len -= ETH_FCS_LEN;
|
|
+ len = pkt_len;
|
|
rx_data += sizeof(struct rx_desc);
|
|
|
|
- if (!agg_free || tp->rx_copybreak > pkt_len)
|
|
- rx_frag_head_sz = pkt_len;
|
|
+ if (!agg_free || tp->rx_copybreak > len)
|
|
+ use_frags = false;
|
|
else
|
|
- rx_frag_head_sz = tp->rx_copybreak;
|
|
+ use_frags = true;
|
|
+
|
|
+ if (use_frags) {
|
|
+ /* If the budget is exhausted, the packet
|
|
+ * would be queued in the driver. That is,
|
|
+ * napi_gro_frags() wouldn't be called, so
|
|
+ * we couldn't use napi_get_frags().
|
|
+ */
|
|
+ if (work_done >= budget) {
|
|
+ rx_frag_head_sz = tp->rx_copybreak;
|
|
+ skb = napi_alloc_skb(napi,
|
|
+ rx_frag_head_sz);
|
|
+ } else {
|
|
+ rx_frag_head_sz = 0;
|
|
+ skb = napi_get_frags(napi);
|
|
+ }
|
|
+ } else {
|
|
+ rx_frag_head_sz = 0;
|
|
+ skb = napi_alloc_skb(napi, len);
|
|
+ }
|
|
|
|
- skb = napi_alloc_skb(napi, rx_frag_head_sz);
|
|
if (!skb) {
|
|
stats->rx_dropped++;
|
|
goto find_next_rx;
|
|
}
|
|
|
|
skb->ip_summed = r8152_rx_csum(tp, rx_desc);
|
|
- memcpy(skb->data, rx_data, rx_frag_head_sz);
|
|
- skb_put(skb, rx_frag_head_sz);
|
|
- pkt_len -= rx_frag_head_sz;
|
|
- rx_data += rx_frag_head_sz;
|
|
- if (pkt_len) {
|
|
+ rtl_rx_vlan_tag(rx_desc, skb);
|
|
+
|
|
+ if (use_frags) {
|
|
+ if (rx_frag_head_sz) {
|
|
+ memcpy(skb->data, rx_data,
|
|
+ rx_frag_head_sz);
|
|
+ skb_put(skb, rx_frag_head_sz);
|
|
+ len -= rx_frag_head_sz;
|
|
+ rx_data += rx_frag_head_sz;
|
|
+ skb->protocol = eth_type_trans(skb,
|
|
+ netdev);
|
|
+ }
|
|
+
|
|
skb_add_rx_frag(skb, 0, agg->page,
|
|
agg_offset(agg, rx_data),
|
|
- pkt_len,
|
|
- SKB_DATA_ALIGN(pkt_len));
|
|
+ len, SKB_DATA_ALIGN(len));
|
|
get_page(agg->page);
|
|
+ } else {
|
|
+ memcpy(skb->data, rx_data, len);
|
|
+ skb_put(skb, len);
|
|
+ skb->protocol = eth_type_trans(skb, netdev);
|
|
}
|
|
|
|
- skb->protocol = eth_type_trans(skb, netdev);
|
|
- rtl_rx_vlan_tag(rx_desc, skb);
|
|
if (work_done < budget) {
|
|
+ if (use_frags)
|
|
+ napi_gro_frags(napi);
|
|
+ else
|
|
+ napi_gro_receive(napi, skb);
|
|
+
|
|
work_done++;
|
|
stats->rx_packets++;
|
|
- stats->rx_bytes += skb->len;
|
|
- napi_gro_receive(napi, skb);
|
|
+ stats->rx_bytes += pkt_len;
|
|
} else {
|
|
__skb_queue_tail(&tp->rx_queue, skb);
|
|
}
|
|
|
|
find_next_rx:
|
|
- rx_data = rx_agg_align(rx_data + pkt_len + ETH_FCS_LEN);
|
|
+ rx_data = rx_agg_align(rx_data + len + ETH_FCS_LEN);
|
|
rx_desc = (struct rx_desc *)rx_data;
|
|
len_used = agg_offset(agg, rx_data);
|
|
len_used += sizeof(struct rx_desc);
|