From patchwork Fri Apr 15 19:55:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 65970 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp116755qge; Fri, 15 Apr 2016 12:55:43 -0700 (PDT) X-Received: by 10.55.204.6 with SMTP id r6mr28271503qki.21.1460750143510; Fri, 15 Apr 2016 12:55:43 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q66si11813953qgd.93.2016.04.15.12.55.43; Fri, 15 Apr 2016 12:55:43 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1703968524; Fri, 15 Apr 2016 19:55:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E14E3684B0; Fri, 15 Apr 2016 19:55:38 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5BEA168500; Fri, 15 Apr 2016 19:55:36 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 4782D68446 for ; Fri, 15 Apr 2016 19:55:35 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id j11so157427015lfb.1 for ; Fri, 15 Apr 2016 12:55:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cLravecRaoU/qSoO7Y3dOcBhL3XubUyfM4qPq1w8UPI=; b=Gp1eD4zpYvB3Fec9Pc/MwQIk6dH/CWquMtotOjZmHNFclVj/irJcs2YRjPofkf2jzb rt+OhSOJerHLsMcvhFm5OgaxQiflfKAwUFtmZg2SKXEYGemgZ3idAIEbiknHv1d6mu1I GJ6u2foF1q41xNVVUn7aoptmUuEWxZEs0V5Nr+fBsGccGchMrrs7ugFbDYCKGOVyjfIE 0GPv3BaIFy3BKxmVnsSad0gkZxs56cg5Xe5KgkVfSLYtTeS8EBeplXLY/Jl+WYddiLQJ 4iZrbwcphsLv69i+8alpYA93CJ9ZCBzMgknSZVwO1voBIqC+FsdjL41SI7SSK5NlieRe wu1Q== X-Gm-Message-State: AOPr4FUMhW21mD/KR5ny6U88toZwZ4SChT0KRDKffG74rbCfy0PoryF1gLox699EtnqcJlT/WLQ= X-Received: by 10.112.133.38 with SMTP id oz6mr9487215lbb.64.1460750134186; Fri, 15 Apr 2016 12:55:34 -0700 (PDT) Received: from localhost.localdomain (ppp91-77-173-31.pppoe.mtu-net.ru. [91.77.173.31]) by smtp.gmail.com with ESMTPSA id v72sm8063103lfd.24.2016.04.15.12.55.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Apr 2016 12:55:33 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 15 Apr 2016 22:55:27 +0300 Message-Id: <1460750127-6119-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 X-Topics: patch Subject: [lng-odp] [ODP-CHECK PATCHv2] odp-linux: add dpdk pktio testing X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Add dpdk pktio compilation and run under native make check. Huge pages have to be mounted: echo 1000 > /proc/sys/vm/nr_hugepages mount -t hugetlbfs nodev /mnt/huge also no other mount points for hugepages, in my case I need to do: umount /sys/fs/cgroup/hugetlb make check should pass without dpdk hardware and loaded dpdk modules using pcap PMD. Signed-off-by: Maxim Uvarov --- apply-and-build.sh | 7 +++---- helper/platform/generic | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/apply-and-build.sh b/apply-and-build.sh index 99f3d45..6168e29 100755 --- a/apply-and-build.sh +++ b/apply-and-build.sh @@ -8,6 +8,7 @@ source ${ROOT_DIR}/helper/toolchain source ${ROOT_DIR}/helper/openssl source ${ROOT_DIR}/helper/cunit +export PLATFORM=${PLATFORM:-linux-generic} export GIT_BRANCH="${GIT_BRANCH:-master}" export PATCH_DIR=${PATCH_DIR:-"$HOME/incoming"} export CLEANUP="${CLEANUP:-1}" @@ -29,6 +30,7 @@ usage() { tc_usage cunit_usage openssl_usage + echo -e "\tPLATFORM=linux-generic\t export platfrom to tested platform" echo -e "\tPATCH_DIR:\t where to look for patches, default: $HOME/incoming" echo -e "\tCLEANUP:\t set to 0 to save *.log files, default: ${CLEANUP}" echo -e "\tCHECKPATCH:\t set to 0 to disable checkpatch test, default: ${CHECKPATCH}" @@ -36,7 +38,7 @@ usage() { echo -e "\tPLATFORM:\t set platform, default: ${PLATFORM}" echo -e "\tDRYRUN:\t\t set to 1 to enable a dryrun, default: ${DRYRUN}" echo -e "\tENABLE_NETMAP:\t set to 1 to enable netmap build, default: ${ENABLE_NETMAP}" - echo -e "\tENABLE_DPDK:\t set to 1 to enable DPDK build, default: 0" + echo -e "\tENABLE_DPDK:\t set to 1 to enable dpdk build, default: ${ENABLE_DPDK}" echo -e "\tNUM_CPUS:\t add parallel make, default: _NPROCESSORS_ONLN" echo -e "\tFILE_EXT:\t supported extensions in patch file names, default: ${FILE_EXT}" echo -e "\tM32_ON_64:\t enable 32 bit builds on a 64 bit host, default: 0" @@ -54,9 +56,6 @@ if [[ ${M32_ON_64} -eq 1 ]]; then CUNIT_BUILD=1 fi -PLATFORM=${PLATFORM:-linux-generic} -[[ ${ENABLE_DPDK} -eq 1 ]] && PLATFORM="linux-dpdk" - display_os prepare_platform diff --git a/helper/platform/generic b/helper/platform/generic index 49ddd65..560e694 100644 --- a/helper/platform/generic +++ b/helper/platform/generic @@ -1,6 +1,9 @@ [ -n "$GENERIC_PLATFORM_HELPER" ] && return || readonly GENERIC_PLATFORM_HELPER=1 export NETMAP_SRCDIR=${ROOT_DIR}/netmap +if [[ ${ENABLE_DPDK} -eq 1 ]]; then + . helper/platform/dpdk +fi generic_usage() { echo -e "\tENABLE_NETMAP:\t enable build with netmap, default: ${ENABLE_NETMAP}" @@ -14,6 +17,10 @@ generic_prepare() { export NETMAP_DIR=${NETMAP_SRCDIR} export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-netmap-path=${NETMAP_DIR}" fi + + if [[ ${ENABLE_DPDK} -eq 1 ]]; then + export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-dpdk-path=${ROOT_DIR_DPDK}/x86_64-native-linuxapp-gcc" + fi } generic_get() { @@ -26,14 +33,21 @@ generic_get() { git reset --hard $NETMAP_REV popd > /dev/null fi + + if [[ ${ENABLE_DPDK} -eq 1 ]]; then + dpdk_get + fi } generic_build() { - : + if [[ ${ENABLE_DPDK} -eq 1 ]]; then + dpdk_build + fi } generic_cleanup() { rm -rf ${NETMAP_SRCDIR} + dpdk_cleanup } ## vim: set ft=sh sw=4 sts=4 et foldmethod=syntax : ##