This series adds the conntrack NAT integration upstreamed in Linux 4.6 to the OVS tree kernel module. Main code is the same as upstream, backports are provided for Linux kernels 3.10 - 4.3. Code compiles on the latest release of each Linux version on this range. Linux 4.4 and 4.5 remain untested as OVS tree kernel module does not yet support them.
The backports are tested on linux-stable versions 4.3 and 4.1, and Ubuntu 14.04 with kernels 3.16.0-71-generic and 3.19.0-59-generic. I have retained the original Acks for patches that are simple "cherry-picks" from upstream patches. In some cases I have squashed in later bug fixes so that the end result is identical to the current net-next upstream. The patch that adds GCC 5 support for older kernels was used for compile-only testing. I have not tested installing kernels that did not compile with GCC 5 without this patch. Jarno Rajahalme (10): datapath: Remove NF_CT_NEW_REPLY datapath: Add commentary to conntrack.c datapath: Update the CT state key only after nf_conntrack_in(). datapath: Find existing conntrack entry after upcall. datapath: Handle NF_REPEAT in conntrack action. datapath: Delay conntrack helper call for new connections. datapath: Allow compiling older kernels with GCC 5. acinclude: Add OVS_FIND_PARAM_IFELSE. datapath: compat for NAT. datapath: Interface with NAT. acinclude.m4 | 48 +- datapath/conntrack.c | 667 +++++++++++++++++++-- datapath/conntrack.h | 3 +- datapath/linux/Modules.mk | 5 + .../linux/compat/include/linux/compiler-gcc5.h | 71 +++ .../linux/compat/include/linux/netfilter/nf_nat.h | 15 + .../include/net/netfilter/nf_conntrack_core.h | 28 +- .../include/net/netfilter/nf_conntrack_seqadj.h | 30 + .../linux/compat/include/net/netfilter/nf_nat.h | 44 ++ .../compat/include/net/netfilter/nf_nat_core.h | 88 +++ 10 files changed, 955 insertions(+), 44 deletions(-) create mode 100644 datapath/linux/compat/include/linux/compiler-gcc5.h create mode 100644 datapath/linux/compat/include/linux/netfilter/nf_nat.h create mode 100644 datapath/linux/compat/include/net/netfilter/nf_conntrack_seqadj.h create mode 100644 datapath/linux/compat/include/net/netfilter/nf_nat.h create mode 100644 datapath/linux/compat/include/net/netfilter/nf_nat_core.h -- 2.1.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
