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 95844A0093 for ; Tue, 19 May 2020 15:13:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8B8511D73C; Tue, 19 May 2020 15:13:07 +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 6D5001D702 for ; Tue, 19 May 2020 15:13:06 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id f134so3026936wmf.1 for ; Tue, 19 May 2020 06:13:06 -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=Tw62xiZmmW7xFWmRLEIaI9JUm//kQ5lO80926Oes5hQ=; b=aNo8RPLIb0jv/nJnzMKrBsvqZMyJ1q7+AIl+IN2iLdOPJmP4hasV0+dU+500gR12SC +LoUxJuRdJvXvL5d+kS4RbsbAe1IGGs/X18Nca7JnWbjg7+gcZLTVQ+3jc67ROrUvb4i clpwGdcS9ivjgH0K4JtNs+oFVd1eD7SbKDOzm8PXJwWaMgmIcBxgrrfnHTxaPLLf0wDI XR0IUJaFCrZPeZK/EIH2kCLEbKfaXfAESbOWKg93y0UWioz/nJ7CK1DA3JcOVctzCEEs 4sCxIpeV4C/cV71gJIBNk0K0bzDI5lB+yPzZphBdPwuS272BCm5+YFMEPRzSWx4Oo7+z bHxg== 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=Tw62xiZmmW7xFWmRLEIaI9JUm//kQ5lO80926Oes5hQ=; b=oUPMxCGubUekUdRXJq0DLlCIFUI0BL5g5gCO2nUaHz9CVoHVKvPlTHZdsO5vZ0XatS UsaPBVsnDQrPZ+7Bs87USqnFsVzpHfHuNrBbhB9ltq+65dByJCCRirQZolG/3w3O/F/O yiZtG8YM/BdiYJ4bqoqG16cifKvR0qRGbzt1be4tVm3mYU+3SfLTqmFaRqT7SDz/LTXk sn1kT4Ow6yxm+iWGtv3VFvQuIyYZ7w/WhUvu7uxEpBpCE15rwK6/AYL+/+Z2C4rY9Riy uuTBvc0YE5R6rx+XigFVR3UfqmMcabSe9V1Fiucpsj0MiiEJ2dTK1HA5JEUHY7RS7rX6 i74g== X-Gm-Message-State: AOAM532zkYMPit9KjJWX7yspElDg80AMTRzMayMqSwtwXTUhOhn4iXlJ 0GgHDBNs+nhxBcC0o/MBAmn0KFhkC3PZziIw X-Google-Smtp-Source: ABdhPJzbAJm+5kqTNANxGeD2uQ12xEJSAUdUJFXhlkAIzS+7GjaVeBeQ1MZinbFMgPR1dGTfts9ugQ== X-Received: by 2002:a1c:3bc5:: with SMTP id i188mr5417972wma.90.1589893986170; Tue, 19 May 2020 06:13:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a13sm20359931wrv.67.2020.05.19.06.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Somnath Kotur Cc: Kalesh AP , dpdk stable Date: Tue, 19 May 2020 14:04:31 +0100 Message-Id: <20200519130549.112823-136-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix max ring count' 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/21/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 fe42bb4b74d1d537fc8c758341e1b9afc44afe44 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Fri, 24 Apr 2020 16:30:54 +0530 Subject: [PATCH] net/bnxt: fix max ring count [ upstream commit 9bccd7010f1f627895409fe189627b2dd5a2c460 ] Max Rx Ring count could be < Max stat contexts. While accounting for stat contexts, this should be also considered and the max ring count adjusted accordingly. Fixes: f03e66cb64ce ("net/bnxt: limit queue count for NS3/Stingray devices") Signed-off-by: Somnath Kotur Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index cfd6f197da..0ef0282d2a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -630,10 +630,10 @@ struct bnxt { #define MAX_STINGRAY_RINGS 128U /* For sake of symmetry, max Tx rings == max Rx rings, one stat ctx for each */ #define BNXT_MAX_RX_RINGS(bp) \ - (BNXT_STINGRAY(bp) ? RTE_MIN(RTE_MIN(bp->max_rx_rings, \ + (BNXT_STINGRAY(bp) ? RTE_MIN(RTE_MIN(bp->max_rx_rings / 2U, \ MAX_STINGRAY_RINGS), \ bp->max_stat_ctx / 2U) : \ - RTE_MIN(bp->max_rx_rings, \ + RTE_MIN(bp->max_rx_rings / 2U, \ bp->max_stat_ctx / 2U)) #define BNXT_MAX_TX_RINGS(bp) \ (RTE_MIN((bp)->max_tx_rings, BNXT_MAX_RX_RINGS(bp))) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.970202575 +0100 +++ 0136-net-bnxt-fix-max-ring-count.patch 2020-05-19 14:04:44.448652578 +0100 @@ -1,14 +1,15 @@ -From 9bccd7010f1f627895409fe189627b2dd5a2c460 Mon Sep 17 00:00:00 2001 +From fe42bb4b74d1d537fc8c758341e1b9afc44afe44 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Fri, 24 Apr 2020 16:30:54 +0530 Subject: [PATCH] net/bnxt: fix max ring count +[ upstream commit 9bccd7010f1f627895409fe189627b2dd5a2c460 ] + Max Rx Ring count could be < Max stat contexts. While accounting for stat contexts, this should be also considered and the max ring count adjusted accordingly. Fixes: f03e66cb64ce ("net/bnxt: limit queue count for NS3/Stingray devices") -Cc: stable@dpdk.org Signed-off-by: Somnath Kotur Reviewed-by: Kalesh AP @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index 586d3f5349..12fed1e9d7 100644 +index cfd6f197da..0ef0282d2a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h -@@ -653,10 +653,10 @@ struct bnxt { +@@ -630,10 +630,10 @@ struct bnxt { #define MAX_STINGRAY_RINGS 128U /* For sake of symmetry, max Tx rings == max Rx rings, one stat ctx for each */ #define BNXT_MAX_RX_RINGS(bp) \