From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by dpdk.org (Postfix) with ESMTP id F151E2A5D for ; Mon, 21 Nov 2016 17:31:19 +0100 (CET) Received: by mail-qt0-f195.google.com with SMTP id n6so26020285qtd.0 for ; Mon, 21 Nov 2016 08:31:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=i0hCuvsiV8D7fJwWvrH4S2QWJZBp42jeIbnrrYIUgbU=; b=tF47vbMxphzNpZSgjYOHjl7GSZ/j2cw6UMtHWCehWJOLLGvA+5+Brk7jI9vXabt7YP 4lGXbHfh4e9dZEZiak3exXqGV83h84wE7NHSvSeRl9vJ2XRmXRoDqBoduz3wApYxMXqk 0KGlaWvYmBOmDolMxcPD4Po8HZ2KWuaj0wOf9geEuMYgpfs5s1edcjiSNtWjp1Of1dnI reZqwbuivHw53As6zA4I4jvj+ExiGoagXE51Upq5A19VEOSsLLSJQxkwDrIgPhx2JEJw lqwbwbawneAsEDgv5Dd962YRfpvwRG2z7ahXmdc0qyh9dtidpG1qFiuKA8jZvzbXGP9t JSvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=i0hCuvsiV8D7fJwWvrH4S2QWJZBp42jeIbnrrYIUgbU=; b=PzUyfIGAKuiW8oe0jYjA8cHi+cgE0Tji/aR8HP5HxlrRimvpFBuzGxQG5JK5bdfrkv uUZkbTWTLZUl9R8Zs9t/adlXrIfmkWUukfztWuYrqJj4IR2JxWDux+3o84GwFNwkrta/ yABUDktpHL1qdnI6sVriEsQ72pBQA1T40BBKH6jYlHLfcS12JSZJPrTpdN6cPBolMwvg QKRfWO+3839X18pFfhr3NVB2eZkZj/srd0cKkagl2Vzcj2mViw1piXUAFpFFTQ0D4OmW ekYE1RKlxzy7RljFHl08c6vxZxETj2bDv6m9rgzdfmsFiGqx4KP9O/ajCUgikABcFEp/ tF7g== X-Gm-Message-State: AKaTC03V9TUCk5VWtIIVruN+J/9N9v/2arLDAKNbhYlj7CsCLv7L5dCell9CqiZQ7TcOTVE4I+yQ4YNPdVRKDw== X-Received: by 10.28.8.202 with SMTP id 193mr15509528wmi.101.1479745878770; Mon, 21 Nov 2016 08:31:18 -0800 (PST) MIME-Version: 1.0 Sender: jblunck@gmail.com Received: by 10.28.191.8 with HTTP; Mon, 21 Nov 2016 08:31:17 -0800 (PST) In-Reply-To: <1478785884-29273-1-git-send-email-david.marchand@6wind.com> References: <1478785884-29273-1-git-send-email-david.marchand@6wind.com> From: Jan Blunck Date: Mon, 21 Nov 2016 17:31:17 +0100 X-Google-Sender-Auth: VDubmHwUxlE_NuRViOHkFbu4aK8 Message-ID: To: David Marchand Cc: Thomas Monjalon , dev@dpdk.org, linville@tuxdriver.com, Declan Doherty , zlu@ezchip.com, lsun@ezchip.com, alejandro.lucero@netronome.com, mtetsuyah@gmail.com, nicolas.pernas.maradei@emutex.com, Ferruh Yigit , harish.patil@qlogic.com, rasesh.mody@qlogic.com, sony.chacko@qlogic.com, Bruce Richardson , huawei.xie@intel.com, Yuanhan Liu , jianfeng.tan@intel.com Content-Type: text/plain; charset=UTF-8 Subject: Re: [dpdk-dev] [PATCH 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: , X-List-Received-Date: Mon, 21 Nov 2016 16:31:20 -0000 On Thu, Nov 10, 2016 at 2:51 PM, David Marchand wrote: > Since b1fb53a39d88 ("ethdev: remove some PCI specific handling"), Please fix this checkpatch finding. > 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 > --- > 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 | 1 - There is another stale variable drivername in qede_ethdev.c. Might be the right time to remove it. Thanks, Jan > 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(+), 26 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 59129f2..a56ba90 100644 > --- a/drivers/net/qede/qede_ethdev.c > +++ b/drivers/net/qede/qede_ethdev.c > @@ -662,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; > > -- > 2.7.4 >