From patchwork Fri Jul 24 05:46:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 1335339 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.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BCdXy0Lt1z9sPB for ; Fri, 24 Jul 2020 15:48:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3D03686DF2; Fri, 24 Jul 2020 05:48:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jQ34Q0hhNngl; Fri, 24 Jul 2020 05:48:31 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2201F86C7C; Fri, 24 Jul 2020 05:48:31 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id EF867C004E; Fri, 24 Jul 2020 05:48:30 +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 636AEC004C for ; Fri, 24 Jul 2020 05:48:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4B876884A2 for ; Fri, 24 Jul 2020 05:48:29 +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 OMNbwLnztnDb for ; Fri, 24 Jul 2020 05:48:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by hemlock.osuosl.org (Postfix) with ESMTP id 764968844E for ; Fri, 24 Jul 2020 05:48:28 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9D57B30E; Thu, 23 Jul 2020 22:48:27 -0700 (PDT) Received: from net-arm-thunderx2-03.shanghai.arm.com (net-arm-thunderx2-03.shanghai.arm.com [10.169.208.204]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1235C3F718; Thu, 23 Jul 2020 22:48:25 -0700 (PDT) From: Lance Yang To: dev@openvswitch.org Date: Fri, 24 Jul 2020 13:46:29 +0800 Message-Id: <20200724054629.16043-1-Lance.Yang@arm.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Cc: nd@arm.com Subject: [ovs-dev] [PATCH v1] Travis: Fix path search issue for AFXDP on arm CI 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" The current AFXDP job only supports x86 on Travis CI. The patch only fixes some issues for arm CI. It did not add AFXDP as an additional job for arm CI. The following issues are fixed: 1. The header file cdefs.h is under different path on arm, this patch adds the path for searching headers in linux-build.sh. 2. GCC on arm does not search a library path, causing the bfp library cannot be found during compilation. To fix this library link issue, this patch adds the bfp library search path in CFLAGS. The fix of above issues will help developers who want to manually run AFXDP job on arm CI when they validate their patches. Reviewed-by: Yanqin Wei Signed-off-by: Lance Yang --- .travis/linux-build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index 02615a8ec..ec92c92d0 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -71,8 +71,16 @@ function install_kernel() # The Linux kernel defines __always_inline in stddef.h (283d7573), and # sys/cdefs.h tries to re-define it. Older libc-dev package in xenial # doesn't have a fix for this issue. Applying it manually. - sudo sed -i '/^# define __always_inline .*/i # undef __always_inline' \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h || true + if [ "$TRAVIS_ARCH" == "aarch64" ]; then + sudo sed -i \ + '/^# define __always_inline .*/i # undef __always_inline' \ + /usr/include/aarch64-linux-gnu/sys/cdefs.h || true + CFLAGS_FOR_OVS="$CFLAGS_FOR_OVS -L/usr/local/lib64" + else + sudo sed -i \ + '/^# define __always_inline .*/i # undef __always_inline' \ + /usr/include/x86_64-linux-gnu/sys/cdefs.h || true + fi EXTRA_OPTS="${EXTRA_OPTS} --enable-afxdp" else EXTRA_OPTS="${EXTRA_OPTS} --with-linux=$(pwd)"