[ovs-dev] [PATCH] datapath: Add support for kernel 4.7

[Pravin B Shelar]

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
---
 .travis.yml            |  1 +
 .travis/linux-build.sh | 12 ++++++++++++
 FAQ.md                 |  2 +-
 NEWS                   |  2 +-
 acinclude.m4           |  4 ++--
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ae6a5b..9f967ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
   - BUILD_ENV="-m32" OPTS="--disable-ssl"
   - KERNEL=3.17.7 DPDK=1
   - KERNEL=3.17.7 DPDK=1 OPTS="--enable-shared"
+  - KERNEL=4.7.2
   - KERNEL=4.4.15
   - KERNEL=4.1.28
   - KERNEL=3.18.37
diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 1b3d43d..3bcec93 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -22,6 +22,18 @@ function install_kernel()
     cd linux-${1}
     make allmodconfig
 
+    # Cannot use CONFIG_KCOV: -fsanitize-coverage=trace-pc is not supported by compiler
+    sed -i 's/CONFIG_KCOV=y/CONFIG_KCOV=n/' .config
+
+    # stack validation depends on tools/objtool, but objtool does not compile on travis.
+    # It is giving following error.
+    #  >>> GEN      arch/x86/insn/inat-tables.c
+    #  >>> Semantic error at 40: Unknown imm opnd: AL
+    # So for now disable stack-validation for the build.
+
+    sed -i 's/CONFIG_STACK_VALIDATION=y/CONFIG_STACK_VALIDATION=n/' .config
+    make oldconfig
+
     # Older kernels do not include openvswitch
     if [ -d "net/openvswitch" ]; then
         make net/openvswitch/
diff --git a/FAQ.md b/FAQ.md
index f4fd55d..6d23443 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -172,7 +172,7 @@ A: The following table lists the Linux kernel versions against which the
 |    2.3.x     | 2.6.32 to 3.14
 |    2.4.x     | 2.6.32 to 4.0
 |    2.5.x     | 2.6.32 to 4.3
-|    2.6.x     | 3.10 to 4.6
+|    2.6.x     | 3.10 to 4.7
 
    Open vSwitch userspace should also work with the Linux kernel module
    built into Linux 3.3 and later.
diff --git a/NEWS b/NEWS
index 12788b6..280fc15 100644
--- a/NEWS
+++ b/NEWS
@@ -100,7 +100,7 @@ v2.6.0 - xx xxx xxxx
    - Datapath Linux kernel compatibility.
      * Dropped support for kernel older than 3.10.
      * Removed VLAN splinters feature.
-     * Datapath supports kernel upto 4.6.
+     * Datapath supports kernel upto 4.7.
    - Tunnels:
      * Flow based tunnel match and action can be used for IPv6 address using
        tun_ipv6_src, tun_ipv6_dst fields.
diff --git a/acinclude.m4 b/acinclude.m4
index 8857b81..353519d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     AC_MSG_RESULT([$kversion])
 
     if test "$version" -ge 4; then
-       if test "$version" = 4 && test "$patchlevel" -le 6; then
+       if test "$version" = 4 && test "$patchlevel" -le 7; then
           : # Linux 4.x
        else
-          AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.6.x is not supported (please refer to the FAQ for advice)])
+          AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.7.x is not supported (please refer to the FAQ for advice)])
        fi
     elif test "$version" = 3 && test "$patchlevel" -ge 10; then
        : # Linux 3.x
-- 
1.8.3.1