From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id B2DDDCAF2 for ; Thu, 30 Apr 2015 14:12:13 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 30 Apr 2015 05:12:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,676,1422950400"; d="scan'208";a="687982615" Received: from unknown (HELO Sent) ([10.217.248.194]) by orsmga001.jf.intel.com with SMTP; 30 Apr 2015 05:12:11 -0700 Received: by Sent (sSMTP sendmail emulation); Thu, 30 Apr 2015 14:11:28 +0116 From: Michal Jastrzebski To: dev@dpdk.org Date: Thu, 30 Apr 2015 14:07:24 +0200 Message-Id: <1430395652-6852-6-git-send-email-michalx.k.jastrzebski@intel.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1430395652-6852-1-git-send-email-michalx.k.jastrzebski@intel.com> References: <1430395652-6852-1-git-send-email-michalx.k.jastrzebski@intel.com> Subject: [dpdk-dev] [PATCH v2 05/13] port: added port_frag stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 12:12:14 -0000 From: Maciej Gajdzica Added statistics for IPv4 and IPv6 fragmentation ports. Signed-off-by: Maciej Gajdzica --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_frag.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 89da648..f3b8459 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -386,6 +386,7 @@ CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n +CONFIG_RTE_PORT_RING_READER_FRAG_STATS_COLLECT=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 630d163..3ac2e66 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -393,6 +393,7 @@ CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n +CONFIG_RTE_PORT_RING_READER_FRAG_STATS_COLLECT=n # # Compile librte_table diff --git a/lib/librte_port/rte_port_frag.c b/lib/librte_port/rte_port_frag.c index c4c05dc..c42b182 100644 --- a/lib/librte_port/rte_port_frag.c +++ b/lib/librte_port/rte_port_frag.c @@ -41,6 +41,20 @@ /* Max number of fragments per packet allowed */ #define RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80 +#ifdef RTE_PORT_RING_READER_FRAG_STATS_COLLECT + +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val) + +#endif + typedef int32_t (*frag_op)(struct rte_mbuf *pkt_in, struct rte_mbuf **pkts_out, @@ -50,6 +64,8 @@ typedef int32_t struct rte_mempool *pool_indirect); struct rte_port_ring_reader_frag { + struct rte_port_in_stats stats; + /* Input parameters */ struct rte_ring *ring; uint32_t mtu; @@ -171,6 +187,7 @@ rte_port_ring_reader_frag_rx(void *port, if (p->n_pkts == 0) { p->n_pkts = rte_ring_sc_dequeue_burst(p->ring, (void **) p->pkts, RTE_PORT_IN_BURST_SIZE_MAX); + RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(p, p->n_pkts); if (p->n_pkts == 0) return n_pkts_out; p->pos_pkts = 0; @@ -203,6 +220,7 @@ rte_port_ring_reader_frag_rx(void *port, if (status < 0) { rte_pktmbuf_free(pkt); + RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(p, 1); continue; } @@ -252,6 +270,22 @@ rte_port_ring_reader_frag_free(void *port) return 0; } +static int +rte_port_frag_reader_stats_read(void *port, + struct rte_port_in_stats *stats, int clear) +{ + struct rte_port_ring_reader_frag *p = + (struct rte_port_ring_reader_frag *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Summary of port operations */ @@ -259,10 +293,12 @@ struct rte_port_in_ops rte_port_ring_reader_ipv4_frag_ops = { .f_create = rte_port_ring_reader_ipv4_frag_create, .f_free = rte_port_ring_reader_frag_free, .f_rx = rte_port_ring_reader_frag_rx, + .f_stats = rte_port_frag_reader_stats_read, }; struct rte_port_in_ops rte_port_ring_reader_ipv6_frag_ops = { .f_create = rte_port_ring_reader_ipv6_frag_create, .f_free = rte_port_ring_reader_frag_free, .f_rx = rte_port_ring_reader_frag_rx, + .f_stats = rte_port_frag_reader_stats_read, }; -- 1.7.9.5