From patchwork Mon Nov 21 18:06:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 17170 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 033E12BC6; Mon, 21 Nov 2016 19:06:27 +0100 (CET) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id D6CFA29D6 for ; Mon, 21 Nov 2016 19:06:25 +0100 (CET) Received: by mail-wm0-f43.google.com with SMTP id a197so161707296wmd.0 for ; Mon, 21 Nov 2016 10:06:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3snHhtkq+1Ul/SnsK//Q6UOpLs5nn/X227E5rguQzrQ=; b=0tgUfVuWdr3H7+xwZjPFUdX/HvHtxdbt3s+AK9cmtxOhMjEgvXLVA++kQHHCHnvzux /Khpdl3tP/PyjA5FpiG+K1lMDwad0d3mpLCCsBj1S430m2EB1yHfZI5XhFpaCRz1jitZ LB/Dncp5YB5pG+T8tsAwgysbL2l4o+7mPJhH4XM7ItCLFIY4Qy/kkKDF5kn2GHlP6yCc jB8EZ7qddrwR+A9bHr5QBOKZX6G8RVdq1+7lPqebowz0Y7TgrbODQlEoW/Ddf7eCDovP CYjs7y28SiiHFf3Hc61l16l8RoAX4+ilPBnrh8AMPk0G2mdJGwkdJdy0XjtjTAUQ0Ksu 7IYQ== 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=3snHhtkq+1Ul/SnsK//Q6UOpLs5nn/X227E5rguQzrQ=; b=GTkeen1k6LTSWGIFifaVj7aE2hWwigqLFrVTnHYCY1hmEArcdBtzRjH0aEwsiheeao naCZ+0B5cJSXeHeWlS0autXkJCDkKcQVXFQ2smQ7PidcdNNExQ0+w+aKkMVAm8ZWhHJT a+h/nFg0+mU/EmmqOi2MKcSPOQmMu+KkDFhW9pKUaOHnU1T4gsaEYL7BNiaf1lnB//id z0jAbsYlpCKLGDgwx8l7nrxHK/vWdpgUZTPcdvNsKd6+y+XjuVG3jxBHrWEY2zooqCvT mQdL5MRv85Q4RALzpajtDOc+yuEZxetQWgpn+yuMiACIH5kNOFRtKAVuzUuUVbjHDBNB Xaxw== X-Gm-Message-State: AKaTC00BL8NUtHrxgaZvvr8DTkl+xHY//KxlYbTXc2MMeuuZ12w1T7XmOgiEuB3kGEhxV0vI X-Received: by 10.28.142.16 with SMTP id q16mr15991972wmd.35.1479751585093; Mon, 21 Nov 2016 10:06:25 -0800 (PST) Received: from gloops.dev.6wind.com (89.156.119.78.rev.sfr.net. [78.119.156.89]) by smtp.gmail.com with ESMTPSA id l74sm20871567wmg.2.2016.11.21.10.06.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 10:06:24 -0800 (PST) From: David Marchand To: thomas.monjalon@6wind.com Cc: dev@dpdk.org, ferruh.yigit@intel.com, jblunck@infradead.org, linville@tuxdriver.com, declan.doherty@intel.com, zlu@ezchip.com, lsun@ezchip.com, alejandro.lucero@netronome.com, mtetsuyah@gmail.com, nicolas.pernas.maradei@emutex.com, harish.patil@qlogic.com, rasesh.mody@qlogic.com, sony.chacko@qlogic.com, bruce.richardson@intel.com, huawei.xie@intel.com, yuanhan.liu@linux.intel.com, jianfeng.tan@intel.com Date: Mon, 21 Nov 2016 19:06:13 +0100 Message-Id: <1479751574-5704-1-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478785884-29273-1-git-send-email-david.marchand@6wind.com> References: <1478785884-29273-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 1/2] net: remove dead driver names 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" Since commit b1fb53a39d88 ("ethdev: remove some PCI specific handling"), rte_eth_dev_info_get() relies on dev->data->drv_name to report the driver name to caller. Having the pmds set driver_info->driver_name in the pmds is useless, since ethdev overwrites it right after. The only thing the pmd must do is: - for pci drivers, call rte_eth_copy_pci_info() which then sets data->drv_name - for vdev drivers, manually set data->drv_name At this stage, virtio-user does not properly report a driver name (fixed in next commit). Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit Reviewed-by: Jan Blunck --- Changes since v1: - fixed commit log (checkpatch warning) - removed stale variable in qede driver (caught by Jan B.) --- drivers/net/af_packet/rte_eth_af_packet.c | 5 +---- drivers/net/nfp/nfp_net.c | 1 - drivers/net/null/rte_eth_null.c | 4 +--- drivers/net/pcap/rte_eth_pcap.c | 4 +--- drivers/net/qede/qede_ethdev.c | 2 -- drivers/net/ring/rte_eth_ring.c | 4 +--- drivers/net/vhost/rte_eth_vhost.c | 3 --- drivers/net/virtio/virtio_ethdev.c | 4 ---- drivers/net/xenvirt/rte_eth_xenvirt.c | 5 +---- 9 files changed, 5 insertions(+), 27 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index ff45068..a66a657 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -115,8 +115,6 @@ static const char *valid_arguments[] = { NULL }; -static const char *drivername = "AF_PACKET PMD"; - static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, @@ -280,7 +278,6 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct pmd_internals *internals = dev->data->dev_private; - dev_info->driver_name = drivername; dev_info->if_index = internals->if_index; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)ETH_FRAME_LEN; @@ -693,7 +690,7 @@ rte_pmd_init_internals(const char *name, (*eth_dev)->dev_ops = &ops; (*eth_dev)->driver = NULL; (*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE; - (*eth_dev)->data->drv_name = drivername; + (*eth_dev)->data->drv_name = "AF_PACKET PMD"; (*eth_dev)->data->kdrv = RTE_KDRV_NONE; (*eth_dev)->data->numa_node = numa_node; diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index c6b1587..0c342ab 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -1006,7 +1006,6 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - dev_info->driver_name = dev->driver->pci_drv.driver.name; dev_info->max_rx_queues = (uint16_t)hw->max_rx_queues; dev_info->max_tx_queues = (uint16_t)hw->max_tx_queues; dev_info->min_rx_bufsize = ETHER_MIN_MTU; diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 836d982..09d77fd 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -88,7 +88,6 @@ struct pmd_internals { static struct ether_addr eth_addr = { .addr_bytes = {0} }; -static const char *drivername = "Null PMD"; static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, @@ -295,7 +294,6 @@ eth_dev_info(struct rte_eth_dev *dev, return; internals = dev->data->dev_private; - dev_info->driver_name = drivername; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)-1; dev_info->max_rx_queues = RTE_DIM(internals->rx_null_queues); @@ -555,7 +553,7 @@ eth_dev_null_create(const char *name, eth_dev->driver = NULL; data->dev_flags = RTE_ETH_DEV_DETACHABLE; data->kdrv = RTE_KDRV_NONE; - data->drv_name = drivername; + data->drv_name = "Null PMD"; data->numa_node = numa_node; /* finally assign rx and tx ops */ diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 0162f44..8b4fba7 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -119,7 +119,6 @@ static struct ether_addr eth_addr = { .addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 } }; -static const char *drivername = "Pcap PMD"; static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, @@ -552,7 +551,6 @@ eth_dev_info(struct rte_eth_dev *dev, { struct pmd_internals *internals = dev->data->dev_private; - dev_info->driver_name = drivername; dev_info->if_index = internals->if_index; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t) -1; @@ -842,7 +840,7 @@ pmd_init_internals(const char *name, const unsigned int nb_rx_queues, (*eth_dev)->driver = NULL; data->dev_flags = RTE_ETH_DEV_DETACHABLE; data->kdrv = RTE_KDRV_NONE; - data->drv_name = drivername; + data->drv_name = "Pcap PMD"; data->numa_node = numa_node; return 0; diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index d106dd0..2c600c1 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -12,7 +12,6 @@ /* Globals */ static const struct qed_eth_ops *qed_ops; -static const char *drivername = "qede pmd"; static int64_t timer_period = 1; struct rte_qede_xstats_name_off { @@ -663,7 +662,6 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev, dev_info->max_vfs = 0; else dev_info->max_vfs = (uint16_t)NUM_OF_VFS(&qdev->edev); - dev_info->driver_name = qdev->drv_ver; dev_info->reta_size = ECORE_RSS_IND_TABLE_SIZE; dev_info->flow_type_rss_offloads = (uint64_t)QEDE_RSS_OFFLOAD_ALL; diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index c1767c4..56afaf2 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -75,7 +75,6 @@ struct pmd_internals { }; -static const char *drivername = "Rings PMD"; static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, @@ -173,7 +172,6 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct pmd_internals *internals = dev->data->dev_private; - dev_info->driver_name = drivername; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)-1; dev_info->max_rx_queues = (uint16_t)internals->max_rx_queues; @@ -343,7 +341,7 @@ do_eth_dev_ring_create(const char *name, eth_dev->dev_ops = &ops; data->dev_flags = RTE_ETH_DEV_DETACHABLE; data->kdrv = RTE_KDRV_NONE; - data->drv_name = drivername; + data->drv_name = "Rings PMD"; data->numa_node = numa_node; TAILQ_INIT(&(eth_dev->link_intr_cbs)); diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 766d4ef..96bf391 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -53,8 +53,6 @@ #define ETH_VHOST_CLIENT_ARG "client" #define ETH_VHOST_DEQUEUE_ZERO_COPY "dequeue-zero-copy" -static const char *drivername = "VHOST PMD"; - static const char *valid_arguments[] = { ETH_VHOST_IFACE_ARG, ETH_VHOST_QUEUES_ARG, @@ -861,7 +859,6 @@ eth_dev_info(struct rte_eth_dev *dev, return; } - dev_info->driver_name = drivername; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)-1; dev_info->max_rx_queues = internal->max_queues; diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 079fd6c..741688e 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1624,10 +1624,6 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) uint64_t tso_mask; struct virtio_hw *hw = dev->data->dev_private; - if (dev->pci_dev) - dev_info->driver_name = dev->driver->pci_drv.driver.name; - else - dev_info->driver_name = "virtio_user PMD"; dev_info->max_rx_queues = RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES); dev_info->max_tx_queues = diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index c08a056..f74d72c 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -70,8 +70,6 @@ /* virtio_idx is increased after new device is created.*/ static int virtio_idx = 0; -static const char *drivername = "xen virtio PMD"; - static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, @@ -331,7 +329,6 @@ eth_dev_info(struct rte_eth_dev *dev, struct pmd_internals *internals = dev->data->dev_private; RTE_SET_USED(internals); - dev_info->driver_name = drivername; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)2048; dev_info->max_rx_queues = (uint16_t)1; @@ -675,7 +672,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, eth_dev->data->dev_flags = RTE_PCI_DRV_DETACHABLE; eth_dev->data->kdrv = RTE_KDRV_NONE; - eth_dev->data->drv_name = drivername; + eth_dev->data->drv_name = "xen virtio PMD"; eth_dev->driver = NULL; eth_dev->data->numa_node = numa_node;