Skip to content

Commit

Permalink
datapath: Add support for kernel 4.18.x
Browse files Browse the repository at this point in the history
No code changing is necessary to support 4.18.x.

Only one kernel test failed and it is in the process of being fixed.

Updated .travis.yml to include 4.18.x and also use latest 4.17 version.
Updated test files to test 4.18 kernel.

Tested-by: Greg Rose <[email protected]>
Reviewed-by: Greg Rose <[email protected]>
Signed-off-by: Yifeng Sun <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
  • Loading branch information
yifsun authored and blp committed Feb 4, 2019
1 parent 7c5793e commit 7c84d7f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ env:
- KERNEL=3.16.54 TESTSUITE=1 DPDK=1
- KERNEL=3.16.54 DPDK_SHARED=1
- KERNEL=3.16.54 DPDK_SHARED=1 OPTS="--enable-shared"
- KERNEL=4.17.14
- KERNEL=4.18.20
- KERNEL=4.17.19
- KERNEL=4.16.18
- KERNEL=4.15.18
- KERNEL=4.14.63
Expand Down
1 change: 1 addition & 0 deletions Documentation/faq/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Q: What Linux kernel versions does each Open vSwitch release work with?
2.8.x 3.10 to 4.12
2.9.x 3.10 to 4.13
2.10.x 3.10 to 4.17
2.11.x 3.10 to 4.18
============ ==============

Open vSwitch userspace should also work with the Linux kernel module built
Expand Down
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ v2.11.0 - xx xxx xxxx
- RHEL packaging:
* OVN packages are split from OVS packages. A new spec
file - ovn-fedora.spec.in is added to generate OVN packages.

- Linux datapath:
* Support for the kernel versions 4.18.x

v2.10.0 - 18 Aug 2018
---------------------
Expand Down
4 changes: 2 additions & 2 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
AC_MSG_RESULT([$kversion])
if test "$version" -ge 4; then
if test "$version" = 4 && test "$patchlevel" -le 17; then
if test "$version" = 4 && test "$patchlevel" -le 18; then
: # Linux 4.x
else
AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.17.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.18.x is not supported (please refer to the FAQ for advice)])
fi
elif test "$version" = 3 && test "$patchlevel" -ge 10; then
: # Linux 3.x
Expand Down
12 changes: 6 additions & 6 deletions tests/system-traffic.at
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over gre tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)

OVS_TRAFFIC_VSWITCHD_START()
AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"])
Expand Down Expand Up @@ -667,7 +667,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over erspan v1 tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)

OVS_TRAFFIC_VSWITCHD_START()
AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"])
Expand Down Expand Up @@ -719,7 +719,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over erspan v2 tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)

OVS_TRAFFIC_VSWITCHD_START()
AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"])
Expand Down Expand Up @@ -772,7 +772,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over ip6erspan v1 tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)

OVS_TRAFFIC_VSWITCHD_START()
AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"])
Expand Down Expand Up @@ -827,7 +827,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over ip6erspan v2 tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)

OVS_TRAFFIC_VSWITCHD_START()
AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"])
Expand Down Expand Up @@ -1066,7 +1066,7 @@ dnl ns1: connect to br0, with IP:10.1.1.2
dnl br-underlay: with IP: 172.31.1.100
dnl ns0: connect to br-underlay, with IP: 10.1.1.1
AT_SETUP([datapath - truncate and output to gre tunnel by simulated packets])
OVS_CHECK_KERNEL(3, 10, 4, 17)
OVS_CHECK_KERNEL(3, 10, 4, 18)
AT_SKIP_IF([test $HAVE_NC = no])
OVS_TRAFFIC_VSWITCHD_START()

Expand Down

0 comments on commit 7c84d7f

Please sign in to comment.