Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/38472/?format=api
{ "id": 38472, "url": "https://patches.dpdk.org/api/patches/38472/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180419070751.8933-9-jfreimann@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": "<20180419070751.8933-9-jfreimann@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180419070751.8933-9-jfreimann@redhat.com", "date": "2018-04-19T07:07:39", "name": "[dpdk-dev,v4,08/20] net/virtio: implement receive path for packed queues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ff3b71230ab6d8dbaed55883ea2256268e1f3165", "submitter": { "id": 745, "url": "https://patches.dpdk.org/api/people/745/?format=api", "name": "Jens Freimann", "email": "jfreimann@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/20180419070751.8933-9-jfreimann@redhat.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/38472/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/38472/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 736797D02;\n\tThu, 19 Apr 2018 09:08:24 +0200 (CEST)", "from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73])\n\tby dpdk.org (Postfix) with ESMTP id 0D5C67D01\n\tfor <dev@dpdk.org>; Thu, 19 Apr 2018 09:08:21 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3])\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 A9341406E8C3;\n\tThu, 19 Apr 2018 07:08:20 +0000 (UTC)", "from localhost (ovpn-117-19.ams2.redhat.com [10.36.117.19])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 2536210F1BF5;\n\tThu, 19 Apr 2018 07:08:20 +0000 (UTC)" ], "From": "Jens Freimann <jfreimann@redhat.com>", "To": "dev@dpdk.org", "Cc": "tiwei.bie@intel.com, yliu@fridaylinux.org, maxime.coquelin@redhat.com,\n\tmst@redhat.com, jens@freimann.org", "Date": "Thu, 19 Apr 2018 09:07:39 +0200", "Message-Id": "<20180419070751.8933-9-jfreimann@redhat.com>", "In-Reply-To": "<20180419070751.8933-1-jfreimann@redhat.com>", "References": "<20180419070751.8933-1-jfreimann@redhat.com>", "X-Scanned-By": "MIMEDefang 2.78 on 10.11.54.3", "X-Greylist": [ "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.11.55.7]); Thu, 19 Apr 2018 07:08:20 +0000 (UTC)", "inspected by milter-greylist-4.5.16 (mx1.redhat.com\n\t[10.11.55.7]); \n\tThu, 19 Apr 2018 07:08:20 +0000 (UTC) for IP:'10.11.54.3'\n\tDOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com'\n\tHELO:'smtp.corp.redhat.com' FROM:'jfreimann@redhat.com' RCPT:''" ], "Subject": "[dpdk-dev] [PATCH v4 08/20] 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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Yuanhan Liu <yuanhan.liu@linux.intel.com>\n\nImplement the receive part here. No support for mergeable buffers yet.\n\nSigned-off-by: Jens Freimann <jfreimann@redhat.com>\nSigned-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 14 +++-\n drivers/net/virtio/virtio_ethdev.h | 2 +\n drivers/net/virtio/virtio_rxtx.c | 137 ++++++++++++++++++++++++++++++++++++-\n 3 files changed, 150 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex c5c2a268b..e4c039a48 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1316,10 +1316,19 @@ 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+\t/*\n+\t * workarount for packed vqs which don't support\n+\t * mrg_rxbuf at this point\n+\t */\n+\tif (vtpci_packed_queue(hw) &&\n+\t\tvtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n+\t\teth_dev->rx_pkt_burst = &virtio_recv_pkts_packed;\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+\t} else if (vtpci_packed_queue(hw)) {\n+\t\teth_dev->rx_pkt_burst = &virtio_recv_pkts_packed;\n \t} else if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n \t\tPMD_INIT_LOG(INFO,\n \t\t\t\"virtio: using mergeable buffer Rx path on port %u\",\n@@ -1475,7 +1484,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);\ndiff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h\nindex 5420d7648..cb1399b3b 100644\n--- a/drivers/net/virtio/virtio_ethdev.h\n+++ b/drivers/net/virtio/virtio_ethdev.h\n@@ -79,6 +79,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 b749babf3..6f6807547 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@@ -523,10 +524,38 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \tstruct virtnet_rx *rxvq = &vq->rxq;\n \tstruct rte_mbuf *m;\n \tuint16_t desc_idx;\n-\tint error, nbufs;\n+\tint error, nbufs = 0;\n \n \tPMD_INIT_FUNC_TRACE();\n \n+\tif (vtpci_packed_queue(hw)) {\n+\t\tstruct vring_desc_packed *desc;\n+\t\tstruct vq_desc_extra *dxp;\n+\n+\t\tfor (desc_idx = 0; desc_idx < vq->vq_nentries;\n+\t\t\t\tdesc_idx++) {\n+\t\t\tm = rte_mbuf_raw_alloc(rxvq->mpool);\n+\t\t\tif (unlikely(m == NULL))\n+\t\t\t\treturn -ENOMEM;\n+\n+\t\t\tdxp = &vq->vq_descx[desc_idx];\n+\t\t\tdxp->cookie = m;\n+\t\t\tdxp->ndescs = 1;\n+\n+\t\t\tdesc = &vq->vq_ring.desc_packed[desc_idx];\n+\t\t\tdesc->addr = VIRTIO_MBUF_ADDR(m, vq) +\n+\t\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n+\t\t\tdesc->len = m->buf_len - RTE_PKTMBUF_HEADROOM +\n+\t\t\t\thw->vtnet_hdr_size;\n+\t\t\tdesc->flags |= VRING_DESC_F_WRITE;\n+\t\t\trte_smp_wmb();\n+\t\t\tset_desc_avail(&vq->vq_ring, desc);\n+\t\t}\n+\t\ttoggle_wrap_counter(&vq->vq_ring);\n+\t\tnbufs = desc_idx;\n+\t\tgoto out;\n+\t}\n+\n \t/* Allocate blank mbufs for the each rx descriptor */\n \tnbufs = 0;\n \n@@ -571,6 +600,7 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\tvq_update_avail_idx(vq);\n \t}\n \n+out:\n \tPMD_INIT_LOG(DEBUG, \"Allocated %d bufs\", nbufs);\n \n \tVIRTQUEUE_DUMP(vq);\n@@ -801,6 +831,111 @@ rx_offload_enabled(struct virtio_hw *hw)\n \t\tvtpci_with_feature(hw, VIRTIO_NET_F_GUEST_TSO6);\n }\n \n+uint16_t\n+virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts,\n+\t\t 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, *nmb;\n+\tuint16_t nb_rx;\n+\tuint32_t len;\n+\tuint32_t i;\n+\tuint32_t hdr_size;\n+\tint offload;\n+\tstruct virtio_net_hdr *hdr;\n+\tstruct vring_desc_packed *descs = vq->vq_ring.desc_packed;\n+\tstruct vring_desc_packed *desc;\n+\tuint16_t used_idx = vq->vq_used_cons_idx;\n+\tstruct vq_desc_extra *dxp;\n+\n+\tnb_rx = 0;\n+\tif (unlikely(hw->started == 0))\n+\t\treturn nb_rx;\n+\n+\thdr_size = hw->vtnet_hdr_size;\n+\toffload = rx_offload_enabled(hw);\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tdesc = &descs[used_idx];\n+\t\tif (!desc_is_used(desc))\n+\t\t\tbreak;\n+\n+\t\trte_smp_rmb();\n+\n+\t\tnmb = rte_mbuf_raw_alloc(rxvq->mpool);\n+\t\tif (unlikely(nmb == 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+\n+\t\tdxp = &vq->vq_descx[used_idx];\n+\n+\t\tlen = desc->len;\n+\t\trxm = dxp->cookie;\n+\t\tdxp->cookie = nmb;\n+\t\tdxp->ndescs = 1;\n+\n+\t\tdesc->addr = VIRTIO_MBUF_ADDR(nmb, vq) +\n+\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n+\t\tdesc->len = nmb->buf_len - RTE_PKTMBUF_HEADROOM +\n+\t\t\thw->vtnet_hdr_size;\n+\t\tdesc->flags |= VRING_DESC_F_WRITE;\n+\n+\t\tPMD_RX_LOG(DEBUG, \"packet len:%d\", len);\n+\n+\t\tif (unlikely(len < hdr_size + ETHER_HDR_LEN)) {\n+\t\t\tPMD_RX_LOG(ERR, \"Packet drop\");\n+\t\t\trte_pktmbuf_free(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 - hdr_size);\n+\t\trxm->data_len = (uint16_t)(len - 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 (offload && virtio_rx_offload(rxm, hdr) < 0) {\n+\t\t\trte_pktmbuf_free(rxm);\n+\t\t\trxvq->stats.errors++;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tVIRTIO_DUMP_PACKET(rxm, rxm->data_len);\n+\n+\t\trxvq->stats.bytes += rxm->pkt_len;\n+\t\tvirtio_update_packet_stats(&rxvq->stats, rxm);\n+\n+\t\trte_smp_wmb();\n+\t\tset_desc_avail(&vq->vq_ring, desc);\n+\n+\t\trx_pkts[nb_rx++] = rxm;\n+\n+\t\tused_idx = increment_pq_index(used_idx, vq->vq_nentries);\n+\t\tif (used_idx == 0)\n+\t\t\ttoggle_wrap_counter(&vq->vq_ring);\n+\t}\n+\n+\trxvq->stats.packets += nb_rx;\n+\n+\tvq->vq_used_cons_idx = used_idx;\n+\n+\treturn nb_rx;\n+}\n+\n #define VIRTIO_MBUF_BURST_SZ 64\n #define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))\n uint16_t\n", "prefixes": [ "dpdk-dev", "v4", "08/20" ] }