Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87302/?format=api
{ "id": 87302, "url": "https://patches.dpdk.org/api/patches/87302/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-15-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-15-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-15-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:09", "name": "[v4,14/44] net/virtio: remove bus type enum", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "001999a1fb3834a6f1f5e264d35b35968282a773", "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-15-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/87302/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87302/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 AA380A052A;\n\tTue, 26 Jan 2021 11:19:12 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4B039141369;\n\tTue, 26 Jan 2021 11:17:36 +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 08E7F141369\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:17:33 +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-554-C7GEUKvCN_uOZkGOhU7wQg-1; Tue, 26 Jan 2021 05:17:31 -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 A619E1005513;\n Tue, 26 Jan 2021 10:17:30 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 6603972163;\n Tue, 26 Jan 2021 10:17:23 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656253;\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=fYs0nCX4onSeyiCGN0ISN8pS9459GTAgzzh+eP+GR48=;\n b=ANP2sX0g7dNaX5QngcGlv46pK/Z9RAclwQBe187HXKespb5B8EZpOqecBzfiBtyW+dxR8r\n XtMKiEvqhKn8/oN5pgIS5sbEbK2Pc0n7RWRBYaVkyaS923HLd6gER+JjgzmuMlaege5Hks\n 9y1dEvY558INyBQFfMJdFZb94TKqNUs=", "X-MC-Unique": "C7GEUKvCN_uOZkGOhU7wQg-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:16:09 +0100", "Message-Id": "<20210126101639.250481-15-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 14/44] net/virtio: remove bus type enum", "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": "Bus type awareness at the generic ethdev level is no\nmore needed as previous patches have made it bus-agnostic.\n\nThis patch removes it from struct virtio_hw.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\nReviewed-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 18 ------------------\n drivers/net/virtio/virtio_pci.c | 2 --\n drivers/net/virtio/virtio_pci.h | 8 --------\n drivers/net/virtio/virtio_pci_ethdev.c | 7 ++++++-\n drivers/net/virtio/virtio_user_ethdev.c | 5 ++++-\n 5 files changed, 10 insertions(+), 30 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 72f527144e..c46fe4adf6 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1798,23 +1798,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \treturn 0;\n }\n \n-\n-static void\n-virtio_set_vtpci_ops(struct virtio_hw *hw)\n-{\n-#ifdef RTE_VIRTIO_USER\n-\tif (hw->bus_type == VIRTIO_BUS_USER)\n-\t\tVTPCI_OPS(hw) = &virtio_user_ops;\n-\telse\n-#endif\n-\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN)\n-\t\tVTPCI_OPS(hw) = &modern_ops;\n-\telse if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n-\t\tVTPCI_OPS(hw) = &legacy_ops;\n-\n-\treturn;\n-}\n-\n /*\n * This function is based on probe() function in virtio_pci.c\n * It returns 0 on success.\n@@ -1840,7 +1823,6 @@ 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\tvirtio_set_vtpci_ops(hw);\n \t\tset_rxtx_funcs(eth_dev);\n \t\treturn 0;\n \t}\ndiff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex 1c8d4b7ddd..20599774a7 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -809,7 +809,6 @@ vtpci_init(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n \tif (virtio_read_caps(pci_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->bus_type = VIRTIO_BUS_PCI_MODERN;\n \t\tdev->modern = true;\n \t\tgoto msix_detect;\n \t}\n@@ -829,7 +828,6 @@ vtpci_init(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n \t}\n \n \tvirtio_hw_internal[hw->port_id].vtpci_ops = &legacy_ops;\n-\thw->bus_type = VIRTIO_BUS_PCI_LEGACY;\n \tdev->modern = false;\n \n msix_detect:\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 6aacc942fc..2cede4a100 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -246,15 +246,7 @@ 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;\ndiff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c\nindex 076a5dbced..8cc6561914 100644\n--- a/drivers/net/virtio/virtio_pci_ethdev.c\n+++ b/drivers/net/virtio/virtio_pci_ethdev.c\n@@ -84,6 +84,11 @@ eth_virtio_pci_init(struct rte_eth_dev *eth_dev)\n \t\t\treturn -1;\n \t\t}\n \t} else {\n+\t\tif (dev->modern)\n+\t\t\tVTPCI_OPS(hw) = &modern_ops;\n+\t\telse\n+\t\t\tVTPCI_OPS(hw) = &legacy_ops;\n+\n \t\tret = virtio_remap_pci(RTE_ETH_DEV_TO_PCI(eth_dev), dev);\n \t\tif (ret < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"Failed to remap PCI device\\n\");\n@@ -105,7 +110,7 @@ eth_virtio_pci_init(struct rte_eth_dev *eth_dev)\n \n err_unmap:\n \trte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));\n-\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n+\tif (!dev->modern)\n \t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n \n \treturn ret;\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex bf958de571..61880a8e02 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -641,7 +641,6 @@ 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->bus_type = VIRTIO_BUS_USER;\n \thw->use_vec_rx = 0;\n \thw->use_vec_tx = 0;\n \thw->use_inorder_rx = 0;\n@@ -691,6 +690,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev)\n \t\t\treturn -1;\n \t\t}\n \n+\t\tdev = eth_dev->data->dev_private;\n+\t\thw = &dev->hw;\n+\t\tVTPCI_OPS(hw) = &virtio_user_ops;\n+\n \t\tif (eth_virtio_dev_init(eth_dev) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"eth_virtio_dev_init fails\");\n \t\t\trte_eth_dev_release_port(eth_dev);\n", "prefixes": [ "v4", "14/44" ] }