From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by dpdk.org (Postfix) with ESMTP id 9F10691B7 for ; Fri, 4 Dec 2015 18:35:33 +0100 (CET) Received: by pabfh17 with SMTP id fh17so92396920pab.0 for ; Fri, 04 Dec 2015 09:35:33 -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=vrWV80EN/JRSc2CWMvoKWJiuD+aQebqJjMm6VGylcv8=; b=TDCmHRLXNhgBvjWAL+fJXj0ba7Lypcxrqr660w0W1FV1VYds+46rePBcbK02t/RdM3 EEn24zdMPqEhuGSfkiYkUc+0RZVZrKb+CjIBGR79HzrH3P+Hybap43skDj9BJ/dVfboz e7+6dE3X7l1OV0vgHbrtQ5NO+1g+BwtMBacaPSqVHRxtxhzRRMBLm+Usx5UaeWlM2ybn km+gxHfu3GZubmPwSciATvYW0T50K5QUzznGuJ9itdl1BXNYVgOTucFB0mG0sqlkr+LP zhC8KeUI8dd0gjGEttjCvYOIHlcJL8Q+Q17mRka0YOTUsTUn7Kj7pMPL2oKJVgyj1iOk BJXA== 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=vrWV80EN/JRSc2CWMvoKWJiuD+aQebqJjMm6VGylcv8=; b=gYczGIlrBbixt1P00xyJlvQIWzq9FMUYTJ1HB1GmmA2SaDxiYmOwh0h4zSpkrP7MiO r2orTBKaSQagASQZ8DCNf0NRSjw2UcYx8IBUHVtzlK8QUwXkxRDzlipTY6gC42K/Cwfz PYM7DloWRcwrkQhQgNGqRZWDwG0uTfasRVATZtsJnmLONo1zJKhMmksnQmMvJzMa/1ez 2jqbseKT5PlirJXb6tf6KtjSVPUBo4S/k7JsBnguGbH4KoxSnG7dBQARrfdARuNxWMZu oCd1yAvdf2G3WOL5sMASLXTPvGBIk0Cy0kt9z1oB+ZvjdWyQP5YRjI/WNYVex0Lb6YM2 sFPQ== X-Gm-Message-State: ALoCoQmn9er3n+0kVlzCIPj+JNagw0ipEMfEHXPK1P0oOh37Spf8fNONFBdQjSMyfwrHpQNBALQl X-Received: by 10.66.235.40 with SMTP id uj8mr23388479pac.151.1449250533049; Fri, 04 Dec 2015 09:35:33 -0800 (PST) Received: from rakeshk-OptiPlex-9020.mvista.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id 134sm18365609pfa.30.2015.12.04.09.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Dec 2015 09:35:32 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Fri, 4 Dec 2015 23:05:14 +0530 Message-Id: <1449250519-28372-2-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449250519-28372-1-git-send-email-sshukla@mvista.com> References: <1449250519-28372-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [PATCH 1/6] 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: Fri, 04 Dec 2015 17:35:34 -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 2866986..e4d6df8 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -267,6 +267,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 5770fa2..164a540 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