From patchwork Tue Jul 17 00:55:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 944631 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="I5dpBzYy"; 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 41V24P1Zjxz9ryt for ; Tue, 17 Jul 2018 10:59:47 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A2CABBAC; Tue, 17 Jul 2018 00:59:43 +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 2578B2D for ; Tue, 17 Jul 2018 00:59:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BDC07163 for ; Tue, 17 Jul 2018 00:59:41 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id p23-v6so8046911pgv.13 for ; Mon, 16 Jul 2018 17:59:41 -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=ZLdZaM0TkeYbfLUZgC8dpmlCM7x5HVPZgcz0+O3jeKo=; b=I5dpBzYyDqt66/8z0izsBGc8gtior5O/KLrYZUXryV4+uHLdNZSWNKmbe5buusEGxi fe1Z/bRtvgKtnu+QIvBmk/2TmO6VSXWkRblb3HnUAMbvKJEMqp2RH03zM93MVD9aSoNU C544cgRJtmlHHlmvydAXt/SB7FQtgMlUTyGXjXS/xOUPhQSk2t99bShgL2rtYtRyOrsc pGEC4NfGt9T/4w+BLTOcAXlD3oV8bLnsMrTd0TvnK5h/F7+P2dSTCLZVhGFZaPEPm2ef UYf6EeA6mzh7aSAaZpCUvF8qaS2/V3FtN3XLyubmT3dQHJ0jqODz20LfFpElSSzlRX0s GXIQ== 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=ZLdZaM0TkeYbfLUZgC8dpmlCM7x5HVPZgcz0+O3jeKo=; b=mXhOOcrxhixRMTsZTqqOA3YlSkDurzRcr0a+emkw6B+hQNxYk0oTN7njo35kTNGaI6 pyumFj3TJZ5iH/NYF7JsZZ/WmjiHHFG/p/Zy8ETIXTEEhhnvmq8MVy/On3mHarzfsoQr KOrvVkwDtiZJVnJ4AKjCffuvzJT6htM1QAvudkFd3ps4wcLsisgDzDGrS+f27RhODKJt aXjYlIibVShkFdNFWBE3g+B8hOS1cxVmvgeDQmxLW2pQCe6H4HYFFHR7Pn1SyLq+Rfm6 PpMUCNSD9hWtRZlNYycnlaoNptDm7reX9Am0v3TRSaRsL/eSQDLSsmwdtg5L8KNbAXrs gyTA== X-Gm-Message-State: AOUpUlE8H77VPAV6kOmn4zMWaDs+lcw61E6yKlWeZGTYTiWhESqGnAXq IC22rGEiPcb5P7QBKsAwJplTl6kO X-Google-Smtp-Source: AAOMgpc7XqAXH3tQLxY8nCyD8MS7raKUTCDtaBcCBwrv8Ff0KVFalZM4wiOj84U34tf11E1Z3511zw== X-Received: by 2002:a63:2fc6:: with SMTP id v189-v6mr17370828pgv.61.1531789180518; Mon, 16 Jul 2018 17:59:40 -0700 (PDT) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id x2-v6sm69932461pfi.166.2018.07.16.17.59.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jul 2018 17:59:39 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Mon, 16 Jul 2018 17:55:57 -0700 Message-Id: <1531788961-46115-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 0/4] Kernel backports from net-next 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 patch series backports the following patches from net-next that modify ./net/openvswitch/* from the previous backport commit, 46e371f0 ("openvswitch: fix vport packet length check."). 1) b2d6cee1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2) 72f17baf openvswitch: Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found 3) 2eb0f624 netfilter: add NAT support for shifted portmap ranges 4) ec9c7809 ovs: Remove rtnl_lock() from ovs_exit_net() 5) f0b07bb1 net: Introduce net_rwsem to protect net_namespace_list 6) 2f635cee net: Drop pernet_operations::async 7) 03fe2deb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 8) ec716650 net: Convert ovs_net_ops 9) ddc502df openvswitch: meter: fix the incorrect calculation of max delta_t Patch 1 and 7 are merge commit, so they are ignored in the backport. Patch 4 and 5 are squashed into one patch since they are logically related. Patch 6 and 8 cancel out each other so they do not show up in this series. The next patch 11efd5cb ("openvswitch: Support conntrack zone limit") has some external dependency on netfilter backend (nf_conncount), I will start to backport it that once the nf_conncount backend optimization patch series are upstream. I tested the build on CentOS 7.2, 7.3, RHEL 7.4, 7.5, Ubuntu 14.04, 16.04 and 18.04. It also passes the travis CI: https://travis-ci.org/YiHungWei/ovs/builds/404672382 Stefano Brivio (1): datapath: Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found Yi-Hung Wei (2): datapath: Introduce net_rwsem and remove rtnl_lock() datapath: NAT support for shifted portmap ranges zhangliping (1): datapath: meter: fix the incorrect calculation of max delta_t acinclude.m4 | 2 ++ datapath/conntrack.c | 8 ++++++-- datapath/datapath.c | 8 ++++++++ datapath/flow_netlink.c | 9 +++------ datapath/meter.c | 12 +++++++++--- 5 files changed, 28 insertions(+), 11 deletions(-)