net: remove sk skb caches
Subsystems (6)
Paolo Abeni
maintainercover net: remove sk skb caches
Eric noted we would be better off reverting the sk skb caches.
MPTCP relies on such a feature, so we need a little refactor of the MPTCP tx path before the mentioned revert.
The first patch exposes additional TCP helpers. The 2nd patch changes the MPTCP code to do locally the whole skb allocation and updating, so it does not rely anymore on core TCP helpers for that nor the sk skb cache.
As a side effect, we can make the tcp_build_frag helper static.
Finally, we can pull Eric's revert.
RFC -> v1:
- drop driver specific patch - no more needed after helper rename
- rename skb_entail -> tcp_skb_entail (Eric)
- preserve the tcp_build_frag helpwe, just make it static (Eric)
---
Note:
that this series touches some LoC also modifed by this -net patch:
so the whole series is based on top of the above and will apply with no conflict after such patch will land into net-next
Eric Dumazet (1):
tcp: remove sk_{tr}x_skb_cache
Paolo Abeni (3):
tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers
mptcp: stop relying on tcp_tx_skb_cache
tcp: make tcp_build_frag() static
Documentation/networking/ip-sysctl.rst | 8 -- include/net/sock.h | 19 ---- include/net/tcp.h | 4 +- net/ipv4/af_inet.c | 4 - net/ipv4/sysctl_net_ipv4.c | 12 --- net/ipv4/tcp.c | 38 ++----- net/ipv4/tcp_ipv4.c | 6 -- net/ipv6/tcp_ipv6.c | 6 -- net/mptcp/protocol.c | 137 ++++++++++++++----------- 9 files changed, 85 insertions(+), 149 deletions(-)
Signature · 1 line
2.26.3
Paolo Abeni
maintainerPATCH 1/4 tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers
the tcp_skb_entail() helper is actually skb_entail(), renamed to provide proper scope.
The two helper will be used by the next patch.
RFC -> v1:
- rename skb_entail to tcp_skb_entail (Eric)
--- include/net/tcp.h | 2 ++ net/ipv4/tcp.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-)
include/net/tcp.h +2 -0
@@ -581,6 +581,8 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb, __u16 *mss);#endif /* tcp_output.c */ +void tcp_skb_entail (struct sock *sk,struct sk_buff *skb); +void tcp_mark_push (struct tcp_sock *tp,struct sk_buff *skb);void __tcp_push_pending_frames (struct sock *sk,unsigned int cur_mss,int nonagle);int __tcp_retransmit_skb (struct sock *sk,struct sk_buff *skb,int segs);
net/ipv4/tcp.c +4 -4
@@ -647,7 +647,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) }EXPORT_SYMBOL (tcp_ioctl); -static inline void tcp_mark_push (struct tcp_sock *tp,struct sk_buff *skb) +void tcp_mark_push (struct tcp_sock *tp,struct sk_buff *skb) {TCP_SKB_CB (skb)->tcp_flags |=TCPHDR_PSH ; tp->pushed_seq = tp->write_seq;
@@ -658,7 +658,7 @@ static inline bool forced_push(const struct tcp_sock *tp)return after (tp->write_seq, tp->pushed_seq + (tp->max_window >>1 )); } -static void skb_entail (struct sock *sk,struct sk_buff *skb) +void tcp_skb_entail (struct sock *sk,struct sk_buff *skb) {struct tcp_sock *tp =tcp_sk (sk);struct tcp_skb_cb *tcb =TCP_SKB_CB (skb);
@@ -985,7 +985,7 @@ struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags,#ifdef CONFIG_TLS_DEVICE skb->decrypted = !!(flags &MSG_SENDPAGE_DECRYPTED );#endif -skb_entail (sk, skb); +tcp_skb_entail (sk, skb); copy = size_goal; }
@@ -1314,7 +1314,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) process_backlog++; skb->ip_summed =CHECKSUM_PARTIAL ; -skb_entail (sk, skb); +tcp_skb_entail (sk, skb); copy = size_goal;/* All packets are restored as if they have
Signature · 1 line
2.26.3
Paolo Abeni
maintainerPATCH 2/4 mptcp: stop relying on tcp_tx_skb_cache
In reply to Paolo AbeniWe want to revert the skb TX cache, but MPTCP is currently using it unconditionally.
Rework the MPTCP tx code, so that tcp_tx_skb_cache is not needed anymore: do the whole coalescing check, skb allocation skb initialization/update inside mptcp_sendmsg_frag(), quite alike the current TCP code.
--- net/mptcp/protocol.c | 137 ++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 60 deletions(-)
net/mptcp/protocol.c +77 -60
@@ -1224,6 +1224,7 @@ static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp)if (likely (__mptcp_add_ext (skb, gfp))) {skb_reserve (skb,MAX_TCP_HEADER ); skb->reserved_tailroom = skb->end - skb->tail; +INIT_LIST_HEAD (&skb->tcp_tsorted_anchor);return skb; }__kfree_skb (skb);
@@ -1233,31 +1234,23 @@ static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp)return NULL ; } -static bool __mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk,gfp_t gfp) +static struct sk_buff *__mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk,gfp_t gfp) {struct sk_buff *skb; -if (ssk->sk_tx_skb_cache) { - skb = ssk->sk_tx_skb_cache; -if (unlikely (!skb_ext_find (skb,SKB_EXT_MPTCP ) && - !__mptcp_add_ext (skb, gfp))) -return false; -return true; - } - skb =__mptcp_do_alloc_tx_skb (sk, gfp);if (!skb) -return false; +return NULL ;if (likely (sk_wmem_schedule (ssk, skb->truesize))) { - ssk->sk_tx_skb_cache = skb; -return true; +tcp_skb_entail (ssk, skb); +return skb; }kfree_skb (skb); -return false; +return NULL ; } -static bool mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk,bool data_lock_held) +static struct sk_buff *mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk,bool data_lock_held) {gfp_t gfp = data_lock_held ?GFP_ATOMIC : sk->sk_allocation;
@@ -1287,23 +1280,29 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, struct mptcp_sendmsg_info *info) {u64 data_seq = dfrag->data_seq + info->sent; +int offset = dfrag->offset + info->sent;struct mptcp_sock *msk =mptcp_sk (sk);bool zero_window_probe = false;struct mptcp_ext *mpext =NULL ; -struct sk_buff *skb, *tail; -bool must_collapse = false; -int size_bias =0 ; -int avail_size; -size_t ret =0 ; +bool can_coalesce = false; +bool reuse_skb = true; +struct sk_buff *skb; +size_t copy; +int i;pr_debug ("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u" , msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent); +if (WARN_ON_ONCE (info->sent > info->limit || + info->limit > dfrag->data_len)) +return 0 ; +/* compute send limit */ info->mss_now =tcp_send_mss (ssk, &info->size_goal, info->flags); - avail_size = info->size_goal; + copy = info->size_goal; + skb =tcp_write_queue_tail (ssk); -if (skb) { +if (skb && copy > skb->len) {/* Limit the write to the size available in the * current skb, if any, so that we create at most a new skb. * Explicitly tells TCP internals to avoid collapsing on later
@@ -1316,62 +1315,80 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, goto alloc_skb; } - must_collapse = (info->size_goal > skb->len) && - (skb_shinfo (skb)->nr_frags < sysctl_max_skb_frags); -if (must_collapse) { - size_bias = skb->len; - avail_size = info->size_goal - skb->len; + i =skb_shinfo (skb)->nr_frags; + can_coalesce =skb_can_coalesce (skb, i, dfrag->page, offset); +if (!can_coalesce && i >= sysctl_max_skb_frags) { +tcp_mark_push (tcp_sk (ssk), skb); + goto alloc_skb; } - } + copy -= skb->len; + }else { alloc_skb: -if (!must_collapse && - !mptcp_alloc_tx_skb (sk, ssk, info->data_lock_held)) -return 0 ; + skb =mptcp_alloc_tx_skb (sk, ssk, info->data_lock_held); +if (!skb) +return -ENOMEM ; + + i =skb_shinfo (skb)->nr_frags; + reuse_skb = false; + mpext =skb_ext_find (skb,SKB_EXT_MPTCP ); + }/* Zero window and all data acked? Probe. */ - avail_size =mptcp_check_allowed_size (msk, data_seq, avail_size); -if (avail_size ==0 ) { + copy =mptcp_check_allowed_size (msk, data_seq, copy); +if (copy ==0 ) {u64 snd_una =READ_ONCE (msk->snd_una); -if (skb || snd_una != msk->snd_nxt) +if (snd_una != msk->snd_nxt) { +tcp_remove_empty_skb (ssk,tcp_write_queue_tail (ssk));return 0 ; + } + zero_window_probe = true; data_seq = snd_una -1 ; - avail_size =1 ; - } + copy =1 ; -if (WARN_ON_ONCE (info->sent > info->limit || - info->limit > dfrag->data_len)) -return 0 ; +/* all mptcp-level data is acked, no skbs should be present into the +* ssk write queue +*/ +WARN_ON_ONCE (reuse_skb); + } - ret = info->limit - info->sent; - tail =tcp_build_frag (ssk, avail_size + size_bias, info->flags, - dfrag->page, dfrag->offset + info->sent, &ret); -if (!tail) { -tcp_remove_empty_skb (sk,tcp_write_queue_tail (ssk)); + copy =min_t (size_t, copy, info->limit - info->sent); +if (!sk_wmem_schedule (ssk, copy)) { +tcp_remove_empty_skb (ssk,tcp_write_queue_tail (ssk));return -ENOMEM ; } -/* if the tail skb is still the cached one, collapsing really happened. -*/ -if (skb == tail) { -TCP_SKB_CB (tail)->tcp_flags &= ~TCPHDR_PSH ; - mpext->data_len += ret; +if (can_coalesce) { +skb_frag_size_add (&skb_shinfo (skb)->frags[i -1 ], copy); + }else { +get_page (dfrag->page); +skb_fill_page_desc (skb, i, dfrag->page, offset, copy); + } + + skb->len += copy; + skb->data_len += copy; + skb->truesize += copy; +sk_wmem_queued_add (ssk, copy); +sk_mem_charge (ssk, copy); + skb->ip_summed =CHECKSUM_PARTIAL ; +WRITE_ONCE (tcp_sk (ssk)->write_seq,tcp_sk (ssk)->write_seq + copy); +TCP_SKB_CB (skb)->end_seq += copy; +tcp_skb_pcount_set (skb,0 ); + +/* on skb reuse we just need to update the DSS len */ +if (reuse_skb) { +TCP_SKB_CB (skb)->tcp_flags &= ~TCPHDR_PSH ; + mpext->data_len += copy;WARN_ON_ONCE (zero_window_probe); goto out; } - mpext =skb_ext_find (tail,SKB_EXT_MPTCP ); -if (WARN_ON_ONCE (!mpext)) { -/* should never reach here, stream corrupted */ -return -EINVAL ; - } -memset (mpext,0 ,sizeof (*mpext)); mpext->data_seq = data_seq; mpext->subflow_seq =mptcp_subflow_ctx (ssk)->rel_write_seq; - mpext->data_len = ret; + mpext->data_len = copy; mpext->use_map =1 ; mpext->dsn64 =1 ;
@@ -1380,18 +1397,18 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, mpext->dsn64);if (zero_window_probe) { -mptcp_subflow_ctx (ssk)->rel_write_seq += ret; +mptcp_subflow_ctx (ssk)->rel_write_seq += copy; mpext->frozen =1 ;if (READ_ONCE (msk->csum_enabled)) -mptcp_update_data_checksum (tail, ret); +mptcp_update_data_checksum (skb, copy);tcp_push_pending_frames (ssk);return 0 ; } out:if (READ_ONCE (msk->csum_enabled)) -mptcp_update_data_checksum (tail, ret); -mptcp_subflow_ctx (ssk)->rel_write_seq += ret; -return ret; +mptcp_update_data_checksum (skb, copy); +mptcp_subflow_ctx (ssk)->rel_write_seq += copy; +return copy; }#define MPTCP_SEND_BURST_SIZE ((1 << 16) - \
Signature · 1 line
2.26.3
Paolo Abeni
maintainerPATCH 3/4 tcp: make tcp_build_frag() static
In reply to Paolo AbeniAfter the previous patch the mentioned helper is
used only inside its compilation unit: let's make
it static.
RFC -> v1:
- preserve the tcp_build_frag() helper (Eric)
--- include/net/tcp.h | 2 -- net/ipv4/tcp.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
include/net/tcp.h +0 -2
@@ -330,8 +330,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags);int tcp_sendpage_locked (struct sock *sk,struct page *page,int offset,size_t size,int flags); -struct sk_buff *tcp_build_frag (struct sock *sk,int size_goal,int flags, -struct page *page,int offset,size_t *size);ssize_t do_tcp_sendpages (struct sock *sk,struct page *page,int offset,size_t size,int flags);int tcp_send_mss (struct sock *sk,int *size_goal,int flags);
net/ipv4/tcp.c +2 -2
@@ -963,8 +963,8 @@ void tcp_remove_empty_skb(struct sock *sk, struct sk_buff *skb) } } -struct sk_buff *tcp_build_frag (struct sock *sk,int size_goal,int flags, -struct page *page,int offset,size_t *size) +static struct sk_buff *tcp_build_frag (struct sock *sk,int size_goal,int flags, +struct page *page,int offset,size_t *size) {struct sk_buff *skb =tcp_write_queue_tail (sk);struct tcp_sock *tp =tcp_sk (sk);
Signature · 1 line
2.26.3
Paolo Abeni
maintainerPATCH 4/4 tcp: remove sk_{tr}x_skb_cache
In reply to Paolo AbeniFrom: Eric Dumazet <[email protected]>
This reverts the following patches :
- commit 2e05fcae83c4 ("tcp: fix compile error if !CONFIG_SYSCTL")
- commit 4f661542a402 ("tcp: fix zerocopy and notsent_lowat issues")
- commit 472c2e07eef0 ("tcp: add one skb cache for tx")
- commit 8b27dae5a2e8 ("tcp: add one skb cache for rx")
Having a cache of one skb (in each direction) per TCP socket is fragile, since it can cause a significant increase of memory needs, and not good enough for high speed flows anyway where more than one skb is needed.
We want instead to add a generic infrastructure, with more flexible per-cpu caches, for alien NUMA nodes.
--- Documentation/networking/ip-sysctl.rst | 8 -------- include/net/sock.h | 19 ------------------- net/ipv4/af_inet.c | 4 ---- net/ipv4/sysctl_net_ipv4.c | 12 ------------ net/ipv4/tcp.c | 26 -------------------------- net/ipv4/tcp_ipv4.c | 6 ------ net/ipv6/tcp_ipv6.c | 6 ------ 7 files changed, 81 deletions(-)
Documentation/networking/ip-sysctl.rst +0 -8
@@ -989,14 +989,6 @@ tcp_challenge_ack_limit - INTEGER in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) Default: 1000 -tcp_rx_skb_cache - BOOLEAN - Controls a per TCP socket cache of one skb, that might help - performance of some workloads. This might be dangerous - on systems with a lot of TCP sockets, since it increases - memory usage. - - Default: 0 (disabled) - UDP variables =============
include/net/sock.h +0 -19
@@ -262,7 +262,6 @@ struct bpf_local_storage;* @sk_dst_cache: destination cache * @sk_dst_pending_confirm: need to confirm neighbour * @sk_policy: flow policy -* @sk_rx_skb_cache: cache copy of recently accessed RX skb * @sk_receive_queue: incoming packets * @sk_wmem_alloc: transmit queue bytes committed * @sk_tsq_flags: TCP Small Queues flags
@@ -328,7 +327,6 @@ struct bpf_local_storage;* @sk_peek_off: current peek_offset value * @sk_send_head: front of stuff to transmit * @tcp_rtx_queue: TCP re-transmit queue [union with @sk_send_head] -* @sk_tx_skb_cache: cache copy of recently accessed TX skb * @sk_security: used by security modules * @sk_mark: generic packet mark * @sk_cgrp_data: cgroup data for this cgroup
@@ -393,7 +391,6 @@ struct sock {atomic_t sk_drops;int sk_rcvlowat;struct sk_buff_head sk_error_queue; -struct sk_buff *sk_rx_skb_cache;struct sk_buff_head sk_receive_queue;/* * The backlog queue is special, it is always used with
@@ -442,7 +439,6 @@ struct sock {struct sk_buff *sk_send_head;struct rb_root tcp_rtx_queue; }; -struct sk_buff *sk_tx_skb_cache;struct sk_buff_head sk_write_queue;__s32 sk_peek_off;int sk_write_pending;
@@ -1555,18 +1551,10 @@ static inline void sk_mem_uncharge(struct sock *sk, int size)__sk_mem_reclaim (sk,1 <<20 ); } -DECLARE_STATIC_KEY_FALSE (tcp_tx_skb_cache_key);static inline void sk_wmem_free_skb (struct sock *sk,struct sk_buff *skb) {sk_wmem_queued_add (sk, -skb->truesize);sk_mem_uncharge (sk, skb->truesize); -if (static_branch_unlikely (&tcp_tx_skb_cache_key) && - !sk->sk_tx_skb_cache && !skb_cloned (skb)) { -skb_ext_reset (skb); -skb_zcopy_clear (skb, true); - sk->sk_tx_skb_cache = skb; -return ; - }__kfree_skb (skb); }
@@ -2575,7 +2563,6 @@ static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags) &skb_shinfo(skb)->tskey); } -DECLARE_STATIC_KEY_FALSE (tcp_rx_skb_cache_key);/** * sk_eat_skb - Release a skb if it is no longer needed * @sk: socket to eat this skb from
@@ -2587,12 +2574,6 @@ DECLARE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key);static inline void sk_eat_skb (struct sock *sk,struct sk_buff *skb) {__skb_unlink (skb, &sk->sk_receive_queue); -if (static_branch_unlikely (&tcp_rx_skb_cache_key) && - !sk->sk_rx_skb_cache) { - sk->sk_rx_skb_cache = skb; -skb_orphan (skb); -return ; - }__kfree_skb (skb); }
net/ipv4/af_inet.c +0 -4
@@ -133,10 +133,6 @@ void inet_sock_destruct(struct sock *sk)struct inet_sock *inet =inet_sk (sk);__skb_queue_purge (&sk->sk_receive_queue); -if (sk->sk_rx_skb_cache) { -__kfree_skb (sk->sk_rx_skb_cache); - sk->sk_rx_skb_cache =NULL ; - }__skb_queue_purge (&sk->sk_error_queue);sk_mem_reclaim (sk);
net/ipv4/sysctl_net_ipv4.c +0 -12
@@ -594,18 +594,6 @@ static struct ctl_table ipv4_table[] = { .extra1 = &sysctl_fib_sync_mem_min, .extra2 = &sysctl_fib_sync_mem_max, }, - { - .procname = "tcp_rx_skb_cache", - .data = &tcp_rx_skb_cache_key.key, - .mode = 0644, - .proc_handler = proc_do_static_key, - }, - { - .procname = "tcp_tx_skb_cache", - .data = &tcp_tx_skb_cache_key.key, - .mode = 0644, - .proc_handler = proc_do_static_key, - }, { } };
net/ipv4/tcp.c +0 -26
@@ -325,11 +325,6 @@ struct tcp_splice_state {unsigned long tcp_memory_pressure__read_mostly ;EXPORT_SYMBOL_GPL (tcp_memory_pressure); -DEFINE_STATIC_KEY_FALSE (tcp_rx_skb_cache_key); -EXPORT_SYMBOL (tcp_rx_skb_cache_key); - -DEFINE_STATIC_KEY_FALSE (tcp_tx_skb_cache_key); -void tcp_enter_memory_pressure (struct sock *sk) {unsigned long val;
@@ -866,18 +861,6 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp, {struct sk_buff *skb; -if (likely (!size)) { - skb = sk->sk_tx_skb_cache; -if (skb) { - skb->truesize =SKB_TRUESIZE (skb_end_offset (skb)); - sk->sk_tx_skb_cache =NULL ; -pskb_trim (skb,0 ); -INIT_LIST_HEAD (&skb->tcp_tsorted_anchor); -skb_shinfo (skb)->tx_flags =0 ; -memset (TCP_SKB_CB (skb),0 ,sizeof (struct tcp_skb_cb )); -return skb; - } - }/* The TCP header must be at least 32-bit aligned. */ size =ALIGN (size,4 );
@@ -2920,11 +2903,6 @@ void tcp_write_queue_purge(struct sock *sk)sk_wmem_free_skb (sk, skb); }tcp_rtx_queue_purge (sk); - skb = sk->sk_tx_skb_cache; -if (skb) { -__kfree_skb (skb); - sk->sk_tx_skb_cache =NULL ; - }INIT_LIST_HEAD (&tcp_sk (sk)->tsorted_sent_queue);sk_mem_reclaim (sk);tcp_clear_all_retrans_hints (tcp_sk (sk));
@@ -2961,10 +2939,6 @@ int tcp_disconnect(struct sock *sk, int flags)tcp_clear_xmit_timers (sk);__skb_queue_purge (&sk->sk_receive_queue); -if (sk->sk_rx_skb_cache) { -__kfree_skb (sk->sk_rx_skb_cache); - sk->sk_rx_skb_cache =NULL ; - }WRITE_ONCE (tp->copied_seq, tp->rcv_nxt); tp->urg_data =0 ;tcp_write_queue_purge (sk);
net/ipv4/tcp_ipv4.c +0 -6
@@ -1941,7 +1941,6 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph,int tcp_v4_rcv (struct sk_buff *skb) {struct net *net =dev_net (skb->dev); -struct sk_buff *skb_to_free;int sdif =inet_sdif (skb);int dif =inet_iif (skb);const struct iphdr *iph;
@@ -2082,17 +2081,12 @@ int tcp_v4_rcv(struct sk_buff *skb)tcp_segs_in (tcp_sk (sk), skb); ret =0 ;if (!sock_owned_by_user (sk)) { - skb_to_free = sk->sk_rx_skb_cache; - sk->sk_rx_skb_cache =NULL ; ret =tcp_v4_do_rcv (sk, skb); }else {if (tcp_add_backlog (sk, skb)) goto discard_and_relse; - skb_to_free =NULL ; }bh_unlock_sock (sk); -if (skb_to_free) -__kfree_skb (skb_to_free); put_and_return:if (refcounted)
net/ipv6/tcp_ipv6.c +0 -6
@@ -1618,7 +1618,6 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr, INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) { -struct sk_buff *skb_to_free;int sdif =inet6_sdif (skb);int dif =inet6_iif (skb);const struct tcphdr *th;
@@ -1754,17 +1753,12 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)tcp_segs_in (tcp_sk (sk), skb); ret =0 ;if (!sock_owned_by_user (sk)) { - skb_to_free = sk->sk_rx_skb_cache; - sk->sk_rx_skb_cache =NULL ; ret =tcp_v6_do_rcv (sk, skb); }else {if (tcp_add_backlog (sk, skb)) goto discard_and_relse; - skb_to_free =NULL ; }bh_unlock_sock (sk); -if (skb_to_free) -__kfree_skb (skb_to_free); put_and_return:if (refcounted)sock_put (sk);
Signature · 1 line
2.26.3
Re: [PATCH net-next 1/4] tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers
In reply to Paolo AbeniQuoted 11 lines · Paolo Abeni
the
tcp_skb_entail()helper is actuallyskb_entail(), renamed to provide proper scope.The two helper will be used by the next patch.
RFC -> v1:
- renameskb_entailtotcp_skb_entail(Eric)Acked-by Mat Martineau <[email protected]>Signed-off-by Paolo Abeni <[email protected]>---
Re: [PATCH net-next 3/4] tcp: make tcp_build_frag() static
In reply to Paolo AbeniQuoted 8 lines · Paolo Abeni
After the previous patch the mentioned helper is
used only inside its compilation unit: let's make
it static.RFC -> v1:
- preserve thetcp_build_frag()helper (Eric)Signed-off-by Paolo Abeni <[email protected]>
Thanks !
Re: [PATCH net-next 4/4] tcp: remove sk_{tr}x_skb_cache
In reply to Paolo AbeniQuoted 14 lines · Paolo Abeni
From: Eric Dumazet <[email protected]>
This reverts the following patches :
- commit
2e05fcae83c4("tcp: fix compile error if !CONFIG_SYSCTL")
- commit4f661542a402("tcp: fix zerocopy andnotsent_lowatissues")
- commit472c2e07eef0("tcp: add one skb cache for tx")
- commit8b27dae5a2e8("tcp: add one skb cache for rx")Having a cache of one skb (in each direction) per TCP socket is fragile, since it can cause a significant increase of memory needs, and not good enough for high speed flows anyway where more than one skb is needed.
Quoted 7 lines
We want instead to add a generic infrastructure, with more flexible per-cpu caches, for alien NUMA nodes.
Acked-by Paolo Abeni <[email protected]>Acked-by Mat Martineau <[email protected]>Signed-off-by Eric Dumazet <[email protected]>---
Thanks Paolo for taking care of MPTCP bits.
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 22 Sep 2021 19:26:39 +0200 you wrote:
Eric noted we would be better off reverting the sk skb caches.
MPTCP relies on such a feature, so we need a little refactor of the MPTCP tx path before the mentioned revert.
[...]
Here is the summary with links:
- [net-next,1/4] tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers
https://git.kernel.org/netdev/net-next/c/04d8825c30b7 - [net-next,2/4] mptcp: stop relying on tcp_tx_skb_cache https://git.kernel.org/netdev/net-next/c/f70cad1085d1 - [net-next,3/4] tcp: make tcp_build_frag() static https://git.kernel.org/netdev/net-next/c/ff6fb083a07f - [net-next,4/4] tcp: remove sk_{tr}x_skb_cache https://git.kernel.org/netdev/net-next/c/d8b81175e412
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html