Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64286/?format=api
{ "id": 64286, "url": "http://patches.dpdk.org/api/patches/64286/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200108062510.3478-4-oda@valinux.co.jp/", "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": "<20200108062510.3478-4-oda@valinux.co.jp>", "list_archive_url": "https://inbox.dpdk.org/dev/20200108062510.3478-4-oda@valinux.co.jp", "date": "2020-01-08T06:25:09", "name": "[3/4] net/vhost: delay vhost driver setup", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6f0dc3efacd279307a30eb3641071b7602ce57fc", "submitter": { "id": 1558, "url": "http://patches.dpdk.org/api/people/1558/?format=api", "name": "Itsuro Oda", "email": "oda@valinux.co.jp" }, "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/20200108062510.3478-4-oda@valinux.co.jp/mbox/", "series": [ { "id": 8013, "url": "http://patches.dpdk.org/api/series/8013/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8013", "date": "2020-01-08T06:25:07", "name": "make vhost PMD available for secondary processes", "version": 1, "mbox": "http://patches.dpdk.org/series/8013/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64286/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/64286/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 44364A04FA;\n\tWed, 8 Jan 2020 07:25:50 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D60491D965;\n\tWed, 8 Jan 2020 07:25:20 +0100 (CET)", "from valinux.co.jp (vagw.valinux.co.jp [210.128.90.14])\n by dpdk.org (Postfix) with ESMTP id B0F551D709\n for <dev@dpdk.org>; Wed, 8 Jan 2020 07:25:12 +0100 (CET)", "by valinux.co.jp (Postfix, from userid 1000)\n id D6A622409A1; Wed, 8 Jan 2020 15:25:11 +0900 (JST)" ], "From": "oda@valinux.co.jp", "To": "dev@dpdk.org", "Date": "Wed, 8 Jan 2020 15:25:09 +0900", "Message-Id": "<20200108062510.3478-4-oda@valinux.co.jp>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200108062510.3478-1-oda@valinux.co.jp>", "References": "<20200108062510.3478-1-oda@valinux.co.jp>", "Subject": "[dpdk-dev] [PATCH 3/4] net/vhost: delay vhost driver setup", "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": "From: Itsuro Oda <oda@valinux.co.jp>\n\nsetting vhost driver is delayed at eth_dev configuration\nin order to be able to set it from a secondary process.\n---\n drivers/net/vhost/rte_eth_vhost.c | 130 ++++++++++++++++++------------\n 1 file changed, 78 insertions(+), 52 deletions(-)", "diff": "diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c\nindex 1b07aad24..0b8b5a4ca 100644\n--- a/drivers/net/vhost/rte_eth_vhost.c\n+++ b/drivers/net/vhost/rte_eth_vhost.c\n@@ -96,6 +96,8 @@ struct vhost_queue {\n struct pmd_internal {\n \trte_atomic32_t dev_attached;\n \tchar *iface_name;\n+\tuint64_t flags;\n+\tuint64_t disable_flags;\n \tuint16_t max_queues;\n \tint vid;\n \trte_atomic32_t started;\n@@ -490,17 +492,6 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)\n \treturn nb_tx;\n }\n \n-static int\n-eth_dev_configure(struct rte_eth_dev *dev __rte_unused)\n-{\n-\tstruct pmd_internal *internal = dev->data->dev_private;\n-\tconst struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;\n-\n-\tinternal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);\n-\n-\treturn 0;\n-}\n-\n static inline struct internal_list *\n find_internal_resource(char *ifname)\n {\n@@ -876,6 +867,62 @@ static struct vhost_device_ops vhost_ops = {\n \t.vring_state_changed = vring_state_changed,\n };\n \n+static int\n+vhost_driver_setup(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct pmd_internal *internal = eth_dev->data->dev_private;\n+\tstruct internal_list *list = NULL;\n+\tstruct rte_vhost_vring_state *vring_state = NULL;\n+\tunsigned int numa_node = eth_dev->device->numa_node;\n+\tconst char *name = eth_dev->device->name;\n+\n+\tlist = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);\n+\tif (list == NULL)\n+\t\tgoto error;\n+\n+\tvring_state = rte_zmalloc_socket(name, sizeof(*vring_state),\n+\t\t\t\t\t 0, numa_node);\n+\tif (vring_state == NULL)\n+\t\tgoto error;\n+\n+\tlist->eth_dev = eth_dev;\n+\tpthread_mutex_lock(&internal_list_lock);\n+\tTAILQ_INSERT_TAIL(&internal_list, list, next);\n+\tpthread_mutex_unlock(&internal_list_lock);\n+\n+\trte_spinlock_init(&vring_state->lock);\n+\tvring_states[eth_dev->data->port_id] = vring_state;\n+\n+\tif (rte_vhost_driver_register(internal->iface_name, internal->flags))\n+\t\tgoto error;\n+\n+\tif (internal->disable_flags) {\n+\t\tif (rte_vhost_driver_disable_features(internal->iface_name,\n+\t\t\t\t\t\t internal->disable_flags))\n+\t\t\tgoto error;\n+\t}\n+\n+\tif (rte_vhost_driver_callback_register(internal->iface_name,\n+\t\t\t\t\t &vhost_ops) < 0) {\n+\t\tVHOST_LOG(ERR, \"Can't register callbacks\\n\");\n+\t\tgoto error;\n+\t}\n+\n+\tif (rte_vhost_driver_start(internal->iface_name) < 0) {\n+\t\tVHOST_LOG(ERR, \"Failed to start driver for %s\\n\",\n+\t\t\t internal->iface_name);\n+\t\tgoto error;\n+\t}\n+\n+\treturn 0;\n+\n+error:\n+\trte_free(vring_state);\n+\trte_free(list);\n+\n+\treturn -1;\n+}\n+\n int\n rte_eth_vhost_get_queue_event(uint16_t port_id,\n \t\tstruct rte_eth_vhost_queue_event *event)\n@@ -942,6 +989,24 @@ rte_eth_vhost_get_vid_from_port_id(uint16_t port_id)\n \treturn vid;\n }\n \n+static int\n+eth_dev_configure(struct rte_eth_dev *dev)\n+{\n+\tstruct pmd_internal *internal = dev->data->dev_private;\n+\tconst struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;\n+\n+\t/* NOTE: the same process has to operate a vhost interface\n+\t * from begining to end (eth_dev configure to eth_dev close).\n+\t * It is user's responsibility at the moment.\n+\t */\n+\tif (vhost_driver_setup(dev) < 0)\n+\t\treturn -1;\n+\n+\tinternal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);\n+\n+\treturn 0;\n+}\n+\n static int\n eth_dev_start(struct rte_eth_dev *eth_dev)\n {\n@@ -1217,16 +1282,10 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,\n \tstruct pmd_internal *internal = NULL;\n \tstruct rte_eth_dev *eth_dev = NULL;\n \tstruct rte_ether_addr *eth_addr = NULL;\n-\tstruct rte_vhost_vring_state *vring_state = NULL;\n-\tstruct internal_list *list = NULL;\n \n \tVHOST_LOG(INFO, \"Creating VHOST-USER backend on numa socket %u\\n\",\n \t\tnuma_node);\n \n-\tlist = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);\n-\tif (list == NULL)\n-\t\tgoto error;\n-\n \t/* reserve an ethdev entry */\n \teth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal));\n \tif (eth_dev == NULL)\n@@ -1240,11 +1299,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,\n \t*eth_addr = base_eth_addr;\n \teth_addr->addr_bytes[5] = eth_dev->data->port_id;\n \n-\tvring_state = rte_zmalloc_socket(name,\n-\t\t\tsizeof(*vring_state), 0, numa_node);\n-\tif (vring_state == NULL)\n-\t\tgoto error;\n-\n \t/* now put it all together\n \t * - store queue data in internal,\n \t * - point eth_dev_data to internals\n@@ -1257,18 +1311,12 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,\n \t\tgoto error;\n \tstrcpy(internal->iface_name, iface_name);\n \n-\tlist->eth_dev = eth_dev;\n-\tpthread_mutex_lock(&internal_list_lock);\n-\tTAILQ_INSERT_TAIL(&internal_list, list, next);\n-\tpthread_mutex_unlock(&internal_list_lock);\n-\n-\trte_spinlock_init(&vring_state->lock);\n-\tvring_states[eth_dev->data->port_id] = vring_state;\n-\n \tdata->nb_rx_queues = queues;\n \tdata->nb_tx_queues = queues;\n \tinternal->max_queues = queues;\n \tinternal->vid = -1;\n+\tinternal->flags = flags;\n+\tinternal->disable_flags = disable_flags;\n \tdata->dev_link = pmd_link;\n \tdata->dev_flags = RTE_ETH_DEV_INTR_LSC | RTE_ETH_DEV_CLOSE_REMOVE;\n \n@@ -1278,35 +1326,13 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,\n \teth_dev->rx_pkt_burst = eth_vhost_rx;\n \teth_dev->tx_pkt_burst = eth_vhost_tx;\n \n-\tif (rte_vhost_driver_register(iface_name, flags))\n-\t\tgoto error;\n-\n-\tif (disable_flags) {\n-\t\tif (rte_vhost_driver_disable_features(iface_name,\n-\t\t\t\t\tdisable_flags))\n-\t\t\tgoto error;\n-\t}\n-\n-\tif (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {\n-\t\tVHOST_LOG(ERR, \"Can't register callbacks\\n\");\n-\t\tgoto error;\n-\t}\n-\n-\tif (rte_vhost_driver_start(iface_name) < 0) {\n-\t\tVHOST_LOG(ERR, \"Failed to start driver for %s\\n\",\n-\t\t\tiface_name);\n-\t\tgoto error;\n-\t}\n-\n \trte_eth_dev_probing_finish(eth_dev);\n \treturn data->port_id;\n \n error:\n \tif (internal)\n \t\trte_free(internal->iface_name);\n-\trte_free(vring_state);\n \trte_eth_dev_release_port(eth_dev);\n-\trte_free(list);\n \n \treturn -1;\n }\n", "prefixes": [ "3/4" ] }