From patchwork Fri Aug 5 22:00:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 114680 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1479AA00C4; Sat, 6 Aug 2022 00:00:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09FC042C17; Sat, 6 Aug 2022 00:00:39 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id E25D7400D6 for ; Sat, 6 Aug 2022 00:00:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659736836; x=1691272836; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dlvEmX0YiaVyPWcmd1SvuGOUcr2w4MPhBoVs5OlkhGI=; b=YXx0OcI5VXAiQUyt43SJes5fHgVmK9TZVGUje3WWSrJbm9ta0SjbdaGr ttOi00sm1x6Uuj7Z+nCF+S+uPHXD9uqgyUCC5iDHuwSV2iL4ie3t075OQ lQKp6Z6zHOolD7SNwFNUU+o7XpoSee2qAo+/8FdKOjheq8Eis1dN5nCic e3qgRMsGIQXVCgXIHcOBM4KU/K+4bClh3qawxiz5fFvZNYzwY7gyT5cE9 fQZ3PXzjUu6vVe+5EbWXKt4GgA/M4rrRBJViG6oZp7c1k8wSGx83OBq34 tZUp7daYWWU28QhPJbiSJOzZxG4NwiioTD/nJnr+8sSEuRDJFSXbauwmE w==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="290308817" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="290308817" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 15:00:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="693137570" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com.) ([10.237.223.157]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2022 15:00:34 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Subject: [PATCH 06/10] port: rework the ring output port behavior to non-blocking Date: Fri, 5 Aug 2022 22:00:25 +0000 Message-Id: <20220805220029.1096212-7-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220805220029.1096212-1-cristian.dumitrescu@intel.com> References: <20220805220029.1096212-1-cristian.dumitrescu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Drop packets that cannot be sent instead of retry sending the same packets potentially forever when the ring consumer that is down. Signed-off-by: Cristian Dumitrescu --- lib/port/rte_swx_port_ring.c | 99 ++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 33 deletions(-) diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c index c62fb3d8c8..72ec7209bf 100644 --- a/lib/port/rte_swx_port_ring.c +++ b/lib/port/rte_swx_port_ring.c @@ -172,6 +172,7 @@ struct writer { struct rte_mbuf **pkts; int n_pkts; + uint32_t n_bytes; }; static void * @@ -218,31 +219,55 @@ writer_create(void *args) return NULL; } -static void +static inline void __writer_flush(struct writer *p) { - int n_pkts; - - for (n_pkts = 0; ; ) { - n_pkts += rte_ring_sp_enqueue_burst(p->params.ring, - (void **)p->pkts + n_pkts, - p->n_pkts - n_pkts, - NULL); - - TRACE("[Ring %s] %d packets out\n", p->params.name, n_pkts); - - if (n_pkts == p->n_pkts) - break; + struct rte_mbuf **pkts = p->pkts; + uint64_t n_pkts_total = p->stats.n_pkts; + uint64_t n_bytes_total = p->stats.n_bytes; + uint64_t n_pkts_drop_total = p->stats.n_pkts_drop; + uint64_t n_bytes_drop_total = p->stats.n_bytes_drop; + int n_pkts = p->n_pkts, n_pkts_drop, n_pkts_tx; + uint32_t n_bytes = p->n_bytes, n_bytes_drop = 0; + + /* Packet TX. */ + n_pkts_tx = rte_ring_sp_enqueue_burst(p->params.ring, + (void **)pkts, + n_pkts, + NULL); + + /* Packet drop. */ + n_pkts_drop = n_pkts - n_pkts_tx; + + for ( ; n_pkts_tx < n_pkts; n_pkts_tx++) { + struct rte_mbuf *m = pkts[n_pkts_tx]; + + n_bytes_drop += m->pkt_len; + rte_pktmbuf_free(m); } + /* Port update. */ + p->stats.n_pkts = n_pkts_total + n_pkts - n_pkts_drop; + p->stats.n_bytes = n_bytes_total + n_bytes - n_bytes_drop; + p->stats.n_pkts_drop = n_pkts_drop_total + n_pkts_drop; + p->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop; p->n_pkts = 0; + p->n_bytes = 0; + + TRACE("[Ring %s] Buffered packets flushed: %d out, %d dropped\n", + p->params.name, + n_pkts - n_pkts_drop, + n_pkts_drop); } static void writer_pkt_tx(void *port, struct rte_swx_pkt *pkt) { struct writer *p = port; + int n_pkts = p->n_pkts; + uint32_t n_bytes = p->n_bytes; struct rte_mbuf *m = pkt->handle; + uint32_t pkt_length = pkt->length; TRACE("[Ring %s] Pkt %d (%u bytes at offset %u)\n", p->params.name, @@ -252,15 +277,15 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt) if (TRACE_LEVEL) rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); - m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len); - m->pkt_len = pkt->length; + m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len); + m->pkt_len = pkt_length; m->data_off = (uint16_t)pkt->offset; - p->stats.n_pkts++; - p->stats.n_bytes += pkt->length; + p->pkts[n_pkts++] = m; + p->n_pkts = n_pkts; + p->n_bytes = n_bytes + pkt_length; - p->pkts[p->n_pkts++] = m; - if (p->n_pkts == (int)p->params.burst_size) + if (n_pkts == (int)p->params.burst_size) __writer_flush(p); } @@ -268,7 +293,11 @@ static void writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt) { struct writer *p = port; + int n_pkts = p->n_pkts; + uint32_t n_bytes = p->n_bytes; + uint64_t n_pkts_clone = p->stats.n_pkts_clone; struct rte_mbuf *m = pkt->handle; + uint32_t pkt_length = pkt->length; TRACE("[Ring %s] Pkt %d (%u bytes at offset %u) (fast clone)\n", p->params.name, @@ -278,17 +307,17 @@ writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt) if (TRACE_LEVEL) rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); - m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len); - m->pkt_len = pkt->length; + m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len); + m->pkt_len = pkt_length; m->data_off = (uint16_t)pkt->offset; rte_pktmbuf_refcnt_update(m, 1); - p->stats.n_pkts++; - p->stats.n_bytes += pkt->length; - p->stats.n_pkts_clone++; + p->pkts[n_pkts++] = m; + p->n_pkts = n_pkts; + p->n_bytes = n_bytes + pkt_length; + p->stats.n_pkts_clone = n_pkts_clone + 1; - p->pkts[p->n_pkts++] = m; - if (p->n_pkts == (int)p->params.burst_size) + if (n_pkts == (int)p->params.burst_size) __writer_flush(p); } @@ -296,7 +325,11 @@ static void writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_length) { struct writer *p = port; + int n_pkts = p->n_pkts; + uint32_t n_bytes = p->n_bytes; + uint64_t n_pkts_clone = p->stats.n_pkts_clone; struct rte_mbuf *m = pkt->handle, *m_clone; + uint32_t pkt_length = pkt->length; TRACE("[Ring %s] Pkt %d (%u bytes at offset %u) (clone)\n", p->params.name, @@ -306,8 +339,8 @@ writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_len if (TRACE_LEVEL) rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); - m->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len); - m->pkt_len = pkt->length; + m->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len); + m->pkt_len = pkt_length; m->data_off = (uint16_t)pkt->offset; m_clone = rte_pktmbuf_copy(m, m->pool, 0, truncation_length); @@ -316,12 +349,12 @@ writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_len return; } - p->stats.n_pkts++; - p->stats.n_bytes += pkt->length; - p->stats.n_pkts_clone++; + p->pkts[n_pkts++] = m_clone; + p->n_pkts = n_pkts; + p->n_bytes = n_bytes + pkt_length; + p->stats.n_pkts_clone = n_pkts_clone + 1; - p->pkts[p->n_pkts++] = m_clone; - if (p->n_pkts == (int)p->params.burst_size) + if (n_pkts == (int)p->params.burst_size) __writer_flush(p); }