From patchwork Mon Jun 10 23:43:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1113393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hkvt4JEK"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45N8sK3bmfz9sNC for ; Tue, 11 Jun 2019 09:45:57 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BD7C81203; Mon, 10 Jun 2019 23:43:33 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id A39B911E3 for ; Mon, 10 Jun 2019 23:43:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 14C50711 for ; Mon, 10 Jun 2019 23:43:30 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id h19so661352wme.0 for ; Mon, 10 Jun 2019 16:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XcyHgA5HJ0rbJ+VN04jKdBoo78zLCUYmzZ0ypfdWQU0=; b=hkvt4JEKq9m72ThZzvTuKhLtmkgoGHaPpoggZBeRG/PXVl220sttjUR4PWkdGNZQnd dqxRIhMAFTXhgaExR4LbeKLRQc8Pb4hVgk17DowkPfcsAd2MXxdgemDfIo3JskpsoNkx X4Y32qQShU0VDm8NGY8B8Oi31KVHTMc5vHJLpnI8IPXoElZCiH2ciPCMJMpNZz+fJ45W ZNEvotJC6RFguiH4OfPxHE5F8cb0E2DNPaUI0mCQJIEBw9KW72YrmAeMntwx6XaEkYhm 2C4UhTROQffCpsVS5Fa/Aznl/dTARtSSV7aGbV+vJvqJWwSxvOFhrliVhpulIro1J0Pi b7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XcyHgA5HJ0rbJ+VN04jKdBoo78zLCUYmzZ0ypfdWQU0=; b=jeinVJQc6K/cYohE2EVFL6qL+gLaAJolU5/r2V59XTsfWJs56TqOlzdj1n94nZ70Yv Lxg0Sy2u4jep4dFnd6Vc/S4zmiDp4iN5tD2tS662/BHTxhSlORR1AuRay5xKBUALQOQ+ P61Zqil7kl8IRkFMMteakaNgPqZnOBWkt44PeHBL31+86otF4gkbVFp/xAZvNb0WYMiL GdIpXp/B7ROWwWXk9n9R7ycU5zmrEVtW6zxcNRfQCoPuFptg6o6sHpbWssJHMthRK1Br Z7nOk3CKvI3WclZhATxzFeDcMU/e+l9AwsDCDLlh8CpPRltco2zZqcMLpiWQgkLzlFUR AQig== X-Gm-Message-State: APjAAAXu3gEDLgRx98FsCgcAeM61+QBZXTH3S4jP88j0lcnU0FccVgt5 6DBiRAVHHub9tOiOtxDyfaxHVvA2lLE= X-Google-Smtp-Source: APXvYqxPk3L4QirQuae5jNqCyrTVB6aifDvg0hcT8mNi80z+fnHomRDPG7dFO4FHgwgwJPaL6hTj+Q== X-Received: by 2002:a1c:988b:: with SMTP id a133mr15095573wme.21.1560210208437; Mon, 10 Jun 2019 16:43:28 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id v2sm10052180wrn.30.2019.06.10.16.43.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jun 2019 16:43:27 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Mon, 10 Jun 2019 16:43:11 -0700 Message-Id: <1560210191-9414-6-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560210191-9414-1-git-send-email-pkusunyifeng@gmail.com> References: <1560210191-9414-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 5/5] datapath: Support kernel version 5.0.x X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch updated acinclude.m4 so that OVS can be compiled on 5.0.x kernels. This patch also updated travis files so that 5.0.x kernel versions are used during travis test builds. Besides, NEWS and releases.rst are also updated to reflect this new support. Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- .travis.yml | 1 + .travis/linux-build.sh | 4 +++- Documentation/faq/releases.rst | 2 +- NEWS | 1 + acinclude.m4 | 10 ++++++---- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6621fb53575f..cb96d13cf537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ env: - KERNEL=3.16 TESTSUITE=1 DPDK=1 - KERNEL=3.16 DPDK_SHARED=1 - KERNEL=3.16 DPDK_SHARED=1 OPTS="--enable-shared" + - KERNEL=5.0 - KERNEL=4.20 - KERNEL=4.19 - KERNEL=4.18 diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index 123cde575667..bb97600c9789 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -11,7 +11,9 @@ TARGET="x86_64-native-linuxapp-gcc" function install_kernel() { - if [[ "$1" =~ ^4.* ]]; then + if [[ "$1" =~ ^5.* ]]; then + PREFIX="v5.x" + elif [[ "$1" =~ ^4.* ]]; then PREFIX="v4.x" elif [[ "$1" =~ ^3.* ]]; then PREFIX="v3.x" diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 6c5949b33d63..d9504d682c60 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -68,7 +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 + 2.11.x 3.10 to 5.0 ============ ============== Open vSwitch userspace should also work with the Linux kernel module built diff --git a/NEWS b/NEWS index 19cebf89a785..a38ab258fc6c 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,7 @@ Post-v2.11.0 - Added support for TLS Server Name Indication (SNI). - Linux datapath: * Support for the kernel versions 4.19.x and 4.20.x. + * Support for the kernel version 5.0.x. v2.11.0 - 19 Feb 2019 diff --git a/acinclude.m4 b/acinclude.m4 index 93fbf0ebb84c..321a741985db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -150,12 +150,14 @@ AC_DEFUN([OVS_CHECK_LINUX], [ fi AC_MSG_RESULT([$kversion]) - if test "$version" -ge 4; then - if test "$version" = 4 && test "$patchlevel" -le 20; then - : # Linux 4.x + if test "$version" -ge 5; then + if test "$version" = 5 && test "$patchlevel" -le 0; then + : # Linux 5.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.20.x is not supported (please refer to the FAQ for advice)]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 5.0.x is not supported (please refer to the FAQ for advice)]) fi + elif test "$version" = 4; then + : # Linux 4.x elif test "$version" = 3 && test "$patchlevel" -ge 10; then : # Linux 3.x else