Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87296/?format=api
{ "id": 87296, "url": "https://patches.dpdk.org/api/patches/87296/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-9-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-9-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-9-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:03", "name": "[v4,08/44] net/virtio: move PCI specific dev init to PCI ethdev init", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b0af343a6d6c76c895bb31262d7e6a153db100f9", "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-9-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/87296/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87296/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 E02E4A052A;\n\tTue, 26 Jan 2021 11:18:09 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 54759141339;\n\tTue, 26 Jan 2021 11:17:18 +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 4CBBB14132E\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:17:17 +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-432-8QZiJ_9IPrugb5_fB9luDw-1; Tue, 26 Jan 2021 05:17:14 -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 CEC0C107ACE3;\n Tue, 26 Jan 2021 10:17:13 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 667DF6F45C;\n Tue, 26 Jan 2021 10:17:11 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656236;\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=oeBuFj3a19Igmd2cb60IjFZObmnBhMn4NWytrQS7EmY=;\n b=XRhupLxCZ4WFt5rHvLAi6EUl3mrj2LLOSpk5v3KDK/mTz4v4olV3o+KUGa1HWRjWM5iKbA\n XB9jeYdT462qFm6LMRBze0eMAJwXVc1jrjeiaTsvMRSTd7GOQbEA3xCM3EUP9j2AOhHg+m\n mVS9rITEDQE5BicH6wBHm12reCGRSqQ=", "X-MC-Unique": "8QZiJ_9IPrugb5_fB9luDw-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:03 +0100", "Message-Id": "<20210126101639.250481-9-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 08/44] net/virtio: move PCI specific dev init\n to PCI ethdev init", "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 moves the PCI specific initialization from\neth_virtio_dev_init() to eth_virtio_pci_init().\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 | 63 +----------------------\n drivers/net/virtio/virtio_pci_ethdev.c | 71 +++++++++++++++++++++++++-\n 2 files changed, 71 insertions(+), 63 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex ad7e9efd5f..a3e81f336d 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1676,7 +1676,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \tstruct virtio_hw *hw = eth_dev->data->dev_private;\n \tstruct virtio_net_config *config;\n \tstruct virtio_net_config local_config;\n-\tstruct rte_pci_device *pci_dev = NULL;\n \tint ret;\n \n \t/* Reset the device although not necessary at startup */\n@@ -1697,9 +1696,6 @@ 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->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 \tif (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS) &&\n \t hw->use_msix != VIRTIO_MSIX_NONE)\n@@ -1828,45 +1824,9 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \n \tvtpci_reinit_complete(hw);\n \n-\tif (pci_dev)\n-\t\tPMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x\",\n-\t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n-\t\t\tpci_dev->id.device_id);\n-\n \treturn 0;\n }\n \n-/*\n- * Remap the PCI device again (IO port map for legacy device and\n- * memory map for modern device), so that the secondary process\n- * could have the PCI initiated correctly.\n- */\n-static int\n-virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)\n-{\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-\t\t * in secondary process would equal to the one mapped in\n-\t\t * the primary process: error will be returned if that\n-\t\t * requirement is not met.\n-\t\t *\n-\t\t * That said, we could simply reuse all cap pointers\n-\t\t * (such as dev_cfg, common_cfg, etc.) parsed from the\n-\t\t * primary process, which is stored in shared memory.\n-\t\t */\n-\t\tif (rte_pci_map_device(pci_dev)) {\n-\t\t\tPMD_INIT_LOG(DEBUG, \"failed to map pci device!\");\n-\t\t\treturn -1;\n-\t\t}\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-\n-\treturn 0;\n-}\n \n static void\n virtio_set_vtpci_ops(struct virtio_hw *hw)\n@@ -1909,17 +1869,11 @@ 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->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-\t\t}\n-\n \t\tvirtio_set_vtpci_ops(hw);\n \t\tset_rxtx_funcs(eth_dev);\n-\n \t\treturn 0;\n \t}\n+\n \tret = virtio_dev_devargs_parse(eth_dev->device->devargs, &speed, &vectorized);\n \tif (ret < 0)\n \t\treturn ret;\n@@ -1936,15 +1890,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \t}\n \n \thw->port_id = eth_dev->data->port_id;\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->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-\t}\n-\n \trte_spinlock_init(&hw->state_lock);\n \n \t/* reset device and negotiate default features */\n@@ -1971,12 +1916,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \treturn 0;\n \n err_virtio_init:\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->bus_type == VIRTIO_BUS_PCI_LEGACY)\n-\t\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n-\t}\n-err_vtpci_init:\n \trte_free(eth_dev->data->mac_addrs);\n \teth_dev->data->mac_addrs = NULL;\n \treturn ret;\ndiff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c\nindex 7c849d01ec..6a0ef6edc3 100644\n--- a/drivers/net/virtio/virtio_pci_ethdev.c\n+++ b/drivers/net/virtio/virtio_pci_ethdev.c\n@@ -32,10 +32,79 @@ static const struct rte_pci_id pci_id_virtio_map[] = {\n \t{ .vendor_id = 0, /* sentinel */ },\n };\n \n+\n+/*\n+ * Remap the PCI device again (IO port map for legacy device and\n+ * memory map for modern device), so that the secondary process\n+ * could have the PCI initiated correctly.\n+ */\n+static int\n+virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)\n+{\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+\t\t * in secondary process would equal to the one mapped in\n+\t\t * the primary process: error will be returned if that\n+\t\t * requirement is not met.\n+\t\t *\n+\t\t * That said, we could simply reuse all cap pointers\n+\t\t * (such as dev_cfg, common_cfg, etc.) parsed from the\n+\t\t * primary process, which is stored in shared memory.\n+\t\t */\n+\t\tif (rte_pci_map_device(pci_dev)) {\n+\t\t\tPMD_INIT_LOG(DEBUG, \"failed to map pci device!\");\n+\t\t\treturn -1;\n+\t\t}\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+\n+\treturn 0;\n+}\n+\n static int\n eth_virtio_pci_init(struct rte_eth_dev *eth_dev)\n {\n-\treturn eth_virtio_dev_init(eth_dev);\n+\tstruct virtio_pci_dev *dev = eth_dev->data->dev_private;\n+\tstruct virtio_hw *hw = &dev->hw;\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\tint ret;\n+\n+\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n+\t\tret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);\n+\t\tif (ret) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to init PCI device\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t} else {\n+\t\tret = virtio_remap_pci(RTE_ETH_DEV_TO_PCI(eth_dev), hw);\n+\t\tif (ret < 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to remap PCI device\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n+\tret = eth_virtio_dev_init(eth_dev);\n+\tif (ret < 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to init virtio device\\n\");\n+\t\tgoto err_unmap;\n+\t}\n+\n+\tPMD_INIT_LOG(DEBUG, \"port %d vendorID=0x%x deviceID=0x%x\",\n+\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n+\t\tpci_dev->id.device_id);\n+\n+\treturn 0;\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+\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n+\n+\treturn ret;\n }\n \n static int\n", "prefixes": [ "v4", "08/44" ] }