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 43D4CA0527 for ; Mon, 9 Nov 2020 19:43:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3CBB069C8; Mon, 9 Nov 2020 19:43:25 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 4295A69C8 for ; Mon, 9 Nov 2020 19:43:23 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id o15so2034782wru.6 for ; Mon, 09 Nov 2020 10:43:23 -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=4q97bPs9V1NFW/6yKbUapac55n0/1nhIR2ejFU+/rno=; b=dC8/WVIE2jOGd/YxJQsatXDCRTEtaGKmLhmUNuq8cnFTQSvUJnIp4NyK2BZJOy4El+ sE4aUWsmTjAUo3L10c6rCfJ4fRvjVNagHcThYOAGDlaGhWbF254uLwb68kTB96AM9sxt jbukTKKWQ44kc9KzejzBANLE6TMBJCbeI3/IvTZXaTvZpQhWiOfpMZO3kXt1lnCdwyUC kU+1SRcIDRtDD8zIYzqo38xxLXIst4BlkOa9M/23xpQvk114V/RldQZxirdI2VwS9DX4 V0dFyX1uSz14WZpJj0QBPTyNaLcDxt5K5d8q39qLYFVjAwlstRsD1KkruqFtARuvKL+A TjEQ== 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=4q97bPs9V1NFW/6yKbUapac55n0/1nhIR2ejFU+/rno=; b=cD5L+Tn/b9LSL51BRR2kd3vczCkcxsbiKORxavjh+wh/GJL63x+Pi489vqcx+6Yjlm bS3f5iR6q9jUTLGrVfuCz48aEpaR638aDqEKOJb7ArBngR56GtGtVhl5sPl07M2bEAsn VK5QlGx8HBPVL9wyZQXtKmOXYv1/yz8x6zTnfLkLEX5/2lApbNLCcgudLoYiSTid6pmd j8ZTdHtcP3UckADzuQ+Xk9Dx09L8tkHJ4MNfxuxAG/qZXNnB9I8tKvdUJ62KsR3uwgTT X6pHLUHrXR7ahCIbQB0IKZScuvp1AzOAHBkUWZi6Ix3nyxK5tMffkvtsdM8KbYOmf2/w cwxQ== X-Gm-Message-State: AOAM532Nw4Q8/NaSg2FQZTJ7DZGYUxP7jjZx2vyKDRe4sbFE2Augi3GQ zmBfpd+4xMV2FYpfKY+6VMk= X-Google-Smtp-Source: ABdhPJwV17xXZmpKhePQDr3Ii55Sk9ryoTGyWlh+dTpYmyh5cS9dmCXP6iAc3eqnKp6XfJf8HiAAog== X-Received: by 2002:a5d:4c4f:: with SMTP id n15mr18830692wrt.137.1604947402965; Mon, 09 Nov 2020 10:43:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 34sm16140413wrq.27.2020.11.09.10.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:43:22 -0800 (PST) From: luca.boccassi@gmail.com To: Jeff Guo Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Qi Zhang , dpdk stable Date: Mon, 9 Nov 2020 18:40:25 +0000 Message-Id: <20201109184111.3463090-37-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/fm10k: 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/4445ad3496d8a6b9894af59f876f0e92f8d80921 Thanks. Luca Boccassi --- >From 4445ad3496d8a6b9894af59f876f0e92f8d80921 Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Fri, 16 Oct 2020 17:44:30 +0800 Subject: [PATCH] net/fm10k: fix vector Rx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 2b768c43941fc9f86670b470523c8e5708a8080d ] The scattered receive path should use a wrapper function to achieve the goal of burst maximizing. Bugzilla ID: 516 Fixes: fe65e1e1ce61 ("fm10k: add vector scatter Rx") Signed-off-by: Jeff Guo Acked-by: Morten Brørup Acked-by: Qi Zhang --- drivers/net/fm10k/fm10k_rxtx_vec.c | 39 ++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index d76dfd16fd..1194251396 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -645,18 +645,15 @@ fm10k_reassemble_packets(struct fm10k_rx_queue *rxq, return pkt_idx; } -/* - * vPMD receive routine that reassembles scattered packets +/** + * vPMD receive routine that reassembles single burst of 32 scattered packets * * Notice: * - don't support ol_flags for rss and csum err - * - nb_pkts > RTE_FM10K_MAX_RX_BURST, only scan RTE_FM10K_MAX_RX_BURST - * numbers of DD bit */ -uint16_t -fm10k_recv_scattered_pkts_vec(void *rx_queue, - struct rte_mbuf **rx_pkts, - uint16_t nb_pkts) +static uint16_t +fm10k_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) { struct fm10k_rx_queue *rxq = rx_queue; uint8_t split_flags[RTE_FM10K_MAX_RX_BURST] = {0}; @@ -691,6 +688,32 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue, &split_flags[i]); } +/** + * vPMD receive routine that reassembles scattered packets. + */ +uint16_t +fm10k_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) +{ + uint16_t retval = 0; + + while (nb_pkts > RTE_FM10K_MAX_RX_BURST) { + uint16_t burst; + + burst = fm10k_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + RTE_FM10K_MAX_RX_BURST); + retval += burst; + nb_pkts -= burst; + if (burst < RTE_FM10K_MAX_RX_BURST) + return retval; + } + + return retval + fm10k_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + nb_pkts); +} + static const struct fm10k_txq_ops vec_txq_ops = { .reset = fm10k_reset_tx_queue, }; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:12.683932758 +0000 +++ 0037-net-fm10k-fix-vector-Rx.patch 2020-11-09 18:40:11.163311780 +0000 @@ -1 +1 @@ -From 2b768c43941fc9f86670b470523c8e5708a8080d Mon Sep 17 00:00:00 2001 +From 4445ad3496d8a6b9894af59f876f0e92f8d80921 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 2b768c43941fc9f86670b470523c8e5708a8080d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index eff3933b5c..6fcc939ad9 100644 +index d76dfd16fd..1194251396 100644