Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114680/?format=api
https://patches.dpdk.org/api/patches/114680/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220805220029.1096212-7-cristian.dumitrescu@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220805220029.1096212-7-cristian.dumitrescu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220805220029.1096212-7-cristian.dumitrescu@intel.com", "date": "2022-08-05T22:00:25", "name": "[06/10] port: rework the ring output port behavior to non-blocking", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "445b946df13cf92ad4b41e5d7b12ccf30a220613", "submitter": { "id": 19, "url": "https://patches.dpdk.org/api/people/19/?format=api", "name": "Cristian Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220805220029.1096212-7-cristian.dumitrescu@intel.com/mbox/", "series": [ { "id": 24217, "url": "https://patches.dpdk.org/api/series/24217/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=24217", "date": "2022-08-05T22:00:23", "name": "port: implement output port non-blocking behavior", "version": 1, "mbox": "https://patches.dpdk.org/series/24217/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/114680/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/114680/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1479AA00C4;\n\tSat, 6 Aug 2022 00:00:49 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 09FC042C17;\n\tSat, 6 Aug 2022 00:00:39 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id E25D7400D6\n for <dev@dpdk.org>; Sat, 6 Aug 2022 00:00:35 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 05 Aug 2022 15:00:35 -0700", "from silpixa00400573.ir.intel.com (HELO\n silpixa00400573.ger.corp.intel.com.) ([10.237.223.157])\n by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2022 15:00:34 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1659736836; x=1691272836;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=dlvEmX0YiaVyPWcmd1SvuGOUcr2w4MPhBoVs5OlkhGI=;\n b=YXx0OcI5VXAiQUyt43SJes5fHgVmK9TZVGUje3WWSrJbm9ta0SjbdaGr\n ttOi00sm1x6Uuj7Z+nCF+S+uPHXD9uqgyUCC5iDHuwSV2iL4ie3t075OQ\n lQKp6Z6zHOolD7SNwFNUU+o7XpoSee2qAo+/8FdKOjheq8Eis1dN5nCic\n e3qgRMsGIQXVCgXIHcOBM4KU/K+4bClh3qawxiz5fFvZNYzwY7gyT5cE9\n fQZ3PXzjUu6vVe+5EbWXKt4GgA/M4rrRBJViG6oZp7c1k8wSGx83OBq34\n tZUp7daYWWU28QhPJbiSJOzZxG4NwiioTD/nJnr+8sSEuRDJFSXbauwmE w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10430\"; a=\"290308817\"", "E=Sophos;i=\"5.93,216,1654585200\"; d=\"scan'208\";a=\"290308817\"", "E=Sophos;i=\"5.93,217,1654585200\"; d=\"scan'208\";a=\"693137570\"" ], "X-ExtLoop1": "1", "From": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "To": "dev@dpdk.org", "Subject": "[PATCH 06/10] port: rework the ring output port behavior to\n 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", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Drop packets that cannot be sent instead of retry sending the same\npackets potentially forever when the ring consumer that is down.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\n---\n lib/port/rte_swx_port_ring.c | 99 ++++++++++++++++++++++++------------\n 1 file changed, 66 insertions(+), 33 deletions(-)", "diff": "diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c\nindex c62fb3d8c8..72ec7209bf 100644\n--- a/lib/port/rte_swx_port_ring.c\n+++ b/lib/port/rte_swx_port_ring.c\n@@ -172,6 +172,7 @@ struct writer {\n \n \tstruct rte_mbuf **pkts;\n \tint n_pkts;\n+\tuint32_t n_bytes;\n };\n \n static void *\n@@ -218,31 +219,55 @@ writer_create(void *args)\n \treturn NULL;\n }\n \n-static void\n+static inline void\n __writer_flush(struct writer *p)\n {\n-\tint n_pkts;\n-\n-\tfor (n_pkts = 0; ; ) {\n-\t\tn_pkts += rte_ring_sp_enqueue_burst(p->params.ring,\n-\t\t\t\t\t\t (void **)p->pkts + n_pkts,\n-\t\t\t\t\t\t p->n_pkts - n_pkts,\n-\t\t\t\t\t\t NULL);\n-\n-\t\tTRACE(\"[Ring %s] %d packets out\\n\", p->params.name, n_pkts);\n-\n-\t\tif (n_pkts == p->n_pkts)\n-\t\t\tbreak;\n+\tstruct rte_mbuf **pkts = p->pkts;\n+\tuint64_t n_pkts_total = p->stats.n_pkts;\n+\tuint64_t n_bytes_total = p->stats.n_bytes;\n+\tuint64_t n_pkts_drop_total = p->stats.n_pkts_drop;\n+\tuint64_t n_bytes_drop_total = p->stats.n_bytes_drop;\n+\tint n_pkts = p->n_pkts, n_pkts_drop, n_pkts_tx;\n+\tuint32_t n_bytes = p->n_bytes, n_bytes_drop = 0;\n+\n+\t/* Packet TX. */\n+\tn_pkts_tx = rte_ring_sp_enqueue_burst(p->params.ring,\n+\t\t\t\t\t (void **)pkts,\n+\t\t\t\t\t n_pkts,\n+\t\t\t\t\t NULL);\n+\n+\t/* Packet drop. */\n+\tn_pkts_drop = n_pkts - n_pkts_tx;\n+\n+\tfor ( ; n_pkts_tx < n_pkts; n_pkts_tx++) {\n+\t\tstruct rte_mbuf *m = pkts[n_pkts_tx];\n+\n+\t\tn_bytes_drop += m->pkt_len;\n+\t\trte_pktmbuf_free(m);\n \t}\n \n+\t/* Port update. */\n+\tp->stats.n_pkts = n_pkts_total + n_pkts - n_pkts_drop;\n+\tp->stats.n_bytes = n_bytes_total + n_bytes - n_bytes_drop;\n+\tp->stats.n_pkts_drop = n_pkts_drop_total + n_pkts_drop;\n+\tp->stats.n_bytes_drop = n_bytes_drop_total + n_bytes_drop;\n \tp->n_pkts = 0;\n+\tp->n_bytes = 0;\n+\n+\tTRACE(\"[Ring %s] Buffered packets flushed: %d out, %d dropped\\n\",\n+\t p->params.name,\n+\t n_pkts - n_pkts_drop,\n+\t n_pkts_drop);\n }\n \n static void\n writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)\n {\n \tstruct writer *p = port;\n+\tint n_pkts = p->n_pkts;\n+\tuint32_t n_bytes = p->n_bytes;\n \tstruct rte_mbuf *m = pkt->handle;\n+\tuint32_t pkt_length = pkt->length;\n \n \tTRACE(\"[Ring %s] Pkt %d (%u bytes at offset %u)\\n\",\n \t p->params.name,\n@@ -252,15 +277,15 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt)\n \tif (TRACE_LEVEL)\n \t\trte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);\n \n-\tm->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);\n-\tm->pkt_len = pkt->length;\n+\tm->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);\n+\tm->pkt_len = pkt_length;\n \tm->data_off = (uint16_t)pkt->offset;\n \n-\tp->stats.n_pkts++;\n-\tp->stats.n_bytes += pkt->length;\n+\tp->pkts[n_pkts++] = m;\n+\tp->n_pkts = n_pkts;\n+\tp->n_bytes = n_bytes + pkt_length;\n \n-\tp->pkts[p->n_pkts++] = m;\n-\tif (p->n_pkts == (int)p->params.burst_size)\n+\tif (n_pkts == (int)p->params.burst_size)\n \t\t__writer_flush(p);\n }\n \n@@ -268,7 +293,11 @@ static void\n writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt)\n {\n \tstruct writer *p = port;\n+\tint n_pkts = p->n_pkts;\n+\tuint32_t n_bytes = p->n_bytes;\n+\tuint64_t n_pkts_clone = p->stats.n_pkts_clone;\n \tstruct rte_mbuf *m = pkt->handle;\n+\tuint32_t pkt_length = pkt->length;\n \n \tTRACE(\"[Ring %s] Pkt %d (%u bytes at offset %u) (fast clone)\\n\",\n \t p->params.name,\n@@ -278,17 +307,17 @@ writer_pkt_fast_clone_tx(void *port, struct rte_swx_pkt *pkt)\n \tif (TRACE_LEVEL)\n \t\trte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);\n \n-\tm->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);\n-\tm->pkt_len = pkt->length;\n+\tm->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);\n+\tm->pkt_len = pkt_length;\n \tm->data_off = (uint16_t)pkt->offset;\n \trte_pktmbuf_refcnt_update(m, 1);\n \n-\tp->stats.n_pkts++;\n-\tp->stats.n_bytes += pkt->length;\n-\tp->stats.n_pkts_clone++;\n+\tp->pkts[n_pkts++] = m;\n+\tp->n_pkts = n_pkts;\n+\tp->n_bytes = n_bytes + pkt_length;\n+\tp->stats.n_pkts_clone = n_pkts_clone + 1;\n \n-\tp->pkts[p->n_pkts++] = m;\n-\tif (p->n_pkts == (int)p->params.burst_size)\n+\tif (n_pkts == (int)p->params.burst_size)\n \t\t__writer_flush(p);\n }\n \n@@ -296,7 +325,11 @@ static void\n writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_length)\n {\n \tstruct writer *p = port;\n+\tint n_pkts = p->n_pkts;\n+\tuint32_t n_bytes = p->n_bytes;\n+\tuint64_t n_pkts_clone = p->stats.n_pkts_clone;\n \tstruct rte_mbuf *m = pkt->handle, *m_clone;\n+\tuint32_t pkt_length = pkt->length;\n \n \tTRACE(\"[Ring %s] Pkt %d (%u bytes at offset %u) (clone)\\n\",\n \t p->params.name,\n@@ -306,8 +339,8 @@ writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_len\n \tif (TRACE_LEVEL)\n \t\trte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length);\n \n-\tm->data_len = (uint16_t)(pkt->length + m->data_len - m->pkt_len);\n-\tm->pkt_len = pkt->length;\n+\tm->data_len = (uint16_t)(pkt_length + m->data_len - m->pkt_len);\n+\tm->pkt_len = pkt_length;\n \tm->data_off = (uint16_t)pkt->offset;\n \n \tm_clone = rte_pktmbuf_copy(m, m->pool, 0, truncation_length);\n@@ -316,12 +349,12 @@ writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt, uint32_t truncation_len\n \t\treturn;\n \t}\n \n-\tp->stats.n_pkts++;\n-\tp->stats.n_bytes += pkt->length;\n-\tp->stats.n_pkts_clone++;\n+\tp->pkts[n_pkts++] = m_clone;\n+\tp->n_pkts = n_pkts;\n+\tp->n_bytes = n_bytes + pkt_length;\n+\tp->stats.n_pkts_clone = n_pkts_clone + 1;\n \n-\tp->pkts[p->n_pkts++] = m_clone;\n-\tif (p->n_pkts == (int)p->params.burst_size)\n+\tif (n_pkts == (int)p->params.burst_size)\n \t\t__writer_flush(p);\n }\n \n", "prefixes": [ "06/10" ] }{ "id": 114680, "url": "