From patchwork Mon Feb 16 04:19:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 3380 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E46FCB5CB; Mon, 16 Feb 2015 05:19:29 +0100 (CET) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by dpdk.org (Postfix) with ESMTP id 51C0BB5C3 for ; Mon, 16 Feb 2015 05:19:27 +0100 (CET) Received: by mail-pa0-f47.google.com with SMTP id lf10so32461753pab.6 for ; Sun, 15 Feb 2015 20:19:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=kg9k5Cf3jHLpT0U3Z+7HgOhjc09pXqAkcAWfvxt1dI0=; b=HHlcLhEutyi/i/OAwT1x2cVxs4rxa0RGoh8ZE9ceDgwp4b5diJOfQKaduQGVcBKdcv V5lQrLTrAFU3o12e9QdUTHXO+EEoEsKnqkemET/jbI8vwhHiXe2VexTXgUuLTb8qMRr8 Z8T4nTYOk+VSPf2Wipw5XA8lLr8PSjDGSPqvHsucBsaJ4NwNVg5+CFYWV6GSki6CZ7oc zyTPRNZkZSmPOsgNJhAgctE3HdPwihRrnSOUdCGyqsZsTGO0Tq1dsByBStFHuI7NIcbC 04cMLx7lsSIbH3smzrCXsJcZgHK+hrVsk9GQMvEtrj0cn6LS8MbcxgTZjXhpGDmPaEpN ZIJA== X-Gm-Message-State: ALoCoQnnbt7qPioilfc3XoSzdKKt60ggCxREq/Rxc5f7UpVptv4nO6rDZYF3B84DjdNvyIJJLSU6 X-Received: by 10.67.7.10 with SMTP id cy10mr13061687pad.151.1424060366589; Sun, 15 Feb 2015 20:19:26 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id ji5sm13172929pbd.22.2015.02.15.20.19.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Feb 2015 20:19:25 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Mon, 16 Feb 2015 13:19:09 +0900 Message-Id: <1424060349-23693-2-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424060349-23693-1-git-send-email-mukawa@igel.co.jp> References: <1423709078-20999-1-git-send-email-mukawa@igel.co.jp> <1424060349-23693-1-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1423709078-20999-1-git-send-email-mukawa@igel.co.jp> References: <1423709078-20999-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v8 2/2] librte_pmd_null: Support port hotplug function 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds port hotplug support to Null PMD. v7: - Add parameter checkings. (Thanks to Iremonger, Bernard) v6: - Fix a parameter of rte_eth_dev_free(). v4: - Fix commit title. Signed-off-by: Tetsuya Mukawa Acked-by: Bernard Iremonger --- lib/librte_pmd_null/rte_eth_null.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/librte_pmd_null/rte_eth_null.c b/lib/librte_pmd_null/rte_eth_null.c index 779db63..1bc4ef3 100644 --- a/lib/librte_pmd_null/rte_eth_null.c +++ b/lib/librte_pmd_null/rte_eth_null.c @@ -336,6 +336,13 @@ eth_stats_reset(struct rte_eth_dev *dev) } } +static struct eth_driver rte_null_pmd = { + .pci_drv = { + .name = "rte_null_pmd", + .drv_flags = RTE_PCI_DRV_DETACHABLE, + }, +}; + static void eth_queue_release(void *q) { @@ -429,10 +436,12 @@ eth_dev_null_create(const char *name, data->nb_tx_queues = (uint16_t)nb_tx_queues; data->dev_link = pmd_link; data->mac_addrs = ð_addr; + strncpy(data->name, eth_dev->data->name, strlen(eth_dev->data->name)); eth_dev->data = data; eth_dev->dev_ops = &ops; eth_dev->pci_dev = pci_dev; + eth_dev->driver = &rte_null_pmd; /* finally assign rx and tx ops */ if (packet_copy) { @@ -532,10 +541,36 @@ rte_pmd_null_devinit(const char *name, const char *params) return eth_dev_null_create(name, numa_node, packet_size, packet_copy); } +static int +rte_pmd_null_devuninit(const char *name, const char *params __rte_unused) +{ + struct rte_eth_dev *eth_dev = NULL; + + if (name == NULL) + return -EINVAL; + + RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n", + rte_socket_id()); + + /* reserve an ethdev entry */ + eth_dev = rte_eth_dev_allocated(name); + if (eth_dev == NULL) + return -1; + + rte_free(eth_dev->data->dev_private); + rte_free(eth_dev->data); + rte_free(eth_dev->pci_dev); + + rte_eth_dev_free(eth_dev); + + return 0; +} + static struct rte_driver pmd_null_drv = { .name = "eth_null", .type = PMD_VDEV, .init = rte_pmd_null_devinit, + .uninit = rte_pmd_null_devuninit, }; PMD_REGISTER_DRIVER(pmd_null_drv);