From patchwork Tue Nov 24 13:10:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 57225 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2078710lbb; Tue, 24 Nov 2015 05:12:59 -0800 (PST) X-Received: by 10.140.135.9 with SMTP id 9mr15938401qhh.3.1448370779242; Tue, 24 Nov 2015 05:12:59 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k110si2730892qge.44.2015.11.24.05.12.58; Tue, 24 Nov 2015 05:12:59 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id A7C1261D40; Tue, 24 Nov 2015 13:12: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.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, 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 9DD4261D39; Tue, 24 Nov 2015 13:11:11 +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 3687F61D3D; Tue, 24 Nov 2015 13:11:04 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 71E1861B1D for ; Tue, 24 Nov 2015 13:11:00 +0000 (UTC) Received: by lfs39 with SMTP id 39so19605406lfs.3 for ; Tue, 24 Nov 2015 05:10:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Usmy+jLdJq63zKDQSgPN5T8HYoSk3b/AaS8lsId8BI=; b=zXysAEFhufbQgTsyRuQwFMgzUShxVjbV3NKyM7kRPk8/dfu9IeVvF8RCo/SErQMO2o EybrqEvy80sFBEBcBW4zPIDq/qy9/X63d5sJPTFVtsoCyZC+Hw94Vk9VxA6Z5I277s0+ Q5vcGQWB9axKUws9WhNDBihD58fSNVSLSH6p5+tHwCNwtQNl4e8jhIvuVisXzwXcfRG2 nYwh7uCBrWIw7H9hIkeR7X4JwdARdPKmNtqpqaKOMGm8rXoxYJhAm/xU3bGH2/QVd0Y0 WNlYR5cdOZFkqT9C07whac0vsjofJ+4b7qZ6eV9qXTzGGUr9UaTV6gCmsdwzVQnzRp8H MWDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9Usmy+jLdJq63zKDQSgPN5T8HYoSk3b/AaS8lsId8BI=; b=XecIT02zVKqeYYd1FAEbubI9QzKf1w9upPD3HO8/+7/uiVkUClesL0Uzdqdw1BxS2X RXS0g6birJg/MzqREpY9CnoofDHf7uq8/fdxx4n1OayAH/8eaxXdloQSYcASahZuPL1h oNwnLTdeVPwoG0XKoEdEFbQ5bSvB/qvrNHj+l0TluZvr2UA+GSz/b+KWGLTV0qvn4c+M Ex+yXh5KAgSAniNJsedZ0nALvnX4jSXnp4PLgRV4Y2If/E738860DNUI+sNHuiXlnGMs ZnvwVHveMkQTkdyooddxi6Zeto/UqPd/YpEk0iFB44+ueiITzAfVmBAYsZAb8k9IcTxo 46ZQ== X-Gm-Message-State: ALoCoQmX80maMP7Up7++uTuCMlKn3AD/ui3nrH42O/yjvstoIjHdfAaW0JdopZMh5spAKRDz94aQ X-Received: by 10.25.145.76 with SMTP id t73mr3544017lfd.121.1448370659154; Tue, 24 Nov 2015 05:10:59 -0800 (PST) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id jg3sm106332lbc.17.2015.11.24.05.10.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Nov 2015 05:10:58 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 24 Nov 2015 16:10:45 +0300 Message-Id: <1448370648-18974-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448370648-18974-1-git-send-email-maxim.uvarov@linaro.org> References: <1448370648-18974-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv4 2/5] linux-generic: pktio loop: implement statistics counters X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/pktio/loop.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 44da917..ac79f81 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -23,6 +23,8 @@ /* MAC address for the "loop" interface */ static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; +static int loopback_stats_reset(pktio_entry_t *pktio_entry); + static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool ODP_UNUSED) { @@ -39,6 +41,8 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, if (pktio_entry->s.pkt_loop.loopq == ODP_QUEUE_INVALID) return -1; + loopback_stats_reset(pktio_entry); + return 0; } @@ -63,8 +67,11 @@ static int loopback_recv(pktio_entry_t *pktio_entry, odp_packet_t pkts[], pkt_hdr = odp_packet_hdr(pkts[i]); packet_parse_reset(pkts[i]); packet_parse_l2(pkt_hdr); + pktio_entry->s.stats.in_octets += odp_packet_len(pkts[i]); } + pktio_entry->s.stats.in_ucast_pkts += nbr; + return nbr; } @@ -74,12 +81,22 @@ static int loopback_send(pktio_entry_t *pktio_entry, odp_packet_t pkt_tbl[], odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; queue_entry_t *qentry; unsigned i; + int ret; + uint32_t bytes = 0; - for (i = 0; i < len; ++i) + for (i = 0; i < len; ++i) { hdr_tbl[i] = odp_buf_to_hdr(_odp_packet_to_buffer(pkt_tbl[i])); + bytes += odp_packet_len(pkt_tbl[i]); + } qentry = queue_to_qentry(pktio_entry->s.pkt_loop.loopq); - return queue_enq_multi(qentry, hdr_tbl, len, 0); + ret = queue_enq_multi(qentry, hdr_tbl, len, 0); + if (ret > 0) { + pktio_entry->s.stats.out_ucast_pkts += ret; + pktio_entry->s.stats.out_octets += bytes; + } + + return ret; } static int loopback_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) @@ -107,6 +124,19 @@ static int loopback_promisc_mode_get(pktio_entry_t *pktio_entry) return pktio_entry->s.pkt_loop.promisc ? 1 : 0; } +static int loopback_stats(pktio_entry_t *pktio_entry, + odp_pktio_stats_t *stats) +{ + memcpy(stats, &pktio_entry->s.stats, sizeof(odp_pktio_stats_t)); + return 0; +} + +static int loopback_stats_reset(pktio_entry_t *pktio_entry ODP_UNUSED) +{ + memset(&pktio_entry->s.stats, 0, sizeof(odp_pktio_stats_t)); + return 0; +} + const pktio_if_ops_t loopback_pktio_ops = { .name = "loop", .init = NULL, @@ -115,6 +145,8 @@ const pktio_if_ops_t loopback_pktio_ops = { .close = loopback_close, .start = NULL, .stop = NULL, + .stats = loopback_stats, + .stats_reset = loopback_stats_reset, .recv = loopback_recv, .send = loopback_send, .mtu_get = loopback_mtu_get,