Skip to content

Commit

Permalink
datapath: Add support for kernel 4.7
Browse files Browse the repository at this point in the history
Signed-off-by: Pravin B Shelar <[email protected]>
Acked-by: Jesse Gross <[email protected]>
  • Loading branch information
pshelar committed Aug 22, 2016
1 parent c132fca commit c3cbb28
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions .travis/linux-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c3cbb28

Please sign in to comment.