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 4AA8E9AC7 for ; Tue, 1 Mar 2016 11:03:20 +0100 (CET) Received: by mail-pa0-f44.google.com with SMTP id fy10so109333463pac.1 for ; Tue, 01 Mar 2016 02:03:20 -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=XCu6bNYB4UliIVtvF6NYaZdLNbSKB+sIzH87QjUPMk0=; b=rExjYRloGy2DRQ5qOK7mr3UdBOiQFnWdSYjpFnFGCnNaruan1DFxNFICrMqIdWPeXk ODZIJoTW4zEIguvzVmKq9Zc5FmYr3zYG9SnJM12DJZgSqEcuoEIYnzHblA08QanixM/o M5bGmV0+MGp8sSjczMZfZSPA/kRTrVSkF0sCaXjmm4q+SS30uGC/7gwUET1x5JpQ13Qq K622ctFwLv7iVqkFd6dzIgjF8aGk0fNYC0oVnfCMe/1N/ZvsTy6KBBYm3G6y0V2F+N3w OQH7lgo5UXbPCnn0V0LBnxxAXxxC5hkvJUH95kg41///XmG7cuEPSQrOZ6SC13veg0gq jwOQ== 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=XCu6bNYB4UliIVtvF6NYaZdLNbSKB+sIzH87QjUPMk0=; b=Ofg/1AdYXUUMHkJO6oBX7cQnvfyn0GCe7aCg1O4Ltur9/ThJ4wJniaPMAYjXW8LTqd rao88jafy1lOW13mXAud8U7embf6WFEObWw996zT0f+WRfKLoO3tM6VGA7Zoy4VOceRP CD0x3lXxCJoCofy+U16TQWf3qseZ7K7XKlnZuZtc+ey6J55pQ1Mpr1UHcpa9nc+sqJjX rRfGuEMukkUK+RTTrEVm0qqrUg7KfMG8PjutuCqF3j5nUcgqAEJazPb3Drp42H5n1r2n S3ahzB2cPWkXbcLubLqGoJi0kT182r8ly1PPtU2RfiCT4sTHWlQjs0qlCp+pda/y16h8 pk1w== X-Gm-Message-State: AD7BkJIWImYMd8i81fRL9Yyj0b1VbXhku75AhYdBCx++ad+Kkht534smWvABg1UZQ2J+pMug X-Received: by 10.66.141.71 with SMTP id rm7mr29036264pab.106.1456826599713; Tue, 01 Mar 2016 02:03:19 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([110.172.16.105]) by smtp.gmail.com with ESMTPSA id q16sm44155666pfi.80.2016.03.01.02.03.15 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 02:03:17 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Tue, 1 Mar 2016 15:32:18 +0530 Message-Id: <1456826540-15990-2-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456826540-15990-1-git-send-email-sshukla@mvista.com> References: <1456750690-3210-1-git-send-email-sshukla@mvista.com> <1456826540-15990-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [PATCH v1 1/3] virtio: use vector rx/tx for ssse cpuflag only 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, 01 Mar 2016 10:03:20 -0000 Temporary implementation to let virtio operate in non-vec mode for archs which doesn't support _ssse_ cpuflag. 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 --- v1: rework of this[1] patch [1] http://dpdk.org/dev/patchwork/patch/10911/ - Removed ifdef from virtio_rxtx_simple.c drivers/net/virtio/Makefile | 3 +++ drivers/net/virtio/virtio_rxtx.c | 16 +++++++++++++++- drivers/net/virtio/virtio_rxtx.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile index 43835ba..ef84f60 100644 --- a/drivers/net/virtio/Makefile +++ b/drivers/net/virtio/Makefile @@ -50,7 +50,10 @@ 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 + +ifeq ($(findstring RTE_MACHINE_CPUFLAG_SSSE3,$(CFLAGS)),RTE_MACHINE_CPUFLAG_SSSE3) SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c +endif # 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 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 -- 1.7.9.5