Skip to content

Commit 3cc4949

Browse files
edumazetdavem330
authored andcommitted
ipv4: use skb coalescing in defragmentation
ip_frag_reasm() can use skb_try_coalesce() to build optimized skb, reducing memory used by them (truesize), and reducing number of cache line misses and overhead for the consumer. Signed-off-by: Eric Dumazet <[email protected]> Cc: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bad43ca commit 3cc4949

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

net/ipv4/ip_fragment.c

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
545545
int len;
546546
int ihlen;
547547
int err;
548+
int sum_truesize;
548549
u8 ecn;
549550

550551
ipq_kill(qp);
@@ -611,19 +612,32 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
611612
atomic_add(clone->truesize, &qp->q.net->mem);
612613
}
613614

614-
skb_shinfo(head)->frag_list = head->next;
615615
skb_push(head, head->data - skb_network_header(head));
616616

617-
for (fp=head->next; fp; fp = fp->next) {
618-
head->data_len += fp->len;
619-
head->len += fp->len;
617+
sum_truesize = head->truesize;
618+
for (fp = head->next; fp;) {
619+
bool headstolen;
620+
int delta;
621+
struct sk_buff *next = fp->next;
622+
623+
sum_truesize += fp->truesize;
620624
if (head->ip_summed != fp->ip_summed)
621625
head->ip_summed = CHECKSUM_NONE;
622626
else if (head->ip_summed == CHECKSUM_COMPLETE)
623627
head->csum = csum_add(head->csum, fp->csum);
624-
head->truesize += fp->truesize;
628+
629+
if (skb_try_coalesce(head, fp, &headstolen, &delta)) {
630+
kfree_skb_partial(fp, headstolen);
631+
} else {
632+
if (!skb_shinfo(head)->frag_list)
633+
skb_shinfo(head)->frag_list = fp;
634+
head->data_len += fp->len;
635+
head->len += fp->len;
636+
head->truesize += fp->truesize;
637+
}
638+
fp = next;
625639
}
626-
atomic_sub(head->truesize, &qp->q.net->mem);
640+
atomic_sub(sum_truesize, &qp->q.net->mem);
627641

628642
head->next = NULL;
629643
head->dev = dev;

0 commit comments

Comments
 (0)