From patchwork Mon Apr 27 10:25:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1277516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=V9FN6uN8; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499gsm41tQz9sSb for ; Mon, 27 Apr 2020 20:26:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 21F1F87D17; Mon, 27 Apr 2020 10:26:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JzaPBUqVqZLZ; Mon, 27 Apr 2020 10:25:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 3944987C41; Mon, 27 Apr 2020 10:25:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 27D49C1D87; Mon, 27 Apr 2020 10:25:58 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9760CC0172 for ; Mon, 27 Apr 2020 10:25:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 862F287C17 for ; Mon, 27 Apr 2020 10:25:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0GXoAHPsF0LP for ; Mon, 27 Apr 2020 10:25:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by hemlock.osuosl.org (Postfix) with ESMTPS id A7DBC87C09 for ; Mon, 27 Apr 2020 10:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587983153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nmwbnTqBqj8/yqy6TWCOQpTwQBXAr5lGgG9QuUsb2ho=; b=V9FN6uN87/25/mG3vKs7MEKV7Lc5BhSoI0M8eWERnRd+YPhIF1g8+mhGb8sqe+NUqNFlRp /h6WaehHUUwED3/Ai2VT2CsKo4hOZev570t2gHl88p/GTueZU0RFSylD0Wi10B04yD1t/g xEXGpscCHLGjL2mcUxxuIOsm2KvKcak= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-og7L266_OGy-fcLrPbKFlQ-1; Mon, 27 Apr 2020 06:25:51 -0400 X-MC-Unique: og7L266_OGy-fcLrPbKFlQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9ABBD800D24; Mon, 27 Apr 2020 10:25:50 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.195.1]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CF3960300; Mon, 27 Apr 2020 10:25:49 +0000 (UTC) From: David Marchand To: dev@openvswitch.org Date: Mon, 27 Apr 2020 12:25:35 +0200 Message-Id: <20200427102535.32731-3-david.marchand@redhat.com> In-Reply-To: <20200427102535.32731-1-david.marchand@redhat.com> References: <20200427102535.32731-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH dpdk-latest 3/3] netdev-dpdk: Remove experimental API flag. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" rfc4115 meter APIs are now part of 20.02 stable ABI so we can remove the forced ALLOW_EXPERIMENTAL_API define. Still, compiling against DPDK experimental API could bite us when we need one of them, add dedicated jobs in Travis. Signed-off-by: David Marchand --- .travis.yml | 4 ++++ .travis/linux-build.sh | 3 +++ lib/netdev-dpdk.c | 6 ------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c5c9c5c02..97249c1ce8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ env: - KERNEL_LIST="4.15 4.14 4.9 4.4 3.19 3.16" - AFXDP=1 KERNEL=5.3 - M32=1 OPTS="--disable-ssl" + - DPDK=1 DPDK_EXPERIMENTAL=1 - DPDK=1 OPTS="--enable-shared" - DPDK_SHARED=1 - DPDK_SHARED=1 OPTS="--enable-shared" @@ -56,6 +57,9 @@ matrix: - arch: arm64 compiler: gcc env: TESTSUITE=1 DPDK=1 + - arch: arm64 + compiler: gcc + env: DPDK=1 DPDK_EXPERIMENTAL=1 - arch: arm64 compiler: gcc env: KERNEL_LIST="5.5 4.19" diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index 0628db6872..33b359a61f 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -173,6 +173,9 @@ if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then # Disregard cast alignment errors until DPDK is fixed CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align" fi + if [ -n "$DPDK_EXPERIMENTAL" ]; then + CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -DALLOW_EXPERIMENTAL_API" + fi fi if [ "$CC" = "clang" ]; then diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 44ebf96da8..9d2b4104cf 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -26,12 +26,6 @@ #include #include -/* Include rte_compat.h first to allow experimental API's needed for the - * rte_meter.h rfc4115 functions. Once they are no longer marked as - * experimental the #define and rte_compat.h include can be removed. - */ -#define ALLOW_EXPERIMENTAL_API -#include #include #include #include