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

mptcp: introduce and use mptcp_try_coalesce()

Browse source 
Factor-out existing code, will be re-used by the
next patch.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2020-09-14 10:01:11 +02:00 committed by David S. Miller
parent da51aef5fe
commit 8268ed4c9d
1 changed files with 19 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

31
net/mptcp/protocol.c
View file

@ -110,6 +110,22 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)
return 0; return 0;
} }
static bool mptcp_try_coalesce(struct sock *sk, struct sk_buff *to,
struct sk_buff *from)
{
bool fragstolen;
int delta;
if (MPTCP_SKB_CB(from)->offset ||
!skb_try_coalesce(to, from, &fragstolen, &delta))
return false;
kfree_skb_partial(from, fragstolen);
atomic_add(delta, &sk->sk_rmem_alloc);
sk_mem_charge(sk, delta);
return true;
}
static void __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, static void __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk,
struct sk_buff *skb, struct sk_buff *skb,
unsigned int offset, size_t copy_len) unsigned int offset, size_t copy_len)
@ -121,24 +137,15 @@ static void __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk,
skb_ext_reset(skb); skb_ext_reset(skb);
skb_orphan(skb); skb_orphan(skb);
MPTCP_SKB_CB(skb)->offset = offset;
msk->ack_seq += copy_len; msk->ack_seq += copy_len;
tail = skb_peek_tail(&sk->sk_receive_queue); tail = skb_peek_tail(&sk->sk_receive_queue);
if (offset == 0 && tail) { if (tail && mptcp_try_coalesce(sk, tail, skb))
bool fragstolen; return;
int delta;
if (skb_try_coalesce(tail, skb, &fragstolen, &delta)) {
kfree_skb_partial(skb, fragstolen);
atomic_add(delta, &sk->sk_rmem_alloc);
sk_mem_charge(sk, delta);
return;
}
}
skb_set_owner_r(skb, sk); skb_set_owner_r(skb, sk);
__skb_queue_tail(&sk->sk_receive_queue, skb); __skb_queue_tail(&sk->sk_receive_queue, skb);
MPTCP_SKB_CB(skb)->offset = offset;
} }
static void mptcp_stop_timer(struct sock *sk) static void mptcp_stop_timer(struct sock *sk)