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 250B1A2E1B for ; Thu, 5 Sep 2019 12:18:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1C3F71EF7B; Thu, 5 Sep 2019 12:18:35 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F3F3C1EF7B for ; Thu, 5 Sep 2019 12:18:33 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69C0F121D; Thu, 5 Sep 2019 10:18:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 296DA19C6A; Thu, 5 Sep 2019 10:18:31 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Lei Yao , Xiaolong Ye , dpdk stable Date: Thu, 5 Sep 2019 11:17:14 +0100 Message-Id: <20190905101754.21933-14-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 05 Sep 2019 10:18:33 +0000 (UTC) Subject: [dpdk-stable] patch 'net/avf: fix endless loop' has been queued to LTS release 18.11.3 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c452a379d36f0c8b99c38deca831606f848f7a10 Thanks. Kevin Traynor --- >From c452a379d36f0c8b99c38deca831606f848f7a10 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 25 Jul 2019 12:38:29 +0800 Subject: [PATCH] net/avf: fix endless loop [ upstream commit 43b29221c1f13189f41d5200027a22f11149dfee ] Change loop index from uint16_t to uint32_t since max index 65535 could be exceeded when ring size is 2k+. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Reported-by: Lei Yao Signed-off-by: Qi Zhang Reviewed-by: Xiaolong Ye --- drivers/net/avf/avf_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c index 1073876e4..8c8771e66 100644 --- a/drivers/net/avf/avf_rxtx.c +++ b/drivers/net/avf/avf_rxtx.c @@ -145,5 +145,6 @@ static inline void reset_rx_queue(struct avf_rx_queue *rxq) { - uint16_t len, i; + uint16_t len; + uint32_t i; if (!rxq) @@ -175,5 +176,6 @@ reset_tx_queue(struct avf_tx_queue *txq) { struct avf_tx_entry *txe; - uint16_t i, prev, size; + uint32_t i, size; + uint16_t prev; if (!txq) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:48.364367038 +0100 +++ 0014-net-avf-fix-endless-loop.patch 2019-09-05 10:36:47.483701169 +0100 @@ -1 +1 @@ -From 43b29221c1f13189f41d5200027a22f11149dfee Mon Sep 17 00:00:00 2001 +From c452a379d36f0c8b99c38deca831606f848f7a10 Mon Sep 17 00:00:00 2001 @@ -4 +4,3 @@ -Subject: [PATCH] net/iavf: fix endless loop +Subject: [PATCH] net/avf: fix endless loop + +[ upstream commit 43b29221c1f13189f41d5200027a22f11149dfee ] @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/iavf/iavf_rxtx.c | 6 ++++-- + drivers/net/avf/avf_rxtx.c | 6 ++++-- @@ -19,4 +20,4 @@ -diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c -index d8eb6d296..22d7bb612 100644 ---- a/drivers/net/iavf/iavf_rxtx.c -+++ b/drivers/net/iavf/iavf_rxtx.c +diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c +index 1073876e4..8c8771e66 100644 +--- a/drivers/net/avf/avf_rxtx.c ++++ b/drivers/net/avf/avf_rxtx.c @@ -24 +25 @@ - reset_rx_queue(struct iavf_rx_queue *rxq) + reset_rx_queue(struct avf_rx_queue *rxq) @@ -31 +32 @@ -@@ -175,5 +176,6 @@ reset_tx_queue(struct iavf_tx_queue *txq) +@@ -175,5 +176,6 @@ reset_tx_queue(struct avf_tx_queue *txq) @@ -33 +34 @@ - struct iavf_tx_entry *txe; + struct avf_tx_entry *txe;