From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 5D4718E8C for ; Mon, 31 Aug 2015 03:41:22 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 30 Aug 2015 18:40:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,436,1437462000"; d="scan'208";a="794388956" Received: from pgsmsx102.gar.corp.intel.com ([10.221.44.80]) by fmsmga002.fm.intel.com with ESMTP; 30 Aug 2015 18:40:56 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.110.15) by PGSMSX102.gar.corp.intel.com (10.221.44.80) with Microsoft SMTP Server (TLS) id 14.3.224.2; Mon, 31 Aug 2015 09:38:53 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.210]) with mapi id 14.03.0224.002; Mon, 31 Aug 2015 09:38:45 +0800 From: "Ouyang, Changchun" To: Stephen Hemminger , "Xie, Huawei" Thread-Topic: [PATCH 2/3] virtio: fix Coverity unsigned warnings Thread-Index: AQHQ4a3kj7B54jI82E+rboBUPbXmEp4lV6Rw Date: Mon, 31 Aug 2015 01:38:44 +0000 Message-ID: References: <1440779019-10793-1-git-send-email-stephen@networkplumber.org> <1440779019-10793-3-git-send-email-stephen@networkplumber.org> In-Reply-To: <1440779019-10793-3-git-send-email-stephen@networkplumber.org> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH 2/3] virtio: fix Coverity unsigned warnings 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, 31 Aug 2015 01:41:23 -0000 Hi Stephen, > -----Original Message----- > From: Stephen Hemminger [mailto:stephen@networkplumber.org] > Sent: Saturday, August 29, 2015 12:24 AM > To: Xie, Huawei; Ouyang, Changchun > Cc: dev@dpdk.org; Stephen Hemminger > Subject: [PATCH 2/3] virtio: fix Coverity unsigned warnings >=20 > There are some places in virtio driver where uint16_t or int are used whe= re it > would be safer to use unsigned. Why will it be safer? >=20 > Signed-off-by: Stephen Hemminger > --- > drivers/net/virtio/virtio_ethdev.c | 7 +- > drivers/net/virtio/virtio_ethdev.c.orig | 1577 > +++++++++++++++++++++++++++++++ > drivers/net/virtio/virtio_ring.h | 4 +- > drivers/net/virtio/virtio_rxtx.c | 4 +- > 4 files changed, 1584 insertions(+), 8 deletions(-) create mode 100644 > drivers/net/virtio/virtio_ethdev.c.orig >=20 > diff --git a/drivers/net/virtio/virtio_ethdev.c > b/drivers/net/virtio/virtio_ethdev.c > index 8c3e924..338d891 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -261,21 +261,20 @@ int virtio_dev_queue_setup(struct rte_eth_dev > *dev, { > char vq_name[VIRTQUEUE_MAX_NAME_SZ]; > const struct rte_memzone *mz; > - uint16_t vq_size; > - int size; > + unsigned int vq_size, size; > struct virtio_hw *hw =3D dev->data->dev_private; > struct virtqueue *vq =3D NULL; >=20 > /* Write the virtqueue index to the Queue Select Field */ > VIRTIO_WRITE_REG_2(hw, VIRTIO_PCI_QUEUE_SEL, > vtpci_queue_idx); > - PMD_INIT_LOG(DEBUG, "selecting queue: %d", vtpci_queue_idx); > + PMD_INIT_LOG(DEBUG, "selecting queue: %u", vtpci_queue_idx); >=20 > /* > * Read the virtqueue size from the Queue Size field > * Always power of 2 and if 0 virtqueue does not exist > */ > vq_size =3D VIRTIO_READ_REG_2(hw, VIRTIO_PCI_QUEUE_NUM); > - PMD_INIT_LOG(DEBUG, "vq_size: %d nb_desc:%d", vq_size, > nb_desc); > + PMD_INIT_LOG(DEBUG, "vq_size: %u nb_desc:%u", vq_size, > nb_desc); > if (vq_size =3D=3D 0) { > PMD_INIT_LOG(ERR, "%s: virtqueue does not exist", > __func__); > return -EINVAL; > diff --git a/drivers/net/virtio/virtio_ethdev.c.orig > b/drivers/net/virtio/virtio_ethdev.c.orig > new file mode 100644 > index 0000000..465d3cd > --- /dev/null > +++ b/drivers/net/virtio/virtio_ethdev.c.orig I don't think we need this orig file. > @@ -0,0 +1,1577 @@ > +/*- > + * BSD LICENSE > + * > + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyrig= ht > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name of Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT > NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND > FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS > OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED > AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR > TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF > THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH > DAMAGE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#ifdef RTE_EXEC_ENV_LINUXAPP > +#include > +#include > +#endif > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > + > +#include "virtio_ethdev.h" > +#include "virtio_pci.h" > +#include "virtio_logs.h" > +#include "virtqueue.h" > + > + > +static int eth_virtio_dev_init(struct rte_eth_dev *eth_dev); static int > +eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev); static int > +virtio_dev_configure(struct rte_eth_dev *dev); static int > +virtio_dev_start(struct rte_eth_dev *dev); static void > +virtio_dev_stop(struct rte_eth_dev *dev); static void > +virtio_dev_promiscuous_enable(struct rte_eth_dev *dev); static void > +virtio_dev_promiscuous_disable(struct rte_eth_dev *dev); static void > +virtio_dev_allmulticast_enable(struct rte_eth_dev *dev); static void > +virtio_dev_allmulticast_disable(struct rte_eth_dev *dev); static void > +virtio_dev_info_get(struct rte_eth_dev *dev, > + struct rte_eth_dev_info *dev_info); static int > +virtio_dev_link_update(struct rte_eth_dev *dev, > + __rte_unused int wait_to_complete); > + > +static void virtio_set_hwaddr(struct virtio_hw *hw); static void > +virtio_get_hwaddr(struct virtio_hw *hw); > + > +static void virtio_dev_stats_get(struct rte_eth_dev *dev, struct > +rte_eth_stats *stats); static void virtio_dev_stats_reset(struct > +rte_eth_dev *dev); static void virtio_dev_free_mbufs(struct rte_eth_dev > +*dev); static int virtio_vlan_filter_set(struct rte_eth_dev *dev, > + uint16_t vlan_id, int on); > +static void virtio_mac_addr_add(struct rte_eth_dev *dev, > + struct ether_addr *mac_addr, > + uint32_t index, uint32_t vmdq > __rte_unused); static void > +virtio_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index); static > +void virtio_mac_addr_set(struct rte_eth_dev *dev, > + struct ether_addr *mac_addr); > + > +static int virtio_dev_queue_stats_mapping_set( > + __rte_unused struct rte_eth_dev *eth_dev, > + __rte_unused uint16_t queue_id, > + __rte_unused uint8_t stat_idx, > + __rte_unused uint8_t is_rx); > + > +/* > + * The set of PCI devices this driver supports */ static const struct > +rte_pci_id pci_id_virtio_map[] =3D { > + > +#define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev) {RTE_PCI_DEVICE(vend, > +dev)}, #include "rte_pci_dev_ids.h" > + > +{ .vendor_id =3D 0, /* sentinel */ }, > +}; > + > +static int > +virtio_send_command(struct virtqueue *vq, struct virtio_pmd_ctrl *ctrl, > + int *dlen, int pkt_num) > +{ > + uint32_t head, i; > + int k, sum =3D 0; > + virtio_net_ctrl_ack status =3D ~0; > + struct virtio_pmd_ctrl result; > + > + ctrl->status =3D status; > + > + if (!(vq && vq->hw->cvq)) { > + PMD_INIT_LOG(ERR, > + "%s(): Control queue is not supported.", > + __func__); > + return -1; > + } > + head =3D vq->vq_desc_head_idx; > + > + PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx =3D %d, status =3D %d, > " > + "vq->hw->cvq =3D %p vq =3D %p", > + vq->vq_desc_head_idx, status, vq->hw->cvq, vq); > + > + if ((vq->vq_free_cnt < ((uint32_t)pkt_num + 2)) || (pkt_num < 1)) > + return -1; > + > + memcpy(vq->virtio_net_hdr_mz->addr, ctrl, > + sizeof(struct virtio_pmd_ctrl)); > + > + /* > + * Format is enforced in qemu code: > + * One TX packet for header; > + * At least one TX packet per argument; > + * One RX packet for ACK. > + */ > + vq->vq_ring.desc[head].flags =3D VRING_DESC_F_NEXT; > + vq->vq_ring.desc[head].addr =3D vq->virtio_net_hdr_mz->phys_addr; > + vq->vq_ring.desc[head].len =3D sizeof(struct virtio_net_ctrl_hdr); > + vq->vq_free_cnt--; > + i =3D vq->vq_ring.desc[head].next; > + > + for (k =3D 0; k < pkt_num; k++) { > + vq->vq_ring.desc[i].flags =3D VRING_DESC_F_NEXT; > + vq->vq_ring.desc[i].addr =3D vq->virtio_net_hdr_mz- > >phys_addr > + + sizeof(struct virtio_net_ctrl_hdr) > + + sizeof(ctrl->status) + sizeof(uint8_t)*sum; > + vq->vq_ring.desc[i].len =3D dlen[k]; > + sum +=3D dlen[k]; > + vq->vq_free_cnt--; > + i =3D vq->vq_ring.desc[i].next; > + } > + > + vq->vq_ring.desc[i].flags =3D VRING_DESC_F_WRITE; > + vq->vq_ring.desc[i].addr =3D vq->virtio_net_hdr_mz->phys_addr > + + sizeof(struct virtio_net_ctrl_hdr); > + vq->vq_ring.desc[i].len =3D sizeof(ctrl->status); > + vq->vq_free_cnt--; > + > + vq->vq_desc_head_idx =3D vq->vq_ring.desc[i].next; > + > + vq_update_avail_ring(vq, head); > + vq_update_avail_idx(vq); > + > + PMD_INIT_LOG(DEBUG, "vq->vq_queue_index =3D %d", vq- > >vq_queue_index); > + > + virtqueue_notify(vq); > + > + rte_rmb(); > + while (vq->vq_used_cons_idx =3D=3D vq->vq_ring.used->idx) { > + rte_rmb(); > + usleep(100); > + } > + > + while (vq->vq_used_cons_idx !=3D vq->vq_ring.used->idx) { > + uint32_t idx, desc_idx, used_idx; > + struct vring_used_elem *uep; > + > + used_idx =3D (uint32_t)(vq->vq_used_cons_idx > + & (vq->vq_nentries - 1)); > + uep =3D &vq->vq_ring.used->ring[used_idx]; > + idx =3D (uint32_t) uep->id; > + desc_idx =3D idx; > + > + while (vq->vq_ring.desc[desc_idx].flags & > VRING_DESC_F_NEXT) { > + desc_idx =3D vq->vq_ring.desc[desc_idx].next; > + vq->vq_free_cnt++; > + } > + > + vq->vq_ring.desc[desc_idx].next =3D vq->vq_desc_head_idx; > + vq->vq_desc_head_idx =3D idx; > + > + vq->vq_used_cons_idx++; > + vq->vq_free_cnt++; > + } > + > + PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=3D%d\nvq- > >vq_desc_head_idx=3D%d", > + vq->vq_free_cnt, vq->vq_desc_head_idx); > + > + memcpy(&result, vq->virtio_net_hdr_mz->addr, > + sizeof(struct virtio_pmd_ctrl)); > + > + return result.status; > +} > + > +static int > +virtio_set_multiple_queues(struct rte_eth_dev *dev, uint16_t nb_queues) > +{ > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int dlen[1]; > + int ret; > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_MQ; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET; > + memcpy(ctrl.data, &nb_queues, sizeof(uint16_t)); > + > + dlen[0] =3D sizeof(uint16_t); > + > + ret =3D virtio_send_command(hw->cvq, &ctrl, dlen, 1); > + if (ret) { > + PMD_INIT_LOG(ERR, "Multiqueue configured but send > command " > + "failed, this is too late now..."); > + return -EINVAL; > + } > + > + return 0; > +} > + > +void > +virtio_dev_queue_release(struct virtqueue *vq) { > + struct virtio_hw *hw =3D vq->hw; > + > + if (vq) { > + /* Select and deactivate the queue */ > + VIRTIO_WRITE_REG_2(hw, VIRTIO_PCI_QUEUE_SEL, vq- > >queue_id); > + VIRTIO_WRITE_REG_4(hw, VIRTIO_PCI_QUEUE_PFN, 0); > + > + rte_free(vq); > + vq =3D NULL; > + } > +} > + > +int virtio_dev_queue_setup(struct rte_eth_dev *dev, > + int queue_type, > + uint16_t queue_idx, > + uint16_t vtpci_queue_idx, > + uint16_t nb_desc, > + unsigned int socket_id, > + struct virtqueue **pvq) > +{ > + char vq_name[VIRTQUEUE_MAX_NAME_SZ]; > + const struct rte_memzone *mz; > + uint16_t vq_size; > + int size; > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtqueue *vq =3D NULL; > + > + /* Write the virtqueue index to the Queue Select Field */ > + VIRTIO_WRITE_REG_2(hw, VIRTIO_PCI_QUEUE_SEL, > vtpci_queue_idx); > + PMD_INIT_LOG(DEBUG, "selecting queue: %d", vtpci_queue_idx); > + > + /* > + * Read the virtqueue size from the Queue Size field > + * Always power of 2 and if 0 virtqueue does not exist > + */ > + vq_size =3D VIRTIO_READ_REG_2(hw, VIRTIO_PCI_QUEUE_NUM); > + PMD_INIT_LOG(DEBUG, "vq_size: %d nb_desc:%d", vq_size, > nb_desc); > + if (vq_size =3D=3D 0) { > + PMD_INIT_LOG(ERR, "%s: virtqueue does not exist", > __func__); > + return -EINVAL; > + } > + > + if (!rte_is_power_of_2(vq_size)) { > + PMD_INIT_LOG(ERR, "%s: virtqueue size is not powerof 2", > __func__); > + return -EINVAL; > + } > + > + if (queue_type =3D=3D VTNET_RQ) { > + snprintf(vq_name, sizeof(vq_name), "port%d_rvq%d", > + dev->data->port_id, queue_idx); > + vq =3D rte_zmalloc(vq_name, sizeof(struct virtqueue) + > + vq_size * sizeof(struct vq_desc_extra), > RTE_CACHE_LINE_SIZE); > + } else if (queue_type =3D=3D VTNET_TQ) { > + snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d", > + dev->data->port_id, queue_idx); > + vq =3D rte_zmalloc(vq_name, sizeof(struct virtqueue) + > + vq_size * sizeof(struct vq_desc_extra), > RTE_CACHE_LINE_SIZE); > + } else if (queue_type =3D=3D VTNET_CQ) { > + snprintf(vq_name, sizeof(vq_name), "port%d_cvq", > + dev->data->port_id); > + vq =3D rte_zmalloc(vq_name, sizeof(struct virtqueue) + > + vq_size * sizeof(struct vq_desc_extra), > + RTE_CACHE_LINE_SIZE); > + } > + if (vq =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue", > __func__); > + return (-ENOMEM); > + } > + > + vq->hw =3D hw; > + vq->port_id =3D dev->data->port_id; > + vq->queue_id =3D queue_idx; > + vq->vq_queue_index =3D vtpci_queue_idx; > + vq->vq_nentries =3D vq_size; > + > + if (nb_desc =3D=3D 0 || nb_desc > vq_size) > + nb_desc =3D vq_size; > + vq->vq_free_cnt =3D nb_desc; > + > + /* > + * Reserve a memzone for vring elements > + */ > + size =3D vring_size(vq_size, VIRTIO_PCI_VRING_ALIGN); > + vq->vq_ring_size =3D RTE_ALIGN_CEIL(size, > VIRTIO_PCI_VRING_ALIGN); > + PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d", > size, > +vq->vq_ring_size); > + > + mz =3D rte_memzone_reserve_aligned(vq_name, vq->vq_ring_size, > + socket_id, 0, VIRTIO_PCI_VRING_ALIGN); > + if (mz =3D=3D NULL) { > + if (rte_errno =3D=3D EEXIST) > + mz =3D rte_memzone_lookup(vq_name); > + if (mz =3D=3D NULL) { > + rte_free(vq); > + return -ENOMEM; > + } > + } > + > + /* > + * Virtio PCI device VIRTIO_PCI_QUEUE_PF register is 32bit, > + * and only accepts 32 bit page frame number. > + * Check if the allocated physical memory exceeds 16TB. > + */ > + if ((mz->phys_addr + vq->vq_ring_size - 1) >> > (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) { > + PMD_INIT_LOG(ERR, "vring address shouldn't be above > 16TB!"); > + rte_free(vq); > + return -ENOMEM; > + } > + > + memset(mz->addr, 0, sizeof(mz->len)); > + vq->mz =3D mz; > + vq->vq_ring_mem =3D mz->phys_addr; > + vq->vq_ring_virt_mem =3D mz->addr; > + PMD_INIT_LOG(DEBUG, "vq->vq_ring_mem: 0x%"PRIx64, > (uint64_t)mz->phys_addr); > + PMD_INIT_LOG(DEBUG, "vq->vq_ring_virt_mem: 0x%"PRIx64, > (uint64_t)(uintptr_t)mz->addr); > + vq->virtio_net_hdr_mz =3D NULL; > + vq->virtio_net_hdr_mem =3D 0; > + > + if (queue_type =3D=3D VTNET_TQ) { > + /* > + * For each xmit packet, allocate a virtio_net_hdr > + */ > + snprintf(vq_name, sizeof(vq_name), > "port%d_tvq%d_hdrzone", > + dev->data->port_id, queue_idx); > + vq->virtio_net_hdr_mz =3D > rte_memzone_reserve_aligned(vq_name, > + vq_size * hw->vtnet_hdr_size, > + socket_id, 0, RTE_CACHE_LINE_SIZE); > + if (vq->virtio_net_hdr_mz =3D=3D NULL) { > + if (rte_errno =3D=3D EEXIST) > + vq->virtio_net_hdr_mz =3D > + rte_memzone_lookup(vq_name); > + if (vq->virtio_net_hdr_mz =3D=3D NULL) { > + rte_free(vq); > + return -ENOMEM; > + } > + } > + vq->virtio_net_hdr_mem =3D > + vq->virtio_net_hdr_mz->phys_addr; > + memset(vq->virtio_net_hdr_mz->addr, 0, > + vq_size * hw->vtnet_hdr_size); > + } else if (queue_type =3D=3D VTNET_CQ) { > + /* Allocate a page for control vq command, data and status > */ > + snprintf(vq_name, sizeof(vq_name), "port%d_cvq_hdrzone", > + dev->data->port_id); > + vq->virtio_net_hdr_mz =3D > rte_memzone_reserve_aligned(vq_name, > + PAGE_SIZE, socket_id, 0, RTE_CACHE_LINE_SIZE); > + if (vq->virtio_net_hdr_mz =3D=3D NULL) { > + if (rte_errno =3D=3D EEXIST) > + vq->virtio_net_hdr_mz =3D > + rte_memzone_lookup(vq_name); > + if (vq->virtio_net_hdr_mz =3D=3D NULL) { > + rte_free(vq); > + return -ENOMEM; > + } > + } > + vq->virtio_net_hdr_mem =3D > + vq->virtio_net_hdr_mz->phys_addr; > + memset(vq->virtio_net_hdr_mz->addr, 0, PAGE_SIZE); > + } > + > + /* > + * Set guest physical address of the virtqueue > + * in VIRTIO_PCI_QUEUE_PFN config register of device > + */ > + VIRTIO_WRITE_REG_4(hw, VIRTIO_PCI_QUEUE_PFN, > + mz->phys_addr >> > VIRTIO_PCI_QUEUE_ADDR_SHIFT); > + *pvq =3D vq; > + return 0; > +} > + > +static int > +virtio_dev_cq_queue_setup(struct rte_eth_dev *dev, uint16_t > vtpci_queue_idx, > + uint32_t socket_id) > +{ > + struct virtqueue *vq; > + int ret; > + struct virtio_hw *hw =3D dev->data->dev_private; > + > + PMD_INIT_FUNC_TRACE(); > + ret =3D virtio_dev_queue_setup(dev, VTNET_CQ, > VTNET_SQ_CQ_QUEUE_IDX, > + vtpci_queue_idx, 0, socket_id, &vq); > + if (ret < 0) { > + PMD_INIT_LOG(ERR, "control vq initialization failed"); > + return ret; > + } > + > + hw->cvq =3D vq; > + return 0; > +} > + > +static void > +virtio_free_queues(struct rte_eth_dev *dev) { > + unsigned int i; > + > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) > + virtio_dev_rx_queue_release(dev->data->rx_queues[i]); > + > + dev->data->nb_rx_queues =3D 0; > + > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) > + virtio_dev_tx_queue_release(dev->data->tx_queues[i]); > + > + dev->data->nb_tx_queues =3D 0; > +} > + > +static void > +virtio_dev_close(struct rte_eth_dev *dev) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct rte_pci_device *pci_dev =3D dev->pci_dev; > + > + PMD_INIT_LOG(DEBUG, "virtio_dev_close"); > + > + /* reset the NIC */ > + if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) > + vtpci_irq_config(hw, VIRTIO_MSI_NO_VECTOR); > + vtpci_reset(hw); > + hw->started =3D 0; > + virtio_dev_free_mbufs(dev); > + virtio_free_queues(dev); > +} > + > +static void > +virtio_dev_promiscuous_enable(struct rte_eth_dev *dev) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int dlen[1]; > + int ret; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) { > + PMD_INIT_LOG(INFO, "host does not support rx control\n"); > + return; > + } > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_RX; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_RX_PROMISC; > + ctrl.data[0] =3D 1; > + dlen[0] =3D 1; > + > + ret =3D virtio_send_command(hw->cvq, &ctrl, dlen, 1); > + if (ret) > + PMD_INIT_LOG(ERR, "Failed to enable promisc"); } > + > +static void > +virtio_dev_promiscuous_disable(struct rte_eth_dev *dev) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int dlen[1]; > + int ret; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) { > + PMD_INIT_LOG(INFO, "host does not support rx control\n"); > + return; > + } > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_RX; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_RX_PROMISC; > + ctrl.data[0] =3D 0; > + dlen[0] =3D 1; > + > + ret =3D virtio_send_command(hw->cvq, &ctrl, dlen, 1); > + if (ret) > + PMD_INIT_LOG(ERR, "Failed to disable promisc"); } > + > +static void > +virtio_dev_allmulticast_enable(struct rte_eth_dev *dev) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int dlen[1]; > + int ret; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) { > + PMD_INIT_LOG(INFO, "host does not support rx control\n"); > + return; > + } > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_RX; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_RX_ALLMULTI; > + ctrl.data[0] =3D 1; > + dlen[0] =3D 1; > + > + ret =3D virtio_send_command(hw->cvq, &ctrl, dlen, 1); > + if (ret) > + PMD_INIT_LOG(ERR, "Failed to enable allmulticast"); } > + > +static void > +virtio_dev_allmulticast_disable(struct rte_eth_dev *dev) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int dlen[1]; > + int ret; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) { > + PMD_INIT_LOG(INFO, "host does not support rx control\n"); > + return; > + } > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_RX; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_RX_ALLMULTI; > + ctrl.data[0] =3D 0; > + dlen[0] =3D 1; > + > + ret =3D virtio_send_command(hw->cvq, &ctrl, dlen, 1); > + if (ret) > + PMD_INIT_LOG(ERR, "Failed to disable allmulticast"); } > + > +/* > + * dev_ops for virtio, bare necessities for basic operation */ static > +const struct eth_dev_ops virtio_eth_dev_ops =3D { > + .dev_configure =3D virtio_dev_configure, > + .dev_start =3D virtio_dev_start, > + .dev_stop =3D virtio_dev_stop, > + .dev_close =3D virtio_dev_close, > + .promiscuous_enable =3D virtio_dev_promiscuous_enable, > + .promiscuous_disable =3D virtio_dev_promiscuous_disable, > + .allmulticast_enable =3D virtio_dev_allmulticast_enable, > + .allmulticast_disable =3D virtio_dev_allmulticast_disable, > + > + .dev_infos_get =3D virtio_dev_info_get, > + .stats_get =3D virtio_dev_stats_get, > + .stats_reset =3D virtio_dev_stats_reset, > + .link_update =3D virtio_dev_link_update, > + .rx_queue_setup =3D virtio_dev_rx_queue_setup, > + .rx_queue_release =3D virtio_dev_rx_queue_release, > + .tx_queue_setup =3D virtio_dev_tx_queue_setup, > + .tx_queue_release =3D virtio_dev_tx_queue_release, > + /* collect stats per queue */ > + .queue_stats_mapping_set =3D virtio_dev_queue_stats_mapping_set, > + .vlan_filter_set =3D virtio_vlan_filter_set, > + .mac_addr_add =3D virtio_mac_addr_add, > + .mac_addr_remove =3D virtio_mac_addr_remove, > + .mac_addr_set =3D virtio_mac_addr_set, > +}; > + > +static inline int > +virtio_dev_atomic_read_link_status(struct rte_eth_dev *dev, > + struct rte_eth_link *link) > +{ > + struct rte_eth_link *dst =3D link; > + struct rte_eth_link *src =3D &(dev->data->dev_link); > + > + if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, > + *(uint64_t *)src) =3D=3D 0) > + return -1; > + > + return 0; > +} > + > +/** > + * Atomically writes the link status information into global > + * structure rte_eth_dev. > + * > + * @param dev > + * - Pointer to the structure rte_eth_dev to read from. > + * - Pointer to the buffer to be saved with the link status. > + * > + * @return > + * - On success, zero. > + * - On failure, negative value. > + */ > +static inline int > +virtio_dev_atomic_write_link_status(struct rte_eth_dev *dev, > + struct rte_eth_link *link) > +{ > + struct rte_eth_link *dst =3D &(dev->data->dev_link); > + struct rte_eth_link *src =3D link; > + > + if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, > + *(uint64_t *)src) =3D=3D 0) > + return -1; > + > + return 0; > +} > + > +static void > +virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats > +*stats) { > + unsigned i; > + > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) { > + const struct virtqueue *txvq =3D dev->data->tx_queues[i]; > + if (txvq =3D=3D NULL) > + continue; > + > + stats->opackets +=3D txvq->packets; > + stats->obytes +=3D txvq->bytes; > + stats->oerrors +=3D txvq->errors; > + > + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { > + stats->q_opackets[i] =3D txvq->packets; > + stats->q_obytes[i] =3D txvq->bytes; > + } > + } > + > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > + const struct virtqueue *rxvq =3D dev->data->rx_queues[i]; > + if (rxvq =3D=3D NULL) > + continue; > + > + stats->ipackets +=3D rxvq->packets; > + stats->ibytes +=3D rxvq->bytes; > + stats->ierrors +=3D rxvq->errors; > + > + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { > + stats->q_ipackets[i] =3D rxvq->packets; > + stats->q_ibytes[i] =3D rxvq->bytes; > + } > + } > + > + stats->rx_nombuf =3D dev->data->rx_mbuf_alloc_failed; } > + > +static void > +virtio_dev_stats_reset(struct rte_eth_dev *dev) { > + unsigned int i; > + > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) { > + struct virtqueue *txvq =3D dev->data->tx_queues[i]; > + if (txvq =3D=3D NULL) > + continue; > + > + txvq->packets =3D 0; > + txvq->bytes =3D 0; > + txvq->errors =3D 0; > + } > + > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > + struct virtqueue *rxvq =3D dev->data->rx_queues[i]; > + if (rxvq =3D=3D NULL) > + continue; > + > + rxvq->packets =3D 0; > + rxvq->bytes =3D 0; > + rxvq->errors =3D 0; > + } > + > + dev->data->rx_mbuf_alloc_failed =3D 0; > +} > + > +static void > +virtio_set_hwaddr(struct virtio_hw *hw) { > + vtpci_write_dev_config(hw, > + offsetof(struct virtio_net_config, mac), > + &hw->mac_addr, ETHER_ADDR_LEN); > +} > + > +static void > +virtio_get_hwaddr(struct virtio_hw *hw) { > + if (vtpci_with_feature(hw, VIRTIO_NET_F_MAC)) { > + vtpci_read_dev_config(hw, > + offsetof(struct virtio_net_config, mac), > + &hw->mac_addr, ETHER_ADDR_LEN); > + } else { > + eth_random_addr(&hw->mac_addr[0]); > + virtio_set_hwaddr(hw); > + } > +} > + > +static void > +virtio_mac_table_set(struct virtio_hw *hw, > + const struct virtio_net_ctrl_mac *uc, > + const struct virtio_net_ctrl_mac *mc) { > + struct virtio_pmd_ctrl ctrl; > + int err, len[2]; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_MAC_ADDR)) { > + PMD_DRV_LOG(INFO, "host does not support mac table\n"); > + return; > + } > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_MAC; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_MAC_TABLE_SET; > + > + len[0] =3D uc->entries * ETHER_ADDR_LEN + sizeof(uc->entries); > + memcpy(ctrl.data, uc, len[0]); > + > + len[1] =3D mc->entries * ETHER_ADDR_LEN + sizeof(mc->entries); > + memcpy(ctrl.data + len[0], mc, len[1]); > + > + err =3D virtio_send_command(hw->cvq, &ctrl, len, 2); > + if (err !=3D 0) > + PMD_DRV_LOG(NOTICE, "mac table set failed: %d", err); } > + > +static void > +virtio_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr > *mac_addr, > + uint32_t index, uint32_t vmdq __rte_unused) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + const struct ether_addr *addrs =3D dev->data->mac_addrs; > + unsigned int i; > + struct virtio_net_ctrl_mac *uc, *mc; > + > + if (index >=3D VIRTIO_MAX_MAC_ADDRS) { > + PMD_DRV_LOG(ERR, "mac address index %u out of range", > index); > + return; > + } > + > + uc =3D alloca(VIRTIO_MAX_MAC_ADDRS * ETHER_ADDR_LEN + > sizeof(uc->entries)); > + uc->entries =3D 0; > + mc =3D alloca(VIRTIO_MAX_MAC_ADDRS * ETHER_ADDR_LEN + > sizeof(mc->entries)); > + mc->entries =3D 0; > + > + for (i =3D 0; i < VIRTIO_MAX_MAC_ADDRS; i++) { > + const struct ether_addr *addr > + =3D (i =3D=3D index) ? mac_addr : addrs + i; > + struct virtio_net_ctrl_mac *tbl > + =3D is_multicast_ether_addr(addr) ? mc : uc; > + > + memcpy(&tbl->macs[tbl->entries++], addr, > ETHER_ADDR_LEN); > + } > + > + virtio_mac_table_set(hw, uc, mc); > +} > + > +static void > +virtio_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct ether_addr *addrs =3D dev->data->mac_addrs; > + struct virtio_net_ctrl_mac *uc, *mc; > + unsigned int i; > + > + if (index >=3D VIRTIO_MAX_MAC_ADDRS) { > + PMD_DRV_LOG(ERR, "mac address index %u out of range", > index); > + return; > + } > + > + uc =3D alloca(VIRTIO_MAX_MAC_ADDRS * ETHER_ADDR_LEN + > sizeof(uc->entries)); > + uc->entries =3D 0; > + mc =3D alloca(VIRTIO_MAX_MAC_ADDRS * ETHER_ADDR_LEN + > sizeof(mc->entries)); > + mc->entries =3D 0; > + > + for (i =3D 0; i < VIRTIO_MAX_MAC_ADDRS; i++) { > + struct virtio_net_ctrl_mac *tbl; > + > + if (i =3D=3D index || is_zero_ether_addr(addrs + i)) > + continue; > + > + tbl =3D is_multicast_ether_addr(addrs + i) ? mc : uc; > + memcpy(&tbl->macs[tbl->entries++], addrs + i, > ETHER_ADDR_LEN); > + } > + > + virtio_mac_table_set(hw, uc, mc); > +} > + > +static void > +virtio_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr > +*mac_addr) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + > + memcpy(hw->mac_addr, mac_addr, ETHER_ADDR_LEN); > + > + /* Use atomic update if available */ > + if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_MAC_ADDR)) { > + struct virtio_pmd_ctrl ctrl; > + int len =3D ETHER_ADDR_LEN; > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_MAC; > + ctrl.hdr.cmd =3D VIRTIO_NET_CTRL_MAC_ADDR_SET; > + > + memcpy(ctrl.data, mac_addr, ETHER_ADDR_LEN); > + virtio_send_command(hw->cvq, &ctrl, &len, 1); > + } else if (vtpci_with_feature(hw, VIRTIO_NET_F_MAC)) > + virtio_set_hwaddr(hw); > +} > + > +static int > +virtio_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int > +on) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct virtio_pmd_ctrl ctrl; > + int len; > + > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VLAN)) > + return -ENOTSUP; > + > + ctrl.hdr.class =3D VIRTIO_NET_CTRL_VLAN; > + ctrl.hdr.cmd =3D on ? VIRTIO_NET_CTRL_VLAN_ADD : > VIRTIO_NET_CTRL_VLAN_DEL; > + memcpy(ctrl.data, &vlan_id, sizeof(vlan_id)); > + len =3D sizeof(vlan_id); > + > + return virtio_send_command(hw->cvq, &ctrl, &len, 1); } > + > +static void > +virtio_negotiate_features(struct virtio_hw *hw) { > + uint32_t host_features; > + > + /* Prepare guest_features: feature that driver wants to support */ > + hw->guest_features =3D VIRTIO_PMD_GUEST_FEATURES; > + PMD_INIT_LOG(DEBUG, "guest_features before negotiate =3D %x", > + hw->guest_features); > + > + /* Read device(host) feature bits */ > + host_features =3D VIRTIO_READ_REG_4(hw, > VIRTIO_PCI_HOST_FEATURES); > + PMD_INIT_LOG(DEBUG, "host_features before negotiate =3D %x", > + host_features); > + > + /* > + * Negotiate features: Subset of device feature bits are written back > + * guest feature bits. > + */ > + hw->guest_features =3D vtpci_negotiate_features(hw, host_features); > + PMD_INIT_LOG(DEBUG, "features after negotiate =3D %x", > + hw->guest_features); > +} > + > +#ifdef RTE_EXEC_ENV_LINUXAPP > +static int > +parse_sysfs_value(const char *filename, unsigned long *val) { > + FILE *f; > + char buf[BUFSIZ]; > + char *end =3D NULL; > + > + f =3D fopen(filename, "r"); > + if (f =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "%s(): cannot open sysfs value %s", > + __func__, filename); > + return -1; > + } > + > + if (fgets(buf, sizeof(buf), f) =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "%s(): cannot read sysfs value %s", > + __func__, filename); > + fclose(f); > + return -1; > + } > + *val =3D strtoul(buf, &end, 0); > + if ((buf[0] =3D=3D '\0') || (end =3D=3D NULL) || (*end !=3D '\n')) { > + PMD_INIT_LOG(ERR, "%s(): cannot parse sysfs value %s", > + __func__, filename); > + fclose(f); > + return -1; > + } > + fclose(f); > + return 0; > +} > + > +static int get_uio_dev(struct rte_pci_addr *loc, char *buf, unsigned int > buflen, > + unsigned int *uio_num) > +{ > + struct dirent *e; > + DIR *dir; > + char dirname[PATH_MAX]; > + > + /* depending on kernel version, uio can be located in uio/uioX > + * or uio:uioX */ > + snprintf(dirname, sizeof(dirname), > + SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/uio", > + loc->domain, loc->bus, loc->devid, loc->function); > + dir =3D opendir(dirname); > + if (dir =3D=3D NULL) { > + /* retry with the parent directory */ > + snprintf(dirname, sizeof(dirname), > + SYSFS_PCI_DEVICES "/" PCI_PRI_FMT, > + loc->domain, loc->bus, loc->devid, loc->function); > + dir =3D opendir(dirname); > + > + if (dir =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "Cannot opendir %s", dirname); > + return -1; > + } > + } > + > + /* take the first file starting with "uio" */ > + while ((e =3D readdir(dir)) !=3D NULL) { > + /* format could be uio%d ...*/ > + int shortprefix_len =3D sizeof("uio") - 1; > + /* ... or uio:uio%d */ > + int longprefix_len =3D sizeof("uio:uio") - 1; > + char *endptr; > + > + if (strncmp(e->d_name, "uio", 3) !=3D 0) > + continue; > + > + /* first try uio%d */ > + errno =3D 0; > + *uio_num =3D strtoull(e->d_name + shortprefix_len, &endptr, > 10); > + if (errno =3D=3D 0 && endptr !=3D (e->d_name + shortprefix_len)) { > + snprintf(buf, buflen, "%s/uio%u", dirname, > *uio_num); > + break; > + } > + > + /* then try uio:uio%d */ > + errno =3D 0; > + *uio_num =3D strtoull(e->d_name + longprefix_len, &endptr, > 10); > + if (errno =3D=3D 0 && endptr !=3D (e->d_name + longprefix_len)) { > + snprintf(buf, buflen, "%s/uio:uio%u", dirname, > + *uio_num); > + break; > + } > + } > + closedir(dir); > + > + /* No uio resource found */ > + if (e =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "Could not find uio resource"); > + return -1; > + } > + > + return 0; > +} > + > +static int > +virtio_has_msix(const struct rte_pci_addr *loc) { > + DIR *d; > + char dirname[PATH_MAX]; > + > + snprintf(dirname, sizeof(dirname), > + SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/msi_irqs", > + loc->domain, loc->bus, loc->devid, loc->function); > + > + d =3D opendir(dirname); > + if (d) > + closedir(d); > + > + return (d !=3D NULL); > +} > + > +/* Extract I/O port numbers from sysfs */ static int > +virtio_resource_init_by_uio(struct rte_pci_device *pci_dev) { > + char dirname[PATH_MAX]; > + char filename[PATH_MAX]; > + unsigned long start, size; > + unsigned int uio_num; > + > + if (get_uio_dev(&pci_dev->addr, dirname, sizeof(dirname), > &uio_num) < 0) > + return -1; > + > + /* get portio size */ > + snprintf(filename, sizeof(filename), > + "%s/portio/port0/size", dirname); > + if (parse_sysfs_value(filename, &size) < 0) { > + PMD_INIT_LOG(ERR, "%s(): cannot parse size", > + __func__); > + return -1; > + } > + > + /* get portio start */ > + snprintf(filename, sizeof(filename), > + "%s/portio/port0/start", dirname); > + if (parse_sysfs_value(filename, &start) < 0) { > + PMD_INIT_LOG(ERR, "%s(): cannot parse portio start", > + __func__); > + return -1; > + } > + pci_dev->mem_resource[0].addr =3D (void *)(uintptr_t)start; > + pci_dev->mem_resource[0].len =3D (uint64_t)size; > + PMD_INIT_LOG(DEBUG, > + "PCI Port IO found start=3D0x%lx with size=3D0x%lx", > + start, size); > + > + /* save fd */ > + memset(dirname, 0, sizeof(dirname)); > + snprintf(dirname, sizeof(dirname), "/dev/uio%u", uio_num); > + pci_dev->intr_handle.fd =3D open(dirname, O_RDWR); > + if (pci_dev->intr_handle.fd < 0) { > + PMD_INIT_LOG(ERR, "Cannot open %s: %s\n", > + dirname, strerror(errno)); > + return -1; > + } > + > + pci_dev->intr_handle.type =3D RTE_INTR_HANDLE_UIO; > + pci_dev->driver->drv_flags |=3D RTE_PCI_DRV_INTR_LSC; > + > + return 0; > +} > + > +/* Extract port I/O numbers from proc/ioports */ static int > +virtio_resource_init_by_ioports(struct rte_pci_device *pci_dev) { > + uint16_t start, end; > + int size; > + FILE *fp; > + char *line =3D NULL; > + char pci_id[16]; > + int found =3D 0; > + size_t linesz; > + > + snprintf(pci_id, sizeof(pci_id), PCI_PRI_FMT, > + pci_dev->addr.domain, > + pci_dev->addr.bus, > + pci_dev->addr.devid, > + pci_dev->addr.function); > + > + fp =3D fopen("/proc/ioports", "r"); > + if (fp =3D=3D NULL) { > + PMD_INIT_LOG(ERR, "%s(): can't open ioports", __func__); > + return -1; > + } > + > + while (getdelim(&line, &linesz, '\n', fp) > 0) { > + char *ptr =3D line; > + char *left; > + int n; > + > + n =3D strcspn(ptr, ":"); > + ptr[n] =3D 0; > + left =3D &ptr[n+1]; > + > + while (*left && isspace(*left)) > + left++; > + > + if (!strncmp(left, pci_id, strlen(pci_id))) { > + found =3D 1; > + > + while (*ptr && isspace(*ptr)) > + ptr++; > + > + sscanf(ptr, "%04hx-%04hx", &start, &end); > + size =3D end - start + 1; > + > + break; > + } > + } > + > + free(line); > + fclose(fp); > + > + if (!found) > + return -1; > + > + pci_dev->mem_resource[0].addr =3D (void *)(uintptr_t)(uint32_t)start; > + pci_dev->mem_resource[0].len =3D (uint64_t)size; > + PMD_INIT_LOG(DEBUG, > + "PCI Port IO found start=3D0x%x with size=3D0x%x", > + start, size); > + > + /* can't support lsc interrupt without uio */ > + pci_dev->driver->drv_flags &=3D ~RTE_PCI_DRV_INTR_LSC; > + > + return 0; > +} > + > +/* Extract I/O port numbers from sysfs */ static int > +virtio_resource_init(struct rte_pci_device *pci_dev) { > + if (virtio_resource_init_by_uio(pci_dev) =3D=3D 0) > + return 0; > + else > + return virtio_resource_init_by_ioports(pci_dev); > +} > + > +#else > +static int > +virtio_has_msix(const struct rte_pci_addr *loc __rte_unused) { > + /* nic_uio does not enable interrupts, return 0 (false). */ > + return 0; > +} > + > +static int virtio_resource_init(struct rte_pci_device *pci_dev > +__rte_unused) { > + /* no setup required */ > + return 0; > +} > +#endif > + > +/* > + * Process Virtio Config changed interrupt and call the callback > + * if link state changed. > + */ > +static void > +virtio_interrupt_handler(__rte_unused struct rte_intr_handle *handle, > + void *param) > +{ > + struct rte_eth_dev *dev =3D param; > + struct virtio_hw *hw =3D dev->data->dev_private; > + uint8_t isr; > + > + /* Read interrupt status which clears interrupt */ > + isr =3D vtpci_isr(hw); > + PMD_DRV_LOG(INFO, "interrupt status =3D %#x", isr); > + > + if (rte_intr_enable(&dev->pci_dev->intr_handle) < 0) > + PMD_DRV_LOG(ERR, "interrupt enable failed"); > + > + if (isr & VIRTIO_PCI_ISR_CONFIG) { > + if (virtio_dev_link_update(dev, 0) =3D=3D 0) > + _rte_eth_dev_callback_process(dev, > + > RTE_ETH_EVENT_INTR_LSC); > + } > + > +} > + > +static void > +rx_func_get(struct rte_eth_dev *eth_dev) { > + struct virtio_hw *hw =3D eth_dev->data->dev_private; > + if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) > + eth_dev->rx_pkt_burst =3D &virtio_recv_mergeable_pkts; > + else > + eth_dev->rx_pkt_burst =3D &virtio_recv_pkts; } > + > +/* > + * This function is based on probe() function in virtio_pci.c > + * It returns 0 on success. > + */ > +static int > +eth_virtio_dev_init(struct rte_eth_dev *eth_dev) { > + struct virtio_hw *hw =3D eth_dev->data->dev_private; > + struct virtio_net_config *config; > + struct virtio_net_config local_config; > + uint32_t offset_conf =3D sizeof(config->mac); > + struct rte_pci_device *pci_dev; > + > + RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM < sizeof(struct > +virtio_net_hdr)); > + > + eth_dev->dev_ops =3D &virtio_eth_dev_ops; > + eth_dev->tx_pkt_burst =3D &virtio_xmit_pkts; > + > + if (rte_eal_process_type() =3D=3D RTE_PROC_SECONDARY) { > + rx_func_get(eth_dev); > + return 0; > + } > + > + /* Allocate memory for storing MAC addresses */ > + eth_dev->data->mac_addrs =3D rte_zmalloc("virtio", > ETHER_ADDR_LEN, 0); > + if (eth_dev->data->mac_addrs =3D=3D NULL) { > + PMD_INIT_LOG(ERR, > + "Failed to allocate %d bytes needed to store MAC > addresses", > + ETHER_ADDR_LEN); > + return -ENOMEM; > + } > + > + pci_dev =3D eth_dev->pci_dev; > + if (virtio_resource_init(pci_dev) < 0) > + return -1; > + > + hw->use_msix =3D virtio_has_msix(&pci_dev->addr); > + hw->io_base =3D (uint32_t)(uintptr_t)pci_dev- > >mem_resource[0].addr; > + > + /* Reset the device although not necessary at startup */ > + vtpci_reset(hw); > + > + /* Tell the host we've noticed this device. */ > + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_ACK); > + > + /* Tell the host we've known how to drive the device. */ > + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER); > + virtio_negotiate_features(hw); > + > + rx_func_get(eth_dev); > + > + /* Setting up rx_header size for the device */ > + if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) > + hw->vtnet_hdr_size =3D sizeof(struct > virtio_net_hdr_mrg_rxbuf); > + else > + hw->vtnet_hdr_size =3D sizeof(struct virtio_net_hdr); > + > + /* Copy the permanent MAC address to: virtio_hw */ > + virtio_get_hwaddr(hw); > + ether_addr_copy((struct ether_addr *) hw->mac_addr, > + ð_dev->data->mac_addrs[0]); > + PMD_INIT_LOG(DEBUG, > + "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X", > + hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], > + hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); > + > + if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VQ)) { > + config =3D &local_config; > + > + if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) { > + offset_conf +=3D sizeof(config->status); > + } else { > + PMD_INIT_LOG(DEBUG, > + "VIRTIO_NET_F_STATUS is not > supported"); > + config->status =3D 0; > + } > + > + if (vtpci_with_feature(hw, VIRTIO_NET_F_MQ)) { > + offset_conf +=3D sizeof(config->max_virtqueue_pairs); > + } else { > + PMD_INIT_LOG(DEBUG, > + "VIRTIO_NET_F_MQ is not supported"); > + config->max_virtqueue_pairs =3D 1; > + } > + > + vtpci_read_dev_config(hw, 0, (uint8_t *)config, offset_conf); > + > + hw->max_rx_queues =3D > + (VIRTIO_MAX_RX_QUEUES < config- > >max_virtqueue_pairs) ? > + VIRTIO_MAX_RX_QUEUES : config- > >max_virtqueue_pairs; > + hw->max_tx_queues =3D > + (VIRTIO_MAX_TX_QUEUES < config- > >max_virtqueue_pairs) ? > + VIRTIO_MAX_TX_QUEUES : config- > >max_virtqueue_pairs; > + > + virtio_dev_cq_queue_setup(eth_dev, > + config->max_virtqueue_pairs * 2, > + SOCKET_ID_ANY); > + > + PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=3D%d", > + config->max_virtqueue_pairs); > + PMD_INIT_LOG(DEBUG, "config->status=3D%d", config- > >status); > + PMD_INIT_LOG(DEBUG, > + "PORT > MAC: %02X:%02X:%02X:%02X:%02X:%02X", > + config->mac[0], config->mac[1], > + config->mac[2], config->mac[3], > + config->mac[4], config->mac[5]); > + } else { > + hw->max_rx_queues =3D 1; > + hw->max_tx_queues =3D 1; > + } > + > + eth_dev->data->nb_rx_queues =3D hw->max_rx_queues; > + eth_dev->data->nb_tx_queues =3D hw->max_tx_queues; > + > + PMD_INIT_LOG(DEBUG, "hw->max_rx_queues=3D%d hw- > >max_tx_queues=3D%d", > + hw->max_rx_queues, hw->max_tx_queues); > + PMD_INIT_LOG(DEBUG, "port %d vendorID=3D0x%x deviceID=3D0x%x", > + eth_dev->data->port_id, pci_dev->id.vendor_id, > + pci_dev->id.device_id); > + > + /* Setup interrupt callback */ > + if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) > + rte_intr_callback_register(&pci_dev->intr_handle, > + virtio_interrupt_handler, eth_dev); > + > + virtio_dev_cq_start(eth_dev); > + > + return 0; > +} > + > +static int > +eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) { > + struct rte_pci_device *pci_dev; > + struct virtio_hw *hw =3D eth_dev->data->dev_private; > + > + PMD_INIT_FUNC_TRACE(); > + > + if (rte_eal_process_type() =3D=3D RTE_PROC_SECONDARY) > + return -EPERM; > + > + if (hw->started =3D=3D 1) { > + virtio_dev_stop(eth_dev); > + virtio_dev_close(eth_dev); > + } > + pci_dev =3D eth_dev->pci_dev; > + > + eth_dev->dev_ops =3D NULL; > + eth_dev->tx_pkt_burst =3D NULL; > + eth_dev->rx_pkt_burst =3D NULL; > + > + virtio_dev_queue_release(hw->cvq); > + > + rte_free(eth_dev->data->mac_addrs); > + eth_dev->data->mac_addrs =3D NULL; > + > + /* reset interrupt callback */ > + if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) > + rte_intr_callback_unregister(&pci_dev->intr_handle, > + virtio_interrupt_handler, > + eth_dev); > + > + PMD_INIT_LOG(DEBUG, "dev_uninit completed"); > + > + return 0; > +} > + > +static struct eth_driver rte_virtio_pmd =3D { > + .pci_drv =3D { > + .name =3D "rte_virtio_pmd", > + .id_table =3D pci_id_virtio_map, > + .drv_flags =3D RTE_PCI_DRV_DETACHABLE, > + }, > + .eth_dev_init =3D eth_virtio_dev_init, > + .eth_dev_uninit =3D eth_virtio_dev_uninit, > + .dev_private_size =3D sizeof(struct virtio_hw), }; > + > +/* > + * Driver initialization routine. > + * Invoked once at EAL init time. > + * Register itself as the [Poll Mode] Driver of PCI virtio devices. > + * Returns 0 on success. > + */ > +static int > +rte_virtio_pmd_init(const char *name __rte_unused, > + const char *param __rte_unused) > +{ > + if (rte_eal_iopl_init() !=3D 0) { > + PMD_INIT_LOG(ERR, "IOPL call failed - cannot use virtio > PMD"); > + return -1; > + } > + > + rte_eth_driver_register(&rte_virtio_pmd); > + return 0; > +} > + > +/* > + * Configure virtio device > + * It returns 0 on success. > + */ > +static int > +virtio_dev_configure(struct rte_eth_dev *dev) { > + const struct rte_eth_rxmode *rxmode =3D &dev->data- > >dev_conf.rxmode; > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct rte_pci_device *pci_dev =3D dev->pci_dev; > + > + PMD_INIT_LOG(DEBUG, "configure"); > + > + if (rxmode->hw_ip_checksum) { > + PMD_DRV_LOG(ERR, "HW IP checksum not supported"); > + return (-EINVAL); > + } > + > + hw->vlan_strip =3D rxmode->hw_vlan_strip; > + > + if (rxmode->hw_vlan_filter > + && !vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VLAN)) { > + PMD_DRV_LOG(NOTICE, > + "vlan filtering not available on this host"); > + return -ENOTSUP; > + } > + > + if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) > + if (vtpci_irq_config(hw, 0) =3D=3D VIRTIO_MSI_NO_VECTOR) { > + PMD_DRV_LOG(ERR, "failed to set config vector"); > + return -EBUSY; > + } > + > + return 0; > +} > + > + > +static int > +virtio_dev_start(struct rte_eth_dev *dev) { > + uint16_t nb_queues, i; > + struct virtio_hw *hw =3D dev->data->dev_private; > + struct rte_pci_device *pci_dev =3D dev->pci_dev; > + > + /* check if lsc interrupt feature is enabled */ > + if ((dev->data->dev_conf.intr_conf.lsc) && > + (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)) { > + if (!vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) { > + PMD_DRV_LOG(ERR, "link status not supported by > host"); > + return -ENOTSUP; > + } > + > + if (rte_intr_enable(&dev->pci_dev->intr_handle) < 0) { > + PMD_DRV_LOG(ERR, "interrupt enable failed"); > + return -EIO; > + } > + } > + > + /* Initialize Link state */ > + virtio_dev_link_update(dev, 0); > + > + /* On restart after stop do not touch queues */ > + if (hw->started) > + return 0; > + > + /* Do final configuration before rx/tx engine starts */ > + virtio_dev_rxtx_start(dev); > + vtpci_reinit_complete(hw); > + > + hw->started =3D 1; > + > + /*Notify the backend > + *Otherwise the tap backend might already stop its queue due to > fullness. > + *vhost backend will have no chance to be waked up > + */ > + nb_queues =3D dev->data->nb_rx_queues; > + if (nb_queues > 1) { > + if (virtio_set_multiple_queues(dev, nb_queues) !=3D 0) > + return -EINVAL; > + } > + > + PMD_INIT_LOG(DEBUG, "nb_queues=3D%d", nb_queues); > + > + for (i =3D 0; i < nb_queues; i++) > + virtqueue_notify(dev->data->rx_queues[i]); > + > + PMD_INIT_LOG(DEBUG, "Notified backend at initialization"); > + > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >rx_queues[i]); > + > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >tx_queues[i]); > + > + return 0; > +} > + > +static void virtio_dev_free_mbufs(struct rte_eth_dev *dev) { > + struct rte_mbuf *buf; > + int i, mbuf_num =3D 0; > + > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > + PMD_INIT_LOG(DEBUG, > + "Before freeing rxq[%d] used and unused buf", i); > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >rx_queues[i]); > + > + PMD_INIT_LOG(DEBUG, "rx_queues[%d]=3D%p", > + i, dev->data->rx_queues[i]); > + while ((buf =3D (struct rte_mbuf *)virtqueue_detatch_unused( > + dev->data->rx_queues[i])) !=3D NULL) { > + rte_pktmbuf_free(buf); > + mbuf_num++; > + } > + > + PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num); > + PMD_INIT_LOG(DEBUG, > + "After freeing rxq[%d] used and unused buf", i); > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >rx_queues[i]); > + } > + > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) { > + PMD_INIT_LOG(DEBUG, > + "Before freeing txq[%d] used and unused bufs", > + i); > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >tx_queues[i]); > + > + mbuf_num =3D 0; > + while ((buf =3D (struct rte_mbuf *)virtqueue_detatch_unused( > + dev->data->tx_queues[i])) !=3D NULL) { > + rte_pktmbuf_free(buf); > + > + mbuf_num++; > + } > + > + PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num); > + PMD_INIT_LOG(DEBUG, > + "After freeing txq[%d] used and unused buf", i); > + VIRTQUEUE_DUMP((struct virtqueue *)dev->data- > >tx_queues[i]); > + } > +} > + > +/* > + * Stop device: disable interrupt and mark link down */ static void > +virtio_dev_stop(struct rte_eth_dev *dev) { > + struct rte_eth_link link; > + > + PMD_INIT_LOG(DEBUG, "stop"); > + > + if (dev->data->dev_conf.intr_conf.lsc) > + rte_intr_disable(&dev->pci_dev->intr_handle); > + > + memset(&link, 0, sizeof(link)); > + virtio_dev_atomic_write_link_status(dev, &link); } > + > +static int > +virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int > +wait_to_complete) { > + struct rte_eth_link link, old; > + uint16_t status; > + struct virtio_hw *hw =3D dev->data->dev_private; > + memset(&link, 0, sizeof(link)); > + virtio_dev_atomic_read_link_status(dev, &link); > + old =3D link; > + link.link_duplex =3D FULL_DUPLEX; > + link.link_speed =3D SPEED_10G; > + > + if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) { > + PMD_INIT_LOG(DEBUG, "Get link status from hw"); > + vtpci_read_dev_config(hw, > + offsetof(struct virtio_net_config, status), > + &status, sizeof(status)); > + if ((status & VIRTIO_NET_S_LINK_UP) =3D=3D 0) { > + link.link_status =3D 0; > + PMD_INIT_LOG(DEBUG, "Port %d is down", > + dev->data->port_id); > + } else { > + link.link_status =3D 1; > + PMD_INIT_LOG(DEBUG, "Port %d is up", > + dev->data->port_id); > + } > + } else { > + link.link_status =3D 1; /* Link up */ > + } > + virtio_dev_atomic_write_link_status(dev, &link); > + > + return (old.link_status =3D=3D link.link_status) ? -1 : 0; } > + > +static void > +virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info > +*dev_info) { > + struct virtio_hw *hw =3D dev->data->dev_private; > + > + dev_info->driver_name =3D dev->driver->pci_drv.name; > + dev_info->max_rx_queues =3D (uint16_t)hw->max_rx_queues; > + dev_info->max_tx_queues =3D (uint16_t)hw->max_tx_queues; > + dev_info->min_rx_bufsize =3D VIRTIO_MIN_RX_BUFSIZE; > + dev_info->max_rx_pktlen =3D VIRTIO_MAX_RX_PKTLEN; > + dev_info->max_mac_addrs =3D VIRTIO_MAX_MAC_ADDRS; > + dev_info->default_txconf =3D (struct rte_eth_txconf) { > + .txq_flags =3D ETH_TXQ_FLAGS_NOOFFLOADS > + }; > +} > + > +/* > + * It enables testpmd to collect per queue stats. > + */ > +static int > +virtio_dev_queue_stats_mapping_set(__rte_unused struct rte_eth_dev > +*eth_dev, __rte_unused uint16_t queue_id, __rte_unused uint8_t > +stat_idx, __rte_unused uint8_t is_rx) { > + return 0; > +} > + > +static struct rte_driver rte_virtio_driver =3D { > + .type =3D PMD_PDEV, > + .init =3D rte_virtio_pmd_init, > +}; > + > +PMD_REGISTER_DRIVER(rte_virtio_driver); > diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio= _ring.h > index a16c499..447760a 100644 > --- a/drivers/net/virtio/virtio_ring.h > +++ b/drivers/net/virtio/virtio_ring.h > @@ -123,10 +123,10 @@ struct vring { > #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define > vring_avail_event(vr) (*(uint16_t *)&(vr)->used->ring[(vr)->num]) >=20 > -static inline int > +static inline size_t > vring_size(unsigned int num, unsigned long align) { > - int size; > + size_t size; >=20 > size =3D num * sizeof(struct vring_desc); > size +=3D sizeof(struct vring_avail) + (num * sizeof(uint16_t)); diff -= -git > a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c > index c5b53bb..d35c5f9 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -206,7 +206,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, > struct rte_mbuf *cookie) > uint16_t seg_num =3D cookie->nb_segs; > uint16_t needed =3D 1 + seg_num; > uint16_t head_idx, idx; > - uint16_t head_size =3D txvq->hw->vtnet_hdr_size; > + size_t head_size =3D txvq->hw->vtnet_hdr_size; >=20 > if (unlikely(txvq->vq_free_cnt =3D=3D 0)) > return -ENOSPC; > @@ -224,7 +224,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, > struct rte_mbuf *cookie) > start_dp =3D txvq->vq_ring.desc; > start_dp[idx].addr =3D > txvq->virtio_net_hdr_mem + idx * head_size; > - start_dp[idx].len =3D (uint32_t)head_size; > + start_dp[idx].len =3D head_size; > start_dp[idx].flags =3D VRING_DESC_F_NEXT; >=20 > for (; ((seg_num > 0) && (cookie !=3D NULL)); seg_num--) { > -- > 2.1.4