Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8058/?format=api
{ "id": 8058, "url": "https://patches.dpdk.org/api/patches/8058/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1445939209-12783-13-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-13-git-send-email-jing.d.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1445939209-12783-13-git-send-email-jing.d.chen@intel.com", "date": "2015-10-27T09:46:45", "name": "[dpdk-dev,v3,12/16] fm10k: use func pointer to reset TX queue and mbuf release", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4b3493ff2066f6cdf76290499b3e5cd9532596c9", "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-13-git-send-email-jing.d.chen@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8058/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8058/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 D46248E88;\n\tTue, 27 Oct 2015 10:47:28 +0100 (CET)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 2112D8E7A\n\tfor <dev@dpdk.org>; Tue, 27 Oct 2015 10:47:23 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP; 27 Oct 2015 02:47:23 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 27 Oct 2015 02:47:22 -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 t9R9lKZd031042;\n\tTue, 27 Oct 2015 17:47:20 +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 t9R9lIed013457; Tue, 27 Oct 2015 17:47:20 +0800", "(from jingche2@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9R9lIxd013452; \n\tTue, 27 Oct 2015 17:47:18 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,204,1444719600\"; d=\"scan'208\";a=\"820358070\"", "From": "\"Chen Jing D(Mark)\" <jing.d.chen@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 27 Oct 2015 17:46:45 +0800", "Message-Id": "<1445939209-12783-13-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 12/16] fm10k: use func pointer to reset TX\n\tqueue and mbuf release", "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\nVector TX use different way to manage TX queue, it's necessary\nto use different functions to reset TX queue and release mbuf\nin TX queue. So, introduce 2 function pointers to do such ops.\n\nSigned-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>\n---\n drivers/net/fm10k/fm10k.h | 9 +++++++++\n drivers/net/fm10k/fm10k_ethdev.c | 21 ++++++++++++++++-----\n 2 files changed, 25 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex 0a4c174..2bead12 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -204,11 +204,14 @@ struct fifo {\n \tuint16_t *endp;\n };\n \n+struct fm10k_txq_ops;\n+\n struct fm10k_tx_queue {\n \tstruct rte_mbuf **sw_ring;\n \tstruct fm10k_tx_desc *hw_ring;\n \tuint64_t hw_ring_phys_addr;\n \tstruct fifo rs_tracker;\n+\tconst struct fm10k_txq_ops *ops; /* txq ops */\n \tuint16_t last_free;\n \tuint16_t next_free;\n \tuint16_t nb_free;\n@@ -225,6 +228,11 @@ struct fm10k_tx_queue {\n \tuint16_t queue_id;\n };\n \n+struct fm10k_txq_ops {\n+\tvoid (*release_mbufs)(struct fm10k_tx_queue *txq);\n+\tvoid (*reset)(struct fm10k_tx_queue *txq);\n+};\n+\n #define MBUF_DMA_ADDR(mb) \\\n \t((uint64_t) ((mb)->buf_physaddr + (mb)->data_off))\n \n@@ -338,4 +346,5 @@ 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+void fm10k_txq_vec_setup(struct fm10k_tx_queue *txq);\n #endif\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex a46a349..88bd887 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -292,6 +292,11 @@ tx_queue_disable(struct fm10k_hw *hw, uint16_t qnum)\n \treturn 0;\n }\n \n+static const struct fm10k_txq_ops def_txq_ops = {\n+\t.release_mbufs = tx_queue_free,\n+\t.reset = tx_queue_reset,\n+};\n+\n static int\n fm10k_dev_configure(struct rte_eth_dev *dev)\n {\n@@ -571,7 +576,8 @@ fm10k_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n \tPMD_INIT_FUNC_TRACE();\n \n \tif (tx_queue_id < dev->data->nb_tx_queues) {\n-\t\ttx_queue_reset(dev->data->tx_queues[tx_queue_id]);\n+\t\tstruct fm10k_tx_queue *q = dev->data->tx_queues[tx_queue_id];\n+\t\tq->ops->reset(q);\n \n \t\t/* reset head and tail pointers */\n \t\tFM10K_WRITE_REG(hw, FM10K_TDH(tx_queue_id), 0);\n@@ -837,8 +843,10 @@ fm10k_dev_queue_release(struct rte_eth_dev *dev)\n \tPMD_INIT_FUNC_TRACE();\n \n \tif (dev->data->tx_queues) {\n-\t\tfor (i = 0; i < dev->data->nb_tx_queues; i++)\n-\t\t\tfm10k_tx_queue_release(dev->data->tx_queues[i]);\n+\t\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n+\t\t\tstruct fm10k_tx_queue *txq = dev->data->tx_queues[i];\n+\t\t\ttxq->ops->release_mbufs(txq);\n+\t\t}\n \t}\n \n \tif (dev->data->rx_queues) {\n@@ -1454,7 +1462,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n \t * different socket than was previously used.\n \t */\n \tif (dev->data->tx_queues[queue_id] != NULL) {\n-\t\ttx_queue_free(dev->data->tx_queues[queue_id]);\n+\t\tstruct fm10k_tx_queue *txq = dev->data->tx_queues[queue_id];\n+\t\ttxq->ops->release_mbufs(txq);\n \t\tdev->data->tx_queues[queue_id] = NULL;\n \t}\n \n@@ -1470,6 +1479,7 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n \tq->nb_desc = nb_desc;\n \tq->port_id = dev->data->port_id;\n \tq->queue_id = queue_id;\n+\tq->ops = &def_txq_ops;\n \tq->tail_ptr = (volatile uint32_t *)\n \t\t&((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];\n \tif (handle_txconf(q, conf))\n@@ -1528,9 +1538,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n static void\n fm10k_tx_queue_release(void *queue)\n {\n+\tstruct fm10k_tx_queue *q = queue;\n \tPMD_INIT_FUNC_TRACE();\n \n-\ttx_queue_free(queue);\n+\tq->ops->release_mbufs(q);\n }\n \n static int\n", "prefixes": [ "dpdk-dev", "v3", "12/16" ] }