Skip to content

net: IP defrag: use rbtrees in IPv6 defragmentation

Peter Oskolkov netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 8 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4net: IP defrag: encapsulate rbtree defrag code into callable functionsinclude/net/inet_frag.h net/ipv4/inet_fragment.c net/ipv4/ip_fragment.c+334 -2640 replies
2/4net: IP6 defrag: use rbtrees for IPv6 defraginclude/net/ipv6_frag.h net/ipv6/reassembly.c+71 -1736 replies
3/4net: IP6 defrag: use rbtrees in nf_conntrack_reasm.cnet/ipv6/netfilter/nf_conntrack_reasm.c+71 -1890 replies
4/4selftests: net: ip_defrag: cover new IPv6 defrag behaviortools/testing/selftests/net/ip_defrag.c tools/testing/selftests/net/ip_defrag.sh+51 -340 replies

Reviews trailers per patch

None of the 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEric Dumazet
SeriesR-b
1/4
2/4
3/4
4/4

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 0/4] net: IP defrag: use rbtrees in IPv6 defragmentation

Currently, IPv6 defragmentation code drops non-last fragments that are smaller than 1280 bytes: see
commit 0ed4229b08c1 ("ipv6: defrag: drop non-last frags smaller than min mtu")

This behavior is not specified in IPv6 RFCs and appears to break compatibility with some IPv6 implementations, as reported here:
https://www.spinics.net/lists/netdev/msg543846.html

This patchset contains four patches:
- patch 1 moves rbtree-related code from IPv4 to files shared b/w IPv4/IPv6
- patch 2 changes IPv6 defragmenation code to use rbtrees for defrag queue
- patch 3 changes nf_conntrack IPv6 defragmentation code to use rbtrees
- patch 4 changes ip_defrag selftest to test changes made in the previous three patches.

Along the way, the 1280-byte restrictions are removed.

I plan to introduce similar changes to 6lowpan defragmentation code once I figure out how to test it.

Peter Oskolkov (4):
net: IP defrag: encapsulate rbtree defrag code into callable functions
net: IP6 defrag: use rbtrees for IPv6 defrag
net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c
selftests: net: ip_defrag: cover new IPv6 defrag behavior

 include/net/inet_frag.h                  |  16 +-
 include/net/ipv6_frag.h                  |  11 +-
 net/ipv4/inet_fragment.c                 | 293 +++++++++++++++++++++++
 net/ipv4/ip_fragment.c                   | 289 +++-------------------
 net/ipv6/netfilter/nf_conntrack_reasm.c  | 260 ++++++--------------
 net/ipv6/reassembly.c                    | 233 +++++-------------
 tools/testing/selftests/net/ip_defrag.c  |  69 +++---
 tools/testing/selftests/net/ip_defrag.sh |  16 ++
 8 files changed, 527 insertions(+), 660 deletions(-)
Signature · 1 line
2.20.1.321.g9e740568ce-goog