Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/40799/?format=api
{ "id": 40799, "url": "https://patches.dpdk.org/api/patches/40799/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180608090724.20855-7-yong.liu@intel.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": "<20180608090724.20855-7-yong.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180608090724.20855-7-yong.liu@intel.com", "date": "2018-06-08T09:07:23", "name": "[dpdk-dev,6/7] net/virtio: add IN_ORDER Rx/Tx into selection", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "50b98e0a8399c3f2499c1291f10c327f9e3f6aa6", "submitter": { "id": 17, "url": "https://patches.dpdk.org/api/people/17/?format=api", "name": "Marvin Liu", "email": "yong.liu@intel.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/20180608090724.20855-7-yong.liu@intel.com/mbox/", "series": [ { "id": 39, "url": "https://patches.dpdk.org/api/series/39/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=39", "date": "2018-06-08T09:07:17", "name": "support VIRTIO_F_IN_ORDER feature", "version": 1, "mbox": "https://patches.dpdk.org/series/39/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/40799/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/40799/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 4D41F1B3FC;\n\tFri, 8 Jun 2018 03:21:07 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 45E741B1A3\n\tfor <dev@dpdk.org>; Fri, 8 Jun 2018 03:20:59 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t07 Jun 2018 18:20:58 -0700", "from dpdk-test32.sh.intel.com ([10.67.119.57])\n\tby orsmga005.jf.intel.com with ESMTP; 07 Jun 2018 18:20:57 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.49,488,1520924400\"; d=\"scan'208\";a=\"230856657\"", "From": "Marvin Liu <yong.liu@intel.com>", "To": "maxime.coquelin@redhat.com,\n\ttiwei.bie@intel.com", "Cc": "zhihong.wang@intel.com,\n\tdev@dpdk.org,\n\tMarvin Liu <yong.liu@intel.com>", "Date": "Fri, 8 Jun 2018 17:07:23 +0800", "Message-Id": "<20180608090724.20855-7-yong.liu@intel.com>", "X-Mailer": "git-send-email 2.17.0", "In-Reply-To": "<20180608090724.20855-1-yong.liu@intel.com>", "References": "<20180608090724.20855-1-yong.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH 6/7] net/virtio: add IN_ORDER Rx/Tx into selection", "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": "After IN_ORDER Rx/Tx paths added, need to update Rx/Tx path selection\nlogic. Also need to handle device start up Rx queue descriptors flush\naction separately.\n\nRx path select logic: If IN_ORDER is disabled will select normal Rx\npath. If IN_ORDER is enabled, Rx offload and merge-able are disabled\nwill select simple Rx path. Otherwise will select IN_ORDER Rx path.\n\nTx path select logic: If IN_ORDER is disabled will select normal Tx\npath. If IN_ORDER is enabled and merge-able is disabled will select\nsimple Tx path. Otherwise will select IN_ORDER Tx path.\n\nSigned-off-by: Marvin Liu <yong.liu@intel.com>", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex df50a571a..af5eba655 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1320,6 +1320,11 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)\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 (hw->use_inorder_rx) {\n+\t\tPMD_INIT_LOG(INFO,\n+\t\t\t\"virtio: using inorder mergeable buffer Rx path on port %u\",\n+\t\t\teth_dev->data->port_id);\n+\t\teth_dev->rx_pkt_burst = &virtio_recv_inorder_pkts;\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@@ -1335,6 +1340,10 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)\n \t\tPMD_INIT_LOG(INFO, \"virtio: using simple Tx path on port %u\",\n \t\t\teth_dev->data->port_id);\n \t\teth_dev->tx_pkt_burst = virtio_xmit_pkts_simple;\n+\t} else if (hw->use_inorder_tx) {\n+\t\tPMD_INIT_LOG(INFO, \"virtio: using inorder Tx path on port %u\",\n+\t\t\teth_dev->data->port_id);\n+\t\teth_dev->tx_pkt_burst = virtio_xmit_inorder_pkts;\n \t} else {\n \t\tPMD_INIT_LOG(INFO, \"virtio: using standard Tx path on port %u\",\n \t\t\teth_dev->data->port_id);\n@@ -1871,23 +1880,25 @@ virtio_dev_configure(struct rte_eth_dev *dev)\n \n \trte_spinlock_init(&hw->state_lock);\n \n-\thw->use_simple_rx = 1;\n-\thw->use_simple_tx = 1;\n-\n #if defined RTE_ARCH_ARM64 || defined RTE_ARCH_ARM\n \tif (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) {\n \t\thw->use_simple_rx = 0;\n \t\thw->use_simple_tx = 0;\n \t}\n #endif\n-\tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n-\t\thw->use_simple_rx = 0;\n-\t\thw->use_simple_tx = 0;\n-\t}\n+\tif (vtpci_with_feature(hw, VIRTIO_F_IN_ORDER)) {\n+\t\tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n+\t\t\thw->use_inorder_rx = 1;\n+\t\t\thw->use_inorder_tx = 1;\n+\t\t} else {\n+\t\t\thw->use_simple_rx = 1;\n+\t\t\thw->use_simple_tx = 1;\n+\t\t}\n \n-\tif (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM |\n-\t\t\t DEV_RX_OFFLOAD_TCP_CKSUM))\n-\t\thw->use_simple_rx = 0;\n+\t\tif (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM |\n+\t\t\t\t DEV_RX_OFFLOAD_TCP_CKSUM))\n+\t\t\thw->use_inorder_rx = 1;\n+\t}\n \n \treturn 0;\n }\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 049344383..77f805df6 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -239,6 +239,8 @@ struct virtio_hw {\n \tuint8_t modern;\n \tuint8_t use_simple_rx;\n \tuint8_t use_simple_tx;\n+\tuint8_t use_inorder_rx;\n+\tuint8_t use_inorder_tx;\n \tuint16_t port_id;\n \tuint8_t mac_addr[ETHER_ADDR_LEN];\n \tuint32_t notify_off_multiplier;\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex d0473d6b4..b0852b721 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -604,7 +604,7 @@ 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, i;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -634,6 +634,24 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\t\tvirtio_rxq_rearm_vec(rxvq);\n \t\t\tnbufs += RTE_VIRTIO_VPMD_RX_REARM_THRESH;\n \t\t}\n+\t} else if (hw->use_inorder_rx) {\n+\t\tif ((!virtqueue_full(vq))) {\n+\t\t\tuint16_t free_cnt = vq->vq_free_cnt;\n+\t\t\tstruct rte_mbuf *pkts[free_cnt];\n+\n+\t\t\tif (!rte_pktmbuf_alloc_bulk(rxvq->mpool, pkts, free_cnt)) {\n+\t\t\t\terror = virtqueue_enqueue_inorder_refill(vq,\n+\t\t\t\t\t\tpkts,\n+\t\t\t\t\t\tfree_cnt);\n+\t\t\t\tif (unlikely(error)) {\n+\t\t\t\t\tfor (i = 0; i < free_cnt; i++)\n+\t\t\t\t\t\trte_pktmbuf_free(pkts[i]);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tnbufs += free_cnt;\n+\t\t\tvq_update_avail_idx(vq);\n+\t\t}\n \t} else {\n \t\twhile (!virtqueue_full(vq)) {\n \t\t\tm = rte_mbuf_raw_alloc(rxvq->mpool);\ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex a7d0a9cbe..56a77cc71 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -74,6 +74,14 @@ virtqueue_rxvq_flush(struct virtqueue *vq)\n \t\t\tdesc_idx = used_idx;\n \t\t\trte_pktmbuf_free(vq->sw_ring[desc_idx]);\n \t\t\tvq->vq_free_cnt++;\n+\t\t} else if (hw->use_inorder_rx) {\n+\t\t\tdesc_idx = (uint16_t)uep->id;\n+\t\t\tdxp = &vq->vq_descx[desc_idx];\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_inorder(vq, desc_idx, 1);\n \t\t} else {\n \t\t\tdesc_idx = (uint16_t)uep->id;\n \t\t\tdxp = &vq->vq_descx[desc_idx];\n", "prefixes": [ "dpdk-dev", "6/7" ] }