From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by dpdk.org (Postfix) with ESMTP id A7F5F6A98 for ; Tue, 26 Aug 2014 04:04:56 +0200 (CEST) Received: by mail-pd0-f176.google.com with SMTP id y10so21562705pdj.21 for ; Mon, 25 Aug 2014 19:08:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject :references:mime-version:content-type:content-disposition; bh=io6EvfVDaMrKe6aa+V62dHj1ROxeeQAEWSzozTaS5Us=; b=WaktQyTKc1lXL5WIbaljSZcNKz0PlzhsTeBX5+Tv5BgFbv0twhMzLaOctbXj+b4Ozz 7A+2h/vAvntHbvxNstvsApHqB8z3VJHcHR27jBdbhg5JGqGp5yOwoaXZ/a1VQXPworHR JwsDtDKjMTLhu4Sto3p+h1MhuhaNbQ3Y3cPdC8HKlwtMEP2n6qkwo3a1g74yOF4mCkgT mX06zp8w/5ydxIArRhb4CFI0oUguTjqefcyUVDH0YHPH7pGk+3d7HO5O8zHiGV/fefSF iIuqgc661EvIs5OFtPD3CwnjS5gAsOgOY2XoTHc1SkWlxYwOHlf8frIOLrfMM6YQ7Cq6 zFjw== X-Gm-Message-State: ALoCoQnYObaxZd0aLJorr36PX7Q6i3o+qD07VawKc8COADOFaMwNgwcZ3LUd+U4HLmLtbqzW5GnV X-Received: by 10.67.30.75 with SMTP id kc11mr3846241pad.75.1409018933801; Mon, 25 Aug 2014 19:08:53 -0700 (PDT) Received: from localhost (static-50-53-65-80.bvtn.or.frontiernet.net. [50.53.65.80]) by mx.google.com with ESMTPSA id fh10sm1933291pdb.71.2014.08.25.19.08.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Aug 2014 19:08:52 -0700 (PDT) Message-Id: <20140826020851.474452281@networkplumber.org> User-Agent: quilt/0.63-1 Date: Mon, 25 Aug 2014 19:07:53 -0700 From: Stephen Hemminger To: Ouyang Changchun References: <20140826020746.062748014@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=virtio-adapter-cleanout.patch Cc: dev@dpdk.org Subject: [dpdk-dev] [RFC 07/10] virtio: remove unnecessary adapter structure 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: Tue, 26 Aug 2014 02:04:57 -0000 Cleanup virtio code by eliminating unnecessary nesting of virtio hardware structure inside adapter structure. Also allows removing unneeded macro, making code clearer. --- lib/librte_pmd_virtio/virtio_ethdev.c | 31 +++++++++++-------------------- lib/librte_pmd_virtio/virtio_ethdev.h | 9 --------- lib/librte_pmd_virtio/virtio_rxtx.c | 3 +-- 3 files changed, 12 insertions(+), 31 deletions(-) --- a/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25 19:00:08.310541279 -0700 +++ b/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25 19:00:08.310541279 -0700 @@ -203,8 +203,7 @@ virtio_send_command(struct virtqueue *vq static int virtio_set_multiple_queues(struct rte_eth_dev *dev, uint16_t nb_queues) { - struct virtio_hw *hw - = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; struct virtio_pmd_ctrl ctrl; int dlen[1]; int ret; @@ -238,8 +237,7 @@ int virtio_dev_queue_setup(struct rte_et const struct rte_memzone *mz; uint16_t vq_size; int size; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; struct virtqueue *vq = NULL; /* Write the virtqueue index to the Queue Select Field */ @@ -379,8 +377,7 @@ virtio_dev_cq_queue_setup(struct rte_eth struct virtqueue *vq; uint16_t nb_desc = 0; int ret; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; PMD_INIT_FUNC_TRACE(); ret = virtio_dev_queue_setup(dev, VTNET_CQ, VTNET_SQ_CQ_QUEUE_IDX, @@ -765,8 +762,7 @@ virtio_interrupt_handler(__rte_unused st void *param) { struct rte_eth_dev *dev = param; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; uint8_t isr; /* Read interrupt status which clears interrupt */ @@ -792,12 +788,11 @@ static int eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv, struct rte_eth_dev *eth_dev) { + struct virtio_hw *hw = eth_dev->data->dev_private; struct virtio_net_config *config; struct virtio_net_config local_config; uint32_t offset_conf = sizeof(config->mac); struct rte_pci_device *pci_dev; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); if (RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr)) { PMD_INIT_LOG(ERR, @@ -928,7 +923,7 @@ static struct eth_driver rte_virtio_pmd .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, }, .eth_dev_init = eth_virtio_dev_init, - .dev_private_size = sizeof(struct virtio_adapter), + .dev_private_size = sizeof(struct virtio_hw), }; /* @@ -965,8 +960,7 @@ static int virtio_dev_configure(struct rte_eth_dev *dev) { const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; int ret; PMD_INIT_LOG(DEBUG, "configure"); @@ -990,8 +984,7 @@ static int virtio_dev_start(struct rte_eth_dev *dev) { uint16_t nb_queues, i; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; /* Tell the host we've noticed this device. */ vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_ACK); @@ -1097,8 +1090,7 @@ static void virtio_dev_free_mbufs(struct static void virtio_dev_stop(struct rte_eth_dev *dev) { - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; /* reset the NIC */ vtpci_irq_config(hw, 0); @@ -1111,8 +1103,7 @@ virtio_dev_link_update(struct rte_eth_de { struct rte_eth_link link, old; uint16_t status; - struct virtio_hw *hw = - VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; memset(&link, 0, sizeof(link)); virtio_dev_atomic_read_link_status(dev, &link); old = link; @@ -1144,7 +1135,7 @@ virtio_dev_link_update(struct rte_eth_de static void virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { - struct virtio_hw *hw = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; dev_info->driver_name = dev->driver->pci_drv.name; dev_info->max_rx_queues = (uint16_t)hw->max_rx_queues; --- a/lib/librte_pmd_virtio/virtio_ethdev.h 2014-08-25 19:00:08.310541279 -0700 +++ b/lib/librte_pmd_virtio/virtio_ethdev.h 2014-08-25 19:00:08.310541279 -0700 @@ -110,15 +110,6 @@ uint16_t virtio_recv_mergeable_pkts(void uint16_t virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); -/* - * Structure to store private data for each driver instance (for each port). - */ -struct virtio_adapter { - struct virtio_hw hw; -}; - -#define VIRTIO_DEV_PRIVATE_TO_HW(adapter)\ - (&((struct virtio_adapter *)adapter)->hw) /* * The VIRTIO_NET_F_GUEST_TSO[46] features permit the host to send us --- a/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25 19:00:08.310541279 -0700 +++ b/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25 19:00:08.310541279 -0700 @@ -326,8 +326,7 @@ virtio_dev_vring_start(struct virtqueue void virtio_dev_cq_start(struct rte_eth_dev *dev) { - struct virtio_hw *hw - = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct virtio_hw *hw = dev->data->dev_private; virtio_dev_vring_start(hw->cvq, VTNET_CQ); VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq);