From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by dpdk.org (Postfix) with ESMTP id 389B65A29 for ; Mon, 19 Jan 2015 11:42:00 +0100 (CET) Received: by mail-pd0-f173.google.com with SMTP id fp1so11069430pdb.4 for ; Mon, 19 Jan 2015 02:41:59 -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; bh=hjod8CpT3qozCxCFh5wwW1e+c3yLFSmoPl5+uHhM5OY=; b=kcp/5WloAKGFKMnFfrm0ZSqgci0P3HZzxSWmwmscavQ0ce4XTJRvCMO6gMP2hPfsoJ p8+8eaFWZzxnA/hgahAAEuXQkQNH4JFqVDyukWNEoAhPp4iiNOflhD3M/CGwd7+2J3Ow DLr+XYtWBX88NYDxTSAdzzeg35nP09r86lH2u4m3k+Tdych5fr3pt7IQEbB9oCyfXKNW 93oyLVae3S8tgidbSvcCVlzLNwIoWKG9OBwDHFGxffkM3TSrvProc81pBy/V/6wqu/3Z 8LWR6/PYje0yMSs2jX0V+1kWepWGjB2qmMw5y7qgTVK5Bd1BJDgml65eCBbaFnGvIgFu 8PIg== X-Gm-Message-State: ALoCoQnBDCdGgYna1bLYF67KQBReihzf11NuuD4NsKQj/hDA4NMjG9KYd9yFANMs8tZcbaLiEXNA X-Received: by 10.70.90.10 with SMTP id bs10mr42710535pdb.165.1421664119544; Mon, 19 Jan 2015 02:41:59 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id nk6sm11313284pdb.89.2015.01.19.02.41.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 02:41:58 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Mon, 19 Jan 2015 19:41:47 +0900 Message-Id: <1421664107-18040-1-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418106629-22227-2-git-send-email-mukawa@igel.co.j> References: <1418106629-22227-2-git-send-email-mukawa@igel.co.j> Subject: [dpdk-dev] [PATCH v4] librte_pmd_pcap: Add port hotplug support 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: Mon, 19 Jan 2015 10:42:00 -0000 This patch adds finalization code to free resources allocated by the PMD. v4: - Change function name. Signed-off-by: Tetsuya Mukawa --- lib/librte_pmd_pcap/rte_eth_pcap.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index 5da92a3..13a68de 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -499,6 +499,13 @@ static struct eth_dev_ops ops = { .stats_reset = eth_stats_reset, }; +static struct eth_driver rte_pcap_pmd = { + .pci_drv = { + .name = "rte_pcap_pmd", + .drv_flags = RTE_PCI_DRV_DETACHABLE, + }, +}; + /* * Function handler that opens the pcap file for reading a stores a * reference of it for use it later on. @@ -714,6 +721,10 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, if (*eth_dev == NULL) goto error; + /* check length of device name */ + if ((strlen((*eth_dev)->data->name) + 1) > sizeof(data->name)) + goto error; + /* now put it all together * - store queue data in internals, * - store numa_node info in pci_driver @@ -739,10 +750,13 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, 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_pcap_pmd; return 0; @@ -927,10 +941,36 @@ rte_pmd_pcap_devinit(const char *name, const char *params) } +static int +rte_pmd_pcap_devuninit(const char *name, const char *params __rte_unused) +{ + struct rte_eth_dev *eth_dev = NULL; + + RTE_LOG(INFO, PMD, "Closing pcap ethdev on numa socket %u\n", + rte_socket_id()); + + if (name == NULL) + return -1; + + /* 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(name); + + return 0; +} + static struct rte_driver pmd_pcap_drv = { .name = "eth_pcap", .type = PMD_VDEV, .init = rte_pmd_pcap_devinit, + .uninit = rte_pmd_pcap_devuninit, }; PMD_REGISTER_DRIVER(pmd_pcap_drv); -- 1.9.1