From: Peter Oskolkov <posk@google.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, netdev@vger.kernel.org
Cc: Peter Oskolkov <posk@posk.io>, David Miller <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Sasha Levin <sashal@kernel.org>,
Captain Wiggum <captwiggum@gmail.com>,
Peter Oskolkov <posk@google.com>
Subject: [PATCH 4.14 stable 0/5] net: ip6 defrag: backport fixes
Date: Mon, 22 Apr 2019 15:29:25 -0700 [thread overview]
Message-ID: <20190422222930.195053-1-posk@google.com> (raw)
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/
I had to backport two additional patches into 4.14 to make it work.
John Masinter (captwiggum), could you, please, confirm that this
patchset fixes TAHI tests? (I'm reasonably certain that it does, as
I ran ip_defrag selftest, but given the amount of changes here,
another set of completed tests would be nice to have).
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 | 290 ++----------------
net/ipv6/netfilter/nf_conntrack_reasm.c | 279 +++++------------
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 3 +-
net/ipv6/reassembly.c | 357 +++++-----------------
net/openvswitch/conntrack.c | 1 +
10 files changed, 616 insertions(+), 765 deletions(-)
create mode 100644 include/net/ipv6_frag.h
--
2.21.0.593.g511ec345e18-goog
next reply other threads:[~2019-04-22 22:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 22:29 Peter Oskolkov [this message]
2019-04-22 22:29 ` [PATCH 4.14 stable 1/5] ipv6: frags: fix a lockdep false positive Peter Oskolkov
2019-04-22 22:29 ` [PATCH 4.14 stable 2/5] net: IP defrag: encapsulate rbtree defrag code into callable functions Peter Oskolkov
2019-04-23 12:07 ` Lars Persson
2019-04-23 16:09 ` Peter Oskolkov
2019-04-22 22:29 ` [PATCH 4.14 stable 3/5] ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module Peter Oskolkov
2019-04-22 22:29 ` [PATCH 4.14 stable 4/5] net: IP6 defrag: use rbtrees for IPv6 defrag Peter Oskolkov
2019-04-22 22:29 ` [PATCH 4.14 stable 5/5] net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c Peter Oskolkov
2019-04-28 0:14 ` [PATCH 4.14 stable 0/5] net: ip6 defrag: backport fixes Captain Wiggum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190422222930.195053-1-posk@google.com \
--to=posk@google.com \
--cc=captwiggum@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=netdev@vger.kernel.org \
--cc=posk@posk.io \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).