1 From 788d30daa8f97f06166b6a63f0e51f2a4c2f036a Mon Sep 17 00:00:00 2001
2 From: Hayes Wang <hayeswang@realtek.com>
3 Date: Tue, 26 Sep 2023 19:17:14 +0800
4 Subject: [PATCH] r8152: use napi_gro_frags
6 Use napi_gro_frags() for the skb of fragments when the work_done is less
9 Signed-off-by: Hayes Wang <hayeswang@realtek.com>
10 Link: https://lore.kernel.org/r/20230926111714.9448-434-nic_swsd@realtek.com
11 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 drivers/net/usb/r8152.c | 67 ++++++++++++++++++++++++++++++-----------
14 1 file changed, 50 insertions(+), 17 deletions(-)
16 --- a/drivers/net/usb/r8152.c
17 +++ b/drivers/net/usb/r8152.c
18 @@ -2584,8 +2584,9 @@ static int rx_bottom(struct r8152 *tp, i
19 while (urb->actual_length > len_used) {
20 struct net_device *netdev = tp->netdev;
21 struct net_device_stats *stats = &netdev->stats;
22 - unsigned int pkt_len, rx_frag_head_sz;
23 + unsigned int pkt_len, rx_frag_head_sz, len;
27 WARN_ON_ONCE(skb_queue_len(&tp->rx_queue) >= 1000);
29 @@ -2598,45 +2599,77 @@ static int rx_bottom(struct r8152 *tp, i
32 pkt_len -= ETH_FCS_LEN;
34 rx_data += sizeof(struct rx_desc);
36 - if (!agg_free || tp->rx_copybreak > pkt_len)
37 - rx_frag_head_sz = pkt_len;
38 + if (!agg_free || tp->rx_copybreak > len)
41 - rx_frag_head_sz = tp->rx_copybreak;
45 + /* If the budget is exhausted, the packet
46 + * would be queued in the driver. That is,
47 + * napi_gro_frags() wouldn't be called, so
48 + * we couldn't use napi_get_frags().
50 + if (work_done >= budget) {
51 + rx_frag_head_sz = tp->rx_copybreak;
52 + skb = napi_alloc_skb(napi,
55 + rx_frag_head_sz = 0;
56 + skb = napi_get_frags(napi);
59 + rx_frag_head_sz = 0;
60 + skb = napi_alloc_skb(napi, len);
63 - skb = napi_alloc_skb(napi, rx_frag_head_sz);
69 skb->ip_summed = r8152_rx_csum(tp, rx_desc);
70 - memcpy(skb->data, rx_data, rx_frag_head_sz);
71 - skb_put(skb, rx_frag_head_sz);
72 - pkt_len -= rx_frag_head_sz;
73 - rx_data += rx_frag_head_sz;
75 + rtl_rx_vlan_tag(rx_desc, skb);
78 + if (rx_frag_head_sz) {
79 + memcpy(skb->data, rx_data,
81 + skb_put(skb, rx_frag_head_sz);
82 + len -= rx_frag_head_sz;
83 + rx_data += rx_frag_head_sz;
84 + skb->protocol = eth_type_trans(skb,
88 skb_add_rx_frag(skb, 0, agg->page,
89 agg_offset(agg, rx_data),
91 - SKB_DATA_ALIGN(pkt_len));
92 + len, SKB_DATA_ALIGN(len));
95 + memcpy(skb->data, rx_data, len);
97 + skb->protocol = eth_type_trans(skb, netdev);
100 - skb->protocol = eth_type_trans(skb, netdev);
101 - rtl_rx_vlan_tag(rx_desc, skb);
102 if (work_done < budget) {
104 + napi_gro_frags(napi);
106 + napi_gro_receive(napi, skb);
110 - stats->rx_bytes += skb->len;
111 - napi_gro_receive(napi, skb);
112 + stats->rx_bytes += pkt_len;
114 __skb_queue_tail(&tp->rx_queue, skb);
118 - rx_data = rx_agg_align(rx_data + pkt_len + ETH_FCS_LEN);
119 + rx_data = rx_agg_align(rx_data + len + ETH_FCS_LEN);
120 rx_desc = (struct rx_desc *)rx_data;
121 len_used = agg_offset(agg, rx_data);
122 len_used += sizeof(struct rx_desc);