From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 CA776C10F11 for ; Mon, 22 Apr 2019 22:29:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EE75204EC for ; Mon, 22 Apr 2019 22:29:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BLhkBfob" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729062AbfDVW3f (ORCPT ); Mon, 22 Apr 2019 18:29:35 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:43059 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729047AbfDVW3f (ORCPT ); Mon, 22 Apr 2019 18:29:35 -0400 Received: by mail-qk1-f202.google.com with SMTP id m8so11610169qka.10 for ; Mon, 22 Apr 2019 15:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=VjZSoLfAPVa7uWnYKXkG6ehfRXcTB82TYFY1tnSg7Hc=; b=BLhkBfobl91bBTdnow5N16fKigU8qS6jRkuD4knpdjYiLIt9BdIskp2U4zkUiSPx76 DUSl9S7l5T092tyFWIBBxm2vIq/MseCKJKPvTUAEfT9QCCfZ5HssP7UU2AQt2bCmq3mU GBr24dflGu60OTuHsaZ09iTV/e3VzjDrFUVjEsWS7/QpP3DR8X9mwWBrIYrAe64Yx1xp XVeecgBZCl5/7fMprZ5WHFjmYFexuQQeNfjwiXPpaYncZ63+jEj4AJLdV4jd2UuX7c2e WgrWiVlRoOCUj+Z9LRjf+OlklY2Pt19D4YHXquwjWYmJS0N20s7o6S9kF1XWE4P/TA7F j0tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=VjZSoLfAPVa7uWnYKXkG6ehfRXcTB82TYFY1tnSg7Hc=; b=szrZZEqs4l+t/n46+OojltVDFIB1JyAXaypnBxnxJvzxo9oVof29X0XFevpnsOsdGB N7CvsyZx03rFVMKP1+sASytYxhiq8gGOJ20QSdN0fda/ZdEnF9sX5go1vtn9sYHNXct3 gEb2ob4aVDaCfWeTUS5t+d/aAwrIlxwl1jwf4sZ9I/08RcQbzSf6U6x8/9nAkUKKAwF/ 71oBKDvTO8RCSrRhTy+fKWoo0TU2+YKI6a5kS8aXpNinkCCXy1i4mEl5dljySJk5/wyL yZiO3TScGHt4k7NGQoF6z2FCtVP5LFNjufD8TVbj1FdpMe1r5LTSGVx4TAcmidbg1Dvf wyQA== X-Gm-Message-State: APjAAAUkWrlca+4oLlQ+Qsoz/ynrS45KYxT+ZpatLD36WTdDexEJY+Lq Qb9jmlEoXRmtvAWat0NswMHFt07W X-Google-Smtp-Source: APXvYqxsq9eAhFnox9TzkSJqsfhRo2f+cTP9VCg6LykriKCL5C2auKDAJG1PhgYcOUOhcUSQSFaVqgIq X-Received: by 2002:ac8:7514:: with SMTP id u20mr14262502qtq.81.1555972174791; Mon, 22 Apr 2019 15:29:34 -0700 (PDT) Date: Mon, 22 Apr 2019 15:29:25 -0700 Message-Id: <20190422222930.195053-1-posk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH 4.14 stable 0/5] net: ip6 defrag: backport fixes From: Peter Oskolkov To: Greg Kroah-Hartman , stable@vger.kernel.org, netdev@vger.kernel.org Cc: Peter Oskolkov , David Miller , Eric Dumazet , Sasha Levin , Captain Wiggum , Peter Oskolkov Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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