Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9E73C282E3 for ; Thu, 25 Apr 2019 08:13:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3579214AE for ; Thu, 25 Apr 2019 08:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729013AbfDYINS (ORCPT ); Thu, 25 Apr 2019 04:13:18 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:40050 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725988AbfDYINR (ORCPT ); Thu, 25 Apr 2019 04:13:17 -0400 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id 19296184E0; Thu, 25 Apr 2019 10:13:14 +0200 (CEST) X-Axis-User: NO X-Axis-NonUser: YES X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id UcwsVbBlyY_X; Thu, 25 Apr 2019 10:13:13 +0200 (CEST) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id A95261853E; Thu, 25 Apr 2019 10:13:12 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 780261A06F; Thu, 25 Apr 2019 10:13:12 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6BF951A067; Thu, 25 Apr 2019 10:13:12 +0200 (CEST) Received: from seth.se.axis.com (unknown [10.0.2.172]) by boulder02.se.axis.com (Postfix) with ESMTP; Thu, 25 Apr 2019 10:13:12 +0200 (CEST) Received: from XBOX04.axis.com (xbox04.axis.com [10.0.5.18]) by seth.se.axis.com (Postfix) with ESMTP id 5F3DD1CDB; Thu, 25 Apr 2019 10:13:12 +0200 (CEST) Received: from [10.88.129.17] (10.0.5.60) by XBOX04.axis.com (10.0.5.18) with Microsoft SMTP Server (TLS) id 15.0.1365.1; Thu, 25 Apr 2019 10:13:12 +0200 Subject: Re: [PATCH 4.14 stable v2 0/5] net: ip6 defrag: backport fixes To: Peter Oskolkov , Greg Kroah-Hartman , , CC: Peter Oskolkov , David Miller , Eric Dumazet , Sasha Levin , Captain Wiggum , Lars Persson References: <20190423174825.24810-1-posk@google.com> From: Lars Persson Message-ID: <7694242a-7f31-e7fe-1cd8-483ea529d1cf@axis.com> Date: Thu, 25 Apr 2019 10:13:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190423174825.24810-1-posk@google.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: XBOX03.axis.com (10.0.5.17) To XBOX04.axis.com (10.0.5.18) X-TM-AS-GCONF: 00 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 4/23/19 7:48 PM, Peter Oskolkov wrote: > Lars Persson reported that a label was unused in > the previous version of this patchset, so I'm sending a v2 that fixes it. > > Sorry for the mess/v2. > > v2 changes: handle overlapping fragments the way it is done upstream. > > 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 | 302 +++--------------- > net/ipv6/netfilter/nf_conntrack_reasm.c | 279 +++++------------ > net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 3 +- > net/ipv6/reassembly.c | 364 ++++++---------------- > net/openvswitch/conntrack.c | 1 + > 10 files changed, 627 insertions(+), 773 deletions(-) > create mode 100644 include/net/ipv6_frag.h > Hi Our QA ran this with the IOL INTACT test suite and they give thumbs up. Tested-by: Lars Persson - Lars