[ovs-git] [openvswitch/ovs] c8f9e6: datapath: Fix kernel-4.3 build.

[GitHub]

  Branch: refs/heads/branch-2.5
  Home:   https://github.com/openvswitch/ovs
  Commit: c8f9e6b9613f43453e629bd782b8230e2f6a8730
      https://github.com/openvswitch/ovs/commit/c8f9e6b9613f43453e629bd782b8230e2f6a8730
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M datapath/linux/compat/include/net/ip.h

  Log Message:
  -----------
  datapath: Fix kernel-4.3 build.

Commit 792e5ed750ce ("datapath: inet: frag: Always orphan skbs inside
ip_defrag().") broke the build for OVS backport against kernel-4.3. Fix
the build.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


  Commit: ed04577298f8383b1aa934a0f942758fcb8e043f
      https://github.com/openvswitch/ovs/commit/ed04577298f8383b1aa934a0f942758fcb8e043f
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M datapath/linux/compat/ip_fragment.c
    M datapath/linux/compat/nf_conntrack_reasm.c

  Log Message:
  -----------
  compat: Rename OVS frag caches.

These should not have the same name as the upstream ones, to reduce
confusion when they are created. Rename them.

Suggested-by: Pravin B Shelar <pshelar at ovn.org>
Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


  Commit: 4011d1bb2ff0811e65e7ffeb3e39c4f16ccf5df2
      https://github.com/openvswitch/ovs/commit/4011d1bb2ff0811e65e7ffeb3e39c4f16ccf5df2
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/include/net/inet_frag.h
    M datapath/linux/compat/inet_fragment.c
    M datapath/linux/compat/ip_fragment.c

  Log Message:
  -----------
  compat: Detect and use inet_frag_queue->list_evictor.

Kernels 3.17 to 4.2 have a work queue to evict old fragments, but do not
track these fragments in an eviction list. On these kernels, we detect
the absence of the list_evictor and provide one. This commit fixes the
reliance on kernel versions in the case that this functionality is
backported.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


  Commit: 5dea489f944a59ae3ea61da2237e744c2e5b9a99
      https://github.com/openvswitch/ovs/commit/5dea489f944a59ae3ea61da2237e744c2e5b9a99
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/include/net/inet_frag.h
    M datapath/linux/compat/include/net/ip.h
    M datapath/linux/compat/inet_fragment.c
    M datapath/linux/compat/ip_fragment.c

  Log Message:
  -----------
  compat: Detect and use upstream ip_fragment().

Previously a version check was used to determine whether the upstream
ip_fragment() should be used or the backported version. The actual test
is for whether upstream commit d6b915e29f4a ("ip_fragment: don't forward
defragmented DF packet") is present, so test for that instead.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


  Commit: 7ed09b002e26ae9c207df59e3a13a5d30d3ffb48
      https://github.com/openvswitch/ovs/commit/7ed09b002e26ae9c207df59e3a13a5d30d3ffb48
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M acinclude.m4

  Log Message:
  -----------
  datapath: Re-designate OVS_FRAGMENT_BACKPORT.

Typically the way that we include backported code is by testing for
existence of the feature in the upstream codebase via header checks,
then attempt to use the upstream code as much as possible. However, for
the IP fragmentation handling backport we have an additional constraint
which is that we cannot support kernels older than Linux-3.10.

To date, OVS_FRAGMENT_BACKPORT has been defined to include the backport
of the IP fragmentation code for all kernels from 3.10 to 4.2, rather
than attempting to use the upstream code as much as possible. This patch
relaxes OVS_FRAGMENT_BACKPORT to only check the lower bound so that the
upstream code may be used in more circumstances.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


  Commit: 010ce67c211a30c4b1a3906666b700ec5dbaf678
      https://github.com/openvswitch/ovs/commit/010ce67c211a30c4b1a3906666b700ec5dbaf678
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: Update kernel matrix.

Remove v4.2 as it is EOL; Add v4.3 as we support this version in
OVS-2.5. Update other versions to the latest listed on kernel.org.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/6f03695d7c65...010ce67c211a