Skip to content

net: remove sk skb caches

Paolo Abeni mptcp netdev 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (refs/heads/master):

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 3 repliesApplied 4/4

Changes in v1 from the cover letter

- 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)

Patches in v1 All 4 applied

#Subject and filesSizeRepliesApplied
1/4tcp: expose the tcp_mark_push() and tcp_skb_entail() helpersinclude/net/tcp.h net/ipv4/tcp.c+6 -41 replyApplied
2/4mptcp: stop relying on tcp_tx_skb_cachenet/mptcp/protocol.c+77 -600 repliesApplied
3/4tcp: make tcp_build_frag() staticinclude/net/tcp.h net/ipv4/tcp.c+2 -41 replyApplied
4/4tcp: remove sk_{tr}x_skb_cacheDocumentation/networking/ip-sysctl.rst include/net/sock.h net/ipv4/af_inet.c +4 more+0 -811 replyApplied

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchMat MartineauPaolo AbeniEric Dumazet
1/4A-b R-b
2/4R-b
3/4R-b
4/4A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH net-next 0/4] 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:

https://patchwork.kernel.org/project/netdevbpf/patch/706c577fde04fbb8285c8fc078a2c6d0a4bf9564.1632309038.git.pabeni@redhat.com/

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