Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/18395/?format=api
{ "id": 18395, "url": "http://patches.dpdk.org/api/patches/18395/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1482332986-7599-12-git-send-email-jblunck@infradead.org/", "project": { "id": 1, "url": "http://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": "<1482332986-7599-12-git-send-email-jblunck@infradead.org>", "list_archive_url": "https://inbox.dpdk.org/dev/1482332986-7599-12-git-send-email-jblunck@infradead.org", "date": "2016-12-21T15:09:34", "name": "[dpdk-dev,v4,11/23] virtio: Don't depend on struct rte_eth_dev's pci_dev", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "27043effa2407771b4ecdbc977f421faec21be48", "submitter": { "id": 249, "url": "http://patches.dpdk.org/api/people/249/?format=api", "name": "Jan Blunck", "email": "jblunck@infradead.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1482332986-7599-12-git-send-email-jblunck@infradead.org/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/18395/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/18395/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id DA03610D06;\n\tWed, 21 Dec 2016 16:10:35 +0100 (CET)", "from mail-wm0-f67.google.com (mail-wm0-f67.google.com\n\t[74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 08E2710CC4\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 16:10:15 +0100 (CET)", "by mail-wm0-f67.google.com with SMTP id u144so31016357wmu.0\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 07:10:15 -0800 (PST)", "from weierstrass.local.net ([91.200.109.169])\n\tby smtp.gmail.com with ESMTPSA id\n\t135sm27627375wmh.14.2016.12.21.07.10.13\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 21 Dec 2016 07:10:13 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=I5nT9WIwnFSicCsJOwzs7mByeSclGPO3EzmXmXteVek=;\n\tb=ZE+RfFJdCoZmb3VD4fsSO+uArvLUwJtevzV118ROYcEZAd7nwGWVhnm5AOhb1gnsa3\n\tBeqw2v4qar+xecLvgNUXuQv3mO4rx1H+yEKt/t8LQFYbUi4lhiMHdd9MgrfMjGk+/KZI\n\t6yjNkwQ26WGTnPbfrNL7GjewIyZpFHedLv3ZNXGPteJwzGNx61Y3zWRHOQKCEv5mcsPX\n\tVD3G7UAk3FezzMrmmm/XtoDez4MVZFahJWacGCIyNtX6dWwKbyeTKgZUUS27u2tYXTcM\n\tuApd7XGQFSKNC5T/Z9d76uQDK6sWWgZn0zE+UgbWlFsVP17eRmT62Du3xZR9x3DVXDpV\n\tra/Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references;\n\tbh=I5nT9WIwnFSicCsJOwzs7mByeSclGPO3EzmXmXteVek=;\n\tb=lwHlZNOCFmgBtcdl4Xlnuy1pJqaBm5iphD8k6tKn3YJXWUdVlY8vPY/CBvQKFA3Ehj\n\tvZSAjHVQt6SGP2jbNlHFOS4V55tHThbOzVbP0A2SOzpwCZBtbTPA/KU2T62CaFJbVMYg\n\tDBRfXnb4p9f55VpLnNkm99hIFrWnxfRexHVXcagi189Y/qjg3qh0VJRQ9S8srYGvxQJ9\n\tgAWLsqviRlxfzsguhUhnL/QpQO2YKTEmf5UAhG+YZSJvCP5tFfYcAievJTWX37nOox1+\n\taBBLBFuVaLt7TA6TqT1QY5Gsbo7VIPtqx7Ml6K/TJAfqRMnflN+gh5FsIVnosg3E5W/i\n\tueeA==", "X-Gm-Message-State": "AIkVDXItKfZkOpsz+POTt4ViCnRuMK16TRf1Otj9siQknLFquxrfjQHq8+QGrS9FSPHd4g==", "X-Received": "by 10.28.130.66 with SMTP id e63mr5236863wmd.39.1482333014632;\n\tWed, 21 Dec 2016 07:10:14 -0800 (PST)", "From": "Jan Blunck <jblunck@infradead.org>", "To": "dev@dpdk.org", "Cc": "shreyansh.jain@nxp.com, david.marchand@6wind.com,\n\tstephen@networkplumber.org", "Date": "Wed, 21 Dec 2016 16:09:34 +0100", "Message-Id": "<1482332986-7599-12-git-send-email-jblunck@infradead.org>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1482332986-7599-1-git-send-email-jblunck@infradead.org>", "References": "<1482332986-7599-1-git-send-email-jblunck@infradead.org>", "Subject": "[dpdk-dev] [PATCH v4 11/23] virtio: Don't depend on struct\n\trte_eth_dev's pci_dev", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://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": "<http://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": "We don't need to depend on rte_eth_dev->pci_dev to differentiate between\nthe virtio_user and the virtio_pci case. Instead we can use the private\nvirtio_hw struct to get that information.\n\nSigned-off-by: Jan Blunck <jblunck@infradead.org>\nAcked-by: Shreyansh Jain <shreyansh.jain@nxp.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 24 ++++++++++++------------\n 1 file changed, 12 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex da9668e..58c03d8 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -483,11 +483,11 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \t\thw->cvq = cvq;\n \t}\n \n-\t/* For virtio_user case (that is when dev->pci_dev is NULL), we use\n+\t/* For virtio_user case (that is when hw->dev is NULL), we use\n \t * 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 (dev->pci_dev)\n+\tif (hw->dev)\n \t\tvq->offset = offsetof(struct rte_mbuf, buf_physaddr);\n \telse {\n \t\tvq->vq_ring_mem = (uintptr_t)mz->addr;\n@@ -1190,7 +1190,7 @@ 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 = eth_dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = hw->dev;\n \tint ret;\n \n \t/* Reset the device although not necessary at startup */\n@@ -1210,7 +1210,8 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)\n \telse\n \t\teth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;\n \n-\trte_eth_copy_pci_info(eth_dev, pci_dev);\n+\tif (pci_dev)\n+\t\trte_eth_copy_pci_info(eth_dev, pci_dev);\n \n \trx_func_get(eth_dev);\n \n@@ -1294,7 +1295,6 @@ int\n eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n {\n \tstruct virtio_hw *hw = eth_dev->data->dev_private;\n-\tstruct rte_pci_device *pci_dev;\n \tuint32_t dev_flags = RTE_ETH_DEV_DETACHABLE;\n \tint ret;\n \n@@ -1317,10 +1317,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \t\treturn -ENOMEM;\n \t}\n \n-\tpci_dev = eth_dev->pci_dev;\n-\n-\tif (pci_dev) {\n-\t\tret = vtpci_init(pci_dev, hw, &dev_flags);\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+\t\tret = vtpci_init(eth_dev->pci_dev, hw, &dev_flags);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n@@ -1343,7 +1344,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n static int\n eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev;\n \tstruct virtio_hw *hw = eth_dev->data->dev_private;\n \n \tPMD_INIT_FUNC_TRACE();\n@@ -1353,7 +1353,6 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)\n \n \tvirtio_dev_stop(eth_dev);\n \tvirtio_dev_close(eth_dev);\n-\tpci_dev = eth_dev->pci_dev;\n \n \teth_dev->dev_ops = NULL;\n \teth_dev->tx_pkt_burst = NULL;\n@@ -1367,7 +1366,8 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)\n \t\trte_intr_callback_unregister(vtpci_intr_handle(hw),\n \t\t\t\t\t\tvirtio_interrupt_handler,\n \t\t\t\t\t\teth_dev);\n-\trte_eal_pci_unmap_device(pci_dev);\n+\tif (hw->dev)\n+\t\trte_eal_pci_unmap_device(hw->dev);\n \n \tPMD_INIT_LOG(DEBUG, \"dev_uninit completed\");\n \n", "prefixes": [ "dpdk-dev", "v4", "11/23" ] }