On Fri, Apr 26, 2019 at 8:41 AM Peter Oskolkov <posk@xxxxxxxxxx> wrote: > > 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). FYI: I have a patchset that backports these into 4.4, but things got much hairier there, as I needed to backport three additional netfilter patches. So I'm not going to send the patchset to the lists unless there is a real need and somebody with enough knowledge of netfitler volunteers to review/test it (I tested that IP defrag works, but there are netfilter-related pieces that I understand little about). > > > 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 > > -- > 2.21.0.593.g511ec345e18-goog >
