Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53900/?format=api
http://patches.dpdk.org/api/patches/53900/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1559211639-17442-6-git-send-email-matan@mellanox.com/", "project": { "id": 1, "url": "http://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": "<1559211639-17442-6-git-send-email-matan@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1559211639-17442-6-git-send-email-matan@mellanox.com", "date": "2019-05-30T10:20:35", "name": "[v1,5/9] net/mlx5: separate Rx queue initialization", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "08118817858bd54f4dc7ccd41e5f5048d9a724d6", "submitter": { "id": 796, "url": "http://patches.dpdk.org/api/people/796/?format=api", "name": "Matan Azrad", "email": "matan@mellanox.com" }, "delegate": { "id": 6624, "url": "http://patches.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1559211639-17442-6-git-send-email-matan@mellanox.com/mbox/", "series": [ { "id": 4823, "url": "http://patches.dpdk.org/api/series/4823/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4823", "date": "2019-05-30T10:20:30", "name": "mlx5: Handle data-path completions with error", "version": 1, "mbox": "http://patches.dpdk.org/series/4823/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53900/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/53900/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7203A1B9B1;\n\tThu, 30 May 2019 12:20:58 +0200 (CEST)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n\tby dpdk.org (Postfix) with ESMTP id 4B29C1B957;\n\tThu, 30 May 2019 12:20:45 +0200 (CEST)" ], "From": "Matan Azrad <matan@mellanox.com>", "To": "Shahaf Shuler <shahafs@mellanox.com>, Yongseok Koh <yskoh@mellanox.com>", "Cc": "dev@dpdk.org,\n\tstable@dpdk.org", "Date": "Thu, 30 May 2019 10:20:35 +0000", "Message-Id": "<1559211639-17442-6-git-send-email-matan@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1559211639-17442-1-git-send-email-matan@mellanox.com>", "References": "<1559211639-17442-1-git-send-email-matan@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v1 5/9] net/mlx5: separate Rx queue initialization", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Move the RQ WQEs initialization code to separate function as an\narrangement to CQE error recovering for code reuse.\n\nCC: stable@dpdk.org\n\nSigned-off-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/mlx5_rxq.c | 43 ++---------------------------------\n drivers/net/mlx5/mlx5_rxtx.c | 53 ++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 55 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 282295f..90e8c49 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -779,7 +779,6 @@ struct mlx5_rxq_ibv *\n \tstruct mlx5_rxq_ibv *tmpl;\n \tstruct mlx5dv_cq cq_info;\n \tstruct mlx5dv_rwq rwq;\n-\tunsigned int i;\n \tint ret = 0;\n \tstruct mlx5dv_obj obj;\n \tstruct mlx5_dev_config *config = &priv->config;\n@@ -964,53 +963,15 @@ struct mlx5_rxq_ibv *\n \t}\n \t/* Fill the rings. */\n \trxq_data->wqes = rwq.buf;\n-\tfor (i = 0; (i != wqe_n); ++i) {\n-\t\tvolatile struct mlx5_wqe_data_seg *scat;\n-\t\tuintptr_t addr;\n-\t\tuint32_t byte_count;\n-\n-\t\tif (mprq_en) {\n-\t\t\tstruct mlx5_mprq_buf *buf = (*rxq_data->mprq_bufs)[i];\n-\n-\t\t\tscat = &((volatile struct mlx5_wqe_mprq *)\n-\t\t\t\t rxq_data->wqes)[i].dseg;\n-\t\t\taddr = (uintptr_t)mlx5_mprq_buf_addr(buf);\n-\t\t\tbyte_count = (1 << rxq_data->strd_sz_n) *\n-\t\t\t\t (1 << rxq_data->strd_num_n);\n-\t\t} else {\n-\t\t\tstruct rte_mbuf *buf = (*rxq_data->elts)[i];\n-\n-\t\t\tscat = &((volatile struct mlx5_wqe_data_seg *)\n-\t\t\t\t rxq_data->wqes)[i];\n-\t\t\taddr = rte_pktmbuf_mtod(buf, uintptr_t);\n-\t\t\tbyte_count = DATA_LEN(buf);\n-\t\t}\n-\t\t/* scat->addr must be able to store a pointer. */\n-\t\tassert(sizeof(scat->addr) >= sizeof(uintptr_t));\n-\t\t*scat = (struct mlx5_wqe_data_seg){\n-\t\t\t.addr = rte_cpu_to_be_64(addr),\n-\t\t\t.byte_count = rte_cpu_to_be_32(byte_count),\n-\t\t\t.lkey = mlx5_rx_addr2mr(rxq_data, addr),\n-\t\t};\n-\t}\n \trxq_data->rq_db = rwq.dbrec;\n \trxq_data->cqe_n = log2above(cq_info.cqe_cnt);\n-\trxq_data->cq_ci = 0;\n-\trxq_data->consumed_strd = 0;\n-\trxq_data->rq_pi = 0;\n-\trxq_data->zip = (struct rxq_zip){\n-\t\t.ai = 0,\n-\t};\n \trxq_data->cq_db = cq_info.dbrec;\n \trxq_data->cqes = (volatile struct mlx5_cqe (*)[])(uintptr_t)cq_info.buf;\n \trxq_data->cq_uar = cq_info.cq_uar;\n \trxq_data->cqn = cq_info.cqn;\n \trxq_data->cq_arm_sn = 0;\n-\trxq_data->decompressed = 0;\n-\t/* Update doorbell counter. */\n-\trxq_data->rq_ci = wqe_n >> rxq_data->sges_n;\n-\trte_cio_wmb();\n-\t*rxq_data->rq_db = rte_cpu_to_be_32(rxq_data->rq_ci);\n+\tmlx5_rxq_initialize(rxq_data);\n+\trxq_data->cq_ci = 0;\n \tDRV_LOG(DEBUG, \"port %u rxq %u updated with %p\", dev->data->port_id,\n \t\tidx, (void *)&tmpl);\n \trte_atomic32_inc(&tmpl->refcnt);\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c\nindex 2c8d066..aec0185 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.c\n+++ b/drivers/net/mlx5/mlx5_rxtx.c\n@@ -1831,6 +1831,59 @@\n }\n \n /**\n+ * Initialize Rx WQ and indexes.\n+ *\n+ * @param[in] rxq\n+ * Pointer to RX queue structure.\n+ */\n+void\n+mlx5_rxq_initialize(struct mlx5_rxq_data *rxq)\n+{\n+\tconst unsigned int wqe_n = 1 << rxq->elts_n;\n+\tunsigned int i;\n+\n+\tfor (i = 0; (i != wqe_n); ++i) {\n+\t\tvolatile struct mlx5_wqe_data_seg *scat;\n+\t\tuintptr_t addr;\n+\t\tuint32_t byte_count;\n+\n+\t\tif (mlx5_rxq_mprq_enabled(rxq)) {\n+\t\t\tstruct mlx5_mprq_buf *buf = (*rxq->mprq_bufs)[i];\n+\n+\t\t\tscat = &((volatile struct mlx5_wqe_mprq *)\n+\t\t\t\trxq->wqes)[i].dseg;\n+\t\t\taddr = (uintptr_t)mlx5_mprq_buf_addr(buf);\n+\t\t\tbyte_count = (1 << rxq->strd_sz_n) *\n+\t\t\t\t\t(1 << rxq->strd_num_n);\n+\t\t} else {\n+\t\t\tstruct rte_mbuf *buf = (*rxq->elts)[i];\n+\n+\t\t\tscat = &((volatile struct mlx5_wqe_data_seg *)\n+\t\t\t\t\trxq->wqes)[i];\n+\t\t\taddr = rte_pktmbuf_mtod(buf, uintptr_t);\n+\t\t\tbyte_count = DATA_LEN(buf);\n+\t\t}\n+\t\t/* scat->addr must be able to store a pointer. */\n+\t\tassert(sizeof(scat->addr) >= sizeof(uintptr_t));\n+\t\t*scat = (struct mlx5_wqe_data_seg){\n+\t\t\t.addr = rte_cpu_to_be_64(addr),\n+\t\t\t.byte_count = rte_cpu_to_be_32(byte_count),\n+\t\t\t.lkey = mlx5_rx_addr2mr(rxq, addr),\n+\t\t};\n+\t}\n+\trxq->consumed_strd = 0;\n+\trxq->decompressed = 0;\n+\trxq->rq_pi = 0;\n+\trxq->zip = (struct rxq_zip){\n+\t\t.ai = 0,\n+\t};\n+\t/* Update doorbell counter. */\n+\trxq->rq_ci = wqe_n >> rxq->sges_n;\n+\trte_cio_wmb();\n+\t*rxq->rq_db = rte_cpu_to_be_32(rxq->rq_ci);\n+}\n+\n+/**\n * Get size of the next packet for a given CQE. For compressed CQEs, the\n * consumer index is updated only once all packets of the current one have\n * been processed.\n", "prefixes": [ "v1", "5/9" ] }{ "id": 53900, "url": "