Commit 8ddab508 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller

tcp: do not allocate linear memory for zerocopy skbs

Zerocopy payload is now always stored in frags, and space for headers
is reversed, so this memory is unused.
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02583ade
...@@ -1104,12 +1104,15 @@ static int linear_payload_sz(bool first_skb) ...@@ -1104,12 +1104,15 @@ static int linear_payload_sz(bool first_skb)
return 0; return 0;
} }
static int select_size(const struct sock *sk, bool sg, bool first_skb) static int select_size(const struct sock *sk, bool sg, bool first_skb, bool zc)
{ {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
int tmp = tp->mss_cache; int tmp = tp->mss_cache;
if (sg) { if (sg) {
if (zc)
return 0;
if (sk_can_gso(sk)) { if (sk_can_gso(sk)) {
tmp = linear_payload_sz(first_skb); tmp = linear_payload_sz(first_skb);
} else { } else {
...@@ -1282,6 +1285,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) ...@@ -1282,6 +1285,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
if (copy <= 0 || !tcp_skb_can_collapse_to(skb)) { if (copy <= 0 || !tcp_skb_can_collapse_to(skb)) {
bool first_skb; bool first_skb;
int linear;
new_segment: new_segment:
/* Allocate new segment. If the interface is SG, /* Allocate new segment. If the interface is SG,
...@@ -1295,9 +1299,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) ...@@ -1295,9 +1299,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
goto restart; goto restart;
} }
first_skb = tcp_rtx_and_write_queues_empty(sk); first_skb = tcp_rtx_and_write_queues_empty(sk);
skb = sk_stream_alloc_skb(sk, linear = select_size(sk, sg, first_skb, zc);
select_size(sk, sg, first_skb), skb = sk_stream_alloc_skb(sk, linear, sk->sk_allocation,
sk->sk_allocation,
first_skb); first_skb);
if (!skb) if (!skb)
goto wait_for_memory; goto wait_for_memory;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment