From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by dpdk.org (Postfix) with ESMTP id 3D5056CAC for ; Mon, 29 Feb 2016 13:58:32 +0100 (CET) Received: by mail-pf0-f177.google.com with SMTP id w128so47108510pfb.2 for ; Mon, 29 Feb 2016 04:58:32 -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=MjqoeFTuDg2LikkFbQ2EGWsaZx/Qp2qRDB/lK6pVC+Y=; b=YIWQKgALTXQTUOQHr8hUCXV6pPoYVY08mY+sr7J1OnUyg1hfKb6bijYsHmz8ZIKpwe yXmhaN8OZNhtFkbbf2+O7qAnHRUhptQXiIO2xpRWweVF9GiL/67oklmYVlxlEVER77ea 2gcH5sC8/F6NkxOqtTdMQvR64d6XjVoWOv7xM2mUqhZQT1Hf50WpvJGNPXKwnIkixzA5 g7v6Cwdlk8FbCJd8XbCfo0W6yTBej2UZcXDZ9wavLHuUBM6Imt1coUdU9t2whbXSFl5Z kE+1e/hVx4UQs3Uu+k+0SJha0mF7Sj00/PJG3SOLfAxXYB7OkV/EDHIHAaxwazEFoKLB hJAg== 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=MjqoeFTuDg2LikkFbQ2EGWsaZx/Qp2qRDB/lK6pVC+Y=; b=f5IKa8omkhseaaSgvZNeetzzXu3OuVLCUGV+cK58cgjfeQzptcYpQZp13FUOSB9vF1 RpzByoxq8Xn7C9fJieLxvSSnZfzPqrXCuFVJVZe4usj9K7cClr9YRpXe5Aqby6tx2nU2 oHTrHppTkds4zdlhsKfJuxu9ozRubzFnyc6DBkA1RRVuG2PmRYKo62I/BL3t0v5yEW7d QNdf2O5h94tgo4p96RXhmm4OsmbXtBpDc54WExGi2wRSJ0lClyqvA/M+x4fJpEpHjVRL 2GTn72+hQXDAhOufZTs7a1siOsMCFpaPX9Ungr+zMkBgqUaqU3FZ8whlJ40eTlPleoMh qzdw== X-Gm-Message-State: AD7BkJLdS1eayk/saepqy3YaJdFhd+ybq/f1jaEmUUeheO8j1jlnNz+DOo9Kb98/MqyWCRVD X-Received: by 10.98.71.210 with SMTP id p79mr21900217pfi.4.1456750711598; Mon, 29 Feb 2016 04:58:31 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([106.194.19.18]) by smtp.gmail.com with ESMTPSA id b2sm38092750pfd.24.2016.02.29.04.58.28 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 04:58:30 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Mon, 29 Feb 2016 18:28:10 +0530 Message-Id: <1456750690-3210-1-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456476662-23081-1-git-send-email-sshukla@mvista.com> References: <1456476662-23081-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [PATCH v2] virtio: Use cpuflag for vector api 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, 29 Feb 2016 12:58:32 -0000 Check cpuflag macro before using vectored api. -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added cpuflag. - Also wrap other vectored freind api ie.. 1) virtqueue_enqueue_recv_refill_simple 2) virtio_rxq_vec_setup - removed VIRTIO_PMD=n from armv7/v8 config. todo: 1) Move virtio_recv_pkts_vec() implementation to drivers/virtio/virtio_vec_.h file. 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h files to provide vectored/non-vectored rx/tx apis. Signed-off-by: Santosh Shukla --- - v2: Removed VIRTIO_PMD=n from arm v7/v8 - v1: This is a rework of patch [1]. Note: This patch will let non-x86 arch to use virtio pmd. [1] http://dpdk.org/dev/patchwork/patch/10429/ config/defconfig_arm-armv7a-linuxapp-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-gcc | 1 - drivers/net/virtio/virtio_rxtx.c | 16 +++++++++++++++- drivers/net/virtio/virtio_rxtx.h | 2 ++ drivers/net/virtio/virtio_rxtx_simple.c | 11 ++++++++++- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index cbebd64..4bfdfad 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -70,7 +70,6 @@ CONFIG_RTE_LIBRTE_I40E_PMD=n CONFIG_RTE_LIBRTE_IXGBE_PMD=n CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MPIPE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_VMXNET3_PMD=n CONFIG_RTE_LIBRTE_PMD_XENVIRT=n CONFIG_RTE_LIBRTE_PMD_BNX2X=n diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc index eacd01c..f6f5d18 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ b/config/defconfig_arm64-armv8a-linuxapp-gcc @@ -44,7 +44,6 @@ CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y CONFIG_RTE_IXGBE_INC_VECTOR=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_IVSHMEM=n CONFIG_RTE_LIBRTE_FM10K_PMD=n CONFIG_RTE_LIBRTE_I40E_PMD=n diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 41a1366..ec0b8de 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -67,7 +67,9 @@ #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \ ETH_TXQ_FLAGS_NOOFFLOADS) +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 static int use_simple_rxtx; +#endif static void vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx) @@ -307,12 +309,13 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type) nbufs = 0; error = ENOSPC; +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 if (use_simple_rxtx) for (i = 0; i < vq->vq_nentries; i++) { vq->vq_ring.avail->ring[i] = i; vq->vq_ring.desc[i].flags = VRING_DESC_F_WRITE; } - +#endif memset(&vq->fake_mbuf, 0, sizeof(vq->fake_mbuf)); for (i = 0; i < RTE_PMD_VIRTIO_RX_MAX_BURST; i++) vq->sw_ring[vq->vq_nentries + i] = &vq->fake_mbuf; @@ -325,9 +328,11 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type) /****************************************** * Enqueue allocated buffers * *******************************************/ +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 if (use_simple_rxtx) error = virtqueue_enqueue_recv_refill_simple(vq, m); else +#endif error = virtqueue_enqueue_recv_refill(vq, m); if (error) { rte_pktmbuf_free(m); @@ -340,6 +345,7 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type) PMD_INIT_LOG(DEBUG, "Allocated %d bufs", nbufs); } else if (queue_type == VTNET_TQ) { +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 if (use_simple_rxtx) { int mid_idx = vq->vq_nentries >> 1; for (i = 0; i < mid_idx; i++) { @@ -357,6 +363,7 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type) for (i = mid_idx; i < vq->vq_nentries; i++) vq->vq_ring.avail->ring[i] = i; } +#endif } } @@ -423,7 +430,9 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, dev->data->rx_queues[queue_idx] = vq; +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 virtio_rxq_vec_setup(vq); +#endif return 0; } @@ -449,7 +458,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_MACHINE_CPUFLAG_SSSE3 struct virtio_hw *hw = dev->data->dev_private; +#endif struct virtqueue *vq; uint16_t tx_free_thresh; int ret; @@ -462,6 +474,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 /* 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)) { @@ -470,6 +483,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); diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h index 831e492..a76c3e5 100644 --- a/drivers/net/virtio/virtio_rxtx.h +++ b/drivers/net/virtio/virtio_rxtx.h @@ -33,7 +33,9 @@ #define RTE_PMD_VIRTIO_RX_MAX_BURST 64 +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 int virtio_rxq_vec_setup(struct virtqueue *rxq); int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq, struct rte_mbuf *m); +#endif diff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c index 3a1de9d..be51d7c 100644 --- a/drivers/net/virtio/virtio_rxtx_simple.c +++ b/drivers/net/virtio/virtio_rxtx_simple.c @@ -37,7 +37,9 @@ #include #include -#include +#ifdef __SSE3__ +#include +#endif #include #include @@ -66,6 +68,7 @@ #pragma GCC diagnostic ignored "-Wcast-qual" #endif +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 int __attribute__((cold)) virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq, struct rte_mbuf *cookie) @@ -90,6 +93,7 @@ virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq, return 0; } +#endif static inline void virtio_rxq_rearm_vec(struct virtqueue *rxvq) @@ -130,6 +134,7 @@ virtio_rxq_rearm_vec(struct virtqueue *rxvq) vq_update_avail_idx(rxvq); } +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 /* virtio vPMD receive routine, only accept(nb_pkts >= RTE_VIRTIO_DESC_PER_LOOP) * * This routine is for non-mergeable RX, one desc for each guest buffer. @@ -291,6 +296,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, rxvq->packets += nb_pkts_received; return nb_pkts_received; } +#endif #define VIRTIO_TX_FREE_THRESH 32 #define VIRTIO_TX_MAX_FREE_BUF_SZ 32 @@ -398,6 +404,7 @@ virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts, return nb_pkts; } +#ifdef RTE_MACHINE_CPUFLAG_SSSE3 int __attribute__((cold)) virtio_rxq_vec_setup(struct virtqueue *rxq) { @@ -416,3 +423,5 @@ virtio_rxq_vec_setup(struct virtqueue *rxq) return 0; } +#endif + -- 1.7.9.5