From patchwork Mon Dec 14 13:00:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 9527 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 4E9AA5A43; Mon, 14 Dec 2015 14:00:47 +0100 (CET) Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by dpdk.org (Postfix) with ESMTP id E909F58D4 for ; Mon, 14 Dec 2015 14:00:45 +0100 (CET) Received: by pfnn128 with SMTP id n128so105334211pfn.0 for ; Mon, 14 Dec 2015 05:00:45 -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=b+74FWklIBGt6Ceukbmt/LNPgW4nML56jb33hgWqNmY=; b=1+Um3aWe54ceaEtW8CtgaWMt3GoLlaHgRkxlukntnHOJErWsgujXBmLEeKczaVhthv Irev59aVhHmnFc1lfHzRu07JxUlW9MUf9uCbjINXBE8EDNqWr8SpR9PIT74cWANByx8x tWVW1pq33GA7LThWJTnclWeCU6GxWUILtRlDMmI0OLNc8r4+kN5+lniKdHZUArsiYUoe JjDhT2Fz92D82EflqLiQ5UzIOBvpGd2tU60rbbQMB6vgwT0X6oHgj0rHEWZxT3Y6BEch WeAsOPR6IoX1OsOakN0TfoerQHbej3RvzMZWpZVweYW15fmvH4KsYYlwMpemLtW+kdJp E9cQ== 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=b+74FWklIBGt6Ceukbmt/LNPgW4nML56jb33hgWqNmY=; b=MH5f18Ppw9jtp3IpFHPHiZJQFY54oKVjjCnOXcAp3Nkc+d4o2H8mm63qOR+mmYvjV/ 5VDI9zLisjwL8FQf8j/N4pGKiVG9MJlf7SymrqzxPQT2sRCrEEO2tZbjqMhMeMwxMSao F2cH3Np5pOddsZqMyr0jmV2sgpZV0x8TcN50cA3zWOsab3Kgo8Og6nr+F5BtLeax/7dn UJPKnMPbwKDsnJsTdAYvzb0ibHE0gCNCIQ3vZvCWhj5aVykKLbVoJZNFhfO1Kwwhh77f +sB/eQ2p+gWNeyVWUKJ0OYImdnKCSedV1m1DiQ00Q/DEHSJkg2ngHiUVyJ/S97OSMU8K /SZA== X-Gm-Message-State: ALoCoQl4YLx2XbCfBDDsj39AuXKszcIjzsm9VzAgnFN7YatBzyMh5cVY3Jr/vnXNkIBqDSYxFD5viktOyRyzUyFjsVWpUFn0kw== X-Received: by 10.98.68.198 with SMTP id m67mr13522466pfi.148.1450098045386; Mon, 14 Dec 2015 05:00:45 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([110.172.16.5]) by smtp.gmail.com with ESMTPSA id 9sm42506405pfn.51.2015.12.14.05.00.42 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 05:00:44 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Mon, 14 Dec 2015 18:30:20 +0530 Message-Id: <1450098032-21198-2-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1450098032-21198-1-git-send-email-sshukla@mvista.com> References: <1450098032-21198-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [ [PATCH v2] 01/13] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 ba9e55d..275fb40 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -273,6 +273,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);