From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2C0FBA0527 for ; Mon, 9 Nov 2020 19:43:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 25A886883; Mon, 9 Nov 2020 19:43:24 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by dpdk.org (Postfix) with ESMTP id D96BB6883 for ; Mon, 9 Nov 2020 19:43:21 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id 33so9863131wrl.7 for ; Mon, 09 Nov 2020 10:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d60xAptA4TaS8/5akcBvm77zmLSrruB39CsoUWlY1xk=; b=Ww5+ahVovnPudRzzv/1UCyftJ0MM6tcbojW5aX3gDYWlYVRzoH93MhljIwI4SIhvM/ lVqT5CFcTw6l6wdOp+6gx53+7BJ8OQ8cvn+VNfr1qudso4uk2XlgdZlTFoOPTxOa9+eQ +ReSqETyhfxbRlTA9tUH/9He153jN31k40SeOEbBl51W+j3ZwmBV/LszrRKVOdejbiGs W8tcJ4vbM21oG6vLymhrWicgM4G6X9ULiV6gMkCp4qMqCkz0gAuT2rEkg02kHRypZ0yJ qKz5aGYvy7BxiDpFMAgg5eYUNFhqvCp4vi8OBi+N/PKIVKYiB0ULYtWxtN0+02I3PPvj qfTw== 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=d60xAptA4TaS8/5akcBvm77zmLSrruB39CsoUWlY1xk=; b=fjcXgbG4ZgRajHNKUWyuSSLLXH9LKc5YqYXnz7L552GbbQxuGYrqDsZMLXjQh6IhRk Qk+n7vSMVBTjsvA9ZAEMU8WNSKxSRV+cQgIHLITV6jFPDsfv8KX71Be4S3eQU9TGAlz5 V5UjZjXF5n0S/hbVvih/mT9tjUIknU0v4kIRNb+QaAgCyJmR2dRJJ/LT+ZW99goOGPnp GJP0G2CEiB1Qe5WqnVNUE5m/zPI8kQJbOEu3LI6IUcCWLSUvi5Zlumu/c1Gu6NNWCh5j 1h37UdHl9m0jSfcWJIdPJ4YD2DlnT3CUsjNjFyg+WwUceHoWo6qTYW2HV+TwAz0bZ4Bi OmKg== X-Gm-Message-State: AOAM532e/hex/ZFdiSkgMOjSVtnnZ3bJwiTN115W62KZl8gA9+t8DlK3 dVvqjbmeakCHNDxEZdlTdYs= X-Google-Smtp-Source: ABdhPJyPaJxmTsGrCs6zF2zVNpbZObiqFSUGc1vAzniD6uhCT0xJ6cms8lMgpCSIsbg67y1UCpujUw== X-Received: by 2002:adf:eb4f:: with SMTP id u15mr19516257wrn.165.1604947401618; Mon, 09 Nov 2020 10:43:21 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t74sm345177wmt.8.2020.11.09.10.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:43:20 -0800 (PST) From: luca.boccassi@gmail.com To: Jeff Guo Cc: Yingya Han , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Qi Zhang , dpdk stable Date: Mon, 9 Nov 2020 18:40:24 +0000 Message-Id: <20201109184111.3463090-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix vector Rx' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2bce196481e8f3757462716c14b4f270a64b0ee5 Thanks. Luca Boccassi --- >From 2bce196481e8f3757462716c14b4f270a64b0ee5 Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Fri, 16 Oct 2020 17:44:29 +0800 Subject: [PATCH] net/ice: fix vector Rx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 7d911640b0a739f55d8fc40a625e0bc8f0831805 ] The limitation of burst size in vector rx was removed, since it should retrieve as much received packets as possible. And also the scattered receive path should use a wrapper function to achieve the goal of burst maximizing. Bugzilla ID: 516 Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx") Signed-off-by: Jeff Guo Tested-by: Yingya Han Acked-by: Morten Brørup Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx_vec_sse.c | 46 +++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c index 70b43e680b..cfa65aae91 100644 --- a/drivers/net/ice/ice_rxtx_vec_sse.c +++ b/drivers/net/ice/ice_rxtx_vec_sse.c @@ -205,10 +205,11 @@ ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts, } /** + * vPMD raw receive routine, only accept(nb_pkts >= ICE_DESCS_PER_LOOP) + * * Notice: * - nb_pkts < ICE_DESCS_PER_LOOP, just return no packet - * - nb_pkts > ICE_VPMD_RX_BURST, only scan ICE_VPMD_RX_BURST - * numbers of DD bits + * - floor align nb_pkts to a ICE_DESCS_PER_LOOP power-of-two */ static inline uint16_t _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -264,9 +265,6 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, const __m128i eop_check = _mm_set_epi64x(0x0000000200000002LL, 0x0000000200000002LL); - /* nb_pkts shall be less equal than ICE_MAX_RX_BURST */ - nb_pkts = RTE_MIN(nb_pkts, ICE_MAX_RX_BURST); - /* nb_pkts has to be floor-aligned to ICE_DESCS_PER_LOOP */ nb_pkts = RTE_ALIGN_FLOOR(nb_pkts, ICE_DESCS_PER_LOOP); @@ -454,15 +452,15 @@ ice_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, return _ice_recv_raw_pkts_vec(rx_queue, rx_pkts, nb_pkts, NULL); } -/* vPMD receive routine that reassembles scattered packets +/** + * vPMD receive routine that reassembles single burst of 32 scattered packets + * * Notice: * - nb_pkts < ICE_DESCS_PER_LOOP, just return no packet - * - nb_pkts > ICE_VPMD_RX_BURST, only scan ICE_VPMD_RX_BURST - * numbers of DD bits */ -uint16_t -ice_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, - uint16_t nb_pkts) +static uint16_t +ice_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) { struct ice_rx_queue *rxq = rx_queue; uint8_t split_flags[ICE_VPMD_RX_BURST] = {0}; @@ -496,6 +494,32 @@ ice_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, &split_flags[i]); } +/** + * vPMD receive routine that reassembles scattered packets. + */ +uint16_t +ice_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) +{ + uint16_t retval = 0; + + while (nb_pkts > ICE_VPMD_RX_BURST) { + uint16_t burst; + + burst = ice_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + ICE_VPMD_RX_BURST); + retval += burst; + nb_pkts -= burst; + if (burst < ICE_VPMD_RX_BURST) + return retval; + } + + return retval + ice_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + nb_pkts); +} + static inline void ice_vtx1(volatile struct ice_tx_desc *txdp, struct rte_mbuf *pkt, uint64_t flags) -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:12.652471319 +0000 +++ 0036-net-ice-fix-vector-Rx.patch 2020-11-09 18:40:11.159311718 +0000 @@ -1 +1 @@ -From 7d911640b0a739f55d8fc40a625e0bc8f0831805 Mon Sep 17 00:00:00 2001 +From 2bce196481e8f3757462716c14b4f270a64b0ee5 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 7d911640b0a739f55d8fc40a625e0bc8f0831805 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 1afd96ac9d..e950c1b922 100644 +index 70b43e680b..cfa65aae91 100644 @@ -30 +31 @@ -@@ -254,10 +254,11 @@ ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts, +@@ -205,10 +205,11 @@ ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts, @@ -44 +45 @@ -@@ -314,9 +315,6 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -264,9 +265,6 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -54 +55 @@ -@@ -560,15 +558,15 @@ ice_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -454,15 +452,15 @@ ice_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -76 +77 @@ -@@ -602,6 +600,32 @@ ice_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -496,6 +494,32 @@ ice_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,