Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8057/?format=api
{ "id": 8057, "url": "https://patches.dpdk.org/api/patches/8057/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1445939209-12783-12-git-send-email-jing.d.chen@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": "<1445939209-12783-12-git-send-email-jing.d.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1445939209-12783-12-git-send-email-jing.d.chen@intel.com", "date": "2015-10-27T09:46:44", "name": "[dpdk-dev,v3,11/16] fm10k: add Vector TX function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4da0fd39698b3fdbe1dc55128922fd1172bd3d25", "submitter": { "id": 40, "url": "https://patches.dpdk.org/api/people/40/?format=api", "name": "Chen, Jing D", "email": "jing.d.chen@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1445939209-12783-12-git-send-email-jing.d.chen@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8057/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8057/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 11CC08E83;\n\tTue, 27 Oct 2015 10:47:28 +0100 (CET)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id 3D76B8E71\n\tfor <dev@dpdk.org>; Tue, 27 Oct 2015 10:47:22 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga102.fm.intel.com with ESMTP; 27 Oct 2015 02:47:22 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby FMSMGA003.fm.intel.com with ESMTP; 27 Oct 2015 02:47:20 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t9R9lIIn031029;\n\tTue, 27 Oct 2015 17:47:18 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t9R9lGW1013446; Tue, 27 Oct 2015 17:47:18 +0800", "(from jingche2@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9R9lFUC013442; \n\tTue, 27 Oct 2015 17:47:15 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,204,1444719600\"; d=\"scan'208\";a=\"588790868\"", "From": "\"Chen Jing D(Mark)\" <jing.d.chen@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 27 Oct 2015 17:46:44 +0800", "Message-Id": "<1445939209-12783-12-git-send-email-jing.d.chen@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1445939209-12783-1-git-send-email-jing.d.chen@intel.com>", "References": "<1445507104-22563-2-git-send-email-jing.d.chen@intel.com>\n\t<1445939209-12783-1-git-send-email-jing.d.chen@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 11/16] fm10k: add Vector TX function", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: \"Chen Jing D(Mark)\" <jing.d.chen@intel.com>\n\nAdd Vector TX func fm10k_xmit_pkts_vec to transmit packets.\n\nSigned-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>\n---\n drivers/net/fm10k/fm10k.h | 5 +\n drivers/net/fm10k/fm10k_rxtx_vec.c | 150 ++++++++++++++++++++++++++++++++++++\n 2 files changed, 155 insertions(+), 0 deletions(-)", "diff": "diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex c5e66e2..0a4c174 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -215,6 +215,9 @@ struct fm10k_tx_queue {\n \tuint16_t nb_used;\n \tuint16_t free_thresh;\n \tuint16_t rs_thresh;\n+\t/* Below 2 fields only valid in case vPMD is applied. */\n+\tuint16_t next_rs; /* Next pos to set RS flag */\n+\tuint16_t next_dd; /* Next pos to check DD flag */\n \tvolatile uint32_t *tail_ptr;\n \tuint16_t nb_desc;\n \tuint8_t port_id;\n@@ -333,4 +336,6 @@ void fm10k_rx_queue_release_mbufs_vec(struct fm10k_rx_queue *rxq);\n uint16_t fm10k_recv_pkts_vec(void *, struct rte_mbuf **, uint16_t);\n uint16_t fm10k_recv_scattered_pkts_vec(void *, struct rte_mbuf **,\n \t\t\t\t\tuint16_t);\n+uint16_t fm10k_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts);\n #endif\ndiff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c\nindex ea85996..e802eec 100644\n--- a/drivers/net/fm10k/fm10k_rxtx_vec.c\n+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c\n@@ -619,3 +619,153 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue,\n \treturn i + fm10k_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,\n \t\t&split_flags[i]);\n }\n+\n+static inline void\n+vtx1(volatile struct fm10k_tx_desc *txdp,\n+\t\tstruct rte_mbuf *pkt, uint64_t flags)\n+{\n+\t__m128i descriptor = _mm_set_epi64x(flags << 56 |\n+\t\t\tpkt->vlan_tci << 16 | pkt->data_len,\n+\t\t\tMBUF_DMA_ADDR(pkt));\n+\t_mm_store_si128((__m128i *)txdp, descriptor);\n+}\n+\n+static inline void\n+vtx(volatile struct fm10k_tx_desc *txdp,\n+\t\tstruct rte_mbuf **pkt, uint16_t nb_pkts, uint64_t flags)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < nb_pkts; ++i, ++txdp, ++pkt)\n+\t\tvtx1(txdp, *pkt, flags);\n+}\n+\n+static inline int __attribute__((always_inline))\n+fm10k_tx_free_bufs(struct fm10k_tx_queue *txq)\n+{\n+\tstruct rte_mbuf **txep;\n+\tuint8_t flags;\n+\tuint32_t n;\n+\tuint32_t i;\n+\tint nb_free = 0;\n+\tstruct rte_mbuf *m, *free[RTE_FM10K_TX_MAX_FREE_BUF_SZ];\n+\n+\t/* check DD bit on threshold descriptor */\n+\tflags = txq->hw_ring[txq->next_dd].flags;\n+\tif (!(flags & FM10K_TXD_FLAG_DONE))\n+\t\treturn 0;\n+\n+\tn = txq->rs_thresh;\n+\n+\t/* First buffer to free from S/W ring is at index\n+\t * next_dd - (rs_thresh-1)\n+\t */\n+\ttxep = &txq->sw_ring[txq->next_dd - (n - 1)];\n+\tm = __rte_pktmbuf_prefree_seg(txep[0]);\n+\tif (likely(m != NULL)) {\n+\t\tfree[0] = m;\n+\t\tnb_free = 1;\n+\t\tfor (i = 1; i < n; i++) {\n+\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tif (likely(m != NULL)) {\n+\t\t\t\tif (likely(m->pool == free[0]->pool))\n+\t\t\t\t\tfree[nb_free++] = m;\n+\t\t\t\telse {\n+\t\t\t\t\trte_mempool_put_bulk(free[0]->pool,\n+\t\t\t\t\t\t\t(void *)free, nb_free);\n+\t\t\t\t\tfree[0] = m;\n+\t\t\t\t\tnb_free = 1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\trte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);\n+\t} else {\n+\t\tfor (i = 1; i < n; i++) {\n+\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tif (m != NULL)\n+\t\t\t\trte_mempool_put(m->pool, m);\n+\t\t}\n+\t}\n+\n+\t/* buffers were freed, update counters */\n+\ttxq->nb_free = (uint16_t)(txq->nb_free + txq->rs_thresh);\n+\ttxq->next_dd = (uint16_t)(txq->next_dd + txq->rs_thresh);\n+\tif (txq->next_dd >= txq->nb_desc)\n+\t\ttxq->next_dd = (uint16_t)(txq->rs_thresh - 1);\n+\n+\treturn txq->rs_thresh;\n+}\n+\n+static inline void __attribute__((always_inline))\n+tx_backlog_entry(struct rte_mbuf **txep,\n+\t\t struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < (int)nb_pkts; ++i)\n+\t\ttxep[i] = tx_pkts[i];\n+}\n+\n+uint16_t\n+fm10k_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\t\tuint16_t nb_pkts)\n+{\n+\tstruct fm10k_tx_queue *txq = (struct fm10k_tx_queue *)tx_queue;\n+\tvolatile struct fm10k_tx_desc *txdp;\n+\tstruct rte_mbuf **txep;\n+\tuint16_t n, nb_commit, tx_id;\n+\tuint64_t flags = FM10K_TXD_FLAG_LAST;\n+\tuint64_t rs = FM10K_TXD_FLAG_RS | FM10K_TXD_FLAG_LAST;\n+\tint i;\n+\n+\t/* cross rx_thresh boundary is not allowed */\n+\tnb_pkts = RTE_MIN(nb_pkts, txq->rs_thresh);\n+\n+\tif (txq->nb_free < txq->free_thresh)\n+\t\tfm10k_tx_free_bufs(txq);\n+\n+\tnb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_free, nb_pkts);\n+\tif (unlikely(nb_pkts == 0))\n+\t\treturn 0;\n+\n+\ttx_id = txq->next_free;\n+\ttxdp = &txq->hw_ring[tx_id];\n+\ttxep = &txq->sw_ring[tx_id];\n+\n+\ttxq->nb_free = (uint16_t)(txq->nb_free - nb_pkts);\n+\n+\tn = (uint16_t)(txq->nb_desc - tx_id);\n+\tif (nb_commit >= n) {\n+\t\ttx_backlog_entry(txep, tx_pkts, n);\n+\n+\t\tfor (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)\n+\t\t\tvtx1(txdp, *tx_pkts, flags);\n+\n+\t\tvtx1(txdp, *tx_pkts++, rs);\n+\n+\t\tnb_commit = (uint16_t)(nb_commit - n);\n+\n+\t\ttx_id = 0;\n+\t\ttxq->next_rs = (uint16_t)(txq->rs_thresh - 1);\n+\n+\t\t/* avoid reach the end of ring */\n+\t\ttxdp = &(txq->hw_ring[tx_id]);\n+\t\ttxep = &txq->sw_ring[tx_id];\n+\t}\n+\n+\ttx_backlog_entry(txep, tx_pkts, nb_commit);\n+\n+\tvtx(txdp, tx_pkts, nb_commit, flags);\n+\n+\ttx_id = (uint16_t)(tx_id + nb_commit);\n+\tif (tx_id > txq->next_rs) {\n+\t\ttxq->hw_ring[txq->next_rs].flags |= FM10K_TXD_FLAG_RS;\n+\t\ttxq->next_rs = (uint16_t)(txq->next_rs + txq->rs_thresh);\n+\t}\n+\n+\ttxq->next_free = tx_id;\n+\n+\tFM10K_PCI_REG_WRITE(txq->tail_ptr, txq->next_free);\n+\n+\treturn nb_pkts;\n+}\n", "prefixes": [ "dpdk-dev", "v3", "11/16" ] }