Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87293/?format=api
{ "id": 87293, "url": "https://patches.dpdk.org/api/patches/87293/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-5-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": "<20210126101639.250481-5-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-5-maxime.coquelin@redhat.com", "date": "2021-01-26T10:15:59", "name": "[v4,04/44] net/virtio: introduce Virtio bus type", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d9526c67649e3f7885f655f49f54f2ff3b60f2d6", "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/20210126101639.250481-5-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14950, "url": "https://patches.dpdk.org/api/series/14950/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14950", "date": "2021-01-26T10:15:55", "name": "net/virtio: Virtio PMD rework", "version": 4, "mbox": "https://patches.dpdk.org/series/14950/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87293/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/87293/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8ED50A052A;\n\tTue, 26 Jan 2021 11:17:37 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E295E14132F;\n\tTue, 26 Jan 2021 11:17:07 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [63.128.21.124])\n by mails.dpdk.org (Postfix) with ESMTP id 6E609141325\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:17:03 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-164-mnox5IWpMfq25FpmMNTrXQ-1; Tue, 26 Jan 2021 05:16:58 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9F1410866A5;\n Tue, 26 Jan 2021 10:16:57 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 2868B6F45C;\n Tue, 26 Jan 2021 10:16:55 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656222;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=EZDY5+0AqTco/LoCMrRaFwLYE6jWnb9fIFk1OWRUUjk=;\n b=AB8dzCrs1G+40kIVGs5+YHxzgrxsot4cmnxm9pMS49wJZFK8qoc7zecwFNMLo52YlxtO88\n K0rBGK/BxtCJ90xXUMv2l+tB/50SGNZb0L7Ou5nxJIiYqGhpskYewz5YNyugenFGhyeaAe\n oxjJdyG2FIdkiyoy5/7ApEE6XEo1jng=", "X-MC-Unique": "mnox5IWpMfq25FpmMNTrXQ-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,\n amorenoz@redhat.com, david.marchand@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Tue, 26 Jan 2021 11:15:59 +0100", "Message-Id": "<20210126101639.250481-5-maxime.coquelin@redhat.com>", "In-Reply-To": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "References": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v4 04/44] net/virtio: introduce Virtio bus type", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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": "This patch is preliminary work for introducing a bus layer\nin Virtio PMD, in order to improve Virtio-user integration.\n\nA new bus type is added to provide a unified way to distinguish\nwhich bus type is used (PCI modern, PCI legacy or Virtio-user).\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 40 +++++++++++++------------\n drivers/net/virtio/virtio_pci.c | 4 +--\n drivers/net/virtio/virtio_pci.h | 9 +++++-\n drivers/net/virtio/virtio_user_ethdev.c | 2 +-\n 4 files changed, 32 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 92a3d4efa5..0ba10c274a 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -592,9 +592,9 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \t * we use virtual address. And we need properly set _offset_, please see\n \t * VIRTIO_MBUF_DATA_DMA_ADDR in virtqueue.h for more information.\n \t */\n-\tif (!hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN) {\n \t\tvq->offset = offsetof(struct rte_mbuf, buf_iova);\n-\telse {\n+\t} else if (hw->bus_type == VIRTIO_BUS_USER) {\n \t\tvq->vq_ring_mem = (uintptr_t)mz->addr;\n \t\tvq->offset = offsetof(struct rte_mbuf, buf_addr);\n \t\tif (queue_type == VTNET_TQ)\n@@ -746,13 +746,13 @@ virtio_dev_close(struct rte_eth_dev *dev)\n \tvirtio_free_queues(hw);\n \n #ifdef RTE_VIRTIO_USER\n-\tif (hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_USER)\n \t\tvirtio_user_dev_uninit(hw->virtio_user_dev);\n \telse\n #endif\n \tif (dev->device) {\n \t\trte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(dev));\n-\t\tif (!hw->modern)\n+\t\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n \t\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n \t}\n \n@@ -1299,7 +1299,7 @@ virtio_intr_unmask(struct rte_eth_dev *dev)\n \tif (rte_intr_ack(dev->intr_handle) < 0)\n \t\treturn -1;\n \n-\tif (!hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n \t\thw->use_msix = vtpci_msix_detect(RTE_ETH_DEV_TO_PCI(dev));\n \n \treturn 0;\n@@ -1313,7 +1313,7 @@ virtio_intr_enable(struct rte_eth_dev *dev)\n \tif (rte_intr_enable(dev->intr_handle) < 0)\n \t\treturn -1;\n \n-\tif (!hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n \t\thw->use_msix = vtpci_msix_detect(RTE_ETH_DEV_TO_PCI(dev));\n \n \treturn 0;\n@@ -1327,7 +1327,7 @@ virtio_intr_disable(struct rte_eth_dev *dev)\n \tif (rte_intr_disable(dev->intr_handle) < 0)\n \t\treturn -1;\n \n-\tif (!hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n \t\thw->use_msix = vtpci_msix_detect(RTE_ETH_DEV_TO_PCI(dev));\n \n \treturn 0;\n@@ -1368,13 +1368,13 @@ virtio_negotiate_features(struct virtio_hw *hw, uint64_t req_features)\n \tPMD_INIT_LOG(DEBUG, \"features after negotiate = %\" PRIx64,\n \t\thw->guest_features);\n \n-\tif (hw->modern && !vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) {\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN && !vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) {\n \t\tPMD_INIT_LOG(ERR,\n \t\t\t\"VIRTIO_F_VERSION_1 features is not enabled.\");\n \t\treturn -1;\n \t}\n \n-\tif (hw->modern || hw->virtio_user_dev) {\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN || hw->bus_type == VIRTIO_BUS_USER) {\n \t\tvtpci_set_status(hw, VIRTIO_CONFIG_STATUS_FEATURES_OK);\n \t\tif (!(vtpci_get_status(hw) & VIRTIO_CONFIG_STATUS_FEATURES_OK)) {\n \t\t\tPMD_INIT_LOG(ERR,\n@@ -1709,7 +1709,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \n \thw->weak_barriers = !vtpci_with_feature(hw, VIRTIO_F_ORDER_PLATFORM);\n \n-\tif (!hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n \t\tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \n \t/* If host does not support both status and MSI-X then disable LSC */\n@@ -1856,7 +1856,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n static int\n virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)\n {\n-\tif (hw->modern) {\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN) {\n \t\t/*\n \t\t * We don't have to re-parse the PCI config space, since\n \t\t * rte_pci_map_device() makes sure the mapped address\n@@ -1872,7 +1872,7 @@ virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)\n \t\t\tPMD_INIT_LOG(DEBUG, \"failed to map pci device!\");\n \t\t\treturn -1;\n \t\t}\n-\t} else {\n+\t} else if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {\n \t\tif (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)\n \t\t\treturn -1;\n \t}\n@@ -1884,14 +1884,16 @@ static void\n virtio_set_vtpci_ops(struct virtio_hw *hw)\n {\n #ifdef RTE_VIRTIO_USER\n-\tif (hw->virtio_user_dev)\n+\tif (hw->bus_type == VIRTIO_BUS_USER)\n \t\tVTPCI_OPS(hw) = &virtio_user_ops;\n \telse\n #endif\n-\tif (hw->modern)\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n \t\tVTPCI_OPS(hw) = &modern_ops;\n-\telse\n+\telse if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n \t\tVTPCI_OPS(hw) = &legacy_ops;\n+\n+\treturn;\n }\n \n /*\n@@ -1919,7 +1921,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \teth_dev->rx_descriptor_done = virtio_dev_rx_queue_done;\n \n \tif (rte_eal_process_type() == RTE_PROC_SECONDARY) {\n-\t\tif (!hw->virtio_user_dev) {\n+\t\tif (hw->bus_type != VIRTIO_BUS_USER) {\n \t\t\tret = virtio_remap_pci(RTE_ETH_DEV_TO_PCI(eth_dev), hw);\n \t\t\tif (ret)\n \t\t\t\treturn ret;\n@@ -1950,7 +1952,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \t/* For virtio_user case the hw->virtio_user_dev is populated by\n \t * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called.\n \t */\n-\tif (!hw->virtio_user_dev) {\n+\tif (hw->bus_type != VIRTIO_BUS_USER) {\n \t\tret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);\n \t\tif (ret)\n \t\t\tgoto err_vtpci_init;\n@@ -1982,9 +1984,9 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \treturn 0;\n \n err_virtio_init:\n-\tif (!hw->virtio_user_dev) {\n+\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN || hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {\n \t\trte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));\n-\t\tif (!hw->modern)\n+\t\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n \t\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n \t}\n err_vtpci_init:\ndiff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex d6b950ee69..1692268f30 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -697,7 +697,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)\n \tif (virtio_read_caps(dev, hw) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"modern virtio pci detected.\");\n \t\tvirtio_hw_internal[hw->port_id].vtpci_ops = &modern_ops;\n-\t\thw->modern = 1;\n+\t\thw->bus_type = VIRTIO_BUS_PCI_MODERN;\n \t\treturn 0;\n \t}\n \n@@ -716,7 +716,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)\n \t}\n \n \tvirtio_hw_internal[hw->port_id].vtpci_ops = &legacy_ops;\n-\thw->modern = 0;\n+\thw->bus_type = VIRTIO_BUS_PCI_LEGACY;\n \n \treturn 0;\n }\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex ab61e911b8..6388f0a74d 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -243,7 +243,15 @@ struct virtio_pci_ops {\n \n struct virtio_net_config;\n \n+enum virtio_bus_type {\n+\tVIRTIO_BUS_UNKNOWN,\n+\tVIRTIO_BUS_PCI_LEGACY,\n+\tVIRTIO_BUS_PCI_MODERN,\n+\tVIRTIO_BUS_USER,\n+};\n+\n struct virtio_hw {\n+\tenum virtio_bus_type bus_type;\n \tstruct virtnet_ctl *cvq;\n \tuint64_t req_guest_features;\n \tuint64_t guest_features;\n@@ -253,7 +261,6 @@ struct virtio_hw {\n \tuint16_t vtnet_hdr_size;\n \tuint8_t\t vlan_strip;\n \tuint8_t\t use_msix;\n-\tuint8_t modern;\n \tuint8_t use_vec_rx;\n \tuint8_t use_vec_tx;\n \tuint8_t use_inorder_rx;\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 7abba1f1ee..441721b6ca 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -629,7 +629,7 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)\n \t * Here just pretend that we support msix.\n \t */\n \thw->use_msix = 1;\n-\thw->modern = 0;\n+\thw->bus_type = VIRTIO_BUS_USER;\n \thw->use_vec_rx = 0;\n \thw->use_vec_tx = 0;\n \thw->use_inorder_rx = 0;\n", "prefixes": [ "v4", "04/44" ] }