Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/47422/?format=api
{ "id": 47422, "url": "http://patchwork.dpdk.org/api/patches/47422/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20181025105301.27795-1-jfreimann@redhat.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20181025105301.27795-1-jfreimann@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181025105301.27795-1-jfreimann@redhat.com", "date": "2018-10-25T10:53:01", "name": "[v9,6/8] net/virtio: implement receive path for packed queues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4fbe4d71e3f45adb59dbdee8b5e1ded2893246f5", "submitter": { "id": 745, "url": "http://patchwork.dpdk.org/api/people/745/?format=api", "name": "Jens Freimann", "email": "jfreimann@redhat.com" }, "delegate": { "id": 2642, "url": "http://patchwork.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20181025105301.27795-1-jfreimann@redhat.com/mbox/", "series": [ { "id": 2091, "url": "http://patchwork.dpdk.org/api/series/2091/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=2091", "date": "2018-10-25T10:46:53", "name": null, "version": 9, "mbox": "http://patchwork.dpdk.org/series/2091/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/47422/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/47422/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 87AF94CC3;\n\tThu, 25 Oct 2018 12:53:18 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id A81134C99\n\tfor <dev@dpdk.org>; Thu, 25 Oct 2018 12:53:16 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22])\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 11DF9C033460;\n\tThu, 25 Oct 2018 10:53:16 +0000 (UTC)", "from localhost (ovpn-117-136.ams2.redhat.com [10.36.117.136])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id D6E8C1057049;\n\tThu, 25 Oct 2018 10:53:04 +0000 (UTC)" ], "From": "Jens Freimann <jfreimann@redhat.com>", "To": "dev@dpdk.org", "Cc": "tiwei.bie@intel.com,\n\tmaxime.coquelin@redhat.com", "Date": "Thu, 25 Oct 2018 12:53:01 +0200", "Message-Id": "<20181025105301.27795-1-jfreimann@redhat.com>", "In-Reply-To": "<20181024143236.21271-7-jfreimann@redhat.com>", "References": "<20181024143236.21271-7-jfreimann@redhat.com>", "X-Scanned-By": "MIMEDefang 2.84 on 10.5.11.22", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]); Thu, 25 Oct 2018 10:53:16 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH v9 6/8] net/virtio: implement receive path for\n\tpacked queues", "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": "Implement the receive part.\n\nSigned-off-by: Jens Freimann <jfreimann@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 18 +-\n drivers/net/virtio/virtio_ethdev.h | 2 +\n drivers/net/virtio/virtio_rxtx.c | 278 ++++++++++++++++++++++++++---\n drivers/net/virtio/virtqueue.c | 22 +++\n drivers/net/virtio/virtqueue.h | 2 +-\n 5 files changed, 296 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 14cf3657e..5a1c4b3e8 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -384,8 +384,10 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \tvq->hw = hw;\n \tvq->vq_queue_index = vtpci_queue_idx;\n \tvq->vq_nentries = vq_size;\n-\tif (vtpci_packed_queue(hw))\n+\tif (vtpci_packed_queue(hw)) {\n \t\tvq->vq_ring.avail_wrap_counter = 1;\n+\t\tvq->vq_ring.used_wrap_counter = 1;\n+\t}\n \n \t/*\n \t * Reserve a memzone for vring elements\n@@ -1326,7 +1328,13 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)\n {\n \tstruct virtio_hw *hw = eth_dev->data->dev_private;\n \n-\tif (hw->use_simple_rx) {\n+\tif (vtpci_packed_queue(hw)) {\n+\t\tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n+\t\t\teth_dev->rx_pkt_burst = &virtio_recv_mergeable_pkts;\n+\t\t} else {\n+\t\teth_dev->rx_pkt_burst = &virtio_recv_pkts_packed;\n+\t\t}\n+\t} else if (hw->use_simple_rx) {\n \t\tPMD_INIT_LOG(INFO, \"virtio: using simple Rx path on port %u\",\n \t\t\teth_dev->data->port_id);\n \t\teth_dev->rx_pkt_burst = virtio_recv_pkts_vec;\n@@ -1490,7 +1498,8 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \n \t/* Setting up rx_header size for the device */\n \tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF) ||\n-\t vtpci_with_feature(hw, VIRTIO_F_VERSION_1))\n+\t vtpci_with_feature(hw, VIRTIO_F_VERSION_1) ||\n+\t vtpci_with_feature(hw, VIRTIO_F_RING_PACKED))\n \t\thw->vtnet_hdr_size = sizeof(struct virtio_net_hdr_mrg_rxbuf);\n \telse\n \t\thw->vtnet_hdr_size = sizeof(struct virtio_net_hdr);\n@@ -1918,7 +1927,8 @@ virtio_dev_configure(struct rte_eth_dev *dev)\n \n \trte_spinlock_init(&hw->state_lock);\n \n-\thw->use_simple_rx = 1;\n+\tif (!vtpci_packed_queue(hw))\n+\t\thw->use_simple_rx = 1;\n \n \tif (vtpci_with_feature(hw, VIRTIO_F_IN_ORDER)) {\n \t\thw->use_inorder_tx = 1;\ndiff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h\nindex 05d355180..6c9247639 100644\n--- a/drivers/net/virtio/virtio_ethdev.h\n+++ b/drivers/net/virtio/virtio_ethdev.h\n@@ -73,6 +73,8 @@ int virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,\n \n uint16_t virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts);\n+uint16_t virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts,\n+\t\tuint16_t nb_pkts);\n \n uint16_t virtio_recv_mergeable_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts);\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 5c8151d2f..188d9bba1 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -31,6 +31,7 @@\n #include \"virtqueue.h\"\n #include \"virtio_rxtx.h\"\n #include \"virtio_rxtx_simple.h\"\n+#include \"virtio_ring.h\"\n \n #ifdef RTE_LIBRTE_VIRTIO_DEBUG_DUMP\n #define VIRTIO_DUMP_PACKET(m, len) rte_pktmbuf_dump(stdout, m, len)\n@@ -103,7 +104,6 @@ vq_ring_free_chain_packed(struct virtqueue *vq, uint16_t used_idx)\n \tif ((dp->flags & VRING_DESC_F_INDIRECT) == 0) {\n \t\twhile (dxp->next != VQ_RING_DESC_CHAIN_END && i < dxp->ndescs) {\n \t\t\tdesc_idx_last = dxp->next;\n-\t\t\tdp = &vq->vq_ring.desc_packed[dxp->next];\n \t\t\tdxp = &vq->vq_descx[dxp->next];\n \t\t\ti++;\n \t\t}\n@@ -125,6 +125,47 @@ vq_ring_free_chain_packed(struct virtqueue *vq, uint16_t used_idx)\n \tdxp->next = VQ_RING_DESC_CHAIN_END;\n }\n \n+static uint16_t\n+virtqueue_dequeue_burst_rx_packed(struct virtqueue *vq,\n+\t\t\t\t struct rte_mbuf **rx_pkts,\n+\t\t\t\t uint32_t *len,\n+\t\t\t\t uint16_t num)\n+{\n+\tstruct rte_mbuf *cookie;\n+\tuint16_t used_idx;\n+\tuint16_t id;\n+\tstruct vring_desc_packed *desc;\n+\tuint16_t i;\n+\n+\tfor (i = 0; i < num; i++) {\n+\t\tused_idx = vq->vq_used_cons_idx;\n+\t\tdesc = (struct vring_desc_packed *) vq->vq_ring.desc_packed;\n+\t\tif (!desc_is_used(&desc[used_idx], &vq->vq_ring))\n+\t\t\treturn i;\n+\t\tlen[i] = desc[used_idx].len;\n+\t\tid = desc[used_idx].index;\n+\t\tcookie = (struct rte_mbuf *)vq->vq_descx[id].cookie;\n+\n+\t\tif (unlikely(cookie == NULL)) {\n+\t\t\tPMD_DRV_LOG(ERR, \"vring descriptor with no mbuf cookie at %u\",\n+\t\t\t\tvq->vq_used_cons_idx);\n+\t\t\tbreak;\n+\t\t}\n+\t\trte_prefetch0(cookie);\n+\t\trte_packet_prefetch(rte_pktmbuf_mtod(cookie, void *));\n+\t\trx_pkts[i] = cookie;\n+\t\tvq_ring_free_chain_packed(vq, used_idx);\n+\n+\t\tvq->vq_used_cons_idx += vq->vq_descx[id].ndescs;\n+\t\tif (vq->vq_used_cons_idx >= vq->vq_nentries) {\n+\t\t\tvq->vq_used_cons_idx -= vq->vq_nentries;\n+\t\t\tvq->vq_ring.used_wrap_counter ^= 1;\n+\t\t}\n+\t}\n+\n+\treturn i;\n+}\n+\n static uint16_t\n virtqueue_dequeue_burst_rx(struct virtqueue *vq, struct rte_mbuf **rx_pkts,\n \t\t\t uint32_t *len, uint16_t num)\n@@ -370,6 +411,55 @@ virtqueue_enqueue_recv_refill(struct virtqueue *vq, struct rte_mbuf *cookie)\n \treturn 0;\n }\n \n+static inline int\n+virtqueue_enqueue_recv_refill_packed(struct virtqueue *vq, struct rte_mbuf *cookie)\n+{\n+\tstruct vq_desc_extra *dxp;\n+\tstruct virtio_hw *hw = vq->hw;\n+\tstruct vring_desc_packed *start_dp;\n+\tuint16_t needed = 1;\n+\tuint16_t head_idx, idx;\n+\tuint16_t flags;\n+\n+\tif (unlikely(vq->vq_free_cnt == 0))\n+\t\treturn -ENOSPC;\n+\tif (unlikely(vq->vq_free_cnt < needed))\n+\t\treturn -EMSGSIZE;\n+\n+\thead_idx = vq->vq_desc_head_idx;\n+\tif (unlikely(head_idx >= vq->vq_nentries))\n+\t\treturn -EFAULT;\n+\n+\tidx = head_idx;\n+\tdxp = &vq->vq_descx[idx];\n+\tdxp->cookie = (void *)cookie;\n+\tdxp->ndescs = needed;\n+\n+\tstart_dp = vq->vq_ring.desc_packed;\n+\tstart_dp[idx].addr =\n+\t\tVIRTIO_MBUF_ADDR(cookie, vq) +\n+\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n+\tstart_dp[idx].len =\n+\t\tcookie->buf_len - RTE_PKTMBUF_HEADROOM + hw->vtnet_hdr_size;\n+\tflags = VRING_DESC_F_WRITE;\n+\tflags |= VRING_DESC_F_AVAIL(vq->vq_ring.avail_wrap_counter) |\n+\t\t VRING_DESC_F_USED(!vq->vq_ring.avail_wrap_counter);\n+\trte_smp_wmb();\n+\tstart_dp[idx].flags = flags;\n+\tidx = dxp->next;\n+\tvq->vq_desc_head_idx = idx;\n+\tif (vq->vq_desc_head_idx == VQ_RING_DESC_CHAIN_END)\n+\t\tvq->vq_desc_tail_idx = idx;\n+\tvq->vq_free_cnt = (uint16_t)(vq->vq_free_cnt - needed);\n+\n+\tvq->vq_avail_idx += needed;\n+\tif (vq->vq_avail_idx >= vq->vq_nentries) {\n+\t\tvq->vq_avail_idx = 0;\n+\t\tvq->vq_ring.avail_wrap_counter ^= 1;\n+\t}\n+\n+\treturn 0;\n+}\n /* When doing TSO, the IP length is not included in the pseudo header\n * checksum of the packet given to the PMD, but for virtio it is\n * expected.\n@@ -848,7 +938,10 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\t\t\tbreak;\n \n \t\t\t/* Enqueue allocated buffers */\n-\t\t\terror = virtqueue_enqueue_recv_refill(vq, m);\n+\t\t\tif (vtpci_packed_queue(vq->hw))\n+\t\t\t\terror = virtqueue_enqueue_recv_refill_packed(vq, m);\n+\t\t\telse\n+\t\t\t\terror = virtqueue_enqueue_recv_refill(vq, m);\n \t\t\tif (error) {\n \t\t\t\trte_pktmbuf_free(m);\n \t\t\t\tbreak;\n@@ -856,7 +949,8 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\t\tnbufs++;\n \t\t}\n \n-\t\tvq_update_avail_idx(vq);\n+\t\tif (!vtpci_packed_queue(vq->hw))\n+\t\t\tvq_update_avail_idx(vq);\n \t}\n \n \tPMD_INIT_LOG(DEBUG, \"Allocated %d bufs\", nbufs);\n@@ -1180,6 +1274,109 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \treturn nb_rx;\n }\n \n+uint16_t\n+virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n+{\n+\tstruct virtnet_rx *rxvq = rx_queue;\n+\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtio_hw *hw = vq->hw;\n+\tstruct rte_mbuf *rxm, *new_mbuf;\n+\tuint16_t nb_used, num, nb_rx;\n+\tuint32_t len[VIRTIO_MBUF_BURST_SZ];\n+\tstruct rte_mbuf *rcv_pkts[VIRTIO_MBUF_BURST_SZ];\n+\tint error;\n+\tuint32_t i, nb_enqueued;\n+\tuint32_t hdr_size;\n+\tstruct virtio_net_hdr *hdr;\n+\n+\tnb_rx = 0;\n+\tif (unlikely(hw->started == 0))\n+\t\treturn nb_rx;\n+\n+\tnb_used = VIRTIO_MBUF_BURST_SZ;\n+\n+\tvirtio_rmb();\n+\n+\tnum = likely(nb_used <= nb_pkts) ? nb_used : nb_pkts;\n+\tif (unlikely(num > VIRTIO_MBUF_BURST_SZ))\n+\t\tnum = VIRTIO_MBUF_BURST_SZ;\n+\tif (likely(num > DESC_PER_CACHELINE))\n+\t\tnum = num - ((vq->vq_used_cons_idx + num) % DESC_PER_CACHELINE);\n+\n+\tnum = virtqueue_dequeue_burst_rx_packed(vq, rcv_pkts, len, num);\n+\tPMD_RX_LOG(DEBUG, \"used:%d dequeue:%d\", nb_used, num);\n+\n+\tnb_enqueued = 0;\n+\thdr_size = hw->vtnet_hdr_size;\n+\n+\tfor (i = 0; i < num ; i++) {\n+\t\trxm = rcv_pkts[i];\n+\n+\t\tPMD_RX_LOG(DEBUG, \"packet len:%d\", len[i]);\n+\n+\t\tif (unlikely(len[i] < hdr_size + ETHER_HDR_LEN)) {\n+\t\t\tPMD_RX_LOG(ERR, \"Packet drop\");\n+\t\t\tnb_enqueued++;\n+\t\t\tvirtio_discard_rxbuf(vq, rxm);\n+\t\t\trxvq->stats.errors++;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\trxm->port = rxvq->port_id;\n+\t\trxm->data_off = RTE_PKTMBUF_HEADROOM;\n+\t\trxm->ol_flags = 0;\n+\t\trxm->vlan_tci = 0;\n+\n+\t\trxm->pkt_len = (uint32_t)(len[i] - hdr_size);\n+\t\trxm->data_len = (uint16_t)(len[i] - hdr_size);\n+\n+\t\thdr = (struct virtio_net_hdr *)((char *)rxm->buf_addr +\n+\t\t\tRTE_PKTMBUF_HEADROOM - hdr_size);\n+\n+\t\tif (hw->vlan_strip)\n+\t\t\trte_vlan_strip(rxm);\n+\n+\t\tif (hw->has_rx_offload && virtio_rx_offload(rxm, hdr) < 0) {\n+\t\t\tvirtio_discard_rxbuf(vq, rxm);\n+\t\t\trxvq->stats.errors++;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tvirtio_rx_stats_updated(rxvq, rxm);\n+\n+\t\trx_pkts[nb_rx++] = rxm;\n+\t}\n+\n+\trxvq->stats.packets += nb_rx;\n+\n+\t/* Allocate new mbuf for the used descriptor */\n+\twhile (likely(!virtqueue_full(vq))) {\n+\t\tnew_mbuf = rte_mbuf_raw_alloc(rxvq->mpool);\n+\t\tif (unlikely(new_mbuf == NULL)) {\n+\t\t\tstruct rte_eth_dev *dev\n+\t\t\t\t= &rte_eth_devices[rxvq->port_id];\n+\t\t\tdev->data->rx_mbuf_alloc_failed++;\n+\t\t\tbreak;\n+\t\t}\n+\t\terror = virtqueue_enqueue_recv_refill_packed(vq, new_mbuf);\n+\t\tif (unlikely(error)) {\n+\t\t\trte_pktmbuf_free(new_mbuf);\n+\t\t\tbreak;\n+\t\t}\n+\t\tnb_enqueued++;\n+\t}\n+\n+\tif (likely(nb_enqueued)) {\n+\t\tif (unlikely(virtqueue_kick_prepare_packed(vq))) {\n+\t\t\tvirtqueue_notify(vq);\n+\t\t\tPMD_RX_LOG(DEBUG, \"Notified\");\n+\t\t}\n+\t}\n+\n+\treturn nb_rx;\n+}\n+\n+\n uint16_t\n virtio_recv_mergeable_pkts_inorder(void *rx_queue,\n \t\t\tstruct rte_mbuf **rx_pkts,\n@@ -1386,12 +1583,20 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \tuint16_t extra_idx;\n \tuint32_t seg_res;\n \tuint32_t hdr_size;\n+\tuint32_t rx_num = 0;\n \n \tnb_rx = 0;\n \tif (unlikely(hw->started == 0))\n \t\treturn nb_rx;\n \n-\tnb_used = VIRTQUEUE_NUSED(vq);\n+\tif (vtpci_packed_queue(vq->hw)) {\n+\t\tif (!desc_is_used(&vq->vq_ring.desc_packed[vq->vq_used_cons_idx],\n+\t\t\t\t &vq->vq_ring))\n+\t\t\treturn 0;\n+\t\tnb_used = VIRTIO_MBUF_BURST_SZ;\n+\t} else {\n+\t\tnb_used = VIRTQUEUE_NUSED(vq);\n+\t}\n \n \tvirtio_rmb();\n \n@@ -1404,13 +1609,20 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \tseg_res = 0;\n \thdr_size = hw->vtnet_hdr_size;\n \n+\n \twhile (i < nb_used) {\n \t\tstruct virtio_net_hdr_mrg_rxbuf *header;\n \n \t\tif (nb_rx == nb_pkts)\n \t\t\tbreak;\n \n-\t\tnum = virtqueue_dequeue_burst_rx(vq, rcv_pkts, len, 1);\n+\t\tif (vtpci_packed_queue(vq->hw))\n+\t\t\tnum = virtqueue_dequeue_burst_rx_packed(vq, rcv_pkts,\n+\t\t\t\tlen, 1);\n+\t\telse\n+\t\t\tnum = virtqueue_dequeue_burst_rx(vq, rcv_pkts, len, 1);\n+\t\tif (num == 0)\n+\t\t\treturn nb_rx;\n \t\tif (num != 1)\n \t\t\tcontinue;\n \n@@ -1462,20 +1674,37 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\t\t */\n \t\t\tuint16_t rcv_cnt =\n \t\t\t\tRTE_MIN(seg_res, RTE_DIM(rcv_pkts));\n-\t\t\tif (likely(VIRTQUEUE_NUSED(vq) >= rcv_cnt)) {\n-\t\t\t\tuint32_t rx_num =\n-\t\t\t\t\tvirtqueue_dequeue_burst_rx(vq,\n-\t\t\t\t\trcv_pkts, len, rcv_cnt);\n-\t\t\t\ti += rx_num;\n-\t\t\t\trcv_cnt = rx_num;\n+\t\t\tif (vtpci_packed_queue(vq->hw)) {\n+\t\t\t\tif (likely(vq->vq_free_cnt >= rcv_cnt)) {\n+\t\t\t\t\tif (!desc_is_used(&vq->vq_ring.desc_packed[vq->vq_used_cons_idx],\n+\t\t\t\t\t\t\t &vq->vq_ring))\n+\t\t\t\t\t\trx_num = 0;\n+\t\t\t\t\telse\n+\t\t\t\t\t\trx_num = virtqueue_dequeue_burst_rx_packed(vq,\n+\t\t\t\t\t\t\t rcv_pkts, len, rcv_cnt);\n+\t\t\t\t} else {\n+\t\t\t\t\tPMD_RX_LOG(ERR,\n+\t\t\t\t\t\t \"No enough segments for packet.\");\n+\t\t\t\t\tnb_enqueued++;\n+\t\t\t\t\tvirtio_discard_rxbuf(vq, rxm);\n+\t\t\t\t\trxvq->stats.errors++;\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n \t\t\t} else {\n-\t\t\t\tPMD_RX_LOG(ERR,\n-\t\t\t\t\t \"No enough segments for packet.\");\n-\t\t\t\tnb_enqueued++;\n-\t\t\t\tvirtio_discard_rxbuf(vq, rxm);\n-\t\t\t\trxvq->stats.errors++;\n-\t\t\t\tbreak;\n+\t\t\t\tif (likely(VIRTQUEUE_NUSED(vq) >= rcv_cnt)) {\n+\t\t\t\t\trx_num = virtqueue_dequeue_burst_rx(vq,\n+\t\t\t\t\t\t rcv_pkts, len, rcv_cnt);\n+\t\t\t\t} else {\n+\t\t\t\t\tPMD_RX_LOG(ERR,\n+\t\t\t\t\t\t \"No enough segments for packet.\");\n+\t\t\t\t\tnb_enqueued++;\n+\t\t\t\t\tvirtio_discard_rxbuf(vq, rxm);\n+\t\t\t\t\trxvq->stats.errors++;\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n \t\t\t}\n+\t\t\ti += rx_num;\n+\t\t\trcv_cnt = rx_num;\n \n \t\t\textra_idx = 0;\n \n@@ -1518,7 +1747,10 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\t\tdev->data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n \t\t}\n-\t\terror = virtqueue_enqueue_recv_refill(vq, new_mbuf);\n+\t\tif (vtpci_packed_queue(vq->hw))\n+\t\t\terror = virtqueue_enqueue_recv_refill_packed(vq, new_mbuf);\n+\t\telse\n+\t\t\terror = virtqueue_enqueue_recv_refill(vq, new_mbuf);\n \t\tif (unlikely(error)) {\n \t\t\trte_pktmbuf_free(new_mbuf);\n \t\t\tbreak;\n@@ -1527,9 +1759,13 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t}\n \n \tif (likely(nb_enqueued)) {\n-\t\tvq_update_avail_idx(vq);\n-\n-\t\tif (unlikely(virtqueue_kick_prepare(vq))) {\n+\t\tif (likely(!vtpci_packed_queue(vq->hw))) {\n+\t\t\tvq_update_avail_idx(vq);\n+\t\t\tif (unlikely(virtqueue_kick_prepare(vq))) {\n+\t\t\t\tvirtqueue_notify(vq);\n+\t\t\t\tPMD_RX_LOG(DEBUG, \"Notified\");\n+\t\t\t}\n+\t\t} else if (virtqueue_kick_prepare_packed(vq)) {\n \t\t\tvirtqueue_notify(vq);\n \t\t\tPMD_RX_LOG(DEBUG, \"Notified\");\n \t\t}\ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex 56a77cc71..0b0bfad77 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -58,12 +58,34 @@ virtqueue_detach_unused(struct virtqueue *vq)\n void\n virtqueue_rxvq_flush(struct virtqueue *vq)\n {\n+\tstruct vring_desc_packed *descs = vq->vq_ring.desc_packed;\n \tstruct virtnet_rx *rxq = &vq->rxq;\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct vring_used_elem *uep;\n \tstruct vq_desc_extra *dxp;\n \tuint16_t used_idx, desc_idx;\n \tuint16_t nb_used, i;\n+\tuint16_t size = vq->vq_nentries;\n+\n+\tif (vtpci_packed_queue(vq->hw)) {\n+\t\ti = vq->vq_used_cons_idx;\n+\t\tif (i > size) {\n+\t\t\tPMD_INIT_LOG(ERR, \"vq_used_cons_idx out of range, %d\", vq->vq_used_cons_idx);\n+\t\t\treturn;\n+\t\t}\n+\t\twhile (desc_is_used(&descs[i], &vq->vq_ring) &&\n+\t\t\ti < size) {\n+\t\t\tdxp = &vq->vq_descx[descs[i].index];\n+\t\t\tif (dxp->cookie != NULL) {\n+\t\t\t\trte_pktmbuf_free(dxp->cookie);\n+\t\t\t\tdxp->cookie = NULL;\n+\t\t\t}\n+\t\t\tvq_ring_free_chain_packed(vq, i);\n+\t\t\ti = dxp->next;\n+\t\t\tvq->vq_used_cons_idx++;\n+\t\t}\n+\t\treturn;\n+\t}\n \n \tnb_used = VIRTQUEUE_NUSED(vq);\n \ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 9debbc3f9..de727205f 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -323,7 +323,7 @@ virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx)\n #define VIRTQUEUE_NUSED(vq) ((uint16_t)((vq)->vq_ring.used->idx - (vq)->vq_used_cons_idx))\n \n void vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx);\n-void vq_ring_free_chain_packed(struct virtqueue *vq, uint16_t desc_idx);\n+void vq_ring_free_chain_packed(struct virtqueue *vq, uint16_t used_idx);\n void vq_ring_free_inorder(struct virtqueue *vq, uint16_t desc_idx,\n \t\t\t uint16_t num);\n \n", "prefixes": [ "v9", "6/8" ] }