From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by dpdk.org (Postfix) with ESMTP id A492F9A81 for ; Thu, 7 Jan 2016 17:34:11 +0100 (CET) Received: by mail-pa0-f44.google.com with SMTP id cy9so262466942pac.0 for ; Thu, 07 Jan 2016 08:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yF2hSXm53KkWbj3Xhp8yEomCZX8EXbT378cvXm5zVx8=; b=esdqWp7IzcmSc8UjEPY0mzFXnTG04wGA18GUHwjzuYHkNZ8steisRezJnlvGBpK5st NleH/bVVeJOvoCL2EkbVOY2m2qy6XcxGuFYSUA+6zjQ4I2bU3NeoWNvmG7Mc/JS3XFHC 2cinqaWxoGMlsqpdxrU9jqRvsa8FTYyH0dgA+Yl1WHyTjZ/8OasyWfcD+DSQfsU7iSzm bxQELXw2jD2OxB2Lkt7KWlanXM5b5Tzq3JkLqnIY7Xr5fGXtmOudeijFOFiu9GkVAury Ruo8DtOGaqamSHkrjmuXVI+HA8/CSNx78Wh5HpwM2y+ih84I33z+5EJpGE0FdnITkgwd fWMw== 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=yF2hSXm53KkWbj3Xhp8yEomCZX8EXbT378cvXm5zVx8=; b=AjhPcIHzum8eaBZ5AhJH2QK371OGD+CFxnilGC5ht75bLAciMbeqFAYrpyUvWv51aw GQ3YdaoVdZ9qahecZ4IncnCn6I3iEXp1q1xx21oYyigW6KbKn/bzmEBmDKcydy0yBdom pjlbbH+x/HgvWksi0f6CJ8WdqB4sbodG+O2pLI/A0ts7PmoLr6o1xINcq65ox/EBi+AB UzGggaaCu7uJTLM5en29N5hcRJgHg5svHfkqfjre6qZCWMnFBmC0wfMlHmhz1YVwAEeV mfDBYWWxxS8WOO/6M6o6z0yoZNAPUvggMVKBmabXPQsY+N5WGVHNr+JedbfygOxqQ4V3 SbEQ== X-Gm-Message-State: ALoCoQls9Jc2u8KNL0GY+Z9HBAwaYFkUCJyC1pamOY+ZBjdtSPwVqPNqk4eAOGA/DH7W/3vfRmicaa0e3N4lKCr1EaOIUlvVzA== X-Received: by 10.66.144.65 with SMTP id sk1mr149098217pab.126.1452184450958; Thu, 07 Jan 2016 08:34:10 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id yn8sm159454163pac.32.2016.01.07.08.34.08 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 08:34:10 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Thu, 7 Jan 2016 22:02:58 +0530 Message-Id: <1452184390-5994-2-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1452184390-5994-1-git-send-email-sshukla@mvista.com> References: <1452184390-5994-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [PATCH v3 01/12] virtio: Introduce config RTE_VIRTIO_INC_VECTOR 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: Thu, 07 Jan 2016 16:34:11 -0000 virtio_recv_pkts_vec and other virtio vector friend apis are written for sse/avx instructions. For arm64 in particular, virtio vector implementation does not exist(todo). So virtio pmd driver wont build for targets like i686, arm64. By making RTE_VIRTIO_INC_VECTOR=n, Driver can build for non-sse/avx targets and will work in non-vectored virtio mode. Signed-off-by: Santosh Shukla --- config/common_linuxapp | 1 + drivers/net/virtio/Makefile | 2 +- drivers/net/virtio/virtio_rxtx.c | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/common_linuxapp b/config/common_linuxapp index 74bc515..8677697 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -274,6 +274,7 @@ CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n +CONFIG_RTE_VIRTIO_INC_VECTOR=y # # Compile burst-oriented VMXNET3 PMD driver diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile index 43835ba..25a842d 100644 --- a/drivers/net/virtio/Makefile +++ b/drivers/net/virtio/Makefile @@ -50,7 +50,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c +SRCS-$(CONFIG_RTE_VIRTIO_INC_VECTOR) += virtio_rxtx_simple.c # this lib depends upon: DEPDIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += lib/librte_eal lib/librte_ether diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 74b39ef..23be1ff 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -438,7 +438,9 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, dev->data->rx_queues[queue_idx] = vq; +#ifdef RTE_VIRTIO_INC_VECTOR virtio_rxq_vec_setup(vq); +#endif return 0; } @@ -464,7 +466,10 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, const struct rte_eth_txconf *tx_conf) { uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; + +#ifdef RTE_VIRTIO_INC_VECTOR struct virtio_hw *hw = dev->data->dev_private; +#endif struct virtqueue *vq; uint16_t tx_free_thresh; int ret; @@ -477,6 +482,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } +#ifdef RTE_VIRTIO_INC_VECTOR /* Use simple rx/tx func if single segment and no offloads */ if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) == VIRTIO_SIMPLE_FLAGS && !vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) { @@ -485,6 +491,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, dev->rx_pkt_burst = virtio_recv_pkts_vec; use_simple_rxtx = 1; } +#endif ret = virtio_dev_queue_setup(dev, VTNET_TQ, queue_idx, vtpci_queue_idx, nb_desc, socket_id, &vq); -- 1.7.9.5