nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: unify alloclen calculation for paged requests

Browse source 
Consolidate alloclen and pagedlen calculation for zerocopy and normal
paged requests. The current non-zerocopy paged version can a bit
overallocate and unnecessary copy a small chunk of data into the linear
part.

Cc: Willem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/netdev/CA+FuTSf0+cJ9_N_xrHmCGX_KoVCWcE0YQBdtgEkzGvcLMSv7Qw@mail.gmail.com/
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b0e4edb7b91f171c7119891d3c61040b8c56596e.1661428921.git.asml.silence@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Pavel Begunkov 2022-08-25 13:06:31 +01:00 committed by Paolo Abeni
parent d287532edf
commit 47cf88993c
2 changed files with 2 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
net/ipv4/ip_output.c
View file

@ -1109,10 +1109,7 @@ static int __ip_append_data(struct sock *sk,
(fraglen + alloc_extra < SKB_MAX_ALLOC || (fraglen + alloc_extra < SKB_MAX_ALLOC ||
!(rt->dst.dev->features & NETIF_F_SG))) !(rt->dst.dev->features & NETIF_F_SG)))
alloclen = fraglen; alloclen = fraglen;
else if (!zc) { else {
alloclen = min_t(int, fraglen, MAX_HEADER);
pagedlen = fraglen - alloclen;
} else {
alloclen = fragheaderlen + transhdrlen; alloclen = fragheaderlen + transhdrlen;
pagedlen = datalen - transhdrlen; pagedlen = datalen - transhdrlen;
} }

5
net/ipv6/ip6_output.c
View file

@ -1648,10 +1648,7 @@ static int __ip6_append_data(struct sock *sk,
(fraglen + alloc_extra < SKB_MAX_ALLOC || (fraglen + alloc_extra < SKB_MAX_ALLOC ||
!(rt->dst.dev->features & NETIF_F_SG))) !(rt->dst.dev->features & NETIF_F_SG)))
alloclen = fraglen; alloclen = fraglen;
else if (!zc) { else {
alloclen = min_t(int, fraglen, MAX_HEADER);
pagedlen = fraglen - alloclen;
} else {
alloclen = fragheaderlen + transhdrlen; alloclen = fragheaderlen + transhdrlen;
pagedlen = datalen - transhdrlen; pagedlen = datalen - transhdrlen;
} }