Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87299/?format=api
https://patches.dpdk.org/api/patches/87299/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-12-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-12-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-12-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:06", "name": "[v4,11/44] net/virtio: store PCI type in Virtio device metadata", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "da50ef8564dcabdf68134919d58f3853a9e6a47f", "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-12-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/87299/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87299/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 F03D9A052A;\n\tTue, 26 Jan 2021 11:18:40 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 95432141356;\n\tTue, 26 Jan 2021 11:17:27 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by mails.dpdk.org (Postfix) with ESMTP id 50EBD14134E\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:17:24 +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-563-tlNtBUo8MP6-X6cg7IHDSg-1; Tue, 26 Jan 2021 05:17:20 -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 751DA18C8C02;\n Tue, 26 Jan 2021 10:17:19 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 06E9A710DC;\n Tue, 26 Jan 2021 10:17:17 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656243;\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=2EEMxnPu4CmVXaQvmn6+VIdnlZ1EewsBhaAfm/45iBg=;\n b=PTlwKW88HksJxdZ6VKUTdx3u4zv8XuaJyu0gPOvLqoC2aBDcfEiQNI/5toynJJYDLDITFM\n KgX2732R7wDRtz6OSU0h48eYSoir1HZp6cM7QTZAHuxy3PCR/OtYDrV5wO4V03iWh5YcQk\n mliL0AWun13RAk9vTWSy0uP1H513H8o=", "X-MC-Unique": "tlNtBUo8MP6-X6cg7IHDSg-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:06 +0100", "Message-Id": "<20210126101639.250481-12-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 11/44] net/virtio: store PCI type in Virtio\n device metadata", "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": "Going further in making the Virtio ethdev layer bus agnostic,\nthis patch adds a boolean in the Virtio PCI device metadata.\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_pci.c | 18 +++++++++++-------\n drivers/net/virtio/virtio_pci.h | 3 ++-\n drivers/net/virtio/virtio_pci_ethdev.c | 12 +++++++-----\n 3 files changed, 20 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex 556be1e3da..6d9c712fd5 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -751,8 +751,10 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)\n * Return 0 on success.\n */\n int\n-vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)\n+vtpci_init(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n {\n+\tstruct virtio_hw *hw = &dev->hw;\n+\n \tRTE_BUILD_BUG_ON(offsetof(struct virtio_pci_dev, hw) != 0);\n \n \t/*\n@@ -760,19 +762,20 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)\n \t * only on modern pci device. If failed, we fallback to legacy\n \t * virtio handling.\n \t */\n-\tif (virtio_read_caps(dev, hw) == 0) {\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 \n \tPMD_INIT_LOG(INFO, \"trying with legacy virtio pci.\");\n-\tif (rte_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) {\n-\t\trte_pci_unmap_device(dev);\n-\t\tif (dev->kdrv == RTE_PCI_KDRV_UNKNOWN &&\n-\t\t (!dev->device.devargs ||\n-\t\t dev->device.devargs->bus !=\n+\tif (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0) {\n+\t\trte_pci_unmap_device(pci_dev);\n+\t\tif (pci_dev->kdrv == RTE_PCI_KDRV_UNKNOWN &&\n+\t\t (!pci_dev->device.devargs ||\n+\t\t pci_dev->device.devargs->bus !=\n \t\t rte_bus_find_by_name(\"pci\"))) {\n \t\t\tPMD_INIT_LOG(INFO,\n \t\t\t\t\"skip kernel managed virtio device.\");\n@@ -783,6 +786,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)\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:\n \tVTPCI_OPS(hw)->intr_detect(hw);\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex b29bbb8074..4c22692414 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -292,6 +292,7 @@ struct virtio_hw {\n \n struct virtio_pci_dev {\n \tstruct virtio_hw hw;\n+\tbool modern;\n };\n \n #define virtio_pci_get_dev(hwp) container_of(hwp, struct virtio_pci_dev, hw)\n@@ -371,7 +372,7 @@ vtpci_packed_queue(struct virtio_hw *hw)\n /*\n * Function declaration from virtio_pci.c\n */\n-int vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw);\n+int vtpci_init(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev);\n void vtpci_reset(struct virtio_hw *);\n \n void vtpci_reinit_complete(struct virtio_hw *);\ndiff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c\nindex 045b134ef2..076a5dbced 100644\n--- a/drivers/net/virtio/virtio_pci_ethdev.c\n+++ b/drivers/net/virtio/virtio_pci_ethdev.c\n@@ -39,9 +39,11 @@ static const struct rte_pci_id pci_id_virtio_map[] = {\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+virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n {\n-\tif (hw->bus_type == VIRTIO_BUS_PCI_MODERN) {\n+\tstruct virtio_hw *hw = &dev->hw;\n+\n+\tif (dev->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@@ -57,7 +59,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 if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {\n+\t} else {\n \t\tif (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)\n \t\t\treturn -1;\n \t}\n@@ -76,13 +78,13 @@ eth_virtio_pci_init(struct rte_eth_dev *eth_dev)\n \tVTPCI_DEV(hw) = pci_dev;\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\tret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), dev);\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\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 \t\t\treturn -1;\n", "prefixes": [ "v4", "11/44" ] }{ "id": 87299, "url": "