From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id A3150E62 for ; Tue, 7 Jul 2015 15:09:50 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 07 Jul 2015 06:09:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,423,1432623600"; d="scan'208";a="724315030" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 07 Jul 2015 06:09:35 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t67D9YuQ021339; Tue, 7 Jul 2015 14:09:34 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t67D9YMb015764; Tue, 7 Jul 2015 14:09:34 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t67D9Yeb015760; Tue, 7 Jul 2015 14:09:34 +0100 From: Bernard Iremonger To: dev@dpdk.org Date: Tue, 7 Jul 2015 14:09:23 +0100 Message-Id: <1436274563-15555-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1436274563-15555-1-git-send-email-bernard.iremonger@intel.com> References: <1436274563-15555-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v4 1/1] ring: changes to support PCI Port Hotplug X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jul 2015 13:09:51 -0000 This patch depends on the Port Hotplug Framework. It implements the rte_dev_uninit_t() function for the ring pmd. Signed-off-by: Bernard Iremonger Acked-by: Bruce Richardson --- drivers/net/ring/rte_eth_ring.c | 97 ++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 22 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index ada025f..6fd3d0a 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -252,6 +252,15 @@ static const struct eth_dev_ops ops = { .mac_addr_add = eth_mac_addr_add, }; +static struct eth_driver rte_ring_pmd = { + .pci_drv = { + .name = "rte_ring_pmd", + .drv_flags = RTE_PCI_DRV_DETACHABLE, + }, +}; + +static struct rte_pci_id id_table; + int rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, @@ -263,8 +272,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], struct rte_pci_device *pci_dev = NULL; struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; - struct eth_driver *eth_drv = NULL; - struct rte_pci_id *id_table = NULL; unsigned i; @@ -288,10 +295,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], if (pci_dev == NULL) goto error; - id_table = rte_zmalloc_socket(name, sizeof(*id_table), 0, numa_node); - if (id_table == NULL) - goto error; - internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node); if (internals == NULL) goto error; @@ -301,9 +304,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], if (eth_dev == NULL) goto error; - eth_drv = rte_zmalloc_socket(name, sizeof(*eth_drv), 0, numa_node); - if (eth_drv == NULL) - goto error; /* now put it all together * - store queue data in internals, @@ -323,21 +323,22 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], internals->tx_ring_queues[i].rng = tx_queues[i]; } - eth_drv->pci_drv.name = ring_ethdev_driver_name; - eth_drv->pci_drv.id_table = id_table; + rte_ring_pmd.pci_drv.name = ring_ethdev_driver_name; + rte_ring_pmd.pci_drv.id_table = &id_table; pci_dev->numa_node = numa_node; - pci_dev->driver = ð_drv->pci_drv; + pci_dev->driver = &rte_ring_pmd.pci_drv; data->dev_private = internals; data->port_id = eth_dev->data->port_id; + memmove(data->name, eth_dev->data->name, sizeof(data->name)); data->nb_rx_queues = (uint16_t)nb_rx_queues; data->nb_tx_queues = (uint16_t)nb_tx_queues; data->dev_link = pmd_link; data->mac_addrs = &internals->address; eth_dev->data = data; - eth_dev->driver = eth_drv; + eth_dev->driver = &rte_ring_pmd; eth_dev->dev_ops = &ops; eth_dev->pci_dev = pci_dev; TAILQ_INIT(&(eth_dev->link_intr_cbs)); @@ -532,20 +533,37 @@ rte_pmd_ring_devinit(const char *name, const char *params) RTE_LOG(INFO, PMD, "Initializing pmd_ring for %s\n", name); - if (params == NULL || params[0] == '\0') - eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); + if (params == NULL || params[0] == '\0') { + ret = eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); + if (ret == -1) { + RTE_LOG(INFO, PMD, + "Attach to pmd_ring for %s\n", name); + ret = eth_dev_ring_create(name, rte_socket_id(), + DEV_ATTACH); + } + } else { kvlist = rte_kvargs_parse(params, valid_arguments); if (!kvlist) { RTE_LOG(INFO, PMD, "Ignoring unsupported parameters when creating" " rings-backed ethernet device\n"); - eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); - return 0; + ret = eth_dev_ring_create(name, rte_socket_id(), + DEV_CREATE); + if (ret == -1) { + RTE_LOG(INFO, PMD, + "Attach to pmd_ring for %s\n", + name); + ret = eth_dev_ring_create(name, rte_socket_id(), + DEV_ATTACH); + } + return ret; } else { ret = rte_kvargs_count(kvlist, ETH_RING_NUMA_NODE_ACTION_ARG); - info = rte_zmalloc("struct node_action_list", sizeof(struct node_action_list) + - (sizeof(struct node_action_pair) * ret), 0); + info = rte_zmalloc("struct node_action_list", + sizeof(struct node_action_list) + + (sizeof(struct node_action_pair) * ret), + 0); if (!info) goto out_free; @@ -559,8 +577,18 @@ rte_pmd_ring_devinit(const char *name, const char *params) goto out_free; for (info->count = 0; info->count < info->total; info->count++) { - eth_dev_ring_create(name, info->list[info->count].node, - info->list[info->count].action); + ret = eth_dev_ring_create(name, + info->list[info->count].node, + info->list[info->count].action); + if ((ret == -1) && + (info->list[info->count].action == DEV_CREATE)) { + RTE_LOG(INFO, PMD, + "Attach to pmd_ring for %s\n", + name); + ret = eth_dev_ring_create(name, + info->list[info->count].node, + DEV_ATTACH); + } } } } @@ -571,10 +599,35 @@ out_free: return ret; } +static int +rte_pmd_ring_devuninit(const char *name) +{ + struct rte_eth_dev *eth_dev = NULL; + + RTE_LOG(INFO, PMD, "Un-Initializing pmd_ring for %s\n", name); + + if (name == NULL) + return -EINVAL; + + /* find an ethdev entry */ + eth_dev = rte_eth_dev_allocated(name); + if (eth_dev == NULL) + return -ENODEV; + + eth_dev_stop(eth_dev); + rte_free(eth_dev->data->dev_private); + rte_free(eth_dev->data); + rte_free(eth_dev->pci_dev); + + rte_eth_dev_release_port(eth_dev); + return 0; +} + static struct rte_driver pmd_ring_drv = { .name = "eth_ring", .type = PMD_VDEV, .init = rte_pmd_ring_devinit, + .uninit = rte_pmd_ring_devuninit, }; PMD_REGISTER_DRIVER(pmd_ring_drv); -- 1.7.4.1