From patchwork Mon Oct 9 14:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115241 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2591780qgn; Mon, 9 Oct 2017 07:01:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCkS05zoPdpEn0224hCAu2RmQuXGTWUNrxW2HFmYb9YODtZH2+8zNX2h2xcdxw3D+hQTHPu X-Received: by 10.36.164.75 with SMTP id v11mr15039928iti.33.1507557719187; Mon, 09 Oct 2017 07:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507557719; cv=none; d=google.com; s=arc-20160816; b=DVlJexl5pAFpuEk6+m44vp2Jeh/JTUK7stgFWwbehsc1jeUVgXgkj/ltGFXNf1Nzm0 0YIaeXrDI9WgZi0y0Z8/7VGxMDYVLqyLIXZ1afUq3ODhGyJg1DWBpCh1DgMvOckFt38O Izq7i1VlEpNzSi7RTu+vYgbQMmsKZv36Kls1V/oqm5fTyuS2z5IdT4qbKjtGadF1pkAG z1K6GKl7o5x2LcDkfXsDBi1GIaAOd0XdbcMU971hsDUjr51TInVvUBymkYft0a94HLhw AmuNA9kzc0reaieW6Zq2DWz8Sghm9/+G2hK/3mVpXSnI0HVRPcOArTH+unb7/vtG1A11 QWXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Mt+ZNkixwC+DvfzJU1tz9Lywi+8ab/Cx6WiLVBJvP9k=; b=w86W3rUz3rF3QhQVA2thPYBXxiUoTdu1Yh7QY8A3jHGR9c0udwF97ZozvFbJf5jQlr K78qSlOBSsSQV236SaRDSQJSXWd/6T+JzUZ23F6+5mdb+EHxm1I/MB7+7nabDJreFHnf DTS7g2zAZqXPxCK44N1PHqHIK4UKOZkmM8VSwdH3Uaey4Efh2jkeviDeP9kiEYPjEqFS +lqeFOk69ipVOaB+2DE9hPDpO0g+VJsSYkOaQ/UV6meEUzvexPK120YipRsfSr+jq2Bu oMjDEjSX7pEdVLe30qdu6RqZgbG6QJZFCxQZ1VAwY9F77h9RoEiC593tNAtSshSKhtB6 alrQ== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id a64si7196886ita.42.2017.10.09.07.01.58; Mon, 09 Oct 2017 07:01:59 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 99B1160C39; Mon, 9 Oct 2017 14:01:58 +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,FREEMAIL_FROM, 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 6F32760B4B; Mon, 9 Oct 2017 14:00:53 +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 5E73960B15; Mon, 9 Oct 2017 14:00:49 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 7D95360812 for ; Mon, 9 Oct 2017 14:00:43 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward100p.mail.yandex.net (Yandex) with ESMTP id D5E695102819 for ; Mon, 9 Oct 2017 17:00:41 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FXiDzrw6Nz-0fsSqpbg; Mon, 09 Oct 2017 17:00:41 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0fdWvXGc; Mon, 09 Oct 2017 17:00:41 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:05 +0300 Message-Id: <1507557617-32018-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 1/13] linux-gen: drop unused _odp_packet_cmp_data() function 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov This is to fix https://bugs.linaro.org/show_bug.cgi?id=3241 Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .../linux-generic/include/odp_packet_internal.h | 3 --- platform/linux-generic/odp_packet.c | 26 ---------------------- 2 files changed, 29 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index d76d7bf08..15cb53f41 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -321,9 +321,6 @@ int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr); int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, uint8_t c, uint32_t len); -int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, - const void *s, uint32_t len); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f4a0e0ec9..fff01ad9d 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1642,32 +1642,6 @@ int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, return 0; } -int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, - const void *s, uint32_t len) -{ - const uint8_t *ptr = s; - void *mapaddr; - uint32_t seglen = 0; /* GCC */ - uint32_t cmplen; - int ret; - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - - ODP_ASSERT(offset + len <= pkt_hdr->frame_len); - - while (len > 0) { - mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL); - cmplen = len > seglen ? seglen : len; - ret = memcmp(mapaddr, ptr, cmplen); - if (ret != 0) - return ret; - offset += cmplen; - len -= cmplen; - ptr += cmplen; - } - - return 0; -} - /* * * Debugging From patchwork Mon Oct 9 14:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115244 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2596294qgn; Mon, 9 Oct 2017 07:05:17 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCOreYhmjfapiFosKpt45NsANVsWK09h2sHjnzyGkVfeSQ7ozmqC8QMxJI+LmR0bH4VOMdH X-Received: by 10.36.206.65 with SMTP id v62mr13872627itg.104.1507557917384; Mon, 09 Oct 2017 07:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507557917; cv=none; d=google.com; s=arc-20160816; b=LHJnLzwNoUhMu6bCXYZnCQHd4xwWptqpRyPcHc0Olf5H22mzzAqEqVC/7oRBiQEwdl dMccAzPfn7HLBtJtiTmpTROYoYcOlYq9PEcfAArmElCbePQ8ya/Oy3NAFFeA92hudP+Z OobOjpYN3aJ75rBKxu+EZ+tj5Te1OTbpVYAnqJxVANM1WzezlAjG7/0f1SByQRI6hM5l AV23Km9GY6aUwCqBuUrv3pCib4tRVfcf18ekuazVE0Tm7untCGZMcYzeGNKV7xLg8ESz VzXZeB9cue5mgg+zJHGS8JWYQMZaCsi51jP99JvbGF5K0PesTwu3C4XcKV+9PTTnhfje Lifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=unseQzG7mbMA1/J6BqLGdbcFGqjDzq52cYLxv1p31/o=; b=OPThNcU9TQ6ghzT7na6YDWMjAqKfgBdVr0YfT+iyyDwVQ7Mr+dk7RpftrJdMs+oqJN r9bFAbQ7tm0n7SySWxIGYuZR8bIPWPocKvdf0MNVkmBp3pDIbSNXBttUzIWnleW9GLgQ nA7xetQIYAQeP36n3QYpDwqWjh9C9RxmdvYlLztIVnlnJZVTCGvbyX9i9lbvRj5dKaq7 PJc9RnDLG+jRra2JhYUqW+xgrGdzHQy2grcX5CX5pXqgIZdoE00S/T1IsbBNCYWJaviW CmV//QUhxWZ3RKN2bh1ooUqfiecb78sReX7ALVcJVfopjheOdI0HaHuq/V18doPFBnaJ 0jBQ== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 140si6490149ioz.244.2017.10.09.07.05.17; Mon, 09 Oct 2017 07:05:17 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id DDB4360C2D; Mon, 9 Oct 2017 14:05:16 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 BC31760C03; Mon, 9 Oct 2017 14:01:17 +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 7BAA060BDC; Mon, 9 Oct 2017 14:00:57 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 36A7C6080D for ; Mon, 9 Oct 2017 14:00:45 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 7957B1241D44 for ; Mon, 9 Oct 2017 17:00:42 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id NSALJhVUTH-0giqIi6w; Mon, 09 Oct 2017 17:00:42 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0fdiNepw; Mon, 09 Oct 2017 17:00:41 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:06 +0300 Message-Id: <1507557617-32018-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 2/13] linux-gen: _fdserver return code cleanup 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov somewhere we have return (-1) somewhere -1, let's make it common. Signed-off-by: Maxim Uvarov Reviewed-by: Bill Fischofer --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ platform/linux-generic/_fdserver.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index d15ddbec6..60bb91393 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -160,7 +160,7 @@ static int send_fdserver_msg(int sock, int command, res = sendmsg(sock, &socket_message, 0); if (res < 0) { ODP_ERR("send_fdserver_msg: %s\n", strerror(errno)); - return(-1); + return -1; } return 0; @@ -206,7 +206,7 @@ static int recv_fdserver_msg(int sock, int *command, /* receive the message */ if (recvmsg(sock, &socket_message, MSG_CMSG_CLOEXEC) < 0) { ODP_ERR("recv_fdserver_msg: %s\n", strerror(errno)); - return(-1); + return -1; } *command = msg.command; @@ -251,7 +251,7 @@ static int get_socket(void) s_sock = socket(AF_UNIX, SOCK_STREAM, 0); if (s_sock == -1) { ODP_ERR("cannot connect to server: %s\n", strerror(errno)); - return(-1); + return -1; } remote.sun_family = AF_UNIX; @@ -260,7 +260,7 @@ static int get_socket(void) if (connect(s_sock, (struct sockaddr *)&remote, len) == -1) { ODP_ERR("cannot connect to server: %s\n", strerror(errno)); close(s_sock); - return(-1); + return -1; } return s_sock; @@ -286,7 +286,7 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key, s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_REGISTER_REQ, context, key, @@ -332,7 +332,7 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_DEREGISTER_REQ, context, key, -1); @@ -375,7 +375,7 @@ int _odp_fdserver_lookup_fd(fd_server_context_e context, uint64_t key) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_LOOKUP_REQ, context, key, -1); @@ -418,7 +418,7 @@ static int stop_server(void) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_SERVERSTOP_REQ, 0, 0, -1); @@ -604,7 +604,7 @@ int _odp_fdserver_init_global(void) sock = socket(AF_UNIX, SOCK_STREAM, 0); if (sock == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); - return(-1); + return -1; } /* remove previous named socket if it already exists: */ @@ -617,14 +617,14 @@ int _odp_fdserver_init_global(void) if (res == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); close(sock); - return(-1); + return -1; } /* listen for incoming conections: */ if (listen(sock, FDSERVER_BACKLOG) == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); close(sock); - return(-1); + return -1; } /* fork a server process: */ @@ -632,7 +632,7 @@ int _odp_fdserver_init_global(void) if (server_pid == -1) { ODP_ERR("Could not fork!\n"); close(sock); - return(-1); + return -1; } if (server_pid == 0) { /*child */ From patchwork Mon Oct 9 14:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115242 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2593215qgn; Mon, 9 Oct 2017 07:03:03 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC2NgFx1tY8yTDt4uKLRgXtedWHV2XvwM6N/wud99q7kPRdZtEckh105ol/nLPzr3kGRSxY X-Received: by 10.36.88.72 with SMTP id f69mr4776766itb.129.1507557783710; Mon, 09 Oct 2017 07:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507557783; cv=none; d=google.com; s=arc-20160816; b=VT4UjEXmgUnF8AkCPgwW3lxV/wNNJNLkq4kvCvZfONZDyQWcOC9wfHAA6OXQS802Vf NEGOMB60fODQqVXgMvkog3+RJrNToNLXN6R/cUI9gAK3MB+7sKNrMiTAXIufY7PYGRgH GUzbZdi+uQFvXs54D18e+Yk36qm+3bvYDcH0iLWXqmcb5Ta8PH1zhC6dzYtD9NJpMXFT xZXhWqEuleDtKv6Kv9ndcW7nyZJvcbW1ZH8+54D0gFDScuJR2wq4ScIgQvGUl98Zi4ZM cG+qsiNgkPXlfu/nEQXcBm6fk0CgX+NQXmF+KZ6vGGI39MB9eLD2VOSqC+vbwDbLrtY+ pZJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=F9KCz96PTb3AbeTp8BwZQ5QAsu3GiSaJ3cNy17G5otE=; b=wUV/d11GI8ENUFERRLwbZ0wpLkQ9qjbaGJC2YHFevhDiJ5qQ7YSL0/SgpVHBOBQI/c py3/hX72FvNYeUrDNM763AcEVIChwf/4r00FCwJVLrZTyPsTcL/iUVBvcPosFoaz8PI+ bP5uW5tuYIn/a2T3WZjY88Xa1HVJoNZYTjxXaLU9FYT9Al99oJEZ1rGLf/jqKCD1qgRo N78Q3SQdq3Pthaw/lpqSFDBxL+48tirBJ7vf2fVx7981xIDJH2uf6pLnFXhyUDuQ96QG vPxWqpC1s0Sc6zG/z7EwILh99hDmEBK0Tcl5aUMo2mn5ygFBer5bF1Ebb1xre3i4w7j5 jUDQ== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j95si6682610iod.232.2017.10.09.07.03.03; Mon, 09 Oct 2017 07:03:03 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3D91660BE0; Mon, 9 Oct 2017 14:03:03 +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,FREEMAIL_FROM, 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 EF7A360AC8; Mon, 9 Oct 2017 14:01:00 +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 009AC60BDC; Mon, 9 Oct 2017 14:00:53 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 5CE42609C3 for ; Mon, 9 Oct 2017 14:00:45 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 05B29430236C for ; Mon, 9 Oct 2017 17:00:44 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id OwZisf6UNQ-0hsi1QNx; Mon, 09 Oct 2017 17:00:43 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0gdCbO2W; Mon, 09 Oct 2017 17:00:42 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:07 +0300 Message-Id: <1507557617-32018-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 3/13] tests: fix validation tests being skipped by default 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov After [d091f2176a28 configure: "best effort" approach for CUnit and validation tests] by default validation tests will get skipped by default because test_vald variable will remain set to check instead of yes. Update it to yes, if it was not set and CUnit was found. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ test/common_plat/m4/validation.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index bf849aa3f..f7127c06c 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -23,7 +23,8 @@ AS_IF([test "x$test_vald" = "xyes" -a "x$cunit_support" = "xno"], [AC_MSG_ERROR([Validation testsuite requested, but CUnit was not found])], [test "x$test_vald" = "xcheck" -a "x$cunit_support" = "xno"], [AC_MSG_WARN([CUnit was not found, disabling validation testsuite]) - test_vald=no]) + test_vald=no], + [test_vald=yes]) AM_CONDITIONAL([cunit_support], [test "x$cunit_support" = "xyes"]) AM_CONDITIONAL([test_vald], [test "x$test_vald" = "xyes"]) From patchwork Mon Oct 9 14:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115243 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2594906qgn; Mon, 9 Oct 2017 07:04:14 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDpoXUbRqAZKYyLAHUR5N/p1GAU1TacJnUfN6n6q9DVcX7uAs4wSd7mg3xPT9BYmRebhyDX X-Received: by 10.107.47.147 with SMTP id v19mr895353iov.280.1507557854099; Mon, 09 Oct 2017 07:04:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507557854; cv=none; d=google.com; s=arc-20160816; b=M5cDmCb488A/6WvMfPo6yEWi8/f5V7etbIO3CCzCRO2loTbpFY4pgDIfcsiJ28IrlA c6CWCv5OV2bdqABMzdpD736WI6CYTBgft/hM8o/U4YpO2HgBo59KB5UWjn7NocwzjmBm 0iisiQlJjA1mf4rxTfcfkgG0DrUQNGpVBsI+w06Km/LJbrwcSt2egZsLA2XXLyVcgqMu pGeE1cdArUv8+LlX1CpGQxz5DASI4v8EV6pMowsdYrTG77fO0SIUp4+l05z1BnS2X4bU cl0UlLUgWcEFphWmyVoFKFvAhL9MSf3zzMNuN+nGG4mcgAgjR+UuBx5rFDPQVB9TMR5e u24g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=yLF8o6CYBOAQ+1oc9PBSIj7+tfkRXIIWbVaU1AwrFRs=; b=xNUlPJZmDqJu9WANxpX6tHi5+9THfJrB/2skhS8DwyrT7/yut21cGMa8rpHfQxfXyf F8zOJFNeZBrG2sHl5WqiGZiXzwb8kCSnCOt1n8Z2AgQDpYAsViJdn9+WaB9uFV210lyS EozIC3tN0/4gaSqobxvuTDOx1PtzSeByl5GZoJ8ZuFQDVfmxbpAN+pHcO/LgLYx0BN1j zjeP3N/9JxSsJ0icMH8DSBhh+YHnnmXEj+bdnYPbA4EYIBNmgBW9JhHO60ft1NUytZDV 5ZCT6MSKWjiwuhSb7a3b/ejV4443lbyFImoC5OzyrlxDgjzUN+LSuJfcgy/4OcCShjly kF6A== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v21si6825158iob.47.2017.10.09.07.04.09; Mon, 09 Oct 2017 07:04:14 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A0EF760BEB; Mon, 9 Oct 2017 14:04:09 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 71E3D60B15; Mon, 9 Oct 2017 14:01:09 +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 1893160BDC; Mon, 9 Oct 2017 14:00:56 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 25B1960A54 for ; Mon, 9 Oct 2017 14:00:46 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward105p.mail.yandex.net (Yandex) with ESMTP id D158C4082403 for ; Mon, 9 Oct 2017 17:00:44 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0RAEZ3XjWI-0i2SSaWT; Mon, 09 Oct 2017 17:00:44 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0id0whuU; Mon, 09 Oct 2017 17:00:44 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:08 +0300 Message-Id: <1507557617-32018-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 4/13] linux-gen: split arm into arm and aarch64 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov In preparation to arch-file cleanup split ARM architecture into 32-bit ARM and AArch64. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ configure.ac | 3 +- platform/Makefile.inc | 3 + platform/linux-generic/Makefile.am | 7 ++ .../linux-generic/arch/aarch64/odp/api/cpu_arch.h | 30 +++++++ platform/linux-generic/arch/aarch64/odp_cpu_arch.c | 94 ++++++++++++++++++++++ .../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 28 +++++++ platform/linux-generic/arch/arm/odp_cpu_arch.c | 23 ------ 7 files changed, 164 insertions(+), 24 deletions(-) create mode 100644 platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h create mode 100644 platform/linux-generic/arch/aarch64/odp_cpu_arch.c create mode 100644 platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c diff --git a/configure.ac b/configure.ac index f7da75ec4..5bc84a71b 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,7 @@ AS_CASE([$host], [i686*], [ARCH_DIR=x86], [mips64*], [ARCH_DIR=mips64], [powerpc*], [ARCH_DIR=powerpc], - [aarch64*], [ARCH_DIR=arm], + [aarch64*], [ARCH_DIR=aarch64], [arm*], [ARCH_DIR=arm], [ARCH_DIR=undefined] ) @@ -219,6 +219,7 @@ AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) AM_CONDITIONAL([ARCH_IS_ARM], [test "x${ARCH_DIR}" = "xarm"]) +AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index f67225603..bb5da187b 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -86,6 +86,9 @@ EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ arch/arm/odp_cpu_arch.c \ arch/arm/odp_sysinfo_parse.c \ + arch/aarch64/odp/api/cpu_arch.h \ + arch/aarch64/odp_cpu_arch.c \ + arch/aarch64/odp_sysinfo_parse.c \ arch/default/odp/api/cpu_arch.h \ arch/default/odp_cpu_arch.c \ arch/default/odp_sysinfo_parse.c \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f5f65384f..7257a60f5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -71,6 +71,9 @@ odpapiinclude_HEADERS = \ if ARCH_IS_ARM odpapiinclude_HEADERS += $(srcdir)/arch/arm/odp/api/cpu_arch.h endif +if ARCH_IS_AARCH64 +odpapiinclude_HEADERS += $(srcdir)/arch/aarch64/odp/api/cpu_arch.h +endif if ARCH_IS_MIPS64 odpapiinclude_HEADERS += $(srcdir)/arch/mips64/odp/api/cpu_arch.h endif @@ -238,6 +241,10 @@ if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/arm/odp_cpu_arch.c \ arch/arm/odp_sysinfo_parse.c endif +if ARCH_IS_AARCH64 +__LIB__libodp_linux_la_SOURCES += arch/aarch64/odp_cpu_arch.c \ + arch/aarch64/odp_sysinfo_parse.c +endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ arch/mips64/odp_sysinfo_parse.c diff --git a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h b/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h new file mode 100644 index 000000000..7c75a690e --- /dev/null +++ b/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h @@ -0,0 +1,30 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_ARCH_H_ +#define ODP_PLAT_CPU_ARCH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define _ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ + /* YIELD hints the CPU to switch to another thread if possible + * and executes as a NOP otherwise. + * ISB flushes the pipeline, then restarts. This is guaranteed to + * stall the CPU a number of cycles. + */ + __asm volatile("isb" ::: "memory"); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_arch.c b/platform/linux-generic/arch/aarch64/odp_cpu_arch.c new file mode 100644 index 000000000..b87d1c102 --- /dev/null +++ b/platform/linux-generic/arch/aarch64/odp_cpu_arch.c @@ -0,0 +1,94 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include + +#include +#include + +#include +#include +#include +#include +#include + +#define GIGA 1000000000 + +uint64_t odp_cpu_cycles(void) +{ + struct timespec time; + uint64_t sec, ns, hz, cycles; + int ret; + + ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); + + if (ret != 0) + ODP_ABORT("clock_gettime failed\n"); + + hz = odp_cpu_hz_max(); + sec = (uint64_t)time.tv_sec; + ns = (uint64_t)time.tv_nsec; + + cycles = sec * hz; + cycles += (ns * hz) / GIGA; + + return cycles; +} + +uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} + +int cpu_has_global_time(void) +{ + uint64_t hz = cpu_global_time_freq(); + + /* + * The system counter portion of the architected timer must + * provide a uniform view of system time to all processing + * elements in the system. This should hold true even for + * heterogeneous SoCs. + * + * Determine whether the system has 'global time' by checking + * whether a read of the architected timer frequency sys reg + * returns a sane value. Sane is considered to be within + * 1MHz and 6GHz (1us and .1667ns period). + */ + return hz >= 1000000 && hz <= 6000000000; +} + +uint64_t cpu_global_time(void) +{ + uint64_t cntvct; + + /* + * To be consistent with other architectures, do not issue a + * serializing instruction, e.g. ISB, before reading this + * sys reg. + */ + + /* Memory clobber to minimize optimization around load from sys reg. */ + __asm__ volatile("mrs %0, cntvct_el0" : "=r"(cntvct) : : "memory"); + + return cntvct; +} + +uint64_t cpu_global_time_freq(void) +{ + uint64_t cntfrq; + + __asm__ volatile("mrs %0, cntfrq_el0" : "=r"(cntfrq) : : ); + + return cntfrq; +} diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c new file mode 100644 index 000000000..1e2c729a7 --- /dev/null +++ b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c @@ -0,0 +1,28 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include +#include +#include + +int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo) +{ + int i; + + ODP_DBG("Warning: use dummy values for freq and model string\n"); + for (i = 0; i < MAX_CPU_NUMBER; i++) { + sysinfo->cpu_hz_max[i] = 1400000000; + strcpy(sysinfo->model_str[i], "UNKNOWN"); + } + + return 0; +} + +void sys_info_print_arch(void) +{ +} diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c index 6622e619f..fc49ce371 100644 --- a/platform/linux-generic/arch/arm/odp_cpu_arch.c +++ b/platform/linux-generic/arch/arm/odp_cpu_arch.c @@ -70,33 +70,10 @@ int cpu_has_global_time(void) uint64_t cpu_global_time(void) { -#ifdef __aarch64__ - uint64_t cntvct; - - /* - * To be consistent with other architectures, do not issue a - * serializing instruction, e.g. ISB, before reading this - * sys reg. - */ - - /* Memory clobber to minimize optimization around load from sys reg. */ - __asm__ volatile("mrs %0, cntvct_el0" : "=r"(cntvct) : : "memory"); - - return cntvct; -#else return 0; -#endif } uint64_t cpu_global_time_freq(void) { -#ifdef __aarch64__ - uint64_t cntfrq; - - __asm__ volatile("mrs %0, cntfrq_el0" : "=r"(cntfrq) : : ); - - return cntfrq; -#else return 0; -#endif } From patchwork Mon Oct 9 14:00:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115246 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2598797qgn; Mon, 9 Oct 2017 07:07:18 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDEr4+wUzafSsfUajKX9QZSGGa67ptmaNeWaFlMw3QFgQ19gAKyPJ/TjNuKyjcJE4bnVx5I X-Received: by 10.36.44.200 with SMTP id i191mr14526063iti.136.1507558038121; Mon, 09 Oct 2017 07:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558038; cv=none; d=google.com; s=arc-20160816; b=ptfznXZagfIMlYFYrVmscAbbnV0JYLNQAWR94kf1sSUcVKiOotWYKDtcEuYZ7NWa+U H8S0H4ohRrXsqB7yX2JR9gJmo2PiMhHo09E9/Cq3ilVw7/H8z7bpU+SXisExADj1qpuE uXjhmo6IR8v+BI/K9ffmQ+ZOPdzQcGiI8rP5reiYV01V1ryEDcZ3D+hlnd76yakQcUE6 nenScOQNjSBbLvTYaTb0J6yvqZHbRNmsyCLAKQuTCUPnPYEo1sCtB/C9de28p9xbx9mJ aauG/a6gaETD5zrVvElZMCNvfo+nCbXY/GjTj9cZGPZ1580eXk/BZv4rzZ/357+r4CP7 MWYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=OyumqxBV0Y/cgnQW3hNzTt85DNixR4zcaSSXzqOaLfg=; b=N7QQ1D+w/dOhSA9UlMKN5WjWAqoSL/DgMlV0G5dOKNGiQQy8Kkq6aP1t4anxjNvjoM miSkevP4WOxXEV68XP6UcOdwErRLJZk7s4Zyp7gUaNlPpsF1f5ntdyoT/3MhgH3iJ/24 +7mp7OnVCC3BeZlAwY5tln+nZqbH3Dx9qyIoMlBhZ4e3WKrf/b+JIqegkXqbEt02BreF 3kOnVewHTD/2N8lx/+IRarOsRjyElvxU9Vjot10cqJhiKwGqv9WR11XcTcr8+hwMdLnZ pvbNU5BB4CsHETK5QsTZZUUibQGPKSJ+ujy9ZRR3ejy1gYPbxIqbVrl7Q/LWekLLwtUC Fr1w== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id y66si7188047itf.66.2017.10.09.07.07.17; Mon, 09 Oct 2017 07:07:18 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A577960C40; Mon, 9 Oct 2017 14:07:17 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 6559A60C18; Mon, 9 Oct 2017 14:01:28 +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 E9C6760BEB; Mon, 9 Oct 2017 14:01:00 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id E06AA60AC8 for ; Mon, 9 Oct 2017 14:00:48 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward101o.mail.yandex.net (Yandex) with ESMTP id BEEE41341A7B for ; Mon, 9 Oct 2017 17:00:45 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Pe0OY5ti72-0jd4VMRQ; Mon, 09 Oct 2017 17:00:45 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0id8N5kn; Mon, 09 Oct 2017 17:00:44 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:09 +0300 Message-Id: <1507557617-32018-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 5/13] linux-gen: deduplicate arch-specific files 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Rewrite ARCH-specific files so that there is no significant code duplication between different arch files and default files set. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ platform/Makefile.inc | 22 ------ platform/linux-generic/Makefile.am | 46 +++++++------ .../aarch64/{odp_cpu_arch.c => odp_global_time.c} | 37 ---------- .../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 28 -------- platform/linux-generic/arch/arm/odp_cpu_arch.c | 79 ---------------------- .../linux-generic/arch/arm/odp_sysinfo_parse.c | 28 -------- platform/linux-generic/arch/default/odp_cpu_arch.c | 28 -------- .../linux-generic/arch/default/odp_cpu_cycles.c | 19 ++++++ .../linux-generic/arch/default/odp_global_time.c | 33 +++++++++ platform/linux-generic/arch/mips64/odp_cpu_arch.c | 25 ------- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 25 ------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 ++++ platform/linux-generic/arch/x86/odp_cpu_arch.c | 72 -------------------- platform/linux-generic/arch/x86/odp_global_time.c | 77 +++++++++++++++++++++ 14 files changed, 169 insertions(+), 365 deletions(-) rename platform/linux-generic/arch/aarch64/{odp_cpu_arch.c => odp_global_time.c} (68%) delete mode 100644 platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c delete mode 100644 platform/linux-generic/arch/arm/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/arm/odp_sysinfo_parse.c create mode 100644 platform/linux-generic/arch/default/odp_cpu_cycles.c create mode 100644 platform/linux-generic/arch/default/odp_global_time.c create mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c create mode 100644 platform/linux-generic/arch/x86/odp_global_time.c diff --git a/platform/Makefile.inc b/platform/Makefile.inc index bb5da187b..f3161abd4 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -81,25 +81,3 @@ odpapiabiarchinclude_HEADERS = \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h - -EXTRA_DIST = \ - arch/arm/odp/api/cpu_arch.h \ - arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c \ - arch/aarch64/odp/api/cpu_arch.h \ - arch/aarch64/odp_cpu_arch.c \ - arch/aarch64/odp_sysinfo_parse.c \ - arch/default/odp/api/cpu_arch.h \ - arch/default/odp_cpu_arch.c \ - arch/default/odp_sysinfo_parse.c \ - arch/mips64/odp/api/cpu_arch.h \ - arch/mips64/odp_cpu_arch.c \ - arch/mips64/odp_sysinfo_parse.c \ - arch/powerpc/odp/api/cpu_arch.h \ - arch/powerpc/odp_cpu_arch.c \ - arch/powerpc/odp_sysinfo_parse.c \ - arch/x86/odp/api/cpu_arch.h \ - arch/x86/odp_cpu_arch.c \ - arch/x86/odp_sysinfo_parse.c \ - arch/x86/cpu_flags.c \ - arch/x86/cpu_flags.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7257a60f5..0ebb6f76c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -68,22 +68,6 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/traffic_mngr.h \ $(srcdir)/include/odp/api/version.h -if ARCH_IS_ARM -odpapiinclude_HEADERS += $(srcdir)/arch/arm/odp/api/cpu_arch.h -endif -if ARCH_IS_AARCH64 -odpapiinclude_HEADERS += $(srcdir)/arch/aarch64/odp/api/cpu_arch.h -endif -if ARCH_IS_MIPS64 -odpapiinclude_HEADERS += $(srcdir)/arch/mips64/odp/api/cpu_arch.h -endif -if ARCH_IS_POWERPC -odpapiinclude_HEADERS += $(srcdir)/arch/powerpc/odp/api/cpu_arch.h -endif -if ARCH_IS_X86 -odpapiinclude_HEADERS += $(srcdir)/arch/x86/odp/api/cpu_arch.h -endif - odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ $(builddir)/include/odp/api/plat/static_inline.h \ @@ -238,27 +222,47 @@ __LIB__libodp_linux_la_SOURCES = \ odp_weak.c if ARCH_IS_ARM -__LIB__libodp_linux_la_SOURCES += arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h endif if ARCH_IS_AARCH64 -__LIB__libodp_linux_la_SOURCES += arch/aarch64/odp_cpu_arch.c \ - arch/aarch64/odp_sysinfo_parse.c +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/aarch64/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c +arch_odp_headers = $(srcdir)/arch/mips64/odp/api/cpu_arch.h endif if ARCH_IS_POWERPC -__LIB__libodp_linux_la_SOURCES += arch/powerpc/odp_cpu_arch.c \ +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c +arch_odp_headers = $(srcdir)/arch/powerpc/odp/api/cpu_arch.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c +arch_odp_headers = $(srcdir)/arch/x86/odp/api/cpu_arch.h +noinst_HEADERS += $(srcdir)/arch/x86/cpu_flags.h endif +noinst_HEADERS += $(srcdir)/arch/default/odp/api/cpu_arch.h + +odpapiinclude_HEADERS += $(arch_odp_headers) + if HAVE_PCAP __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_arch.c b/platform/linux-generic/arch/aarch64/odp_global_time.c similarity index 68% rename from platform/linux-generic/arch/aarch64/odp_cpu_arch.c rename to platform/linux-generic/arch/aarch64/odp_global_time.c index b87d1c102..97444f7e9 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/aarch64/odp_global_time.c @@ -8,48 +8,11 @@ #include -#include #include -#include -#include -#include #include #include -#define GIGA 1000000000 - -uint64_t odp_cpu_cycles(void) -{ - struct timespec time; - uint64_t sec, ns, hz, cycles; - int ret; - - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); - - if (ret != 0) - ODP_ABORT("clock_gettime failed\n"); - - hz = odp_cpu_hz_max(); - sec = (uint64_t)time.tv_sec; - ns = (uint64_t)time.tv_nsec; - - cycles = sec * hz; - cycles += (ns * hz) / GIGA; - - return cycles; -} - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - int cpu_has_global_time(void) { uint64_t hz = cpu_global_time_freq(); diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c deleted file mode 100644 index 1e2c729a7..000000000 --- a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include -#include -#include - -int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo) -{ - int i; - - ODP_DBG("Warning: use dummy values for freq and model string\n"); - for (i = 0; i < MAX_CPU_NUMBER; i++) { - sysinfo->cpu_hz_max[i] = 1400000000; - strcpy(sysinfo->model_str[i], "UNKNOWN"); - } - - return 0; -} - -void sys_info_print_arch(void) -{ -} diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c deleted file mode 100644 index fc49ce371..000000000 --- a/platform/linux-generic/arch/arm/odp_cpu_arch.c +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include - -#include -#include - -#include -#include -#include -#include -#include - -#define GIGA 1000000000 - -uint64_t odp_cpu_cycles(void) -{ - struct timespec time; - uint64_t sec, ns, hz, cycles; - int ret; - - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); - - if (ret != 0) - ODP_ABORT("clock_gettime failed\n"); - - hz = odp_cpu_hz_max(); - sec = (uint64_t)time.tv_sec; - ns = (uint64_t)time.tv_nsec; - - cycles = sec * hz; - cycles += (ns * hz) / GIGA; - - return cycles; -} - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - -int cpu_has_global_time(void) -{ - uint64_t hz = cpu_global_time_freq(); - - /* - * The system counter portion of the architected timer must - * provide a uniform view of system time to all processing - * elements in the system. This should hold true even for - * heterogeneous SoCs. - * - * Determine whether the system has 'global time' by checking - * whether a read of the architected timer frequency sys reg - * returns a sane value. Sane is considered to be within - * 1MHz and 6GHz (1us and .1667ns period). - */ - return hz >= 1000000 && hz <= 6000000000; -} - -uint64_t cpu_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time_freq(void) -{ - return 0; -} diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c deleted file mode 100644 index 1e2c729a7..000000000 --- a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include -#include -#include - -int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo) -{ - int i; - - ODP_DBG("Warning: use dummy values for freq and model string\n"); - for (i = 0; i < MAX_CPU_NUMBER; i++) { - sysinfo->cpu_hz_max[i] = 1400000000; - strcpy(sysinfo->model_str[i], "UNKNOWN"); - } - - return 0; -} - -void sys_info_print_arch(void) -{ -} diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c index fab351feb..8a8da7445 100644 --- a/platform/linux-generic/arch/default/odp_cpu_arch.c +++ b/platform/linux-generic/arch/default/odp_cpu_arch.c @@ -12,10 +12,7 @@ #include #include -#include -#include #include -#include #define GIGA 1000000000 @@ -39,28 +36,3 @@ uint64_t odp_cpu_cycles(void) return cycles; } - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - -int cpu_has_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time_freq(void) -{ - return 0; -} diff --git a/platform/linux-generic/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c new file mode 100644 index 000000000..ccc588825 --- /dev/null +++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c @@ -0,0 +1,19 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include + +uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} diff --git a/platform/linux-generic/arch/default/odp_global_time.c b/platform/linux-generic/arch/default/odp_global_time.c new file mode 100644 index 000000000..89cce1cfb --- /dev/null +++ b/platform/linux-generic/arch/default/odp_global_time.c @@ -0,0 +1,33 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include + +#include +#include + +#include +#include +#include +#include +#include + +int cpu_has_global_time(void) +{ + return 0; +} + +uint64_t cpu_global_time(void) +{ + return 0; +} + +uint64_t cpu_global_time_freq(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c index 143867ea0..620a01044 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c @@ -22,28 +22,3 @@ uint64_t odp_cpu_cycles(void) return cycle; } - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - -int cpu_has_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time_freq(void) -{ - return 0; -} diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c index fab351feb..6a16f13a2 100644 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c @@ -39,28 +39,3 @@ uint64_t odp_cpu_cycles(void) return cycles; } - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - -int cpu_has_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time(void) -{ - return 0; -} - -uint64_t cpu_global_time_freq(void) -{ - return 0; -} diff --git a/platform/linux-generic/arch/powerpc/odp_global_time.c b/platform/linux-generic/arch/powerpc/odp_global_time.c new file mode 100644 index 000000000..d54ba6bc8 --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp_global_time.c @@ -0,0 +1,15 @@ + +int cpu_has_global_time(void) +{ + return 0; +} + +uint64_t cpu_global_time(void) +{ + return 0; +} + +uint64_t cpu_global_time_freq(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c index 50fbbac66..a20d91734 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_arch.c +++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c @@ -9,7 +9,6 @@ #include #include -#include #include #include @@ -30,74 +29,3 @@ uint64_t odp_cpu_cycles(void) return tsc.tsc_64; } - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - -uint64_t cpu_global_time(void) -{ - return odp_cpu_cycles(); -} - -#define SEC_IN_NS 1000000000ULL - -/* Measure TSC frequency. Frequency information registers are defined for x86, - * but those are often not enumerated. */ -uint64_t cpu_global_time_freq(void) -{ - struct timespec sleep, ts1, ts2; - uint64_t t1, t2, ts_nsec, cycles, hz; - int i; - uint64_t avg = 0; - int rounds = 3; - int warm_up = 1; - - for (i = 0; i < rounds; i++) { - sleep.tv_sec = 0; - - if (warm_up) - sleep.tv_nsec = SEC_IN_NS / 1000; - else - sleep.tv_nsec = SEC_IN_NS / 4; - - if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts1)) { - ODP_DBG("clock_gettime failed\n"); - return 0; - } - - t1 = cpu_global_time(); - - if (nanosleep(&sleep, NULL) < 0) { - ODP_DBG("nanosleep failed\n"); - return 0; - } - - if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts2)) { - ODP_DBG("clock_gettime failed\n"); - return 0; - } - - t2 = cpu_global_time(); - - ts_nsec = (ts2.tv_sec - ts1.tv_sec) * SEC_IN_NS; - ts_nsec += ts2.tv_nsec - ts1.tv_nsec; - - cycles = t2 - t1; - - hz = (cycles * SEC_IN_NS) / ts_nsec; - - if (warm_up) - warm_up = 0; - else - avg += hz; - } - - return avg / (rounds - 1); -} diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c new file mode 100644 index 000000000..3ed243cc6 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -0,0 +1,77 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include + +#include + +#include +#include +#include +#include + +uint64_t cpu_global_time(void) +{ + return odp_cpu_cycles(); +} + +#define SEC_IN_NS 1000000000ULL + +/* Measure TSC frequency. Frequency information registers are defined for x86, + * but those are often not enumerated. */ +uint64_t cpu_global_time_freq(void) +{ + struct timespec sleep, ts1, ts2; + uint64_t t1, t2, ts_nsec, cycles, hz; + int i; + uint64_t avg = 0; + int rounds = 3; + int warm_up = 1; + + for (i = 0; i < rounds; i++) { + sleep.tv_sec = 0; + + if (warm_up) + sleep.tv_nsec = SEC_IN_NS / 1000; + else + sleep.tv_nsec = SEC_IN_NS / 4; + + if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts1)) { + ODP_DBG("clock_gettime failed\n"); + return 0; + } + + t1 = cpu_global_time(); + + if (nanosleep(&sleep, NULL) < 0) { + ODP_DBG("nanosleep failed\n"); + return 0; + } + + if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts2)) { + ODP_DBG("clock_gettime failed\n"); + return 0; + } + + t2 = cpu_global_time(); + + ts_nsec = (ts2.tv_sec - ts1.tv_sec) * SEC_IN_NS; + ts_nsec += ts2.tv_nsec - ts1.tv_nsec; + + cycles = t2 - t1; + + hz = (cycles * SEC_IN_NS) / ts_nsec; + + if (warm_up) + warm_up = 0; + else + avg += hz; + } + + return avg / (rounds - 1); +} From patchwork Mon Oct 9 14:00:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115245 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2597496qgn; Mon, 9 Oct 2017 07:06:14 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDuAubdoTqG/iNM83/wKflpClmGpDk4OLJy7dRc7JzH1Ha3ZLa676bHpfv1WYgc+otoVAsT X-Received: by 10.36.206.71 with SMTP id v68mr14683223itg.116.1507557974399; Mon, 09 Oct 2017 07:06:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507557974; cv=none; d=google.com; s=arc-20160816; b=PMvE95fVEJ8a2WVqbNfkFaK7vGyOtarSSYsTY05KCNne7EPTAYoreHdbNO3mkmbKhb 7cAqs6WGQbOx+Md8si3ReSvmZIe4p6iUZzpKkqKXXrRhrNR2PP7NWUHVWl+9QDeQHRn7 unq4qqCvWmkYnQSePqm8L7NxQ18TnGEiVfSiKKqjWviCm5r8eN2wTJ0eaUZpwx1FU3m2 lTWogF6AkyDjcHlfn91XmjmOL2zkfz/KQNQaMIsRBzSvJ0YCE9iFrRLuaKrWv4ktqM+q azJEtO5JMiexNWUcZ0vrFN2I2nFyK+lCAhhKs1jTy6jXCQQP9lMdZWeDseSjbXYvmF+i o3Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Fh9BaBYhATVwuEic2oElLTMPMutRDkGJR4IG1OZzkFU=; b=L7P6b+F5u0hY+fbgPgqmuQ0XFuLhy1XKn/t3rSEQBM02Pb9X1GiqBGpLS6viMRnLP6 VLysk5jAHOQGCvrp78vfivXu5dBgDPKqn691r2ys2sMhJfYCtgIr7L3FQzJeVvqUxIy1 jhO2Q/EFl1t8u3Vy2w152HOG85iqRWWec0EgArtuN2xbhtTcBAzbvRZUnkdD6JxjbafH /qK8mbHDxCcOM4lid75Y6plnXAorHntupzFCvX6xzfme8LXroU2oulmkb2JUIhnYeWDR 06Bdw69X+RR4MvMTWp71EyZeB/Bt/O0kWMuOC7rokcoBH2NV1REKpJ/jAeV3jo1bNOFH EJxg== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m15si6928104itb.162.2017.10.09.07.06.13; Mon, 09 Oct 2017 07:06:14 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id BD08360A54; Mon, 9 Oct 2017 14:06:13 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 0EB6960C0F; Mon, 9 Oct 2017 14:01:24 +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 10DB460BDC; Mon, 9 Oct 2017 14:00:59 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 513D360AF4 for ; Mon, 9 Oct 2017 14:00:49 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 6A3EB1340E4E for ; Mon, 9 Oct 2017 17:00:46 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id VmBBllyUo2-0kfiGnId; Mon, 09 Oct 2017 17:00:46 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0jdmeYCo; Mon, 09 Oct 2017 17:00:45 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:10 +0300 Message-Id: <1507557617-32018-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 6/13] travis: typo to call dynamic executable 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov we changed name for dynamic executable on compile line but did not change it on execute line. Signed-off-by: Maxim Uvarov Reviewed-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 395feb0ef..5069ddff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -200,7 +200,7 @@ script: - echo "Static link.." - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - if [ -z "$CROSS_ARCH" ] ; then - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst ; + LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; ./odp_hello_inst_static ; fi - popd From patchwork Mon Oct 9 14:00:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115247 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2601738qgn; Mon, 9 Oct 2017 07:09:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCN1d1zqAJ2vnOIGL/3Nn7ieJDS0sYlYS939VIQ+bTFlejXiyu8MbgJkzMEu44EJdd/yUeY X-Received: by 10.107.47.11 with SMTP id j11mr14735002ioo.217.1507558198803; Mon, 09 Oct 2017 07:09:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558198; cv=none; d=google.com; s=arc-20160816; b=vxxWiiTEy6LU3v9U5ZVSdKi8Ko5DBhrdjqtDH11Lf6qbyCNLWx0l7fqxmsKO0oYZYO uGyOkcZ9YXiqBW5qnGmtcwvNryc2nt8HWT/qrAUteL6fwBBHYOZcDePhVVoC6CbiMlvo xNMAzuPwcOve/LJq0I33KEongMeYjwakW7yGPXEJyqUZVbiaQC0y4sVwAGd9bOgAorLN wCHyvtBBWjymagkv00JMqJjxxVBoisHHPCz5EKjKUGO38EwNVsmOBwOyWBxLHb3FZRIY elnLokuPKrmMUUyjRQOHxtmYQDQ1CoX4UCzOI51HomrSRPZrC4Zr4aAmrXTPZyLIG9e0 vwBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=2XeUKnckYrxL61phHN3s6Oc1xfdJmbuo1+8lF0D/D6M=; b=zB5oIGV3meZYWu2Ra0qraHBaVDXIzG++fY92LfrbCRXIkaKknQIbOkpEXkOJrtYtBz 24mdjPFBRptrbs1xrI2JdkbjfUiS6ZroJ6Emt581ZEzNppjIcznjKYXefmGGXoiOqiSf rBr8hXRVinEdt3NbWg+yDvQEPqsDtEZQKccL1Q1U5KIFkYtnar9lzBL7PVU4b2kwS/KN J7gjKhleRYt1PRVbAxLGI1gbvKmkYqZh7kuE0InNIIIazgbOy+WodfVca52fS+t5qA44 QvCl9dl7YK13j9Igk0tZYz8wQlr2xCzx2sQVJrrwMaZ8fmycnL5SKG7JiM8DdEn4MF/e lYmg== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l22si7123524ita.21.2017.10.09.07.09.58; Mon, 09 Oct 2017 07:09:58 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CD6BE60CC6; Mon, 9 Oct 2017 14:09:57 +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=-4.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, 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 2D02C60C3E; Mon, 9 Oct 2017 14:02:44 +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 C295660C4E; Mon, 9 Oct 2017 14:02:35 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 52A22609C3 for ; Mon, 9 Oct 2017 14:00:54 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward102o.mail.yandex.net (Yandex) with ESMTP id F40F55A014F0 for ; Mon, 9 Oct 2017 17:00:52 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rOwQx8JbSz-0kXCeXvB; Mon, 09 Oct 2017 17:00:46 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0kdqhDLl; Mon, 09 Oct 2017 17:00:46 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:11 +0300 Message-Id: <1507557617-32018-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 7/13] linux-gen: fixing typos 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Mykyta Iziumtsev Signed-off-by: Mykyta Iziumtsev Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ platform/linux-generic/doc/platform_specific.dox | 2 +- platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/doc/platform_specific.dox b/platform/linux-generic/doc/platform_specific.dox index e116ec617..41ad53f4b 100644 --- a/platform/linux-generic/doc/platform_specific.dox +++ b/platform/linux-generic/doc/platform_specific.dox @@ -28,7 +28,7 @@ * to odp_init_local() is actually fully defined by these * requirements: It has to be the value returned by the * unique call to odp_init_global() made by one single - * acsendant of the current process. + * ancestor of the current process. */ /** diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h index f47a13f6f..be3926d46 100644 --- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h +++ b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h @@ -56,7 +56,7 @@ extern "C" { #define ODP_TM_MAX_SCHED_WEIGHT 255 /** The ODP_TM_MAX_TM_QUEUES constant is the largest number of tm_queues - * that can handled by any one TM system. + * that can be handled by any one TM system. */ #define ODP_TM_MAX_TM_QUEUES (16 * 1024 * 1024) From patchwork Mon Oct 9 14:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115248 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2602770qgn; Mon, 9 Oct 2017 07:10:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBq4AZktjQIdPoeyxb7XDDsrTNtSG5po5BlycVjxLZfpZAOckEw9RCxcsoAXvPc3kuCJ/w3 X-Received: by 10.200.28.42 with SMTP id a39mr5874085qtk.126.1507558245065; Mon, 09 Oct 2017 07:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558245; cv=none; d=google.com; s=arc-20160816; b=iWvaiGiGpN+bdDNSiHR0jU7lGqpbUXN9aTYXcDXtUUrz+KSSPHKiPGEQZ2+/QfUewY qrMNen1nVlN5LgxXY+RsSUIhkMPwECWyGUhEt0j3/DPf47c/s6ZS5XDG9dFZbZ1oWrqe 76FwLPCOLGsJefD0BrkclVxg5s8Y7BNII1m51p1Sk3BFyH+bjBBKjg8HCpEE1nPJ6tkS GQv19nfaYXRvjtDKwAsoFZ3VsWTp+jF3kI5+Sy21HhgQT6UqYBCz0lDV3j5w2C0mr3yd EuPZdES7Gu3crZ9eajjlXfDyrLA4yLX18jMjlm4XtbGbRhImgxfbGCseHL/doguyOF7A NqIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=TCDEWf1ShOYsdTph2z1u49M3pR4JHt1yFC2oKEGYvTw=; b=lGbjsNS4787POzKos/ZBxutcgtGS/ihEFLUUIHDYsDsUduH6wz6brbvJcI3BZAwPII yAT8XXz0fES3K3HOUUGvd+JN2iYaWBbTWHWNvg/wB3zNA+M0hMWc2WAikWNbu1tEpbk5 EpUYj6YKCen9hqyKHzixqJCoR/NBtLOMsUxUX+U1OYeMvDChofdmb8BxA08F1Zwso/0V Rcj/AapUoVvlSCVXU0zrznCfqgobLxurYQWq1mW9y+YIeAy6N9TEig8G9sNNrE0nvkhU bbL7jOqjF571FUx0Hzlp7KFPZjnpBvI6uUuUkKsJeohXQc9MYHHokZ63WSpARjT51P1m wcIA== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id u36si2634548qtb.345.2017.10.09.07.10.44; Mon, 09 Oct 2017 07:10:45 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id B891560C2F; Mon, 9 Oct 2017 14:10:44 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 706B3609C3; Mon, 9 Oct 2017 14:02:51 +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 0041860C3E; Mon, 9 Oct 2017 14:02:36 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id D075E60BDB for ; Mon, 9 Oct 2017 14:00:54 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward101p.mail.yandex.net (Yandex) with ESMTP id AE7FE6A835D1 for ; Mon, 9 Oct 2017 17:00:53 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tdYAWJFGet-0r3m7keW; Mon, 09 Oct 2017 17:00:53 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0rdWL1pU; Mon, 09 Oct 2017 17:00:53 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:12 +0300 Message-Id: <1507557617-32018-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 8/13] travis: fix netmap module loading 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Travis script will insmod netmap.ko only it was rebuilt during this session, which is wrong. Split the ifs, so that module loading does not depend on the cache contents. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5069ddff6..88cc3f4eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,13 +167,15 @@ install: # Netmap pktio - | - if [ -z "$CROSS_ARCH" -a ! -f "netmap/LINUX/netmap.ko" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git - pushd netmap/LINUX - ./configure - make - sudo insmod ./netmap.ko - popd + if [ -z "$CROSS_ARCH" ]; then + if [ ! -f "netmap/LINUX/netmap.ko" ]; then + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + pushd netmap/LINUX + ./configure + make + popd + fi + sudo insmod ./netmap/LINUX/netmap.ko fi script: From patchwork Mon Oct 9 14:00:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115249 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2423810edb; Mon, 9 Oct 2017 07:11:26 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDI3iVGrEvYn90gmgGdojJic8BA7YP3+O6bZ6ytsM66FvSStsyIv6uPh4Iw3dPXW28homEh X-Received: by 10.200.4.29 with SMTP id v29mr9574038qtg.76.1507558286504; Mon, 09 Oct 2017 07:11:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558286; cv=none; d=google.com; s=arc-20160816; b=AW+QabcR393qlIU7hDhgLEZL5f+WEc5JALtNlisuRxgiBMSWBvE4KTfLhNzINYPxcH Set9bHjtFiGRJSs/18UaLCmVvUUaS+C/HlHINoS75zs4NAWsyvodM6VXyD3ecOdUOuDE 6UbygZZ51qOAQrwYmflpVvGy+q0mwNmKEagEVpP+1M9lNKh3VcpI+TGqG0jJ9FHRbCzY 7U2iHRq42qTmB2MnW8dH3InExCW6MX8TSLAbZRlsiEJyP5usq69V1clhYt/dlZpVIVPj 66QPQMDFguHVRZO/BOlvkXeuFRoyCw4flpUa+0+c2JRiW+P9pRAStLLaaUorHg+dez3u FrxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=S3uq9RmOwG3wsILU954zw2HrsZo4xrcUwJhsZcHb8cI=; b=dzDPLc8c29u4kaIitZ2oHPa8pbdrh4ZYXO/hrJIK3DLNsVKRrW93pFr4+i7Qz9vMCm BjoCEXW4aEyBBbgAOtTGtzlai6viSL+hvVnGBsfhxulXGmyrkdSjs9Prspd07MOzIR4v s1ZRIU0DajKpPlqhYKWQU6rGcR/NsAv2fVbkQNG32I4mWap6Ye/af9uZ4f3O+J5eTLjR +FUuKjea31TIqWuwsNQZ2KhrbwbrfxgIvs60REhrlBKAW7g5m+AbtHJHI2Fw1WZb8Iqm /dcfqOaeIC40b/A6Q74VhGgPd/92sCmwkPUb8wbTdUD+ulPVlOEy92u8si3pGtVm5OCl DFKQ== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 77si1454648qkt.393.2017.10.09.07.11.26; Mon, 09 Oct 2017 07:11:26 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3BBDE60BEF; Mon, 9 Oct 2017 14:11:26 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 A00DF60C63; Mon, 9 Oct 2017 14:02:58 +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 C665760C4B; Mon, 9 Oct 2017 14:02:47 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 3344560812 for ; Mon, 9 Oct 2017 14:00:56 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward105p.mail.yandex.net (Yandex) with ESMTP id C37464082093 for ; Mon, 9 Oct 2017 17:00:54 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9q9o0F7SQK-0sAWsK3N; Mon, 09 Oct 2017 17:00:54 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0rd8Ofp6; Mon, 09 Oct 2017 17:00:54 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:13 +0300 Message-Id: <1507557617-32018-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 9/13] travis: temporary turn off dpdk caching 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov some issues happened with dpdk, needed to be more clear what we build. Turn off dpdk cache for now. Signed-off-by: Maxim Uvarov Reviewed-by: Bill Fischofer --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 88cc3f4eb..7aff2e623 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ cache: ccache: true pip: true directories: - - dpdk + #- dpdk - netmap - $HOME/cunit-install - $HOME/doxygen-install From patchwork Mon Oct 9 14:00:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115250 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2424541edb; Mon, 9 Oct 2017 07:12:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDlzLU1bD+7GqHPZnlDmHEeidu9G7we0M75ELZkFFgzH9rYKtuMf1z3ArIHJO+4QcR0yIin X-Received: by 10.107.168.103 with SMTP id r100mr13159910ioe.158.1507558327144; Mon, 09 Oct 2017 07:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558327; cv=none; d=google.com; s=arc-20160816; b=mRhpbgPBlQDxYqjjL6ng964Z6ga78R8zdBMEBnbZqc792Ezg+0Zhq/sFXbSg6IeRc5 jDEK70QQ0W14kzFCDATLBk5iE/wFLL+wUoecqw8intSpCGpOdh5ALLDYoSRI3Ig7JRTl PUpKElq57UIzy5Z+dCM2yU2rjsZROgL+WnNEIxEpcd7FgoYZTkCRnxval+an1RUJUoru lJe87baxjOAJQiUUEad2U7eaqM0ff+Vec72UzYb/QFEBvE92wM8rgxPWjdyFMYMbcKes j6YGi6U7A6QRPHBP5S5XsznNHU+nttgWVHcJBHRlZ5eBhFDG7+BpLSoemcJfndLVuVYx UoJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=PvjefdPmaTkaXrZHDuNk/ex+K188YOkVGqDjl46gCmQ=; b=MVUOp2at9dI3aDMo9exOmPN3bTBPehscRj0Q0Aonwwd1slJo4hs+gVQq1vSjujltvK 5B7V0Qhltk2+VJ/dnh+7ZdEv40MKZ7x+zzevQ+fa7v/JC23Nl1K4iG09ji22y7MYZjRN sl5GTOIGRjjBVSigO7btLVbl1mFQ32v2ycmb9IZTBrvWL64tXuRWWiy7GWTWxAZIbtkT e3V8/n1JUE5+sZhsTDdWllQ+Q9qbIKi3umAT7SFlYUonBveRoXEOu4ukuWh5KMe6ZRiF pajkPbSOPzrYvy/jP9bC3asS817xF4Rt5w0IoLy3v/E6jjCwfPSpCH84TgtjeEyohtvV fpgg== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z77si6469594ioz.164.2017.10.09.07.12.06; Mon, 09 Oct 2017 07:12:07 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id AE7FF60BFA; Mon, 9 Oct 2017 14:12:06 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 0925060BED; Mon, 9 Oct 2017 14:03:10 +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 E48FC60A54; Mon, 9 Oct 2017 14:02:57 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id DE9B860A54 for ; Mon, 9 Oct 2017 14:00:59 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 814B45881253 for ; Mon, 9 Oct 2017 17:00:55 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id VJ3RQlNY0N-0tDOJaHx; Mon, 09 Oct 2017 17:00:55 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0tdqv1CI; Mon, 09 Oct 2017 17:00:55 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:14 +0300 Message-Id: <1507557617-32018-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 10/13] travis: build dpdk for general cpu 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov as described here build dpdk for Sandybridge https://stackoverflow.com/questions/37386738/ error-when-running-dpdk-app-on-valgrind to make it work in Travis Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7aff2e623..990579202 100644 --- a/.travis.yml +++ b/.travis.yml @@ -159,6 +159,8 @@ install: make config T=${TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + cat .config |grep RTE_MACHINE + sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"snb",' .config popd make install T=${TARGET} EXTRA_CFLAGS="-fPIC" rm -r ./doc ./${TARGET}/app ./${TARGET}/build From patchwork Mon Oct 9 14:00:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115251 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2425414edb; Mon, 9 Oct 2017 07:13:00 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDiqZrP+SAolz4u9sxSZHwE+yJTTq4YAnBfinNooYrBvKn5JV3fTIamspz8GyKZRsZihEOp X-Received: by 10.36.118.81 with SMTP id z78mr1144195itb.97.1507558380611; Mon, 09 Oct 2017 07:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558380; cv=none; d=google.com; s=arc-20160816; b=pF8Dik7cuTPlM7Vfgu56G2He8aS1LIMXZQcqe82PUicCvXe4VSZm0i6lcKdY4l0kNs BBbbsFKYoIYHs8aWJDiE/Dhqu6OmX5bF2XPgPeYCuDxRU7pKqg/a/jfXs6pNLweuxs+0 yWJk6GigmtGKMf2e1ziS/47uXNMtZ154NL5Fyiu1q/VMkFwtVmU9Gsi3yTmhNHnxJqD8 MBSBczn9p+mqc93TPiY+yfEexYgmdNucsmNLGW+jWObRk4e9b1cStrSybcWqy7XcRrSQ M8ivCFX6ONfszVmsT7i99MPqQAGzGmgodL95rbGKwND7ZFsLodF77jrFkai/gdZGXsXK G9MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=4dCbHczRsANDIx/YMnWIi6n7nsVVoUilrjqhnZZHAUs=; b=K49q7Nyo8cRHS1KeS7X0yRpWMaqFffm3zClK8zkLYauT63u4Qj9h1+1AG1/7U1Sq4U FsJ7yH1evDoJTq5kkdtw7ETOX/fjzUeRFxnZjjjYgUu78Zy1D9rKW2tyIwh0UPfwCzfl +/OKCggq/IW/U94eUTjyPOK7gy+K8baCXi4H2gAZZmOJpSoK9B5D/OvL3AFtJPaYZLG7 7QG13F84RCPPWzBSZ1z8OFyYivGc0Kc4OgyHGbfiS5N51Nt0mydnblJ6qeGYvHdet5JD z+gJAHD/fmMJtTiJxqufUb6lBCbM6x4oH0UFiwV5tV5l5cQUbxbH0WgT6zzufvmukUsd Mgbw== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 189si6366046ioy.392.2017.10.09.07.13.00; Mon, 09 Oct 2017 07:13:00 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1CF9C60C1D; Mon, 9 Oct 2017 14:13:00 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 5CDB860C61; Mon, 9 Oct 2017 14:03:15 +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 18F9660C6C; Mon, 9 Oct 2017 14:03:00 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 1F33F6080D for ; Mon, 9 Oct 2017 14:00:58 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 16F521342E1C for ; Mon, 9 Oct 2017 17:00:57 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id g2121rlzDw-0vvSav7W; Mon, 09 Oct 2017 17:00:57 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0td8QEeN; Mon, 09 Oct 2017 17:00:55 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:15 +0300 Message-Id: <1507557617-32018-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 11/13] travis: purge dpdk cache on version change 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov changing dpdk version and not clearing build can lead to reference to old cached not supported dpdk version. Needed to remove cache if version was changed. Signed-off-by: Maxim Uvarov Reviewed-by: Bill Fischofer Reviewed-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 990579202..7fcd98e2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,11 +149,17 @@ install: fi - gem install asciidoctor -# DPDK pktio. Note that cache must be purged if dpdk version changes. + # DPDK pktio. Note that cache must be purged if dpdk version changes. + - DPDK_VERS="17.02" + - | + CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` + if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then + rm -rf dpdk + fi - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - | if [ -z "$CROSS_ARCH" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 http://dpdk.org/git/dpdk dpdk + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate make config T=${TARGET} O=${TARGET} From patchwork Mon Oct 9 14:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115252 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2425951edb; Mon, 9 Oct 2017 07:13:34 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCR0o3Y9LdfqfEMJxYfm9OAsxIphmHn2qgJqhuMbSQAV81YT/wXRDvr3EGllBd4dSr6l/vU X-Received: by 10.36.51.212 with SMTP id k203mr14618479itk.74.1507558413888; Mon, 09 Oct 2017 07:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558413; cv=none; d=google.com; s=arc-20160816; b=G46N0AZ6zcTCZvjdxKTrT0IzNIVYXsszEVxj+wmegzJdzYxBhei1qXsPo1c0k9d3AX ilCBGziEbEKa4HmtBtA6JmqmveEnZ/jCI2dlDGtOhNmc3yOM1X0YTAaN0bbnBlmJQMDQ ZcYA//jaO75QpL85I0ai/OH+6Elik39uyKM/xAmh/iShdH32BdKLnHO/SPDBztEr4Lj6 s4G+N5HQkng9JWr9s8hgf+v4lV7r30D9HL2h6nMn3AqRuQC90l6lvhvHB1lruVHfUjbT x4qji/GRqWg+B2pcDhgamz2dANVFcax7owt/w3NOBQh3wSmeYc05u05p0szDk9ONYo6q pgdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=7qoJUSAyB3hdYBVTyGQUdmi4hgof8rnWNm+G5JxwW5U=; b=fnd5gbDQDt+E8EHBrDXP9Uthmvkp6zqPPbvXwotyOjgkkjyuOWdg3dPYlbEAW/D/YA ixdmVVdilaOjKWG/eh19LdjAhltXkxDcwqVrOFRyRbwVied8ImM4My/Zw1aG4EkcrvwK YGD+YNJre96ymwCIGStAODcFJDSKqJ7ePbt6ggDsMapvqIL6nE0tHnYZq1YBnkLqB1Pc 28cpWsW7ABRMyw0HpcTaHV6NVo2XhYiE7THbAsHOaBZQVH36gPgbFscdb9/7Fe4CHAm5 5B12DpN07mNLbRM/+8i9L/hqlUjzxJMsfONWjvIWA1a3oxGi9jcHYtKZAXeo2oa2PENa p2Hw== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b186si266291ioa.28.2017.10.09.07.13.33; Mon, 09 Oct 2017 07:13:33 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 5DE4A60C29; Mon, 9 Oct 2017 14:13:33 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 A269860BFB; Mon, 9 Oct 2017 14:03:26 +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 4AF9B60B4E; Mon, 9 Oct 2017 14:03:00 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id F1AF860AF4 for ; Mon, 9 Oct 2017 14:00:59 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 8C95F218439D for ; Mon, 9 Oct 2017 17:00:58 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1nxWGZzInK-0woaA37g; Mon, 09 Oct 2017 17:00:58 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0vdKSmGb; Mon, 09 Oct 2017 17:00:57 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:16 +0300 Message-Id: <1507557617-32018-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 12/13] test: make odp_pktio_perf more scalable 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Ola Liljedahl Amortise overhead of atomic increment over multiple packets so to minimise this scalability bottleneck. Signed-off-by: Ola Liljedahl Reviewed-by: Brian Brooks Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov Jira: ENTNET-487 Change-Id: Idefb23da5d9b9b9c2c82eb46533cdf82dc19442e --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ test/common_plat/performance/odp_pktio_perf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index a170e1285..210a833fe 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -167,14 +167,13 @@ static test_globals_t *gbl_args; /* * Generate a single test packet for transmission. */ -static odp_packet_t pktio_create_packet(void) +static odp_packet_t pktio_create_packet(uint32_t seq) { odp_packet_t pkt; odph_ethhdr_t *eth; odph_ipv4hdr_t *ip; odph_udphdr_t *udp; char *buf; - uint16_t seq; uint32_t offset; pkt_head_t pkt_hdr; size_t payload_len; @@ -209,7 +208,6 @@ static odp_packet_t pktio_create_packet(void) ODPH_IPV4HDR_LEN); ip->ttl = 128; ip->proto = ODPH_IPPROTO_UDP; - seq = odp_atomic_fetch_inc_u32(&ip_seq); ip->id = odp_cpu_to_be_16(seq); ip->chksum = 0; odph_ipv4_csum_update(pkt); @@ -263,9 +261,11 @@ static int pktio_pkt_has_magic(odp_packet_t pkt) static int alloc_packets(odp_packet_t *pkt_tbl, int num_pkts) { int n; + uint16_t seq; + seq = odp_atomic_fetch_add_u32(&ip_seq, num_pkts); for (n = 0; n < num_pkts; ++n) { - pkt_tbl[n] = pktio_create_packet(); + pkt_tbl[n] = pktio_create_packet(seq + n); if (pkt_tbl[n] == ODP_PACKET_INVALID) break; } From patchwork Mon Oct 9 14:00:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115253 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2426931edb; Mon, 9 Oct 2017 07:14:32 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAXSxJz1ZvpO8E0HbLCQUjOwH/8C1Udy2buk007EO8SF7FEvJ4onWnuxb2Y3twL9zcx1Dd4 X-Received: by 10.107.14.203 with SMTP id 194mr13154695ioo.127.1507558472097; Mon, 09 Oct 2017 07:14:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558472; cv=none; d=google.com; s=arc-20160816; b=sT7aK+b/Q+wsh2pPvCyp6LmWtLTiq9woiHfOzeu25ddxFfVZ4XBxRmmROEqTo0k3Yg CBdZMaHj9DcLHPxu964TSZipq+wuMhI3t8hY2KTBk2ehgL0FQI2QVAmhROB4vfMHRGPo rzrXlcPg5OBZSRWqUG1n64VmUqtEn/vXFKF4+davV4CUmvZLptFsRuPSGvADsfobuS7C i4oav7x+W/PDk8p9iJ+uVHPc3NIxjyqHHb5u0SCkTDGzOWeLi5Zvo5t+xcqqAUYFfAyL 6OX0py1PslbcJ9tJi6Ph91pzJcbOjwuTP03pwG12ix9lg4hIARjA+NuvAJHHIc/ew8it OBzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=w4UNSeyS40SOKu537colxRmOFtFaaUCjYVyWIL4+d+8=; b=RNzLsQwB3wrryeQR/XvLSDR4+1Xz8t2CipCV5KL7Eg5b2sLXdNKdWrgl5zWPUVJDAi vBIPjSw94LRkeH5GG3F4d5maX2UNTq+KTrzpa0kd11oZGugCkIpM+yD40W3tA7vXud1S fczD4298KX4sx5jMnMb+4LjxE+85jNA2AFRtw5QGxxjIVJ0HeVOM/gQIQN5FM612rY1d Pvx9bbCU28d7vJ85XxjyB8U0EbH4zRSF0SHbBASsF9bUi3LE3vp8gH7hkk8+f8tCqixQ ATEZvK44uhHhFpVCulXQwWK8LI3n6iNfUsTI+UrJGNjQsTgBh8rnfXg3lNxbjhxA8eeK 9LCA== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m65si5756302iod.307.2017.10.09.07.14.30; Mon, 09 Oct 2017 07:14:32 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3C85160C11; Mon, 9 Oct 2017 14:14:30 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 E548560C95; Mon, 9 Oct 2017 14:03:29 +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 06DCC60BED; Mon, 9 Oct 2017 14:03:09 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id E704760BDF for ; Mon, 9 Oct 2017 14:01:00 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 4D94E5882F96 for ; Mon, 9 Oct 2017 17:00:59 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0T9oZwUHwW-0x5OBiAa; Mon, 09 Oct 2017 17:00:59 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0wdia0sq; Mon, 09 Oct 2017 17:00:58 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 9 Oct 2017 17:00:17 +0300 Message-Id: <1507557617-32018-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 13/13] test: disable packet parsing in odp_pktio_perf 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Ola Liljedahl Disable packet parsing as it is done in the driver where it affects scalability of the application. This especially problematic for e.g. the loopback pktio which has only one RX queue. Together with the improved sequence number allocation change, performance improves >2x on Hisilicon D02 (6 and 8 threads) and more of the scalability of the scheduler itself is exposed. Signed-off-by: Ola Liljedahl Reviewed-by: Brian Brooks Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov Jira: ENTNET-488 Change-Id: I44035bf5b70af5b5bd9b7163ca55673043d2493b --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ test/common_plat/performance/odp_pktio_perf.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 210a833fe..b749ee9b9 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -239,18 +239,16 @@ static int pktio_pkt_has_magic(odp_packet_t pkt) size_t l4_off; pkt_head_t pkt_hdr; - l4_off = odp_packet_l4_offset(pkt); - if (l4_off) { - int ret = odp_packet_copy_to_mem(pkt, - l4_off + ODPH_UDPHDR_LEN, - sizeof(pkt_hdr), &pkt_hdr); + l4_off = ODPH_ETHHDR_LEN + ODPH_IPV4HDR_LEN; + int ret = odp_packet_copy_to_mem(pkt, + l4_off + ODPH_UDPHDR_LEN, + sizeof(pkt_hdr), &pkt_hdr); - if (ret != 0) - return 0; + if (ret != 0) + return 0; - if (pkt_hdr.magic == TEST_HDR_MAGIC) - return 1; - } + if (pkt_hdr.magic == TEST_HDR_MAGIC) + return 1; return 0; } @@ -739,6 +737,7 @@ static int test_init(void) odp_pool_param_t params; const char *iface; int schedule; + odp_pktio_config_t cfg; odp_pool_param_init(¶ms); params.pkt.len = PKT_HDR_LEN + gbl_args->args.pkt_len; @@ -788,6 +787,13 @@ static int test_init(void) return -1; } + /* Disable packet parsing as this is done in the driver where it + * affects scalability. + */ + odp_pktio_config_init(&cfg); + cfg.parser.layer = ODP_PKTIO_PARSER_LAYER_NONE; + odp_pktio_config(gbl_args->pktio_rx, &cfg); + if (gbl_args->args.num_ifaces > 1) { if (odp_pktout_queue_config(gbl_args->pktio_rx, NULL)) { LOG_ERR("failed to configure pktio_rx queue\n");