[RFC 01/19] staging: qlge: fix incorrect truesize accounting

Coiby Xu
2021-06-21T13:49:25Z

Commit 7c734359d3504c869132166d159c7f0649f0ab34 ("qlge: Size RX buffers
based on MTU") introduced page_chunk structure. We should add
qdev->lbq_buf_size to skb->truesize after __skb_fill_page_desc.

Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
---
drivers/staging/qlge/TODO | 2 --
drivers/staging/qlge/qlge_main.c | 10 +++++-----
2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/qlge/TODO b/drivers/staging/qlge/TODO
index c76394b9451b..449d7dca478b 100644
--- a/drivers/staging/qlge/TODO
+++ b/drivers/staging/qlge/TODO
@@ -4,8 +4,6 @@
ql_build_rx_skb(). That function is now used exclusively to handle packets
that underwent header splitting but it still contains code to handle non
split cases.
-* truesize accounting is incorrect (ex: a 9000B frame has skb->truesize 10280
- while containing two frags of order-1 allocations, ie. >16K)
* while in that area, using two 8k buffers to store one 9k frame is a poor
choice of buffer size.
* in the "chain of large buffers" case, the driver uses an skb allocated with
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 19a02e958865..6dd69b689a58 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -1446,7 +1446,7 @@ static void qlge_process_mac_rx_gro_page(struct qlge_adapter *qdev,

skb->len += length;
skb->data_len += length;
- skb->truesize += length;
+ skb->truesize += qdev->lbq_buf_size;
skb_shinfo(skb)->nr_frags++;

rx_ring->rx_packets++;
@@ -1507,7 +1507,7 @@ static void qlge_process_mac_rx_page(struct qlge_adapter *qdev,
lbq_desc->p.pg_chunk.offset + hlen, length - hlen);
skb->len += length - hlen;
skb->data_len += length - hlen;
- skb->truesize += length - hlen;
+ skb->truesize += qdev->lbq_buf_size;

rx_ring->rx_packets++;
rx_ring->rx_bytes += skb->len;
@@ -1757,7 +1757,7 @@ static struct sk_buff *qlge_build_rx_skb(struct qlge_adapter *qdev,
lbq_desc->p.pg_chunk.offset, length);
skb->len += length;
skb->data_len += length;
- skb->truesize += length;
+ skb->truesize += qdev->lbq_buf_size;
} else {
/*
* The headers and data are in a single large buffer. We
@@ -1783,7 +1783,7 @@ static struct sk_buff *qlge_build_rx_skb(struct qlge_adapter *qdev,
length);
skb->len += length;
skb->data_len += length;
- skb->truesize += length;
+ skb->truesize += qdev->lbq_buf_size;
qlge_update_mac_hdr_len(qdev, ib_mac_rsp,
lbq_desc->p.pg_chunk.va,
&hlen);
@@ -1835,7 +1835,7 @@ static struct sk_buff *qlge_build_rx_skb(struct qlge_adapter *qdev,
lbq_desc->p.pg_chunk.offset, size);
skb->len += size;
skb->data_len += size;
- skb->truesize += size;
+ skb->truesize += qdev->lbq_buf_size;
length -= size;
i++;
} while (length > 0);
--
2.32.0