Skip to contentSkip to conversation

tcp: Set rcv zerocopy hint correctly if skb last frag is < PAGE_SIZE

PATCH Applied Eric Dumazet 2 participants 2 messages Dec 15, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tcp: Set rcv zerocopy hint correctly if skb last frag is < PAGE_SIZE

From: Arjun Roy <[email protected]>

At present, if the last frag of paged data in a skb has < PAGE_SIZE data, we compute the recv_skip_hint as being equal to the size of that frag and the entire next skb.

Instead, just return the runt frag size as the hint.

recv_skip_hint is used by the application to skip over bytes that can not be mmaped, so returning a too big chunk is pessimistic and forces more bytes to be copied.

---
v2: added more info in the changelog (Jakub)

 net/ipv4/tcp.c | 2 ++
 1 file changed, 2 insertions(+)
net/ipv4/tcp.c +2 -0
index 09e2cae929565a438b298ab6c0df3e2c263e7a11..93fe77c5b02d631ce0f0742f107c570a81d139fe 100644
@@ -1778,6 +1778,8 @@ static int tcp_zerocopy_receive(struct sock *sk,
 	while (length + PAGE_SIZE <= zc->length) {
 		if (zc->recv_skip_hint < PAGE_SIZE) {
 			if (skb) {
+				if (zc->recv_skip_hint > 0)
+					break;
 				skb = skb->next;
 				offset = seq - TCP_SKB_CB(skb)->seq;
 			} else {
Signature · 1 line
2.24.1.735.g03f4e72817-goog
#1 lore raw
Quoted 8 lines · Eric Dumazet

From: Arjun Roy <[email protected]>

At present, if the last frag of paged data in a skb has < PAGE_SIZE data, we compute the recv_skip_hint as being equal to the size of that frag and the entire next skb.

Instead, just return the runt frag size as the hint.

Quoted 7 lines

recv_skip_hint is used by the application to skip over bytes that can not be mmaped, so returning a too big chunk is pessimistic and forces more bytes to be copied.

Applied, thank you!!