From: Bruce Richardson <bruce.richardson@intel.com>
To: Bernard Iremonger <bernard.iremonger@intel.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [RFC PATCH V2] librte_pmd_ring: changes to support PCI Port Hotplug
Date: Wed, 6 May 2015 17:15:30 +0100 [thread overview]
Message-ID: <20150506161530.GA11456@bricha3-MOBL3> (raw)
In-Reply-To: <1430836601-12248-1-git-send-email-bernard.iremonger@intel.com>
On Tue, May 05, 2015 at 03:36:41PM +0100, Bernard Iremonger wrote:
> This patch depends on the Port Hotplug Framework.
> It implements the rte_dev_uninit_t() function for the ring pmd.
>
> Changes in V2:
>
> Fix crash in the rte_pmd_ring_devuninit() function.
>
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
This seems to work fine in testing with testpmd.
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> lib/librte_pmd_ring/rte_eth_ring.c | 92 +++++++++++++++++++++++++++--------
> 1 files changed, 71 insertions(+), 21 deletions(-)
>
> diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c
> index 6832f01..6d32e6b 100644
> --- a/lib/librte_pmd_ring/rte_eth_ring.c
> +++ b/lib/librte_pmd_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));
> @@ -531,20 +532,34 @@ 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;
>
> @@ -558,8 +573,17 @@ 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,
> + 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);
> + }
> }
> }
> }
> @@ -570,10 +594,36 @@ 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
>
next prev parent reply other threads:[~2015-05-06 16:15 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <RFC PATCH>
2015-04-08 10:02 ` [dpdk-dev] [RFC PATCH] librte_pmd_ixgbe: " Bernard Iremonger
2015-04-22 3:14 ` Qiu, Michael
2015-04-08 14:11 ` [dpdk-dev] [RFC PATCH] librte_pmd_e1000: igb and em1000 PCI Port Hotplug changes Bernard Iremonger
2015-04-30 13:16 ` [dpdk-dev] [RFC PATCH 1/1] librte_pmd_ring: changes to support PCI Port Hotplug Bernard Iremonger
2015-04-30 15:40 ` [dpdk-dev] [RFC PATCH 1/4] librte_pmd_i40e: " Bernard Iremonger
2015-04-30 15:41 ` [dpdk-dev] [RFC PATCH 2/4] librte_pmd_i40e: release vmdq vsi's in dev_close Bernard Iremonger
2015-04-30 15:42 ` [dpdk-dev] [RFC PATCH 3/4] librte_pmd_i40e: increase ASQ_DELAY_MS to 100 in i40evf_wait_cmd_done() Bernard Iremonger
2015-04-30 15:42 ` [dpdk-dev] [RFC PATCH 4/4] librte_pmd_i40e: call _clear_cmd() when error occurs Bernard Iremonger
2015-05-01 14:36 ` [dpdk-dev] [RFC PATCH] librte_pmd_bond: add support for PCI Port Hotplug Bernard Iremonger
2015-05-01 15:17 ` Neil Horman
2015-05-01 15:28 ` [dpdk-dev] [RFC PATCH] librte_pmd_virtio: " Bernard Iremonger
2015-05-05 14:36 ` [dpdk-dev] [RFC PATCH V2] librte_pmd_ring: changes to support " Bernard Iremonger
2015-05-06 16:15 ` Bruce Richardson [this message]
2015-05-06 10:22 ` [dpdk-dev] [RFC PATCH V2] librte_pmd_ixgbe: " Bernard Iremonger
2015-05-06 11:20 ` [dpdk-dev] [RFC PATCH V2] librte_pmd_e1000: igb and em1000 PCI Port Hotplug changes Bernard Iremonger
2015-05-27 16:00 ` [dpdk-dev] [RFC PATCH V2 1/2] drivers/net/virtio: add support for PCI Port Hotplug Bernard Iremonger
2015-05-27 16:00 ` [dpdk-dev] [RFC PATCH V2 2/2] drivers/net/virtio: check vq parameter Bernard Iremonger
2015-06-16 1:08 ` Ouyang, Changchun
2015-05-28 12:28 ` [dpdk-dev] [RFC PATCH V2] drivers/net/bonding: add support for PCI Port Hotplug Bernard Iremonger
2015-05-29 13:46 ` [dpdk-dev] [RFC PATCH V3] drivers/net/ring: changes to support " Bernard Iremonger
2015-06-03 15:21 ` Bruce Richardson
2015-06-02 10:18 ` [dpdk-dev] [RFC PATCH V3] ixgbe: " Bernard Iremonger
2015-06-03 14:03 ` [dpdk-dev] [RFC PATCH V3] e1000: igb and em1000 PCI Port Hotplug changes Bernard Iremonger
2015-06-04 16:24 ` [dpdk-dev] [RFC PATCH V2 1/4] i40e: changes to support PCI Port Hotplug Bernard Iremonger
2015-06-24 8:03 ` Qiu, Michael
2015-06-04 16:25 ` [dpdk-dev] [RFC PATCH V2 2/4] i40e: release vmdq vsi's in dev_close Bernard Iremonger
2015-06-04 16:25 ` [dpdk-dev] [RFC PATCH V2 3/4] i40e: increase ASQ_DELAY_MS to 100 in i40evf_wait_cmd_done() Bernard Iremonger
2015-06-04 16:26 ` [dpdk-dev] [RFC PATCH V2 4/4] i40e: call _clear_cmd() when error occurs Bernard Iremonger
2015-06-08 15:47 ` [dpdk-dev] [RFC PATCH V4] ixgbe: changes to support PCI Port Hotplug Bernard Iremonger
2015-06-15 22:31 ` Ananyev, Konstantin
2015-06-17 6:11 ` Zhang, Helin
2015-06-24 7:45 ` Qiu, Michael
2015-06-24 7:46 ` Qiu, Michael
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 0/5] PCI Port Hotplug changes Bernard Iremonger
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 1/5] i40e: changes to support PCI Port Hotplug Bernard Iremonger
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 2/5] i40e: release vmdq vsi's in dev_close Bernard Iremonger
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 3/5] i40e: increase ASQ_DELAY_MS to 100 in i40evf_wait_cmd_done() Bernard Iremonger
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 4/5] i40e: call _clear_cmd() when error occurs Bernard Iremonger
2015-06-10 8:27 ` [dpdk-dev] [RFC PATCH V3 5/5] i40e: clear queues in i40evf_dev_stop Bernard Iremonger
2015-06-10 12:09 ` [dpdk-dev] [RFC PATCH V4] e1000: igb and em1000 PCI Port Hotplug changes Bernard Iremonger
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 0/6] remove pci driver from vdevs Bernard Iremonger
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 1/6] librte_ether: add fields from rte_pci_driver to rte_eth_dev and rte_eth_dev_data Bernard Iremonger
2015-08-31 14:07 ` Thomas Monjalon
2015-09-01 11:38 ` Iremonger, Bernard
2015-09-01 12:03 ` Bruce Richardson
2015-09-01 12:37 ` Ananyev, Konstantin
2015-09-01 12:43 ` Richardson, Bruce
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 2/6] librte_ether: handle RTE_ETH_DEV_INTR_LSC for vdevs Bernard Iremonger
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 3/6] null: remove pci device driver Bernard Iremonger
2015-08-31 14:11 ` Thomas Monjalon
2015-08-31 16:05 ` Iremonger, Bernard
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 4/6] ring: " Bernard Iremonger
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 5/6] bonding: " Bernard Iremonger
2015-08-27 17:48 ` Stephen Hemminger
2015-08-28 8:32 ` Iremonger, Bernard
2015-08-28 15:57 ` Stephen Hemminger
2015-08-27 15:40 ` [dpdk-dev] [RFC PATCH 6/6] pcap: " Bernard Iremonger
2015-08-27 17:43 ` [dpdk-dev] [RFC PATCH 0/6] remove pci driver from vdevs John W. Linville
2015-08-28 8:15 ` Iremonger, Bernard
2015-08-28 10:32 ` Neil Horman
2015-08-28 19:48 ` Wiles, Keith
2015-08-31 11:21 ` Iremonger, Bernard
2015-08-31 12:41 ` Neil Horman
2015-08-28 17:51 ` John W. Linville
2015-08-31 10:23 ` Iremonger, Bernard
2015-08-31 12:59 ` Neil Horman
2015-08-31 14:22 ` Thomas Monjalon
2015-09-01 13:38 ` Iremonger, Bernard
2015-09-01 19:18 ` Neil Horman
2015-09-03 14:02 ` Iremonger, Bernard
2015-09-07 9:22 ` Zende, Amruta S
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 00/18] refactor eal driver registration code Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 01/18] librte_eal: remove type field from rte_driver structure Bernard Iremonger
2015-09-04 13:08 ` Thomas Monjalon
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 02/18] af_packet: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 03/18] bnx2x: remove type field and initialise name field in " Bernard Iremonger
2015-09-04 11:26 ` Harish Patil
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 04/18] bonding: remove type field from " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 05/18] cxgbe: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 06/18] e1000: remove type field and initialise name field in rte_driver structures Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 07/18] enic: remove type field and initialise name field in rte_driver structure Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 08/18] fm10k: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 09/18] i40e: remove type field and initialise name field in rte_driver structures Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 10/18] ixgbe: remove type field and initialise name field in rte_driver structure Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 11/18] mlx4: remove type field from " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 12/18] mpipe: remove type field and update name in " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 13/18] null: remove type field from " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 14/18] pcap: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 15/18] ring: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 16/18] virtio_ethdev: remove type field and initialise name field in " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 17/18] vmxnet3: " Bernard Iremonger
2015-09-04 11:01 ` [dpdk-dev] [RFC PATCH 18/18] xenvirt: remove type field from " Bernard Iremonger
2015-09-04 11:18 ` [dpdk-dev] [RFC PATCH 00/18] refactor eal driver registration code Bruce Richardson
2015-09-04 12:46 ` Iremonger, Bernard
2015-09-04 12:53 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150506161530.GA11456@bricha3-MOBL3 \
--to=bruce.richardson@intel.com \
--cc=bernard.iremonger@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).