Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85502/?format=api
{ "id": 85502, "url": "http://patches.dpdk.org/api/patches/85502/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201219075454.40266-3-jingjing.wu@intel.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": "<20201219075454.40266-3-jingjing.wu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201219075454.40266-3-jingjing.wu@intel.com", "date": "2020-12-19T07:54:51", "name": "[v1,2/5] net/iavf_be: control queue enabling", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c444a34e5d022a0c7e0e01c0e743e7ba32a4bd3a", "submitter": { "id": 47, "url": "http://patches.dpdk.org/api/people/47/?format=api", "name": "Jingjing Wu", "email": "jingjing.wu@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201219075454.40266-3-jingjing.wu@intel.com/mbox/", "series": [ { "id": 14385, "url": "http://patches.dpdk.org/api/series/14385/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=14385", "date": "2020-12-19T07:54:49", "name": "introduce iavf backend driver", "version": 1, "mbox": "http://patches.dpdk.org/series/14385/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/85502/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/85502/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7F238A04B5;\n\tSat, 19 Dec 2020 09:06:45 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4C93ECB3E;\n\tSat, 19 Dec 2020 09:06:11 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by dpdk.org (Postfix) with ESMTP id 57D73CB19\n for <dev@dpdk.org>; Sat, 19 Dec 2020 09:06:08 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Dec 2020 00:06:06 -0800", "from dpdk-wujingji.sh.intel.com ([10.67.119.101])\n by fmsmga001.fm.intel.com with ESMTP; 19 Dec 2020 00:06:04 -0800" ], "IronPort-SDR": [ "\n KKBUSjDTsp8vCdDCkezPzGR0SkiMcBdI3sjrmhRoGWfjYQ0GfNDYpLPltLjXzD83eVVP5oVi5W\n wYF62yeZ4Rrw==", "\n Y0/HH4367AhMXgASByv9V5Y97O+kKmN2o90ezZ6jGN601xxnhKx0bNKmk7ncRZCiQbOEeIe8t8\n vUfthc/u3kvg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9839\"; a=\"155353438\"", "E=Sophos;i=\"5.78,432,1599548400\"; d=\"scan'208\";a=\"155353438\"", "E=Sophos;i=\"5.78,432,1599548400\"; d=\"scan'208\";a=\"454532214\"" ], "X-ExtLoop1": "1", "From": "Jingjing Wu <jingjing.wu@intel.com>", "To": "dev@dpdk.org", "Cc": "jingjing.wu@intel.com, beilei.xing@intel.com, chenbo.xia@intel.com,\n xiuchun.lu@intel.com", "Date": "Sat, 19 Dec 2020 15:54:51 +0800", "Message-Id": "<20201219075454.40266-3-jingjing.wu@intel.com>", "X-Mailer": "git-send-email 2.21.1", "In-Reply-To": "<20201219075454.40266-1-jingjing.wu@intel.com>", "References": "<20201219075454.40266-1-jingjing.wu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v1 2/5] net/iavf_be: control queue enabling", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "1. Set up control rx/tx queues.\n2. Emu device callback functions implemention.\n3. Enabling recv/send msg through control queue.\n\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\nSigned-off-by: Chenbo Xia <chenbo.xia@intel.com>\nSigned-off-by: Xiuchun Lu <xiuchun.lu@intel.com>\n---\n drivers/net/iavf_be/iavf_be.h | 39 ++++\n drivers/net/iavf_be/iavf_be_ethdev.c | 321 ++++++++++++++++++++++++++-\n drivers/net/iavf_be/iavf_be_vchnl.c | 273 +++++++++++++++++++++++\n drivers/net/iavf_be/meson.build | 1 +\n 4 files changed, 632 insertions(+), 2 deletions(-)\n create mode 100644 drivers/net/iavf_be/iavf_be_vchnl.c", "diff": "diff --git a/drivers/net/iavf_be/iavf_be.h b/drivers/net/iavf_be/iavf_be.h\nindex 55f218afcd..aff7bb9c56 100644\n--- a/drivers/net/iavf_be/iavf_be.h\n+++ b/drivers/net/iavf_be/iavf_be.h\n@@ -5,13 +5,49 @@\n #ifndef _IAVF_BE_H_\n #define _IAVF_BE_H_\n \n+#define IAVF_BE_AQ_LEN 32\n+#define IAVF_BE_AQ_BUF_SZ 4096\n+#define IAVF_BE_32_TO_64(hi, lo) ((((uint64_t)(hi)) << 32) + (lo))\n+\n+#define IAVFBE_READ_32(addr) \\\n+\trte_le_to_cpu_32(*(volatile uint32_t *)(addr))\n+#define IAVFBE_WRITE_32(addr, val) \\\n+\t*(volatile uint32_t *)(addr) = rte_cpu_to_le_32(val);\n+\n+struct iavfbe_control_q {\n+\trte_spinlock_t access_lock;\n+\tstruct rte_emudev_q_info q_info;\n+\tstruct iavf_aq_desc *ring;\n+\tuint64_t p_ring_addr;\t/* Guest physical address of the ring */\n+\tuint16_t len;\n+\tvolatile uint8_t *tail;\n+\tvolatile uint8_t *head;\n+\n+\tuint16_t next_to_use;\n+\tuint16_t next_to_clean;\n+\n+\tuint32_t cmd_retval; /* return value of the cmd response from PF */\n+\tuint8_t *aq_req; /* buffer to store the adminq request from VF, NULL if arq */\n+};\n+\n+/* Control queue structure of iavf */\n+struct iavfbe_controlq_info {\n+\tstruct iavfbe_control_q asq;\n+\tstruct iavfbe_control_q arq;\n+};\n+\n /* Structure to store private data for backend instance*/\n struct iavfbe_adapter {\n \tstruct rte_eth_dev *eth_dev;\n \tstruct rte_emudev *emu_dev;\n \tuint16_t edev_id; /* Emulated Device ID */\n \tstruct rte_emudev_info dev_info;\n+\tstruct rte_iavf_emu_mem *mem_table;\n \n+\tstruct iavfbe_controlq_info cq_info; /* Control/Admin Queue info*/\n+\t/* Adminq handle thread info */\n+\tvolatile int thread_status;\n+\tpthread_t thread_id;\n \tuint16_t nb_qps;\n \tbool link_up;\n \tint cq_irqfd;\n@@ -32,6 +68,9 @@ struct iavfbe_adapter {\n \t((struct iavfbe_adapter *)adapter)\n \n int iavfbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);\n+void iavfbe_handle_virtchnl_msg(void *arg);\n+void iavfbe_reset_asq(struct iavfbe_adapter *adapter, bool lock);\n+void iavfbe_reset_arq(struct iavfbe_adapter *adapter, bool lock);\n \n extern int iavfbe_logtype;\n #define IAVF_BE_LOG(level, fmt, args...) \\\ndiff --git a/drivers/net/iavf_be/iavf_be_ethdev.c b/drivers/net/iavf_be/iavf_be_ethdev.c\nindex 3d5ca34ec0..2ab66f889d 100644\n--- a/drivers/net/iavf_be/iavf_be_ethdev.c\n+++ b/drivers/net/iavf_be/iavf_be_ethdev.c\n@@ -14,6 +14,7 @@\n #include <rte_iavf_emu.h>\n \n #include <iavf_type.h>\n+#include <virtchnl.h>\n #include \"iavf_be.h\"\n \n #define AVFBE_EDEV_ID_ARG \"emu\"\n@@ -33,6 +34,12 @@ static struct rte_eth_link iavfbe_link = {\n \t.link_status = ETH_LINK_DOWN\n };\n \n+static int iavfbe_new_device(struct rte_emudev *dev);\n+static void iavfbe_destroy_device(struct rte_emudev *dev);\n+static int iavfbe_update_device(struct rte_emudev *dev);\n+static int iavfbe_lock_dp(struct rte_emudev *dev, int lock);\n+static int iavfbe_reset_device(struct rte_emudev *dev);\n+\n static int iavfbe_dev_configure(struct rte_eth_dev *dev);\n static int iavfbe_dev_close(struct rte_eth_dev *dev);\n static int iavfbe_dev_start(struct rte_eth_dev *dev);\n@@ -41,6 +48,16 @@ static int iavfbe_dev_info_get(struct rte_eth_dev *dev,\n \t\t\t\tstruct rte_eth_dev_info *dev_info);\n static void iavfbe_destroy_adapter(struct rte_eth_dev *dev);\n \n+struct rte_iavf_emu_notify_ops iavfbe_notify_ops = {\n+\t.device_ready = iavfbe_new_device,\n+\t.device_destroy = iavfbe_destroy_device,\n+\t.update_status = iavfbe_update_device,\n+\t.device_start = NULL,\n+\t.device_stop = NULL,\n+\t.lock_dp = iavfbe_lock_dp,\n+\t.reset_device = iavfbe_reset_device,\n+};\n+\n static const struct eth_dev_ops iavfbe_eth_dev_ops = {\n \t.dev_configure = iavfbe_dev_configure,\n \t.dev_close = iavfbe_dev_close,\n@@ -51,7 +68,8 @@ static const struct eth_dev_ops iavfbe_eth_dev_ops = {\n };\n \n static int\n-iavfbe_dev_info_get(struct rte_eth_dev *dev __rte_unused, struct rte_eth_dev_info *dev_info)\n+iavfbe_dev_info_get(struct rte_eth_dev *dev __rte_unused,\n+\t\t struct rte_eth_dev_info *dev_info)\n {\n \tdev_info->max_rx_queues = 0;\n \tdev_info->max_tx_queues = 0;\n@@ -61,7 +79,6 @@ iavfbe_dev_info_get(struct rte_eth_dev *dev __rte_unused, struct rte_eth_dev_i\n \treturn 0;\n }\n \n-\n static int\n iavfbe_dev_configure(struct rte_eth_dev *dev __rte_unused)\n {\n@@ -122,6 +139,241 @@ iavfbe_dev_close(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n+/* Called when emulation device is ready */\n+static int\n+iavfbe_new_device(struct rte_emudev *dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\t(struct iavfbe_adapter *)dev->backend_priv;\n+\tstruct rte_iavf_emu_mem **mem = &(adapter->mem_table);\n+\tstruct rte_emudev_irq_info irq_info;\n+\tstruct rte_emudev_q_info q_info;\n+\tstruct rte_emudev_db_info db_info;\n+\tuint64_t addr;\n+\tuint16_t i;\n+\n+\tif (rte_emudev_get_mem_table(dev->dev_id, (void **)mem)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get mem table\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tfor (i = 0; i < RTE_IAVF_EMU_ADMINQ_NUM; i++) {\n+\t\tif (rte_emudev_get_queue_info(dev->dev_id, i, &q_info)) {\n+\t\t\tIAVF_BE_LOG(ERR,\n+\t\t\t\t\"Can not get queue info of qid %d\\n\", i);\n+\t\t\treturn -1;\n+\t\t}\n+\t\t/*\n+\t\t * Only doorbell of LANQ is viable when device ready.\n+\t\t * Other info of LANQ is acquired through virtchnl.\n+\t\t *\n+\t\t * AdminQ's irq and doorbell will both be ready in this stage.\n+\t\t */\n+\t\tif (rte_emudev_get_db_info(dev->dev_id, q_info.doorbell_id,\n+\t\t\t\t\t &db_info)) {\n+\t\t\tIAVF_BE_LOG(ERR,\n+\t\t\t\t\"Can not get doorbell info of qid %d\\n\", i);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* Only support memory based doorbell for now */\n+\t\tif (db_info.flag & RTE_EMUDEV_DB_FD ||\n+\t\t\tdb_info.data.mem.size != 4)\n+\t\t\treturn -1;\n+\n+\t\tif (i == RTE_IAVF_EMU_ADMINQ_TXQ) {\n+\t\t\tadapter->cq_info.asq.tail =\n+\t\t\t\t(uint8_t *)db_info.data.mem.base;\n+\t\t} else {\n+\t\t\tadapter->cq_info.arq.tail =\n+\t\t\t\t(uint8_t *)db_info.data.mem.base;\n+\n+\t\t\tif (rte_emudev_get_irq_info(dev->dev_id,\n+\t\t\t\tq_info.irq_vector, &irq_info)) {\n+\t\t\t\tIAVF_BE_LOG(ERR,\n+\t\t\t\t\t\"Can not get irq info of qid %d\\n\", i);\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\n+\t\t\tadapter->cq_irqfd = irq_info.eventfd;\n+\t\t}\n+\t}\n+\n+\t/* Lan queue info would be set when queue setup */\n+\n+\tif (rte_emudev_get_attr(dev->dev_id, RTE_IAVF_EMU_ATTR_ASQ_HEAD,\n+\t\t(rte_emudev_attr_t)&addr)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get asq head\\n\");\n+\t\treturn -1;\n+\t}\n+\tadapter->cq_info.asq.head = (uint8_t *)(uintptr_t)addr;\n+\n+\tif (rte_emudev_get_attr(dev->dev_id, RTE_IAVF_EMU_ATTR_ARQ_HEAD,\n+\t\t(rte_emudev_attr_t)&addr)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get arq head\\n\");\n+\t\treturn -1;\n+\t}\n+\tadapter->cq_info.arq.head = (uint8_t *)(uintptr_t)addr;\n+\n+\tiavfbe_reset_asq(adapter, false);\n+\tiavfbe_reset_arq(adapter, false);\n+\n+\tif (rte_emudev_get_attr(dev->dev_id, RTE_IAVF_EMU_ATTR_RESET,\n+\t\t(rte_emudev_attr_t)&addr)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get arq head\\n\");\n+\t\treturn -1;\n+\t}\n+\tadapter->reset = (uint8_t *)(uintptr_t)addr;\n+\tIAVFBE_WRITE_32(adapter->reset, RTE_IAVF_EMU_RESET_COMPLETED);\n+\tadapter->started = 1;\n+\tprintf(\"NEW DEVICE: memtable, %p\\n\", adapter->mem_table);\n+\n+\treturn 0;\n+}\n+\n+static void\n+iavfbe_destroy_device(struct rte_emudev *dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\t(struct iavfbe_adapter *)dev->backend_priv;\n+\n+\t/* TODO: Disable all lan queues */\n+\n+\t/* update link status */\n+\tadapter->link_up = false;\n+\tiavfbe_dev_link_update(adapter->eth_dev, 0);\n+}\n+\n+static int\n+iavfbe_update_device(struct rte_emudev *dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\t(struct iavfbe_adapter *)dev->backend_priv;\n+\tstruct rte_iavf_emu_mem **mem = &(adapter->mem_table);\n+\tstruct rte_emudev_q_info q_info;\n+\tstruct rte_emudev_irq_info irq_info;\n+\n+\tif (rte_emudev_get_mem_table(dev->dev_id, (void **)mem)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get mem table\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (rte_emudev_get_queue_info(dev->dev_id,\n+\t\tRTE_IAVF_EMU_ADMINQ_RXQ, &q_info)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get queue info of qid %d\\n\",\n+\t\t\tRTE_IAVF_EMU_ADMINQ_RXQ);\n+\t\treturn -1;\n+\t}\n+\n+\tif (rte_emudev_get_irq_info(dev->dev_id, q_info.irq_vector, &irq_info)) {\n+\t\tIAVF_BE_LOG(ERR, \"Can not get irq info of qid %d\\n\",\n+\t\t\tRTE_IAVF_EMU_ADMINQ_RXQ);\n+\t\treturn -1;\n+\t}\n+\n+\t/* TODO: Lan queue info update */\n+\tadapter->cq_irqfd = irq_info.eventfd;\n+\trte_atomic32_set(&adapter->irq_enable, irq_info.enable);\n+\n+\treturn 0;\n+}\n+\n+static int\n+iavfbe_lock_dp(struct rte_emudev *dev, int lock)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\t(struct iavfbe_adapter *)dev->backend_priv;\n+\n+\t/* Acquire/Release lock of control queue and lan queue */\n+\n+\tif (lock) {\n+\t\t/* TODO: Lan queue lock */\n+\t\trte_spinlock_lock(&adapter->cq_info.asq.access_lock);\n+\t\trte_spinlock_lock(&adapter->cq_info.arq.access_lock);\n+\t} else {\n+\t\t/* TODO: Lan queue unlock */\n+\t\trte_spinlock_unlock(&adapter->cq_info.asq.access_lock);\n+\t\trte_spinlock_unlock(&adapter->cq_info.arq.access_lock);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void\n+iavfbe_reset_asq(struct iavfbe_adapter *adapter, bool lock)\n+{\n+\tstruct iavfbe_control_q *q;\n+\n+\tq = &adapter->cq_info.asq;\n+\n+\tif (lock)\n+\t\trte_spinlock_lock(&q->access_lock);\n+\n+\tif (q->aq_req)\n+\t\tmemset(q->aq_req, 0, IAVF_BE_AQ_BUF_SZ);\n+\tmemset(&q->q_info, 0, sizeof(q->q_info));\n+\tq->ring = NULL;\n+\tq->p_ring_addr = 0;\n+\tq->len = 0;\n+\tq->next_to_clean = 0;\n+\tq->cmd_retval = 0;\n+\tif (q->head)\n+\t\tIAVFBE_WRITE_32(q->head, 0);\n+\n+\t/* Do not reset tail as it init by FE */\n+\n+\tif (lock)\n+\t\trte_spinlock_unlock(&q->access_lock);\n+\n+}\n+\n+void\n+iavfbe_reset_arq(struct iavfbe_adapter *adapter, bool lock)\n+{\n+\tstruct iavfbe_control_q *q;\n+\n+\tq = &adapter->cq_info.arq;\n+\n+\tif (lock)\n+\t\trte_spinlock_lock(&q->access_lock);\n+\n+\tmemset(&q->q_info, 0, sizeof(q->q_info));\n+\tq->ring = NULL;\n+\tq->p_ring_addr = 0;\n+\tq->len = 0;\n+\tq->next_to_use = 0;\n+\tif (q->head)\n+\t\tIAVFBE_WRITE_32(q->head, 0);\n+\n+\t/* Do not reset tail as it init by FE */\n+\n+\tif (lock)\n+\t\trte_spinlock_unlock(&q->access_lock);\n+\n+}\n+\n+static int\n+iavfbe_reset_device(struct rte_emudev *dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\t(struct iavfbe_adapter *)dev->backend_priv;\n+\n+\t/* Lock has been acquired by lock_dp */\n+\t/* TODO: reset all queues */\n+\tiavfbe_reset_asq(adapter, false);\n+\tiavfbe_reset_arq(adapter, false);\n+\n+\tadapter->link_up = 0;\n+\tadapter->unicast_promisc = true;\n+\tadapter->multicast_promisc = true;\n+\tadapter->vlan_filter = false;\n+\tadapter->vlan_strip = false;\n+\tadapter->cq_irqfd = -1;\n+\tadapter->adapter_stopped = 1;\n+\n+\treturn 0;\n+}\n+\n static inline int\n save_str(const char *key __rte_unused, const char *value,\n \tvoid *extra_args)\n@@ -146,6 +398,34 @@ set_mac(const char *key __rte_unused, const char *value, void *extra_args)\n \treturn 0;\n }\n \n+static int\n+iavfbe_driver_admq_session_start(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\tIAVFBE_DEV_PRIVATE_TO_ADAPTER(eth_dev->data->dev_private);\n+\tint ret;\n+\n+\tadapter->thread_status = 1;\n+\tret = pthread_create(&adapter->thread_id, NULL,\n+\t\t\t (void *)iavfbe_handle_virtchnl_msg,\n+\t\t\t eth_dev);\n+\tif (ret) {\n+\t\tIAVF_BE_LOG(ERR, \"Can't create a thread\\n\");\n+\t\tadapter->thread_status = 0;\n+\t}\n+\treturn ret;\n+}\n+\n+static void\n+iavfbe_driver_admq_session_stop(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct iavfbe_adapter *adapter =\n+\t\tIAVFBE_DEV_PRIVATE_TO_ADAPTER(eth_dev->data->dev_private);\n+\n+\tadapter->thread_status = 0;\n+\tpthread_join(adapter->thread_id, NULL);\n+}\n+\n static int\n iavfbe_init_adapter(struct rte_eth_dev *eth_dev,\n \t\t struct rte_emudev *emu_dev,\n@@ -177,8 +457,44 @@ iavfbe_init_adapter(struct rte_eth_dev *eth_dev,\n \t\tgoto err_info;\n \n \tadapter->nb_qps = conf->qp_num;\n+\n+\tadapter->cq_info.asq.aq_req =\n+\t\trte_zmalloc_socket(\"iavfbe\", IAVF_BE_AQ_BUF_SZ, 0,\n+\t\t\t\t eth_dev->device->numa_node);\n+\tif (!adapter->cq_info.asq.aq_req) {\n+\t\tIAVF_BE_LOG(ERR, \"Fail to allocate buffer for\"\n+\t\t\t\t \" control queue request\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err_aq;\n+\t}\n+\n+\t/* Init lock */\n+\trte_spinlock_init(&adapter->cq_info.asq.access_lock);\n+\trte_spinlock_init(&adapter->cq_info.arq.access_lock);\n+\n+\tadapter->unicast_promisc = true;\n+\tadapter->multicast_promisc = true;\n+\tadapter->vlan_filter = false;\n+\tadapter->vlan_strip = false;\n+\n+\t/* No need to map region or init admin queue here now. They would be\n+\t * done when emu device is ready.*/\n+\n+\t/* Currently RSS is not necessary for device emulator */\n+\n+\t/* Subscribe event from emulated avf device */\n+\trte_emudev_subscribe_event(emu_dev->dev_id, &iavfbe_notify_ops);\n+\n+\t/* Create a thread for virtchnnl command process */\n+\tif (iavfbe_driver_admq_session_start(eth_dev)) {\n+\t\tIAVF_BE_LOG(ERR, \"iavfbe driver adminq session start failed\");\n+\t\tgoto err_thread;\n+\t}\n+\n \treturn 0;\n \n+err_thread:\n+err_aq:\n err_info:\n \trte_free(conf);\n \treturn ret;\n@@ -190,6 +506,7 @@ iavfbe_destroy_adapter(struct rte_eth_dev *dev)\n \tstruct iavfbe_adapter *adapter =\n \t\tIAVFBE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n \n+\tiavfbe_driver_admq_session_stop(dev);\n \tif (adapter->emu_dev) {\n \t\tadapter->emu_dev->backend_priv = NULL;\n \t\trte_wmb();\ndiff --git a/drivers/net/iavf_be/iavf_be_vchnl.c b/drivers/net/iavf_be/iavf_be_vchnl.c\nnew file mode 100644\nindex 0000000000..646c967252\n--- /dev/null\n+++ b/drivers/net/iavf_be/iavf_be_vchnl.c\n@@ -0,0 +1,273 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2020 Intel Corporation\n+ */\n+\n+#include <unistd.h>\n+#include <inttypes.h>\n+#include <sys/mman.h>\n+#include <sys/eventfd.h>\n+\n+#include <rte_kvargs.h>\n+#include <rte_debug.h>\n+#include <rte_atomic.h>\n+#include <rte_eal.h>\n+#include <rte_ether.h>\n+#include <rte_ethdev_driver.h>\n+#include <rte_dev.h>\n+#include <rte_emudev.h>\n+#include <rte_iavf_emu.h>\n+\n+#include <iavf_type.h>\n+#include <virtchnl.h>\n+\n+#include \"iavf_be.h\"\n+\n+__rte_unused static int\n+iavfbe_send_msg_to_vf(struct iavfbe_adapter *adapter,\n+\t\t\tuint32_t opcode,\n+\t\t\tuint32_t retval,\n+\t\t\tuint8_t *msg,\n+\t\t\tuint16_t msglen)\n+{\n+\tstruct iavfbe_control_q *arq = &adapter->cq_info.arq;\n+\tstruct iavf_aq_desc *desc;\n+\tenum iavf_status status = IAVF_SUCCESS;\n+\tuint32_t dma_buff_low, dma_buff_high;\n+\tuint16_t ntu;\n+\n+\tif (msglen > IAVF_BE_AQ_BUF_SZ) {\n+\t\tIAVF_BE_LOG(ERR, \"ARQ: msg is tool long: %u\\n\", msglen);\n+\t\tstatus = IAVF_ERR_INVALID_SIZE;\n+\t\tgoto arq_send_error;\n+\t}\n+\n+\trte_spinlock_lock(&arq->access_lock);\n+\n+\tntu = arq->next_to_use;\n+\tif (ntu == IAVFBE_READ_32(arq->tail)) {\n+\t\tIAVF_BE_LOG(ERR, \"ARQ: No free desc\\n\");\n+\t\tstatus = IAVF_ERR_QUEUE_EMPTY;\n+\t\tgoto arq_send_error;\n+\t}\n+\tdesc = &arq->ring[ntu];\n+\tdma_buff_low = LE32_TO_CPU(desc->params.external.addr_low);\n+\tdma_buff_high = LE32_TO_CPU(desc->params.external.addr_high);\n+\n+\t/* Prepare descriptor */\n+\tmemset((void *)desc, 0, sizeof(struct iavf_aq_desc));\n+\tdesc->opcode = CPU_TO_LE16(iavf_aqc_opc_send_msg_to_vf);\n+\n+\tdesc->flags = CPU_TO_LE16(IAVF_AQ_FLAG_SI);\n+\tdesc->cookie_high = CPU_TO_LE32(opcode);\n+\tdesc->cookie_low = CPU_TO_LE32(retval);\n+\n+\tif (msg && msglen) {\n+\t\tvoid *buf_va;\n+\t\tuint64_t buf_sz = msglen;\n+\n+\t\tdesc->flags |= CPU_TO_LE16((uint16_t)(IAVF_AQ_FLAG_BUF\n+\t\t\t\t\t\t| IAVF_AQ_FLAG_RD));\n+\t\tif (msglen > IAVF_AQ_LARGE_BUF)\n+\t\t\tdesc->flags |= CPU_TO_LE16((uint16_t)IAVF_AQ_FLAG_LB);\n+\t\tdesc->datalen = CPU_TO_LE16(msglen);\n+\n+\t\tbuf_va = (void *)(uintptr_t)rte_iavf_emu_get_dma_vaddr(\n+\t\t\tadapter->mem_table,\n+\t\t\tIAVF_BE_32_TO_64(dma_buff_high, dma_buff_low),\n+\t\t\t&buf_sz);\n+\t\tif (buf_sz != msglen)\n+\t\t\tgoto arq_send_error;\n+\n+\t\trte_memcpy(buf_va, msg, msglen);\n+\t}\n+\trte_wmb();\n+\n+\tntu++;\n+\tif (ntu == arq->len)\n+\t\tntu = 0;\n+\tarq->next_to_use = ntu;\n+\tIAVFBE_WRITE_32(arq->head, arq->next_to_use);\n+\n+arq_send_error:\n+\trte_spinlock_unlock(&arq->access_lock);\n+\treturn status;\n+}\n+\n+/* Read data in admin queue to get msg from vf driver */\n+static enum iavf_status\n+iavfbe_read_msg_from_vf(struct iavfbe_adapter *adapter,\n+\t\t\tstruct iavf_arq_event_info *event)\n+{\n+\tstruct iavfbe_control_q *asq = &adapter->cq_info.asq;\n+\tstruct iavf_aq_desc *desc;\n+\tenum virtchnl_ops opcode;\n+\tuint16_t ntc;\n+\tuint16_t datalen;\n+\tuint16_t flags;\n+\tint ret = IAVF_SUCCESS;\n+\n+\trte_spinlock_lock(&asq->access_lock);\n+\n+\tntc = asq->next_to_clean;\n+\n+\t/* pre-clean the event info */\n+\tmemset(&event->desc, 0, sizeof(event->desc));\n+\tevent->msg_len = 0;\n+\n+\tif (ntc == IAVFBE_READ_32(asq->tail)) {\n+\t\t/* nothing to do */\n+\t\tret = IAVF_ERR_ADMIN_QUEUE_NO_WORK;\n+\t\tgoto end;\n+\t}\n+\t/* now get the next descriptor */\n+\tdesc = &asq->ring[ntc];\n+\trte_memcpy(&event->desc, desc, sizeof(struct iavf_aq_desc));\n+\tflags = LE16_TO_CPU(desc->flags);\n+\tdatalen = LE16_TO_CPU(desc->datalen);\n+\tif (flags & IAVF_AQ_FLAG_RD) {\n+\t\tif (datalen > event->buf_len) {\n+\t\t\tret = IAVF_ERR_BUF_TOO_SHORT;\n+\t\t\tgoto end;\n+\t\t} else {\n+\t\t\tuint32_t reg1 = 0;\n+\t\t\tuint32_t reg2 = 0;\n+\t\t\tvoid *buf_va;\n+\t\t\tuint64_t buf_sz = datalen;\n+\n+\t\t\tevent->msg_len = datalen;\n+\t\t\treg1 = LE32_TO_CPU(desc->params.external.addr_low);\n+\t\t\treg2 = LE32_TO_CPU(desc->params.external.addr_high);\n+\t\t\tbuf_va = (void *)(uintptr_t)rte_iavf_emu_get_dma_vaddr(\n+\t\t\t\t\tadapter->mem_table,\n+\t\t\t\t\tIAVF_BE_32_TO_64(reg2, reg1), &buf_sz);\n+\t\t\trte_memcpy(event->msg_buf, buf_va, event->msg_len);\n+\t\t}\n+\t}\n+\n+\tntc++;\n+\tif (ntc == asq->len)\n+\t\tntc = 0;\n+\tasq->next_to_clean = ntc;\n+\n+\t/* Write back to head and Desc with Flags.DD and Flags.CMP */\n+\tdesc->flags |= IAVF_AQ_FLAG_DD | IAVF_AQ_FLAG_CMP;\n+\trte_wmb();\n+\n+\tIAVFBE_WRITE_32(asq->head, asq->next_to_clean);\n+\topcode = (enum virtchnl_ops)rte_le_to_cpu_32(event->desc.cookie_high);\n+\tasq->cmd_retval = (enum virtchnl_status_code)\n+\t\t\t\trte_le_to_cpu_32(event->desc.cookie_low);\n+\n+\tIAVF_BE_LOG(DEBUG, \"AQ from pf carries opcode %u,virtchnl_op %u retval %d\",\n+\t\t event->desc.opcode, opcode, asq->cmd_retval);\n+end:\n+\trte_spinlock_unlock(&asq->access_lock);\n+\n+\treturn ret;\n+}\n+\n+static inline int\n+iavfbe_control_queue_remap(struct iavfbe_adapter *adapter,\n+\t\t\t struct iavfbe_control_q *asq,\n+\t\t\t struct iavfbe_control_q *arq)\n+{\n+\tstruct rte_emudev_q_info *asq_info;\n+\tstruct rte_emudev_q_info *arq_info;\n+\tuint64_t len;\n+\tint ret;\n+\n+\tasq_info = &adapter->cq_info.asq.q_info;\n+\tarq_info = &adapter->cq_info.arq.q_info;\n+\n+\tret = rte_emudev_get_queue_info(adapter->edev_id,\n+\t\t\t\t RTE_IAVF_EMU_ADMINQ_TXQ,\n+\t\t\t\t asq_info);\n+\tif (ret)\n+\t\treturn IAVF_ERR_NOT_READY;\n+\n+\tret = rte_emudev_get_queue_info(adapter->edev_id,\n+\t\t\t\t\tRTE_IAVF_EMU_ADMINQ_RXQ,\n+\t\t\t\t\tarq_info);\n+\tif (ret)\n+\t\treturn IAVF_ERR_NOT_READY;\n+\n+\trte_spinlock_lock(&asq->access_lock);\n+\n+\tasq->p_ring_addr = asq_info->base;\n+\tasq->len = asq_info->size;\n+\tlen = asq->len * sizeof(struct iavf_aq_desc);\n+\tasq->ring = (void *)(uintptr_t)rte_iavf_emu_get_dma_vaddr(\n+\t\t\t\t\tadapter->mem_table,\n+\t\t\t\t\tasq->p_ring_addr, &len);\n+\trte_spinlock_unlock(&asq->access_lock);\n+\n+\trte_spinlock_lock(&arq->access_lock);\n+\tarq->p_ring_addr = arq_info->base;\n+\tarq->len = arq_info->size;\n+\tlen = arq->len * sizeof(struct iavf_aq_desc);\n+\tarq->ring = (void *)(uintptr_t)rte_iavf_emu_get_dma_vaddr(\n+\t\t\t\t\tadapter->mem_table,\n+\t\t\t\t\tarq->p_ring_addr, &len);\n+\trte_spinlock_unlock(&arq->access_lock);\n+\n+\treturn 0;\n+}\n+\n+void\n+iavfbe_handle_virtchnl_msg(void *arg)\n+{\n+\tstruct rte_eth_dev *dev = (struct rte_eth_dev *)arg;\n+\tstruct iavfbe_adapter *adapter =\n+\t\tIAVFBE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n+\tstruct iavfbe_control_q *arq = &adapter->cq_info.arq;\n+\tstruct iavfbe_control_q *asq = &adapter->cq_info.asq;\n+\tstruct iavf_arq_event_info info;\n+\tuint16_t aq_opc;\n+\tint ret;\n+\n+\tinfo.buf_len = IAVF_BE_AQ_BUF_SZ;\n+\tinfo.msg_buf = adapter->cq_info.asq.aq_req;\n+\n+\twhile (adapter->thread_status) {\n+\t\trte_delay_us_sleep(3000); /* sleep for 3 ms*/\n+\t\t/* Check if control queue is initilized */\n+\t\tif (adapter->started == 0)\n+\t\t\tcontinue;\n+\n+\t\t/* remap every time */\n+\t\tret = iavfbe_control_queue_remap(adapter, asq, arq);\n+\t\tif (ret ||\n+\t\t !(asq->p_ring_addr && asq->len && asq->ring) ||\n+\t\t !(arq->p_ring_addr && arq->len && arq->ring))\n+\t\t\tcontinue;\n+\n+\t\tif (asq->next_to_clean == IAVFBE_READ_32(asq->tail))\n+\t\t\t/* nothing to do */\n+\t\t\tcontinue;\n+\n+\t\tret = iavfbe_read_msg_from_vf(adapter, &info);\n+\t\tif (ret != IAVF_SUCCESS) {\n+\t\t\tIAVF_BE_LOG(DEBUG, \"Failed to read msg\"\n+\t\t\t\t \"from AdminQ\");\n+\t\t\tbreak;\n+\t\t}\n+\t\taq_opc = rte_le_to_cpu_16(info.desc.opcode);\n+\n+\t\tswitch (aq_opc) {\n+\t\tcase iavf_aqc_opc_send_msg_to_pf:\n+\t\t\t/* Process msg from VF BE*/\n+\t\t\tbreak;\n+\t\tcase iavf_aqc_opc_queue_shutdown:\n+\t\t\tiavfbe_reset_arq(adapter, true);\n+\t\t\tbreak;\n+\t\tcase 0:\n+\t\t\tIAVF_BE_LOG(DEBUG, \"NULL Request ignored\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tIAVF_BE_LOG(ERR, \"Unexpected Request 0x%04x ignored \",\n+\t\t\t\t aq_opc);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\tpthread_exit(0);\n+}\ndiff --git a/drivers/net/iavf_be/meson.build b/drivers/net/iavf_be/meson.build\nindex 24c625fa18..be13a2e492 100644\n--- a/drivers/net/iavf_be/meson.build\n+++ b/drivers/net/iavf_be/meson.build\n@@ -9,4 +9,5 @@ deps += ['bus_vdev', 'common_iavf', 'vfio_user', 'emu_iavf']\n \n sources = files(\n \t'iavf_be_ethdev.c',\n+\t'iavf_be_vchnl.c',\n )\n", "prefixes": [ "v1", "2/5" ] }