| Message ID | 1531788961-46115-1-git-send-email-yihung.wei@gmail.com |
|---|---|
| Headers | show |
| Series | Kernel backports from net-next | expand |
> On Jul 16, 2018, at 5:55 PM, Yi-Hung Wei <yihung.wei@gmail.com> wrote: > > 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. Thank you for the doing these backports. I pushed these to master and branch-2.10. I also brought the "Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found" all the way back to 2.5. Thanks! --Justin
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(-)