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 1D03BA04A4 for ; Wed, 27 May 2020 11:24:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 140091D651; Wed, 27 May 2020 11:24:51 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id E0E191D645 for ; Wed, 27 May 2020 11:24:49 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id x13so8623006wrv.4 for ; Wed, 27 May 2020 02:24:49 -0700 (PDT) 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=UL5K3BKbp4my1cA8Q+6NmbnINPgJ/o/5zsgVD1xGAHg=; b=GcHA/yCYjWyDSajD5FB2ZNFz48iJnhilaF5n3PQvFyaNMTWhtnWTUdAF+dDFCOJqwg bGuy3SFznPzgs0DsD+TvOM3CRRc2oEo+j0tOpwXr7as6IiHCA2batZGVusNkLDzaw6gr 6bE6GipoqudKgwO8n5qQH1TZbKaxGtaPZi0tF2uo2DXF4OS8Nr7hEqphZcQz4LK+dhcS +QDr67nOYHipCJz+YfsgL+yOsWNnhrPBQIEBbK7uJMQNjpG5oRK/kT7wPsbdrN4WsxBx bbH8Mb6elM906Lz89f6PBCWlUd8KDGGfMh0ghgvkiug+9Cx4DJSUuLh66ZDm3hv8uzgn RHsA== 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=UL5K3BKbp4my1cA8Q+6NmbnINPgJ/o/5zsgVD1xGAHg=; b=WrfU/m9bqHjKEsaNMTULOfVSheKzmT7VQrSyETzK4HXEZLETfKGIJK52uPTm0AOtZu yXOvwl/VnUGoltLSyQiKFkAF3Uv2ZlIB9W8Pfm9GmYxWGumUL7W2wGlbwUlEiRX/l0cy J7lQJe6N+5FD91EMmpazVQ7q6bVZLscokDDXavqE++c+QoS2SJ07qUuUemOb/yJ1Q74E vwAnqc0E1XziEDyTXbh+yAgJjAnyj2XHtrzUZcAyMMGjMQhQX6tI103U9//nqkss7/qg 9O3h4U2FCztHreMRhWBO2N0tZD0MI78w5uRjA0jys5HsKROd7h9Vq4+taMlcBqstRc2V t/+g== X-Gm-Message-State: AOAM530VfjgIzgzmQFyk04es3fQEbETDuRwE2LBUTZZmhz/TVk+US/cn SKWyV9RmcZ/ddCP7xhyFghh9bMz2EQ0= X-Google-Smtp-Source: ABdhPJww+U1KzZ7aZr+BIaw9l9wvuaGYzzK/r4Cs3B5CnIlYHc0ukRvE372phWsG+0jObh6HikH6qA== X-Received: by 2002:adf:9c84:: with SMTP id d4mr2167794wre.327.1590571489574; Wed, 27 May 2020 02:24:49 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s8sm2294933wrg.50.2020.05.27.02.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Gupta Cc: Kalesh AP , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 27 May 2020 10:24:09 +0100 Message-Id: <20200527092422.258652-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix Rx ring producer index' has been queued to stable release 19.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 stable release 19.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 05/29/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. Thanks. Luca Boccassi --- >From 586faf5a4ff8e35fc5abb083327ba7f92bf3cd4e Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Wed, 20 May 2020 23:09:18 +0530 Subject: [PATCH] net/bnxt: fix Rx ring producer index [ upstream commit 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 ] When a queue is started after deferred_start, then increment raw_prod irrespective of new mbuf is allocated or old mbufs are used. Fixes: d256c73c1122 ("net/bnxt: fix memory leak during queue restart") Signed-off-by: Rahul Gupta Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 3ebc398375..fa3b4a6be4 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -860,9 +860,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) rxq->queue_id, i, ring->ring_size); break; } - rxr->rx_prod = prod; - prod = RING_NEXT(rxr->rx_ring_struct, prod); } + rxr->rx_prod = prod; + prod = RING_NEXT(rxr->rx_ring_struct, prod); } ring = rxr->ag_ring_struct; @@ -878,9 +878,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) rxq->queue_id, i, ring->ring_size); break; } - rxr->ag_prod = prod; - prod = RING_NEXT(rxr->ag_ring_struct, prod); } + rxr->ag_prod = prod; + prod = RING_NEXT(rxr->ag_ring_struct, prod); } PMD_DRV_LOG(DEBUG, "AGG Done!\n"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.856330131 +0100 +++ 0006-net-bnxt-fix-Rx-ring-producer-index.patch 2020-05-27 10:23:31.627933720 +0100 @@ -1,13 +1,14 @@ -From 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 Mon Sep 17 00:00:00 2001 +From 586faf5a4ff8e35fc5abb083327ba7f92bf3cd4e Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Wed, 20 May 2020 23:09:18 +0530 Subject: [PATCH] net/bnxt: fix Rx ring producer index +[ upstream commit 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 ] + When a queue is started after deferred_start, then increment raw_prod irrespective of new mbuf is allocated or old mbufs are used. Fixes: d256c73c1122 ("net/bnxt: fix memory leak during queue restart") -Cc: stable@dpdk.org Signed-off-by: Rahul Gupta Signed-off-by: Kalesh AP @@ -18,10 +19,10 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c -index d2955bae3c..ee1acb1969 100644 +index 3ebc398375..fa3b4a6be4 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c -@@ -987,9 +987,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) +@@ -860,9 +860,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) rxq->queue_id, i, ring->ring_size); break; } @@ -33,7 +34,7 @@ } ring = rxr->ag_ring_struct; -@@ -1005,9 +1005,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) +@@ -878,9 +878,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) rxq->queue_id, i, ring->ring_size); break; }