Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58221/?format=api
{ "id": 58221, "url": "https://patches.dpdk.org/api/patches/58221/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190829080000.20806-4-maxime.coquelin@redhat.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": "<20190829080000.20806-4-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190829080000.20806-4-maxime.coquelin@redhat.com", "date": "2019-08-29T07:59:48", "name": "[03/15] net/virtio: move control path fonctions in virtqueue file", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "28dc2b2f2be7ee4746e50467db8c59906fbcbe07", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190829080000.20806-4-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 6163, "url": "https://patches.dpdk.org/api/series/6163/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6163", "date": "2019-08-29T07:59:45", "name": "Introduce Virtio vDPA driver", "version": 1, "mbox": "https://patches.dpdk.org/series/6163/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/58221/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/58221/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 962A71D420;\n\tThu, 29 Aug 2019 10:00:29 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id AB2B91D41A;\n\tThu, 29 Aug 2019 10:00:26 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0D19581129;\n\tThu, 29 Aug 2019 08:00:26 +0000 (UTC)", "from localhost.localdomain (ovpn-112-52.ams2.redhat.com\n\t[10.36.112.52])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C1F455D6B2;\n\tThu, 29 Aug 2019 08:00:23 +0000 (UTC)" ], "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "tiwei.bie@intel.com, zhihong.wang@intel.com, amorenoz@redhat.com,\n\txiao.w.wang@intel.com, dev@dpdk.org, jfreimann@redhat.com", "Cc": "stable@dpdk.org,\n\tMaxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Thu, 29 Aug 2019 09:59:48 +0200", "Message-Id": "<20190829080000.20806-4-maxime.coquelin@redhat.com>", "In-Reply-To": "<20190829080000.20806-1-maxime.coquelin@redhat.com>", "References": "<20190829080000.20806-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.15", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]); Thu, 29 Aug 2019 08:00:26 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH 03/15] net/virtio: move control path fonctions in\n\tvirtqueue file", "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": "Virtio-vdpa driver needs to implement the control path,\nso move related functions to virtqueue file so that it\ncan be used by both Virtio PMD and Virtio-vdpa drivers.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 252 ----------------------------\n drivers/net/virtio/virtqueue.c | 255 +++++++++++++++++++++++++++++\n drivers/net/virtio/virtqueue.h | 5 +\n 3 files changed, 260 insertions(+), 252 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex f96588b9d..3682ee318 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -140,226 +140,6 @@ static const struct rte_virtio_xstats_name_off rte_virtio_txq_stat_strings[] = {\n \n struct virtio_hw_internal virtio_hw_internal[RTE_MAX_ETHPORTS];\n \n-static struct virtio_pmd_ctrl *\n-virtio_send_command_packed(struct virtnet_ctl *cvq,\n-\t\t\t struct virtio_pmd_ctrl *ctrl,\n-\t\t\t int *dlen, int pkt_num)\n-{\n-\tstruct virtqueue *vq = cvq->vq;\n-\tint head;\n-\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n-\tstruct virtio_pmd_ctrl *result;\n-\tuint16_t flags;\n-\tint sum = 0;\n-\tint nb_descs = 0;\n-\tint k;\n-\n-\t/*\n-\t * Format is enforced in qemu code:\n-\t * One TX packet for header;\n-\t * At least one TX packet per argument;\n-\t * One RX packet for ACK.\n-\t */\n-\thead = vq->vq_avail_idx;\n-\tflags = vq->vq_packed.cached_flags;\n-\tdesc[head].addr = cvq->virtio_net_hdr_mem;\n-\tdesc[head].len = sizeof(struct virtio_net_ctrl_hdr);\n-\tvq->vq_free_cnt--;\n-\tnb_descs++;\n-\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n-\t\tvq->vq_avail_idx -= vq->vq_nentries;\n-\t\tvq->vq_packed.cached_flags ^= VRING_PACKED_DESC_F_AVAIL_USED;\n-\t}\n-\n-\tfor (k = 0; k < pkt_num; k++) {\n-\t\tdesc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem\n-\t\t\t+ sizeof(struct virtio_net_ctrl_hdr)\n-\t\t\t+ sizeof(ctrl->status) + sizeof(uint8_t) * sum;\n-\t\tdesc[vq->vq_avail_idx].len = dlen[k];\n-\t\tdesc[vq->vq_avail_idx].flags = VRING_DESC_F_NEXT |\n-\t\t\tvq->vq_packed.cached_flags;\n-\t\tsum += dlen[k];\n-\t\tvq->vq_free_cnt--;\n-\t\tnb_descs++;\n-\t\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n-\t\t\tvq->vq_avail_idx -= vq->vq_nentries;\n-\t\t\tvq->vq_packed.cached_flags ^=\n-\t\t\t\tVRING_PACKED_DESC_F_AVAIL_USED;\n-\t\t}\n-\t}\n-\n-\tdesc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem\n-\t\t+ sizeof(struct virtio_net_ctrl_hdr);\n-\tdesc[vq->vq_avail_idx].len = sizeof(ctrl->status);\n-\tdesc[vq->vq_avail_idx].flags = VRING_DESC_F_WRITE |\n-\t\tvq->vq_packed.cached_flags;\n-\tvq->vq_free_cnt--;\n-\tnb_descs++;\n-\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n-\t\tvq->vq_avail_idx -= vq->vq_nentries;\n-\t\tvq->vq_packed.cached_flags ^= VRING_PACKED_DESC_F_AVAIL_USED;\n-\t}\n-\n-\tvirtio_wmb(vq->hw->weak_barriers);\n-\tdesc[head].flags = VRING_DESC_F_NEXT | flags;\n-\n-\tvirtio_wmb(vq->hw->weak_barriers);\n-\tvirtqueue_notify(vq);\n-\n-\t/* wait for used descriptors in virtqueue */\n-\twhile (!desc_is_used(&desc[head], vq))\n-\t\tusleep(100);\n-\n-\tvirtio_rmb(vq->hw->weak_barriers);\n-\n-\t/* now get used descriptors */\n-\tvq->vq_free_cnt += nb_descs;\n-\tvq->vq_used_cons_idx += nb_descs;\n-\tif (vq->vq_used_cons_idx >= vq->vq_nentries) {\n-\t\tvq->vq_used_cons_idx -= vq->vq_nentries;\n-\t\tvq->vq_packed.used_wrap_counter ^= 1;\n-\t}\n-\n-\tPMD_INIT_LOG(DEBUG, \"vq->vq_free_cnt=%d\\n\"\n-\t\t\t\"vq->vq_avail_idx=%d\\n\"\n-\t\t\t\"vq->vq_used_cons_idx=%d\\n\"\n-\t\t\t\"vq->vq_packed.cached_flags=0x%x\\n\"\n-\t\t\t\"vq->vq_packed.used_wrap_counter=%d\\n\",\n-\t\t\tvq->vq_free_cnt,\n-\t\t\tvq->vq_avail_idx,\n-\t\t\tvq->vq_used_cons_idx,\n-\t\t\tvq->vq_packed.cached_flags,\n-\t\t\tvq->vq_packed.used_wrap_counter);\n-\n-\tresult = cvq->virtio_net_hdr_mz->addr;\n-\treturn result;\n-}\n-\n-static struct virtio_pmd_ctrl *\n-virtio_send_command_split(struct virtnet_ctl *cvq,\n-\t\t\t struct virtio_pmd_ctrl *ctrl,\n-\t\t\t int *dlen, int pkt_num)\n-{\n-\tstruct virtio_pmd_ctrl *result;\n-\tstruct virtqueue *vq = cvq->vq;\n-\tuint32_t head, i;\n-\tint k, sum = 0;\n-\n-\thead = vq->vq_desc_head_idx;\n-\n-\t/*\n-\t * Format is enforced in qemu code:\n-\t * One TX packet for header;\n-\t * At least one TX packet per argument;\n-\t * One RX packet for ACK.\n-\t */\n-\tvq->vq_split.ring.desc[head].flags = VRING_DESC_F_NEXT;\n-\tvq->vq_split.ring.desc[head].addr = cvq->virtio_net_hdr_mem;\n-\tvq->vq_split.ring.desc[head].len = sizeof(struct virtio_net_ctrl_hdr);\n-\tvq->vq_free_cnt--;\n-\ti = vq->vq_split.ring.desc[head].next;\n-\n-\tfor (k = 0; k < pkt_num; k++) {\n-\t\tvq->vq_split.ring.desc[i].flags = VRING_DESC_F_NEXT;\n-\t\tvq->vq_split.ring.desc[i].addr = cvq->virtio_net_hdr_mem\n-\t\t\t+ sizeof(struct virtio_net_ctrl_hdr)\n-\t\t\t+ sizeof(ctrl->status) + sizeof(uint8_t)*sum;\n-\t\tvq->vq_split.ring.desc[i].len = dlen[k];\n-\t\tsum += dlen[k];\n-\t\tvq->vq_free_cnt--;\n-\t\ti = vq->vq_split.ring.desc[i].next;\n-\t}\n-\n-\tvq->vq_split.ring.desc[i].flags = VRING_DESC_F_WRITE;\n-\tvq->vq_split.ring.desc[i].addr = cvq->virtio_net_hdr_mem\n-\t\t\t+ sizeof(struct virtio_net_ctrl_hdr);\n-\tvq->vq_split.ring.desc[i].len = sizeof(ctrl->status);\n-\tvq->vq_free_cnt--;\n-\n-\tvq->vq_desc_head_idx = vq->vq_split.ring.desc[i].next;\n-\n-\tvq_update_avail_ring(vq, head);\n-\tvq_update_avail_idx(vq);\n-\n-\tPMD_INIT_LOG(DEBUG, \"vq->vq_queue_index = %d\", vq->vq_queue_index);\n-\n-\tvirtqueue_notify(vq);\n-\n-\trte_rmb();\n-\twhile (VIRTQUEUE_NUSED(vq) == 0) {\n-\t\trte_rmb();\n-\t\tusleep(100);\n-\t}\n-\n-\twhile (VIRTQUEUE_NUSED(vq)) {\n-\t\tuint32_t idx, desc_idx, used_idx;\n-\t\tstruct vring_used_elem *uep;\n-\n-\t\tused_idx = (uint32_t)(vq->vq_used_cons_idx\n-\t\t\t\t& (vq->vq_nentries - 1));\n-\t\tuep = &vq->vq_split.ring.used->ring[used_idx];\n-\t\tidx = (uint32_t) uep->id;\n-\t\tdesc_idx = idx;\n-\n-\t\twhile (vq->vq_split.ring.desc[desc_idx].flags &\n-\t\t\t\tVRING_DESC_F_NEXT) {\n-\t\t\tdesc_idx = vq->vq_split.ring.desc[desc_idx].next;\n-\t\t\tvq->vq_free_cnt++;\n-\t\t}\n-\n-\t\tvq->vq_split.ring.desc[desc_idx].next = vq->vq_desc_head_idx;\n-\t\tvq->vq_desc_head_idx = idx;\n-\n-\t\tvq->vq_used_cons_idx++;\n-\t\tvq->vq_free_cnt++;\n-\t}\n-\n-\tPMD_INIT_LOG(DEBUG, \"vq->vq_free_cnt=%d\\nvq->vq_desc_head_idx=%d\",\n-\t\t\tvq->vq_free_cnt, vq->vq_desc_head_idx);\n-\n-\tresult = cvq->virtio_net_hdr_mz->addr;\n-\treturn result;\n-}\n-\n-static int\n-virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,\n-\t\t int *dlen, int pkt_num)\n-{\n-\tvirtio_net_ctrl_ack status = ~0;\n-\tstruct virtio_pmd_ctrl *result;\n-\tstruct virtqueue *vq;\n-\n-\tctrl->status = status;\n-\n-\tif (!cvq || !cvq->vq) {\n-\t\tPMD_INIT_LOG(ERR, \"Control queue is not supported.\");\n-\t\treturn -1;\n-\t}\n-\n-\trte_spinlock_lock(&cvq->lock);\n-\tvq = cvq->vq;\n-\n-\tPMD_INIT_LOG(DEBUG, \"vq->vq_desc_head_idx = %d, status = %d, \"\n-\t\t\"vq->hw->cvq = %p vq = %p\",\n-\t\tvq->vq_desc_head_idx, status, vq->hw->cvq, vq);\n-\n-\tif (vq->vq_free_cnt < pkt_num + 2 || pkt_num < 1) {\n-\t\trte_spinlock_unlock(&cvq->lock);\n-\t\treturn -1;\n-\t}\n-\n-\tmemcpy(cvq->virtio_net_hdr_mz->addr, ctrl,\n-\t\tsizeof(struct virtio_pmd_ctrl));\n-\n-\tif (vtpci_packed_queue(vq->hw))\n-\t\tresult = virtio_send_command_packed(cvq, ctrl, dlen, pkt_num);\n-\telse\n-\t\tresult = virtio_send_command_split(cvq, ctrl, dlen, pkt_num);\n-\n-\trte_spinlock_unlock(&cvq->lock);\n-\treturn result->status;\n-}\n-\n static int\n virtio_set_multiple_queues(struct rte_eth_dev *dev, uint16_t nb_queues)\n {\n@@ -401,38 +181,6 @@ virtio_get_nr_vq(struct virtio_hw *hw)\n \treturn nr_vq;\n }\n \n-static void\n-virtio_init_vring(struct virtqueue *vq)\n-{\n-\tint size = vq->vq_nentries;\n-\tuint8_t *ring_mem = vq->vq_ring_virt_mem;\n-\n-\tPMD_INIT_FUNC_TRACE();\n-\n-\tmemset(ring_mem, 0, vq->vq_ring_size);\n-\n-\tvq->vq_used_cons_idx = 0;\n-\tvq->vq_desc_head_idx = 0;\n-\tvq->vq_avail_idx = 0;\n-\tvq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);\n-\tvq->vq_free_cnt = vq->vq_nentries;\n-\tmemset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);\n-\tif (vtpci_packed_queue(vq->hw)) {\n-\t\tvring_init_packed(&vq->vq_packed.ring, ring_mem,\n-\t\t\t\t VIRTIO_PCI_VRING_ALIGN, size);\n-\t\tvring_desc_init_packed(vq, size);\n-\t} else {\n-\t\tstruct vring *vr = &vq->vq_split.ring;\n-\n-\t\tvring_init_split(vr, ring_mem, VIRTIO_PCI_VRING_ALIGN, size);\n-\t\tvring_desc_init_split(vr->desc, size);\n-\t}\n-\t/*\n-\t * Disable device(host) interrupting guest\n-\t */\n-\tvirtqueue_disable_intr(vq);\n-}\n-\n static int\n virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n {\ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex 5ff1e3587..db630e07c 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -2,6 +2,7 @@\n * Copyright(c) 2010-2015 Intel Corporation\n */\n #include <stdint.h>\n+#include <unistd.h>\n \n #include <rte_mbuf.h>\n \n@@ -141,3 +142,257 @@ virtqueue_rxvq_flush(struct virtqueue *vq)\n \telse\n \t\tvirtqueue_rxvq_flush_split(vq);\n }\n+\n+static struct virtio_pmd_ctrl *\n+virtio_send_command_packed(struct virtnet_ctl *cvq,\n+\t\t\t struct virtio_pmd_ctrl *ctrl,\n+\t\t\t int *dlen, int pkt_num)\n+{\n+\tstruct virtqueue *vq = cvq->vq;\n+\tint head;\n+\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n+\tstruct virtio_pmd_ctrl *result;\n+\tuint16_t flags;\n+\tint sum = 0;\n+\tint nb_descs = 0;\n+\tint k;\n+\n+\t/*\n+\t * Format is enforced in qemu code:\n+\t * One TX packet for header;\n+\t * At least one TX packet per argument;\n+\t * One RX packet for ACK.\n+\t */\n+\thead = vq->vq_avail_idx;\n+\tflags = vq->vq_packed.cached_flags;\n+\tdesc[head].addr = cvq->virtio_net_hdr_mem;\n+\tdesc[head].len = sizeof(struct virtio_net_ctrl_hdr);\n+\tvq->vq_free_cnt--;\n+\tnb_descs++;\n+\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n+\t\tvq->vq_avail_idx -= vq->vq_nentries;\n+\t\tvq->vq_packed.cached_flags ^= VRING_PACKED_DESC_F_AVAIL_USED;\n+\t}\n+\n+\tfor (k = 0; k < pkt_num; k++) {\n+\t\tdesc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem\n+\t\t\t+ sizeof(struct virtio_net_ctrl_hdr)\n+\t\t\t+ sizeof(ctrl->status) + sizeof(uint8_t) * sum;\n+\t\tdesc[vq->vq_avail_idx].len = dlen[k];\n+\t\tdesc[vq->vq_avail_idx].flags = VRING_DESC_F_NEXT |\n+\t\t\tvq->vq_packed.cached_flags;\n+\t\tsum += dlen[k];\n+\t\tvq->vq_free_cnt--;\n+\t\tnb_descs++;\n+\t\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n+\t\t\tvq->vq_avail_idx -= vq->vq_nentries;\n+\t\t\tvq->vq_packed.cached_flags ^=\n+\t\t\t\tVRING_PACKED_DESC_F_AVAIL_USED;\n+\t\t}\n+\t}\n+\n+\tdesc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem\n+\t\t+ sizeof(struct virtio_net_ctrl_hdr);\n+\tdesc[vq->vq_avail_idx].len = sizeof(ctrl->status);\n+\tdesc[vq->vq_avail_idx].flags = VRING_DESC_F_WRITE |\n+\t\tvq->vq_packed.cached_flags;\n+\tvq->vq_free_cnt--;\n+\tnb_descs++;\n+\tif (++vq->vq_avail_idx >= vq->vq_nentries) {\n+\t\tvq->vq_avail_idx -= vq->vq_nentries;\n+\t\tvq->vq_packed.cached_flags ^= VRING_PACKED_DESC_F_AVAIL_USED;\n+\t}\n+\n+\tvirtio_wmb(vq->hw->weak_barriers);\n+\tdesc[head].flags = VRING_DESC_F_NEXT | flags;\n+\n+\tvirtio_wmb(vq->hw->weak_barriers);\n+\tvirtqueue_notify(vq);\n+\n+\t/* wait for used descriptors in virtqueue */\n+\twhile (!desc_is_used(&desc[head], vq))\n+\t\tusleep(100);\n+\n+\tvirtio_rmb(vq->hw->weak_barriers);\n+\n+\t/* now get used descriptors */\n+\tvq->vq_free_cnt += nb_descs;\n+\tvq->vq_used_cons_idx += nb_descs;\n+\tif (vq->vq_used_cons_idx >= vq->vq_nentries) {\n+\t\tvq->vq_used_cons_idx -= vq->vq_nentries;\n+\t\tvq->vq_packed.used_wrap_counter ^= 1;\n+\t}\n+\n+\tPMD_INIT_LOG(DEBUG, \"vq->vq_free_cnt=%d\\n\"\n+\t\t\t\"vq->vq_avail_idx=%d\\n\"\n+\t\t\t\"vq->vq_used_cons_idx=%d\\n\"\n+\t\t\t\"vq->vq_packed.cached_flags=0x%x\\n\"\n+\t\t\t\"vq->vq_packed.used_wrap_counter=%d\\n\",\n+\t\t\tvq->vq_free_cnt,\n+\t\t\tvq->vq_avail_idx,\n+\t\t\tvq->vq_used_cons_idx,\n+\t\t\tvq->vq_packed.cached_flags,\n+\t\t\tvq->vq_packed.used_wrap_counter);\n+\n+\tresult = cvq->virtio_net_hdr_mz->addr;\n+\treturn result;\n+}\n+\n+static struct virtio_pmd_ctrl *\n+virtio_send_command_split(struct virtnet_ctl *cvq,\n+\t\t\t struct virtio_pmd_ctrl *ctrl,\n+\t\t\t int *dlen, int pkt_num)\n+{\n+\tstruct virtio_pmd_ctrl *result;\n+\tstruct virtqueue *vq = cvq->vq;\n+\tuint32_t head, i;\n+\tint k, sum = 0;\n+\n+\thead = vq->vq_desc_head_idx;\n+\n+\t/*\n+\t * Format is enforced in qemu code:\n+\t * One TX packet for header;\n+\t * At least one TX packet per argument;\n+\t * One RX packet for ACK.\n+\t */\n+\tvq->vq_split.ring.desc[head].flags = VRING_DESC_F_NEXT;\n+\tvq->vq_split.ring.desc[head].addr = cvq->virtio_net_hdr_mem;\n+\tvq->vq_split.ring.desc[head].len = sizeof(struct virtio_net_ctrl_hdr);\n+\tvq->vq_free_cnt--;\n+\ti = vq->vq_split.ring.desc[head].next;\n+\n+\tfor (k = 0; k < pkt_num; k++) {\n+\t\tvq->vq_split.ring.desc[i].flags = VRING_DESC_F_NEXT;\n+\t\tvq->vq_split.ring.desc[i].addr = cvq->virtio_net_hdr_mem\n+\t\t\t+ sizeof(struct virtio_net_ctrl_hdr)\n+\t\t\t+ sizeof(ctrl->status) + sizeof(uint8_t) * sum;\n+\t\tvq->vq_split.ring.desc[i].len = dlen[k];\n+\t\tsum += dlen[k];\n+\t\tvq->vq_free_cnt--;\n+\t\ti = vq->vq_split.ring.desc[i].next;\n+\t}\n+\n+\tvq->vq_split.ring.desc[i].flags = VRING_DESC_F_WRITE;\n+\tvq->vq_split.ring.desc[i].addr = cvq->virtio_net_hdr_mem\n+\t\t\t+ sizeof(struct virtio_net_ctrl_hdr);\n+\tvq->vq_split.ring.desc[i].len = sizeof(ctrl->status);\n+\tvq->vq_free_cnt--;\n+\n+\tvq->vq_desc_head_idx = vq->vq_split.ring.desc[i].next;\n+\n+\tvq_update_avail_ring(vq, head);\n+\tvq_update_avail_idx(vq);\n+\n+\tPMD_INIT_LOG(DEBUG, \"vq->vq_queue_index = %d\", vq->vq_queue_index);\n+\n+\tvirtqueue_notify(vq);\n+\n+\trte_rmb();\n+\twhile (VIRTQUEUE_NUSED(vq) == 0) {\n+\t\trte_rmb();\n+\t\tusleep(100);\n+\t}\n+\n+\twhile (VIRTQUEUE_NUSED(vq)) {\n+\t\tuint32_t idx, desc_idx, used_idx;\n+\t\tstruct vring_used_elem *uep;\n+\n+\t\tused_idx = (uint32_t)(vq->vq_used_cons_idx\n+\t\t\t\t& (vq->vq_nentries - 1));\n+\t\tuep = &vq->vq_split.ring.used->ring[used_idx];\n+\t\tidx = (uint32_t)uep->id;\n+\t\tdesc_idx = idx;\n+\n+\t\twhile (vq->vq_split.ring.desc[desc_idx].flags &\n+\t\t\t\tVRING_DESC_F_NEXT) {\n+\t\t\tdesc_idx = vq->vq_split.ring.desc[desc_idx].next;\n+\t\t\tvq->vq_free_cnt++;\n+\t\t}\n+\n+\t\tvq->vq_split.ring.desc[desc_idx].next = vq->vq_desc_head_idx;\n+\t\tvq->vq_desc_head_idx = idx;\n+\n+\t\tvq->vq_used_cons_idx++;\n+\t\tvq->vq_free_cnt++;\n+\t}\n+\n+\tPMD_INIT_LOG(DEBUG, \"vq->vq_free_cnt=%d\\nvq->vq_desc_head_idx=%d\",\n+\t\t\tvq->vq_free_cnt, vq->vq_desc_head_idx);\n+\n+\tresult = cvq->virtio_net_hdr_mz->addr;\n+\treturn result;\n+}\n+\n+int\n+virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,\n+\t\t int *dlen, int pkt_num)\n+{\n+\tvirtio_net_ctrl_ack status = ~0;\n+\tstruct virtio_pmd_ctrl *result;\n+\tstruct virtqueue *vq;\n+\n+\tctrl->status = status;\n+\n+\tif (!cvq || !cvq->vq) {\n+\t\tPMD_INIT_LOG(ERR, \"Control queue is not supported.\");\n+\t\treturn -1;\n+\t}\n+\n+\trte_spinlock_lock(&cvq->lock);\n+\tvq = cvq->vq;\n+\n+\tPMD_INIT_LOG(DEBUG, \"vq->vq_desc_head_idx = %d, status = %d, \"\n+\t\t\"vq->hw->cvq = %p vq = %p\",\n+\t\tvq->vq_desc_head_idx, status, vq->hw->cvq, vq);\n+\n+\tif (vq->vq_free_cnt < pkt_num + 2 || pkt_num < 1) {\n+\t\trte_spinlock_unlock(&cvq->lock);\n+\t\treturn -1;\n+\t}\n+\n+\tmemcpy(cvq->virtio_net_hdr_mz->addr, ctrl,\n+\t\tsizeof(struct virtio_pmd_ctrl));\n+\n+\tif (vtpci_packed_queue(vq->hw))\n+\t\tresult = virtio_send_command_packed(cvq, ctrl, dlen, pkt_num);\n+\telse\n+\t\tresult = virtio_send_command_split(cvq, ctrl, dlen, pkt_num);\n+\n+\trte_spinlock_unlock(&cvq->lock);\n+\treturn result->status;\n+}\n+\n+void\n+virtio_init_vring(struct virtqueue *vq)\n+{\n+\tint size = vq->vq_nentries;\n+\tuint8_t *ring_mem = vq->vq_ring_virt_mem;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\tmemset(ring_mem, 0, vq->vq_ring_size);\n+\n+\tvq->vq_used_cons_idx = 0;\n+\tvq->vq_desc_head_idx = 0;\n+\tvq->vq_avail_idx = 0;\n+\tvq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);\n+\tvq->vq_free_cnt = vq->vq_nentries;\n+\tif (vq->vq_descx)\n+\t\tmemset(vq->vq_descx, 0,\n+\t\t\tsizeof(struct vq_desc_extra) * vq->vq_nentries);\n+\tif (vtpci_packed_queue(vq->hw)) {\n+\t\tvring_init_packed(&vq->vq_packed.ring, ring_mem,\n+\t\t\t\t VIRTIO_PCI_VRING_ALIGN, size);\n+\t\tvring_desc_init_packed(vq, size);\n+\t} else {\n+\t\tstruct vring *vr = &vq->vq_split.ring;\n+\n+\t\tvring_init_split(vr, ring_mem, VIRTIO_PCI_VRING_ALIGN, size);\n+\t\tvring_desc_init_split(vr->desc, size);\n+\t}\n+\t/*\n+\t * Disable device(host) interrupting guest\n+\t */\n+\tvirtqueue_disable_intr(vq);\n+}\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex c6dd4a347..4d8d069c7 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -480,6 +480,11 @@ virtqueue_notify(struct virtqueue *vq)\n \tVTPCI_OPS(vq->hw)->notify_queue(vq->hw, vq);\n }\n \n+int virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,\n+\t\t int *dlen, int pkt_num);\n+\n+void virtio_init_vring(struct virtqueue *vq);\n+\n #ifdef RTE_LIBRTE_VIRTIO_DEBUG_DUMP\n #define VIRTQUEUE_DUMP(vq) do { \\\n \tuint16_t used_idx, nused; \\\n", "prefixes": [ "03/15" ] }