From patchwork Tue Oct 15 17:27:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 1177246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V78+FKFW"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46t2jm4RBVz9sPV for ; Wed, 16 Oct 2019 04:39:24 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A4C57E91; Tue, 15 Oct 2019 17:39:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 85422E7C for ; Tue, 15 Oct 2019 17:39:18 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 373B76C5 for ; Tue, 15 Oct 2019 17:39:18 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id e15so4556187pgu.13 for ; Tue, 15 Oct 2019 10:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uXOKl7c3kQpAMa3k0+2W2NDREocOpwCrGvTu72v9ki0=; b=V78+FKFWv3tPxdhp9UZS9lbnXIEzui5UUgRaYbtKZyOu+BVWKHDbCNvH9gu7bWF+8t PnCzPENuchJFtA2VNaapeYHORlO6x+K+7FFoBWo/NdsSfATBtJ58Surui6I8BOBi4eb+ n6Cc5BbA39ZZrFy7Hu+Xj7Jh1PHJqLbLHm2sxZmV9oe/AAnIEnrVFt0+ZbDOOuSqJARi YVdyo6d66C5gYea0isrSREqGJ8bnTaZw9KyDrZUQtzp9ZwZR8csZzdqkwzeR2Xbn6f54 W+T1lh1kupzv7dSSKSM3400zmlMiPHx3efvDny6J6PSqqewPpjPDCJzs4Q0uNDlChYto F9FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uXOKl7c3kQpAMa3k0+2W2NDREocOpwCrGvTu72v9ki0=; b=CbUD5qt8SIUB5f52QKwCEu5QW1qMkqmB9IxBS8Xn9/9ggoWGiHxHM0NHN/jGSD7My9 82Sw/FR+s3XIcdHIWRFopiu+Y4DwtmA5/VjL8NOHH2fQ15wM3DjcSMZyM4EQBlMd/hE2 BCSa3gwRfAKGlF3y2sbor5h5dWWMc3bQ2KMFukp241L0fvuN93P7pt8mkERJ0eJdQq1B H9fQUmDiv+GOFmaDvzYlWKrL/sI8ej49vK7fPcIPgULBxThKUIPNVDDq+ZDikwQOE+eW Cl4O9lY6VCuZYrHuhdiS0dydjEkatM2BRcWEuASjSs0vRqoqA2Ic5P0KAAIoI5BwNnLL XgmQ== X-Gm-Message-State: APjAAAV4DdbAFIn824LKa4/1NqX6JcN5nprXTijKBK4hay9Jh1XRU3tv RMdmvLOkSsfwaJ/5nAzJYxePyyMZYQk= X-Google-Smtp-Source: APXvYqwZQrfmfcWzcm4zQwr3OR2jviQTObOdkWn4NVdu5YrZhz2P+kgRab3OXCo4mSHGGXU/Mf9WsQ== X-Received: by 2002:a62:4d04:: with SMTP id a4mr39617877pfb.60.1571161157168; Tue, 15 Oct 2019 10:39:17 -0700 (PDT) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id q204sm25590311pfc.11.2019.10.15.10.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Oct 2019 10:39:16 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Tue, 15 Oct 2019 10:27:41 -0700 Message-Id: <1571160473-46132-1-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 00/12] Backport upstream conntrack related patches X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This series backports conntrack related patches from upstream kernel. It has been tested on * Ubuntu 14.04, 16.04, and 18.04. * RHEL 7.4-7.6. * 5.0 kernel. Travis test: https://travis-ci.org/YiHungWei/ovs/builds/596361660 v1->v2: - Fix commit message in one patch as noted by Yifeng. - Add one more upstream patch ("datapath: Fix linking without CONFIG_NF_CONNTRACK_LABELS") Arnd Bergmann (1): datapath: Fix linking without CONFIG_NF_CONNTRACK_LABELS Colin Ian King (1): datapath: Check for null pointer return from nla_nest_start_noflag Flavio Leitner (1): datapath: add seqadj extension when NAT is used. Yi-Hung Wei (9): datapath: Replace nf_ct_invert_tuplepr() with nf_ct_invert_tuple() datapath: Detect upstream nf_nat change datapath: Handle NF_NAT_NEEDED replacement datapath: Use nla_nest_start_noflag() datapath: genetlink: optionally validate strictly/dumps datapath: Load and reference the NAT helper. datapath: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT) datapath: Fix log message in ovs conntrack datapath: Allow attaching helper in later commit acinclude.m4 | 11 ++ datapath/conntrack.c | 118 ++++++++++++++++----- datapath/datapath.c | 46 +++++++- datapath/flow_netlink.c | 33 +++--- .../include/net/netfilter/nf_conntrack_core.h | 14 +++ .../include/net/netfilter/nf_conntrack_helper.h | 17 +++ datapath/linux/compat/include/net/netlink.h | 9 ++ datapath/meter.c | 20 +++- datapath/vport-vxlan.c | 2 +- datapath/vport.c | 2 +- 10 files changed, 218 insertions(+), 54 deletions(-)