Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85534/?format=api
{ "id": 85534, "url": "http://patches.dpdk.org/api/patches/85534/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201220211405.313012-11-maxime.coquelin@redhat.com/", "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": "<20201220211405.313012-11-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201220211405.313012-11-maxime.coquelin@redhat.com", "date": "2020-12-20T21:13:35", "name": "[10/40] net/virtio: add callback for device closing", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "90d397a2ff2b5fbcb63b672e6eea7cde8bcb2842", "submitter": { "id": 512, "url": "http://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201220211405.313012-11-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14390, "url": "http://patches.dpdk.org/api/series/14390/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=14390", "date": "2020-12-20T21:13:25", "name": "net/virtio: Virtio PMD rework", "version": 1, "mbox": "http://patches.dpdk.org/series/14390/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/85534/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/85534/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id A7896A09FD;\n\tSun, 20 Dec 2020 22:17:42 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EE658CCE0;\n\tSun, 20 Dec 2020 22:15:00 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by dpdk.org (Postfix) with ESMTP id 52955CCDC\n for <dev@dpdk.org>; Sun, 20 Dec 2020 22:14:59 +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-465-pqcsZrbdMZOEh5S3FZQskg-1; Sun, 20 Dec 2020 16:14:54 -0500", "from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com\n [10.5.11.12])\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 D3088107ACE3;\n Sun, 20 Dec 2020 21:14:52 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.43])\n by smtp.corp.redhat.com (Postfix) with ESMTP id F017D60C43;\n Sun, 20 Dec 2020 21:14:50 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1608498897;\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=29h30Bv2jf7yyIjVWL7Wkvjbzlh8/UbgT/uZPBufVhE=;\n b=dw8uXkXPBPDIPHujSTFMfh/wHui0RoKqpdTe4rrNzCQhgZqa9IXdgWD7mv7Qzve5CGncKI\n /45G/k03WamRgRH2hq/1Qz03NtSSeN0cK6MckYc2sCrHXe8iISrHXgsVgIxnA1Pr3WDPa6\n HU0Tneqj9pnWlpDzKuQv6Km5YnoUagI=", "X-MC-Unique": "pqcsZrbdMZOEh5S3FZQskg-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": "Sun, 20 Dec 2020 22:13:35 +0100", "Message-Id": "<20201220211405.313012-11-maxime.coquelin@redhat.com>", "In-Reply-To": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "References": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "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 10/40] net/virtio: add callback for device closing", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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 introduces a new callback for device closing,\nmaking virtio_dev_close() bus-agnostic.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/meson.build | 2 --\n drivers/net/virtio/virtio_ethdev.c | 13 +------------\n drivers/net/virtio/virtio_pci.c | 25 +++++++++++++++++++++++++\n drivers/net/virtio/virtio_pci.h | 2 ++\n drivers/net/virtio/virtio_user_ethdev.c | 11 +++++++++++\n 5 files changed, 39 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build\nindex 8e0f1a9951..0b62418f33 100644\n--- a/drivers/net/virtio/meson.build\n+++ b/drivers/net/virtio/meson.build\n@@ -37,8 +37,6 @@ elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')\n endif\n \n if is_linux\n-\tdpdk_conf.set('RTE_VIRTIO_USER', 1)\n-\n \tsources += files('virtio_user_ethdev.c',\n \t\t'virtio_user/vhost_kernel.c',\n \t\t'virtio_user/vhost_kernel_tap.c',\ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 13e2ec998a..00aa38e4ef 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -718,18 +718,7 @@ virtio_dev_close(struct rte_eth_dev *dev)\n \tvirtio_dev_free_mbufs(dev);\n \tvirtio_free_queues(hw);\n \n-#ifdef RTE_VIRTIO_USER\n-\tif (hw->bus_type == VIRTIO_BUS_USER)\n-\t\tvirtio_user_dev_uninit(dev->data->dev_private);\n-\telse\n-#endif\n-\tif (dev->device) {\n-\t\trte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(dev));\n-\t\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)\n-\t\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n-\t}\n-\n-\treturn 0;\n+\treturn VTPCI_OPS(hw)->dev_close(hw);\n }\n \n static int\ndiff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex 7f0c066968..599d8afa6b 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -241,6 +241,17 @@ legacy_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)\n \t\tVIRTIO_PCI_QUEUE_NOTIFY);\n }\n \n+static int\n+legacy_dev_close(struct virtio_hw *hw)\n+{\n+\tstruct virtio_pci_dev *dev = virtio_pci_get_dev(hw);\n+\n+\trte_pci_unmap_device(dev->pci_dev);\n+\trte_pci_ioport_unmap(VTPCI_IO(hw));\n+\n+\treturn 0;\n+}\n+\n const struct virtio_pci_ops legacy_ops = {\n \t.read_dev_cfg\t= legacy_read_dev_config,\n \t.write_dev_cfg\t= legacy_write_dev_config,\n@@ -255,6 +266,7 @@ const struct virtio_pci_ops legacy_ops = {\n \t.setup_queue\t= legacy_setup_queue,\n \t.del_queue\t= legacy_del_queue,\n \t.notify_queue\t= legacy_notify_queue,\n+\t.dev_close\t= legacy_dev_close,\n };\n \n static inline void\n@@ -446,6 +458,16 @@ modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)\n \trte_write32(notify_data, vq->notify_addr);\n }\n \n+static int\n+modern_dev_close(struct virtio_hw *hw)\n+{\n+\tstruct virtio_pci_dev *dev = virtio_pci_get_dev(hw);\n+\n+\trte_pci_unmap_device(dev->pci_dev);\n+\n+\treturn 0;\n+}\n+\n const struct virtio_pci_ops modern_ops = {\n \t.read_dev_cfg\t= modern_read_dev_config,\n \t.write_dev_cfg\t= modern_write_dev_config,\n@@ -460,6 +482,7 @@ const struct virtio_pci_ops modern_ops = {\n \t.setup_queue\t= modern_setup_queue,\n \t.del_queue\t= modern_del_queue,\n \t.notify_queue\t= modern_notify_queue,\n+\t.dev_close\t= modern_dev_close,\n };\n \n \n@@ -691,6 +714,8 @@ vtpci_init(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n {\n \tstruct virtio_hw *hw = &dev->hw;\n \n+\tdev->pci_dev = pci_dev;\n+\n \t/*\n \t * Try if we can succeed reading virtio pci caps, which exists\n \t * only on modern pci device. If failed, we fallback to legacy\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 3e245ed630..4f7d0e479e 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -239,6 +239,7 @@ struct virtio_pci_ops {\n \tint (*setup_queue)(struct virtio_hw *hw, struct virtqueue *vq);\n \tvoid (*del_queue)(struct virtio_hw *hw, struct virtqueue *vq);\n \tvoid (*notify_queue)(struct virtio_hw *hw, struct virtqueue *vq);\n+\tint (*dev_close)(struct virtio_hw *hw);\n };\n \n struct virtio_net_config;\n@@ -291,6 +292,7 @@ struct virtio_hw {\n \n struct virtio_pci_dev {\n \tstruct virtio_hw hw;\n+\tstruct rte_pci_device *pci_dev;\n \tbool modern;\n };\n \ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex f4775ff141..f9a2dbae71 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -462,6 +462,16 @@ virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)\n \t\t\t strerror(errno));\n }\n \n+static int\n+virtio_user_dev_close(struct virtio_hw *hw)\n+{\n+\tstruct virtio_user_dev *dev = virtio_user_get_dev(hw);\n+\n+\tvirtio_user_dev_uninit(dev);\n+\n+\treturn 0;\n+}\n+\n const struct virtio_pci_ops virtio_user_ops = {\n \t.read_dev_cfg\t= virtio_user_read_dev_config,\n \t.write_dev_cfg\t= virtio_user_write_dev_config,\n@@ -476,6 +486,7 @@ const struct virtio_pci_ops virtio_user_ops = {\n \t.setup_queue\t= virtio_user_setup_queue,\n \t.del_queue\t= virtio_user_del_queue,\n \t.notify_queue\t= virtio_user_notify_queue,\n+\t.dev_close\t= virtio_user_dev_close,\n };\n \n static const char *valid_args[] = {\n", "prefixes": [ "10/40" ] }