From patchwork Wed Sep 11 16:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Herbelot X-Patchwork-Id: 59121 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BA9EF1E8CA; Wed, 11 Sep 2019 18:04:52 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id D97F81E8C2 for ; Wed, 11 Sep 2019 18:04:51 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id p7so4142596wmp.4 for ; Wed, 11 Sep 2019 09:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9k+VkqWIKhC5aBr3JYg4qcAj0AVeNDxY4zBQQntLZUI=; b=jAMqlH5tbFxOTIma4XCqGKHVoHwKdVD1g8lXbSKKVmYERWbTvKPnhlPL3xCfe9SJKb bm2/uyc4+pIz7g3ga6z/RJhk6SpR+zwmThIlzbWAL3Il5lUZGP90RF2oEnaGf8VNjoAd DLb4IgYf8gfp0uIndjIFqk5qsYTL+844SXMCmb6A2NRn1ug0/bvzfeUkAwkufX845E2Z qCF24FLug7M5/tQ8RwJskDWPUoPbYhmahSNcCmAc28v2PqVbfmoTdylCvZxNU0Rgi94C 9pEfhuJYlj1JDHTG8ooP5NWumzAi4l9i6TcHyVSsUlKXVq0PDW1mnUE4zIqhvBPFmlFf mVDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9k+VkqWIKhC5aBr3JYg4qcAj0AVeNDxY4zBQQntLZUI=; b=VorfImg57XoI1gdgCkCTI/9HIe5kUvVV2uyjoT2x1S9MQqNXHkMC16GcGgW9ViQz3f Ps1RgF31r2/wWPWyym/3dV6CDnvBfMTPRVKed0+NAkLKYD9Y7gy5X9QA5eY2VpX9iOUX x19pg0y2NRCU5czBs/7rwGoBfZXClsDv/p81+ROSd80FPeJBIQXjvvXzIipXeABkrnSn wy+ff2p03C83GjApjiE6FRbsM7TWzqb509sL00Fkau1No2wWa9UviLcew/ZhL+kpmE0z 5fZ+Oy0Tu4X9eBiLhW2YzokvfTUkWlaxH/wMSV1vyTwl+5SsNiPJo+403CZ4r9svCPJa 3plQ== X-Gm-Message-State: APjAAAWsbEfz/TifEgzdpDllgzNCP5pT5NY1m33w5t49/kCPxsr/L8Lq Zlt/KWr+oLUJwNJkPf6+ryTDWRHe2TXZ X-Google-Smtp-Source: APXvYqwWMCexadyr4b7TeJ3cvDAF5cNjID5eFVjWCgAcaVn2lj640B39LuP4R3QryTiujFo5DB46CQ== X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr4739937wme.105.1568217891392; Wed, 11 Sep 2019 09:04:51 -0700 (PDT) Received: from ascain.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id v8sm33477216wra.79.2019.09.11.09.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 09:04:50 -0700 (PDT) From: Thierry Herbelot To: dev@dpdk.org Cc: Thibaut Collet , Thomas Monjalon , stable@dpdk.org, maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com Date: Wed, 11 Sep 2019 18:04:08 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] virtio: fix rx stats with vectorized functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Thibaut Collet With vectorized functions, only the rx stats for number of packets is incremented. Update also the other statistics. Performance impact is about 2% Fixes: fc3d66212fed ("virtio: add vector Rx") Cc: stable@dpdk.org Cc: maxime.coquelin@redhat.com Cc: tiwei.bie@intel.com Cc: zhihong.wang@intel.com Signed-off-by: Thibaut Collet Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 2 +- drivers/net/virtio/virtio_rxtx.h | 2 ++ drivers/net/virtio/virtio_rxtx_simple_neon.c | 5 +++++ drivers/net/virtio/virtio_rxtx_simple_sse.c | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 27ead19fbe81..6dd62bf51863 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1083,7 +1083,7 @@ virtio_discard_rxbuf_inorder(struct virtqueue *vq, struct rte_mbuf *m) } } -static inline void +void virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf) { uint32_t s = mbuf->pkt_len; diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h index 685cc4f8104c..1eb8dae227ee 100644 --- a/drivers/net/virtio/virtio_rxtx.h +++ b/drivers/net/virtio/virtio_rxtx.h @@ -59,5 +59,7 @@ struct virtnet_ctl { }; int virtio_rxq_vec_setup(struct virtnet_rx *rxvq); +void virtio_update_packet_stats(struct virtnet_stats *stats, + struct rte_mbuf *mbuf); #endif /* _VIRTIO_RXTX_H_ */ diff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c index cdc2a4d28ed5..70e89fc428e0 100644 --- a/drivers/net/virtio/virtio_rxtx_simple_neon.c +++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c @@ -47,6 +47,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, struct vring_used_elem *rused; struct rte_mbuf **sw_ring; struct rte_mbuf **sw_ring_end; + struct rte_mbuf **ref_rx_pkts; uint16_t nb_pkts_received = 0; uint8x16_t shuf_msk1 = { @@ -105,6 +106,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, virtqueue_notify(vq); } + ref_rx_pkts = rx_pkts; for (nb_pkts_received = 0; nb_pkts_received < nb_used;) { uint64x2_t desc[RTE_VIRTIO_DESC_PER_LOOP / 2]; @@ -204,5 +206,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, vq->vq_used_cons_idx += nb_pkts_received; vq->vq_free_cnt += nb_pkts_received; rxvq->stats.packets += nb_pkts_received; + for (nb_used = 0; nb_used < nb_pkts_received; nb_used++) + virtio_update_packet_stats(&rxvq->stats, ref_rx_pkts[nb_used]); + return nb_pkts_received; } diff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c index af76708d66ae..cb1610e71563 100644 --- a/drivers/net/virtio/virtio_rxtx_simple_sse.c +++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c @@ -48,6 +48,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, struct vring_used_elem *rused; struct rte_mbuf **sw_ring; struct rte_mbuf **sw_ring_end; + struct rte_mbuf **ref_rx_pkts; uint16_t nb_pkts_received = 0; __m128i shuf_msk1, shuf_msk2, len_adjust; @@ -107,6 +108,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, virtqueue_notify(vq); } + ref_rx_pkts = rx_pkts; for (nb_pkts_received = 0; nb_pkts_received < nb_used;) { __m128i desc[RTE_VIRTIO_DESC_PER_LOOP / 2]; @@ -190,5 +192,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, vq->vq_used_cons_idx += nb_pkts_received; vq->vq_free_cnt += nb_pkts_received; rxvq->stats.packets += nb_pkts_received; + for (nb_used = 0; nb_used < nb_pkts_received; nb_used++) + virtio_update_packet_stats(&rxvq->stats, ref_rx_pkts[nb_used]); + return nb_pkts_received; } From patchwork Wed Sep 11 16:04:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Herbelot X-Patchwork-Id: 59122 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D9A1E1E8DB; Wed, 11 Sep 2019 18:05:00 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id C92A51E8C9 for ; Wed, 11 Sep 2019 18:04:59 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id c10so4144735wmc.0 for ; Wed, 11 Sep 2019 09:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RwQWS9CO9J/2iL73c/pHW9nEZcegR1EglYm2fZBdyoY=; b=gC0zktI63riKxrgjgiveSzzNjGr0iVKxXkyIBNdKlSJSApD2LFEEiIYHkyng1K6gHm Iyi95r/camSJh/bVzFvPRnEmIgN9KfaMXTt09eCfXh2wOqfBtDZ9a0C7BxRicYXNA4C6 cnwbEJZWPURYqk8Me86v3w5k6/Pkx/DWpMRqvf3Kd/hQAzT7lpfrd71HngnGxhjDPayI atJUa2bNNy/XokiqpNcW3GfOdAhRnZxQdRWwqEBTREm8MWe5PYsY4be2MwY6+U9z03+D NC8x0KSX3cqx5NxV0j5zxePiPQsIZ5PEQJg+sGnahc3H05MqEclDXvq2s/GbcRMOlmiw TEcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RwQWS9CO9J/2iL73c/pHW9nEZcegR1EglYm2fZBdyoY=; b=RLjZIr78YRw6MZbrOVsqO9oXEaRakGvmTfgyzOAn17lGwNzSjIRgldKE12gjKdlDHD 7W/3Bp37jXJtqiorhrkKG4l7V4ILdxS3kGf3Fb8MhGd0gQP/GMkURBpHEWSYvgR49V61 HWupJQn74QioUYxVV8Z9btlZajCXpU63WYMoAb6UikqYH9XqKQXCizwNWrTAcvqCL2/G QODWJPhw2HHAU8hP3Isjp4XLYNUZswIjtKc8IbFJORY4QNJpfJMdUv9K5lGD4/l7Fk8Q KLoDvH2JCB7gn+v4lRPicVqCsztmWgNzS8tLR5nKzKz54BMDXOdz5X1jaSvZfQrJOUvY HlOw== X-Gm-Message-State: APjAAAV57P9SY22T9ER7Dx8HkwVam6ye24T+Y9rhhQh9bM8BCbM9uGdJ ILTcrSGGUL6aGNUTS2NOqVbtoKiJBuoqSDw= X-Google-Smtp-Source: APXvYqz2m3PVhL5JTcqujrom4gz40XgCT5HBvIw9jjx+ph4Vci7OZ68yCOq1w4BeqU/nFSXBLC6qZA== X-Received: by 2002:a7b:c054:: with SMTP id u20mr4481301wmc.11.1568217899386; Wed, 11 Sep 2019 09:04:59 -0700 (PDT) Received: from ascain.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id v8sm33477216wra.79.2019.09.11.09.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 09:04:58 -0700 (PDT) From: Thierry Herbelot To: dev@dpdk.org Cc: Thibaut Collet , Thomas Monjalon , stable@dpdk.org, maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com, jerinj@marvell.com, gavin.hu@arm.com Date: Wed, 11 Sep 2019 18:04:09 +0200 Message-Id: <4532a3e5b53802da7e1b35c6c9383b406a18c30d.1568216827.git.thierry.herbelot@6wind.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] virtio: get all pending rx packets with vectorized functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Thibaut Collet The loop to read packets does not take all packets as the number of available packets (nb_used) is decremented in the loop. Take all available packets provides a performance improvement of 3%. Fixes: fc3d66212fed ("virtio: add vector Rx") Cc: stable@dpdk.org Cc: maxime.coquelin@redhat.com Cc: tiwei.bie@intel.com Cc: zhihong.wang@intel.com Cc: jerinj@marvell.com Cc: gavin.hu@arm.com Signed-off-by: Thibaut Collet Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx_simple_neon.c | 5 +++-- drivers/net/virtio/virtio_rxtx_simple_sse.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c index 70e89fc428e0..992e71f010eb 100644 --- a/drivers/net/virtio/virtio_rxtx_simple_neon.c +++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c @@ -42,7 +42,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, struct virtnet_rx *rxvq = rx_queue; struct virtqueue *vq = rxvq->vq; struct virtio_hw *hw = vq->hw; - uint16_t nb_used; + uint16_t nb_used, nb_total; uint16_t desc_idx; struct vring_used_elem *rused; struct rte_mbuf **sw_ring; @@ -106,9 +106,10 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, virtqueue_notify(vq); } + nb_total = nb_used; ref_rx_pkts = rx_pkts; for (nb_pkts_received = 0; - nb_pkts_received < nb_used;) { + nb_pkts_received < nb_total;) { uint64x2_t desc[RTE_VIRTIO_DESC_PER_LOOP / 2]; uint64x2_t mbp[RTE_VIRTIO_DESC_PER_LOOP / 2]; uint64x2_t pkt_mb[RTE_VIRTIO_DESC_PER_LOOP]; diff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c index cb1610e71563..f9ec4ae69986 100644 --- a/drivers/net/virtio/virtio_rxtx_simple_sse.c +++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c @@ -43,7 +43,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, struct virtnet_rx *rxvq = rx_queue; struct virtqueue *vq = rxvq->vq; struct virtio_hw *hw = vq->hw; - uint16_t nb_used; + uint16_t nb_used, nb_total; uint16_t desc_idx; struct vring_used_elem *rused; struct rte_mbuf **sw_ring; @@ -108,9 +108,10 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, virtqueue_notify(vq); } + nb_total = nb_used; ref_rx_pkts = rx_pkts; for (nb_pkts_received = 0; - nb_pkts_received < nb_used;) { + nb_pkts_received < nb_total;) { __m128i desc[RTE_VIRTIO_DESC_PER_LOOP / 2]; __m128i mbp[RTE_VIRTIO_DESC_PER_LOOP / 2]; __m128i pkt_mb[RTE_VIRTIO_DESC_PER_LOOP];