Skip to content

net: ip6 defrag: backport fixes

Peter Oskolkov netdev stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5ipv6: frags: fix a lockdep false positivenet/ipv6/reassembly.c+12 -110 replies
2/5net: IP defrag: encapsulate rbtree defrag code into callable functionsinclude/net/inet_frag.h net/ipv4/inet_fragment.c net/ipv4/ip_fragment.c+342 -2620 replies
3/5ipv6: remove dependency of nf_defrag_ipv6 on ipv6 moduleinclude/net/ipv6.h include/net/ipv6_frag.h net/ieee802154/6lowpan/reassembly.c +4 more+126 -1220 replies
4/5net: IP6 defrag: use rbtrees for IPv6 defraginclude/net/ipv6_frag.h net/ipv6/reassembly.c+81 -1760 replies
5/5net: IP6 defrag: use rbtrees in nf_conntrack_reasm.cnet/ipv6/netfilter/nf_conntrack_reasm.c+72 -1840 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 4.9 stable 0/5] net: ip6 defrag: backport fixes

This is a backport of a 5.1rc patchset:
https://patchwork.ozlabs.org/cover/1029418/

Which was backported into 4.19:
https://patchwork.ozlabs.org/cover/1081619/

and into 4.14:
https://patchwork.ozlabs.org/cover/1089651/

This 4.9 patchset is very close to the 4.14 patchset above (cherry-picks from 4.14 were almost clean).

Eric Dumazet (1):
ipv6: frags: fix a lockdep false positive

Florian Westphal (1):
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module

Peter Oskolkov (3):
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

 include/net/inet_frag.h                   |  16 +-
 include/net/ipv6.h                        |  29 --
 include/net/ipv6_frag.h                   | 111 +++++++
 net/ieee802154/6lowpan/reassembly.c       |   2 +-
 net/ipv4/inet_fragment.c                  | 293 ++++++++++++++++++
 net/ipv4/ip_fragment.c                    | 295 +++---------------
 net/ipv6/netfilter/nf_conntrack_reasm.c   | 273 +++++-----------
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c |   3 +-
 net/ipv6/reassembly.c                     | 361 ++++++----------------
 net/openvswitch/conntrack.c               |   1 +
 10 files changed, 631 insertions(+), 753 deletions(-)
 create mode 100644 include/net/ipv6_frag.h
Signature · 1 line
2.21.0.593.g511ec345e18-goog