From patchwork Mon Nov 30 15:46:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Zhang X-Patchwork-Id: 9181 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C84E9688E; Mon, 30 Nov 2015 16:47:00 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 6E9605AA0 for ; Mon, 30 Nov 2015 16:46:59 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 30 Nov 2015 07:46:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,364,1444719600"; d="scan'208";a="863329764" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 30 Nov 2015 07:46:57 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id tAUFku24023259; Mon, 30 Nov 2015 15:46:56 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id tAUFkuSt027624; Mon, 30 Nov 2015 15:46:56 GMT Received: (from fanzhan2@localhost) by sivswdev02.ir.intel.com with id tAUFkutX027620; Mon, 30 Nov 2015 15:46:56 GMT From: Fan Zhang To: dev@dpdk.org Date: Mon, 30 Nov 2015 15:46:55 +0000 Message-Id: <1448898415-27529-1-git-send-email-roy.fan.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] librte_port: fix mbuf allocation in source port and missing 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes two issues: - The allocated mbufs in rte_port_source_rx() are not initialized properly issue. This issue caused the mbufs not be able to freed back to mempool by rte_pktmbuf_free(). - The missed sink port statistics issue. Sink port was not able record the number of mbufs received/dropped. Signed-off-by: Fan Zhang Acked-by: Cristian Dumitrescu --- lib/librte_port/rte_port_source_sink.c | 68 +++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c index 234ab18..babecd7 100644 --- a/lib/librte_port/rte_port_source_sink.c +++ b/lib/librte_port/rte_port_source_sink.c @@ -105,10 +105,16 @@ static int rte_port_source_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) { struct rte_port_source *p = (struct rte_port_source *) port; + uint32_t i; if (rte_mempool_get_bulk(p->mempool, (void **) pkts, n_pkts) != 0) return 0; + for (i = 0; i < n_pkts; i++) { + rte_mbuf_refcnt_set(pkts[i], 1); + rte_pktmbuf_reset(pkts[i]); + } + RTE_PORT_SOURCE_STATS_PKTS_IN_ADD(p, n_pkts); return n_pkts; @@ -133,17 +139,48 @@ rte_port_source_stats_read(void *port, /* * Port SINK */ +#ifdef RTE_PORT_STATS_COLLECT + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) \ + (port->stats.n_pkts_in += val) +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) \ + (port->stats.n_pkts_drop += val) + +#else + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) + +#endif + +struct rte_port_sink { + struct rte_port_out_stats stats; +}; + static void * rte_port_sink_create(__rte_unused void *params, __rte_unused int socket_id) { - return (void *) 1; + struct rte_port_sink *port; + + /* Memory allocation */ + port = rte_zmalloc_socket("PORT", sizeof(*port), + RTE_CACHE_LINE_SIZE, socket_id); + if (port == NULL) { + RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__); + return NULL; + } + + return port; } static int rte_port_sink_tx(__rte_unused void *port, struct rte_mbuf *pkt) { - rte_pktmbuf_free(pkt); + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); + rte_pktmbuf_free(pkt); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); return 0; } @@ -151,29 +188,55 @@ static int rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, uint64_t pkts_mask) { + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + if ((pkts_mask & (pkts_mask + 1)) == 0) { uint64_t n_pkts = __builtin_popcountll(pkts_mask); uint32_t i; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, n_pkts); + for (i = 0; i < n_pkts; i++) { struct rte_mbuf *pkt = pkts[i]; rte_pktmbuf_free(pkt); } + + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, n_pkts); } else { + + for ( ; pkts_mask; ) { uint32_t pkt_index = __builtin_ctzll(pkts_mask); uint64_t pkt_mask = 1LLU << pkt_index; struct rte_mbuf *pkt = pkts[pkt_index]; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); rte_pktmbuf_free(pkt); pkts_mask &= ~pkt_mask; + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); } } return 0; } +static int +rte_port_sink_stats_read(void *port, struct rte_port_out_stats *stats, + int clear) +{ + struct rte_port_sink *p = + (struct rte_port_sink *) 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 */ @@ -190,4 +253,5 @@ struct rte_port_out_ops rte_port_sink_ops = { .f_tx = rte_port_sink_tx, .f_tx_bulk = rte_port_sink_tx_bulk, .f_flush = NULL, + .f_stats = rte_port_sink_stats_read, };