Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/115683/?format=api
{ "id": 115683, "url": "https://patches.dpdk.org/api/patches/115683/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1661899911-13086-19-git-send-email-longli@linuxonhyperv.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": "<1661899911-13086-19-git-send-email-longli@linuxonhyperv.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1661899911-13086-19-git-send-email-longli@linuxonhyperv.com", "date": "2022-08-30T22:51:51", "name": "[v6,18/18] net/mana: add function to support RX interrupts", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1f54d8e084a527c40137c988a9bd7db0a63e9e39", "submitter": { "id": 1784, "url": "https://patches.dpdk.org/api/people/1784/?format=api", "name": "Long Li", "email": "longli@linuxonhyperv.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1661899911-13086-19-git-send-email-longli@linuxonhyperv.com/mbox/", "series": [ { "id": 24471, "url": "https://patches.dpdk.org/api/series/24471/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=24471", "date": "2022-08-30T22:51:33", "name": "Introduce Microsoft Azure Network Adatper (MANA) PMD", "version": 6, "mbox": "https://patches.dpdk.org/series/24471/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/115683/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/115683/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 2D5CEA00C5;\n\tWed, 31 Aug 2022 00:53:43 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7440A42BC4;\n\tWed, 31 Aug 2022 00:52:15 +0200 (CEST)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id AB37A42B8D\n for <dev@dpdk.org>; Wed, 31 Aug 2022 00:52:09 +0200 (CEST)", "by linux.microsoft.com (Postfix, from userid 1004)\n id 1E4E820C31B8; Tue, 30 Aug 2022 15:52:09 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 1E4E820C31B8", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxonhyperv.com;\n s=default; t=1661899929;\n bh=Vcb7wVNwgHU0wh4my7van4/TKwMzj4SzG7wLm6FA9gQ=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To:From;\n b=WBMNaz1Wubfm2DAJrcB6G4a5B/9t9PKK9muZzUE+W62tRWu4pwNgbWrxW5mmjaG7Q\n zpcE+kZ4wf5NWoAZIbrdR9bjNHHGMaQTFyAgTn5tLIxmmzPQ4ByHkK9BDIz8Tff8MW\n 3YVf7i9q6ogXjkef0DD3l2i90QJ7R/tueVrHwlws=", "From": "longli@linuxonhyperv.com", "To": "Ferruh Yigit <ferruh.yigit@xilinx.com>", "Cc": "dev@dpdk.org, Ajay Sharma <sharmaajay@microsoft.com>,\n Stephen Hemminger <sthemmin@microsoft.com>, Long Li <longli@microsoft.com>", "Subject": "[Patch v6 18/18] net/mana: add function to support RX interrupts", "Date": "Tue, 30 Aug 2022 15:51:51 -0700", "Message-Id": "<1661899911-13086-19-git-send-email-longli@linuxonhyperv.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1661899911-13086-1-git-send-email-longli@linuxonhyperv.com>", "References": "<1661899911-13086-1-git-send-email-longli@linuxonhyperv.com>", "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>", "Reply-To": "longli@microsoft.com", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Long Li <longli@microsoft.com>\n\nmana can receive RX interrupts from kernel through RDMA verbs interface.\nImplement RX interrupts in the driver.\n\nSigned-off-by: Long Li <longli@microsoft.com>\n---\nChange log:\nv5:\nNew patch added to the series\n\n doc/guides/nics/features/mana.ini | 1 +\n drivers/net/mana/gdma.c | 10 +--\n drivers/net/mana/mana.c | 125 ++++++++++++++++++++++++++----\n drivers/net/mana/mana.h | 13 +++-\n drivers/net/mana/rx.c | 91 +++++++++++++++++++---\n drivers/net/mana/tx.c | 3 +-\n 6 files changed, 207 insertions(+), 36 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/mana.ini b/doc/guides/nics/features/mana.ini\nindex b2729aba3a..42d78ac6b1 100644\n--- a/doc/guides/nics/features/mana.ini\n+++ b/doc/guides/nics/features/mana.ini\n@@ -14,6 +14,7 @@ Multiprocess aware = Y\n Queue start/stop = Y\n Removal event = Y\n RSS hash = Y\n+Rx interrupt = Y\n Speed capabilities = P\n Stats per queue = Y\n Usage doc = Y\ndiff --git a/drivers/net/mana/gdma.c b/drivers/net/mana/gdma.c\nindex 7ad175651e..275520bff5 100644\n--- a/drivers/net/mana/gdma.c\n+++ b/drivers/net/mana/gdma.c\n@@ -204,7 +204,7 @@ union gdma_doorbell_entry {\n #define DOORBELL_OFFSET_EQ 0xFF8\n \n int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type,\n-\t\t uint32_t queue_id, uint32_t tail)\n+\t\t uint32_t queue_id, uint32_t tail, uint8_t arm)\n {\n \tuint8_t *addr = db_page;\n \tunion gdma_doorbell_entry e = {};\n@@ -219,14 +219,14 @@ int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type,\n \tcase gdma_queue_receive:\n \t\te.rq.id = queue_id;\n \t\te.rq.tail_ptr = tail;\n-\t\te.rq.wqe_cnt = 1;\n+\t\te.rq.wqe_cnt = arm;\n \t\taddr += DOORBELL_OFFSET_RQ;\n \t\tbreak;\n \n \tcase gdma_queue_completion:\n \t\te.cq.id = queue_id;\n \t\te.cq.tail_ptr = tail;\n-\t\te.cq.arm = 1;\n+\t\te.cq.arm = arm;\n \t\taddr += DOORBELL_OFFSET_CQ;\n \t\tbreak;\n \n@@ -238,8 +238,8 @@ int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type,\n \t/* Ensure all writes are done before ringing doorbell */\n \trte_wmb();\n \n-\tDRV_LOG(DEBUG, \"db_page %p addr %p queue_id %u type %u tail %u\",\n-\t\tdb_page, addr, queue_id, queue_type, tail);\n+\tDRV_LOG(DEBUG, \"db_page %p addr %p queue_id %u type %u tail %u arm %u\",\n+\t\tdb_page, addr, queue_id, queue_type, tail, arm);\n \n \trte_write64(e.as_uint64, addr);\n \treturn 0;\ndiff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c\nindex bb8ef652bf..935811ea01 100644\n--- a/drivers/net/mana/mana.c\n+++ b/drivers/net/mana/mana.c\n@@ -95,7 +95,68 @@ static int mana_dev_configure(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n-static int mana_intr_uninstall(struct mana_priv *priv);\n+static void rx_intr_vec_disable(struct mana_priv *priv)\n+{\n+\tstruct rte_intr_handle *intr_handle = priv->intr_handle;\n+\n+\trte_intr_free_epoll_fd(intr_handle);\n+\trte_intr_vec_list_free(intr_handle);\n+\trte_intr_nb_efd_set(intr_handle, 0);\n+}\n+\n+static int rx_intr_vec_enable(struct mana_priv *priv)\n+{\n+\tunsigned int i;\n+\tunsigned int rxqs_n = priv->dev_data->nb_rx_queues;\n+\tunsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);\n+\tstruct rte_intr_handle *intr_handle = priv->intr_handle;\n+\tint ret;\n+\n+\trx_intr_vec_disable(priv);\n+\n+\tif (rte_intr_vec_list_alloc(intr_handle, NULL, n)) {\n+\t\tDRV_LOG(ERR, \"Failed to allocate memory for interrupt vector\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tfor (i = 0; i < n; i++) {\n+\t\tstruct mana_rxq *rxq = priv->dev_data->rx_queues[i];\n+\n+\t\tret = rte_intr_vec_list_index_set(intr_handle, i,\n+\t\t\t\t\t\t RTE_INTR_VEC_RXTX_OFFSET + i);\n+\t\tif (ret) {\n+\t\t\tDRV_LOG(ERR, \"Failed to set intr vec %u\", i);\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\tret = rte_intr_efds_index_set(intr_handle, i, rxq->channel->fd);\n+\t\tif (ret) {\n+\t\t\tDRV_LOG(ERR, \"Failed to set FD at intr %u\", i);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn rte_intr_nb_efd_set(intr_handle, n);\n+}\n+\n+static void rxq_intr_disable(struct mana_priv *priv)\n+{\n+\tint err = rte_errno;\n+\n+\trx_intr_vec_disable(priv);\n+\trte_errno = err;\n+}\n+\n+static int rxq_intr_enable(struct mana_priv *priv)\n+{\n+\tconst struct rte_eth_intr_conf *const intr_conf =\n+\t\t&priv->dev_data->dev_conf.intr_conf;\n+\n+\tif (!intr_conf->rxq)\n+\t\treturn 0;\n+\n+\treturn rx_intr_vec_enable(priv);\n+}\n \n static int\n mana_dev_start(struct rte_eth_dev *dev)\n@@ -133,8 +194,17 @@ mana_dev_start(struct rte_eth_dev *dev)\n \t/* Enable datapath for secondary processes */\n \tmana_mp_req_on_rxtx(dev, MANA_MP_REQ_START_RXTX);\n \n+\tret = rxq_intr_enable(priv);\n+\tif (ret) {\n+\t\tDRV_LOG(ERR, \"Failed to enable RX interrupts\");\n+\t\tgoto failed_intr;\n+\t}\n+\n \treturn 0;\n \n+failed_intr:\n+\tmana_stop_rx_queues(dev);\n+\n failed_rx:\n \tmana_stop_tx_queues(dev);\n \n@@ -145,9 +215,12 @@ mana_dev_start(struct rte_eth_dev *dev)\n }\n \n static int\n-mana_dev_stop(struct rte_eth_dev *dev __rte_unused)\n+mana_dev_stop(struct rte_eth_dev *dev)\n {\n \tint ret;\n+\tstruct mana_priv *priv = dev->data->dev_private;\n+\n+\trxq_intr_disable(priv);\n \n \tdev->tx_pkt_burst = mana_tx_burst_removed;\n \tdev->rx_pkt_burst = mana_rx_burst_removed;\n@@ -596,6 +669,8 @@ const struct eth_dev_ops mana_dev_ops = {\n \t.tx_queue_release\t= mana_dev_tx_queue_release,\n \t.rx_queue_setup\t\t= mana_dev_rx_queue_setup,\n \t.rx_queue_release\t= mana_dev_rx_queue_release,\n+\t.rx_queue_intr_enable\t= mana_rx_intr_enable,\n+\t.rx_queue_intr_disable\t= mana_rx_intr_disable,\n \t.link_update\t\t= mana_dev_link_update,\n \t.stats_get\t\t= mana_dev_stats_get,\n \t.stats_reset\t\t= mana_dev_stats_reset,\n@@ -783,7 +858,7 @@ static int mana_ibv_device_to_pci_addr(const struct ibv_device *device,\n \treturn 0;\n }\n \n-static void mana_intr_handler(void *arg)\n+void mana_intr_handler(void *arg)\n {\n \tstruct mana_priv *priv = arg;\n \tstruct ibv_context *ctx = priv->ib_ctx;\n@@ -807,7 +882,7 @@ static void mana_intr_handler(void *arg)\n \t}\n }\n \n-static int mana_intr_uninstall(struct mana_priv *priv)\n+int mana_intr_uninstall(struct mana_priv *priv)\n {\n \tint ret;\n \n@@ -823,9 +898,20 @@ static int mana_intr_uninstall(struct mana_priv *priv)\n \treturn 0;\n }\n \n-static int mana_intr_install(struct mana_priv *priv)\n+int mana_fd_set_non_blocking(int fd)\n+{\n+\tint ret = fcntl(fd, F_GETFL);\n+\n+\tif (ret != -1 && !fcntl(fd, F_SETFL, ret | O_NONBLOCK))\n+\t\treturn 0;\n+\n+\trte_errno = errno;\n+\treturn -rte_errno;\n+}\n+\n+int mana_intr_install(struct rte_eth_dev *eth_dev, struct mana_priv *priv)\n {\n-\tint ret, flags;\n+\tint ret;\n \tstruct ibv_context *ctx = priv->ib_ctx;\n \n \tpriv->intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED);\n@@ -835,31 +921,35 @@ static int mana_intr_install(struct mana_priv *priv)\n \t\treturn -ENOMEM;\n \t}\n \n-\trte_intr_fd_set(priv->intr_handle, -1);\n+\tret = rte_intr_fd_set(priv->intr_handle, -1);\n+\tif (ret)\n+\t\tgoto free_intr;\n \n-\tflags = fcntl(ctx->async_fd, F_GETFL);\n-\tret = fcntl(ctx->async_fd, F_SETFL, flags | O_NONBLOCK);\n+\tret = mana_fd_set_non_blocking(ctx->async_fd);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Failed to change async_fd to NONBLOCK\");\n \t\tgoto free_intr;\n \t}\n \n-\trte_intr_fd_set(priv->intr_handle, ctx->async_fd);\n-\trte_intr_type_set(priv->intr_handle, RTE_INTR_HANDLE_EXT);\n+\tret = rte_intr_fd_set(priv->intr_handle, ctx->async_fd);\n+\tif (ret)\n+\t\tgoto free_intr;\n+\n+\tret = rte_intr_type_set(priv->intr_handle, RTE_INTR_HANDLE_EXT);\n+\tif (ret)\n+\t\tgoto free_intr;\n \n \tret = rte_intr_callback_register(priv->intr_handle,\n \t\t\t\t\t mana_intr_handler, priv);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Failed to register intr callback\");\n \t\trte_intr_fd_set(priv->intr_handle, -1);\n-\t\tgoto restore_fd;\n+\t\tgoto free_intr;\n \t}\n \n+\teth_dev->intr_handle = priv->intr_handle;\n \treturn 0;\n \n-restore_fd:\n-\tfcntl(ctx->async_fd, F_SETFL, flags);\n-\n free_intr:\n \trte_intr_instance_free(priv->intr_handle);\n \tpriv->intr_handle = NULL;\n@@ -1183,8 +1273,10 @@ static int mana_pci_probe_mac(struct rte_pci_driver *pci_drv __rte_unused,\n \t\t\t\tname, priv->max_rx_queues, priv->max_rx_desc,\n \t\t\t\tpriv->max_send_sge);\n \n+\t\t\trte_eth_copy_pci_info(eth_dev, pci_dev);\n+\n \t\t\t/* Create async interrupt handler */\n-\t\t\tret = mana_intr_install(priv);\n+\t\t\tret = mana_intr_install(eth_dev, priv);\n \t\t\tif (ret) {\n \t\t\t\tDRV_LOG(ERR, \"Failed to install intr handler\");\n \t\t\t\tgoto failed;\n@@ -1207,7 +1299,6 @@ static int mana_pci_probe_mac(struct rte_pci_driver *pci_drv __rte_unused,\n \t\t\teth_dev->tx_pkt_burst = mana_tx_burst_removed;\n \t\t\teth_dev->dev_ops = &mana_dev_ops;\n \n-\t\t\trte_eth_copy_pci_info(eth_dev, pci_dev);\n \t\t\trte_eth_dev_probing_finish(eth_dev);\n \t\t}\n \ndiff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h\nindex b4056bd50b..9cc98fee4c 100644\n--- a/drivers/net/mana/mana.h\n+++ b/drivers/net/mana/mana.h\n@@ -427,6 +427,7 @@ struct mana_rxq {\n \tuint32_t num_desc;\n \tstruct rte_mempool *mp;\n \tstruct ibv_cq *cq;\n+\tstruct ibv_comp_channel *channel;\n \tstruct ibv_wq *wq;\n \n \t/* For storing pending requests */\n@@ -460,8 +461,8 @@ extern int mana_logtype_init;\n #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, \" >>\")\n \n int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type,\n-\t\t uint32_t queue_id, uint32_t tail);\n-int mana_rq_ring_doorbell(struct mana_rxq *rxq);\n+\t\t uint32_t queue_id, uint32_t tail, uint8_t arm);\n+int mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm);\n \n int gdma_post_work_request(struct mana_gdma_queue *queue,\n \t\t\t struct gdma_work_request *work_req,\n@@ -496,6 +497,10 @@ int mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv,\n void mana_remove_all_mr(struct mana_priv *priv);\n void mana_del_pmd_mr(struct mana_mr_cache *mr);\n \n+void mana_intr_handler(void *arg);\n+int mana_intr_install(struct rte_eth_dev *eth_dev, struct mana_priv *priv);\n+int mana_intr_uninstall(struct mana_priv *priv);\n+\n void mana_mempool_chunk_cb(struct rte_mempool *mp, void *opaque,\n \t\t\t struct rte_mempool_memhdr *memhdr, unsigned int idx);\n \n@@ -541,4 +546,8 @@ void mana_mp_req_on_rxtx(struct rte_eth_dev *dev, enum mana_mp_req_type type);\n void *mana_alloc_verbs_buf(size_t size, void *data);\n void mana_free_verbs_buf(void *ptr, void *data __rte_unused);\n \n+int mana_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n+int mana_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n+int mana_fd_set_non_blocking(int fd);\n+\n #endif\ndiff --git a/drivers/net/mana/rx.c b/drivers/net/mana/rx.c\nindex f2573a6d06..1a61fc59b1 100644\n--- a/drivers/net/mana/rx.c\n+++ b/drivers/net/mana/rx.c\n@@ -21,7 +21,7 @@ static uint8_t mana_rss_hash_key_default[TOEPLITZ_HASH_KEY_SIZE_IN_BYTES] = {\n \t0xfc, 0x1f, 0xdc, 0x2a,\n };\n \n-int mana_rq_ring_doorbell(struct mana_rxq *rxq)\n+int mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm)\n {\n \tstruct mana_priv *priv = rxq->priv;\n \tint ret;\n@@ -36,9 +36,9 @@ int mana_rq_ring_doorbell(struct mana_rxq *rxq)\n \t}\n \n \tret = mana_ring_doorbell(db_page, gdma_queue_receive,\n-\t\t\t\t rxq->gdma_rq.id,\n-\t\t\t\t rxq->gdma_rq.head *\n-\t\t\t\t\tGDMA_WQE_ALIGNMENT_UNIT_SIZE);\n+\t\t\t rxq->gdma_rq.id,\n+\t\t\t rxq->gdma_rq.head * GDMA_WQE_ALIGNMENT_UNIT_SIZE,\n+\t\t\t arm);\n \n \tif (ret)\n \t\tDRV_LOG(ERR, \"failed to ring RX doorbell ret %d\", ret);\n@@ -115,7 +115,7 @@ static int mana_alloc_and_post_rx_wqes(struct mana_rxq *rxq)\n \t\t}\n \t}\n \n-\tmana_rq_ring_doorbell(rxq);\n+\tmana_rq_ring_doorbell(rxq, rxq->num_desc);\n \n \treturn ret;\n }\n@@ -156,6 +156,14 @@ int mana_stop_rx_queues(struct rte_eth_dev *dev)\n \t\t\t\tDRV_LOG(ERR,\n \t\t\t\t\t\"rx_queue destroy_cq failed %d\", ret);\n \t\t\trxq->cq = NULL;\n+\n+\t\t\tif (rxq->channel) {\n+\t\t\t\tret = ibv_destroy_comp_channel(rxq->channel);\n+\t\t\t\tif (ret)\n+\t\t\t\t\tDRV_LOG(ERR, \"failed destroy comp %d\",\n+\t\t\t\t\t\tret);\n+\t\t\t\trxq->channel = NULL;\n+\t\t\t}\n \t\t}\n \n \t\t/* Drain and free posted WQEs */\n@@ -196,8 +204,24 @@ int mana_start_rx_queues(struct rte_eth_dev *dev)\n \t\t\t\t.data = (void *)(uintptr_t)rxq->socket,\n \t\t\t}));\n \n+\t\tif (dev->data->dev_conf.intr_conf.rxq) {\n+\t\t\trxq->channel = ibv_create_comp_channel(priv->ib_ctx);\n+\t\t\tif (!rxq->channel) {\n+\t\t\t\tret = -errno;\n+\t\t\t\tDRV_LOG(ERR, \"Queue %d comp channel failed\", i);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t\tret = mana_fd_set_non_blocking(rxq->channel->fd);\n+\t\t\tif (ret) {\n+\t\t\t\tDRV_LOG(ERR, \"Failed to set comp non-blocking\");\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\t\t}\n+\n \t\trxq->cq = ibv_create_cq(priv->ib_ctx, rxq->num_desc,\n-\t\t\t\t\tNULL, NULL, 0);\n+\t\t\t\t\tNULL, rxq->channel,\n+\t\t\t\t\trxq->channel ? i : 0);\n \t\tif (!rxq->cq) {\n \t\t\tret = -errno;\n \t\t\tDRV_LOG(ERR, \"failed to create rx cq queue %d\", i);\n@@ -347,7 +371,8 @@ int mana_start_rx_queues(struct rte_eth_dev *dev)\n \n uint16_t mana_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n {\n-\tuint16_t pkt_received = 0, cqe_processed = 0;\n+\tuint16_t pkt_received = 0;\n+\tuint8_t wqe_posted = 0;\n \tstruct mana_rxq *rxq = dpdk_rxq;\n \tstruct mana_priv *priv = rxq->priv;\n \tstruct gdma_comp comp;\n@@ -433,18 +458,62 @@ uint16_t mana_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\tif (rxq->desc_ring_tail >= rxq->num_desc)\n \t\t\trxq->desc_ring_tail = 0;\n \n-\t\tcqe_processed++;\n-\n \t\t/* Post another request */\n \t\tret = mana_alloc_and_post_rx_wqe(rxq);\n \t\tif (ret) {\n \t\t\tDRV_LOG(ERR, \"failed to post rx wqe ret=%d\", ret);\n \t\t\tbreak;\n \t\t}\n+\n+\t\twqe_posted++;\n \t}\n \n-\tif (cqe_processed)\n-\t\tmana_rq_ring_doorbell(rxq);\n+\tif (wqe_posted)\n+\t\tmana_rq_ring_doorbell(rxq, wqe_posted);\n \n \treturn pkt_received;\n }\n+\n+static int mana_arm_cq(struct mana_rxq *rxq, uint8_t arm)\n+{\n+\tstruct mana_priv *priv = rxq->priv;\n+\tuint32_t head = rxq->gdma_cq.head %\n+\t\t(rxq->gdma_cq.count << COMPLETION_QUEUE_ENTRY_OWNER_BITS_SIZE);\n+\n+\tDRV_LOG(ERR, \"Ringing completion queue ID %u head %u arm %d\",\n+\t\trxq->gdma_cq.id, head, arm);\n+\n+\treturn mana_ring_doorbell(priv->db_page, gdma_queue_completion,\n+\t\t\t\t rxq->gdma_cq.id, head, arm);\n+}\n+\n+int mana_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n+{\n+\tstruct mana_rxq *rxq = dev->data->rx_queues[rx_queue_id];\n+\n+\treturn mana_arm_cq(rxq, 1);\n+}\n+\n+int mana_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n+{\n+\tstruct mana_rxq *rxq = dev->data->rx_queues[rx_queue_id];\n+\tstruct ibv_cq *ev_cq;\n+\tvoid *ev_ctx;\n+\tint ret;\n+\n+\tret = ibv_get_cq_event(rxq->channel, &ev_cq, &ev_ctx);\n+\tif (ret)\n+\t\tret = errno;\n+\telse if (ev_cq != rxq->cq)\n+\t\tret = EINVAL;\n+\n+\tif (ret) {\n+\t\tif (ret != EAGAIN)\n+\t\t\tDRV_LOG(ERR, \"Can't disable RX intr queue %d\",\n+\t\t\t\trx_queue_id);\n+\t} else {\n+\t\tibv_ack_cq_events(rxq->cq, 1);\n+\t}\n+\n+\treturn -ret;\n+}\ndiff --git a/drivers/net/mana/tx.c b/drivers/net/mana/tx.c\nindex 0aefab1b6c..5878ea62f9 100644\n--- a/drivers/net/mana/tx.c\n+++ b/drivers/net/mana/tx.c\n@@ -396,7 +396,8 @@ uint16_t mana_tx_burst(void *dpdk_txq, struct rte_mbuf **tx_pkts,\n \tret = mana_ring_doorbell(db_page, gdma_queue_send,\n \t\t\t\t txq->gdma_sq.id,\n \t\t\t\t txq->gdma_sq.head *\n-\t\t\t\t\tGDMA_WQE_ALIGNMENT_UNIT_SIZE);\n+\t\t\t\t\tGDMA_WQE_ALIGNMENT_UNIT_SIZE,\n+\t\t\t\t 0);\n \tif (ret)\n \t\tDRV_LOG(ERR, \"mana_ring_doorbell failed ret %d\", ret);\n \n", "prefixes": [ "v6", "18/18" ] }