From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1951FA0524 for ; Fri, 5 Feb 2021 12:21:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 128EC1606C7; Fri, 5 Feb 2021 12:21:34 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id E041D4067B for ; Fri, 5 Feb 2021 12:21:31 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id m13so7231179wro.12 for ; Fri, 05 Feb 2021 03:21:31 -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=rDKQ8u17OEMxy+bhE7h8OO3idpFHOb+6321KXpqCfEw=; b=apVHX+xAd68d5sEugdtwkpn5BCXfw46SduWUrhCJ43IxCy+NX9xDyXssBt0eKg/DYb h0IHvmEwB5iGN4EdYZ5AEO/HzsLqPYHeNVFw+ksLWLoCd3zSeNq9AIXs2CB97Ot1bk+q R441c3EKD7WSlLRo1H8v2w3R0OgcwV66bUUMusIsqo/RK2oI+p6Le19qV6oKVHgqNOKU vRN5YYOmp/+6xjMzHvEJGuIU7qVjoh8avkwompV0fLTpbIatn6thI2Qnbp8tY70wALvK 2nfpilMwvU3ZTVr6Tk3fMFIKb16omBya2nwhigFEQjeZOaK4O/xynkvta5TsJuruZ1Hh kg0g== 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=rDKQ8u17OEMxy+bhE7h8OO3idpFHOb+6321KXpqCfEw=; b=sYhk3YmMMDNuvgx9pUlIL+RQp6AfOad6sW420oUXAx2GnxqxVZvoarFtWIwDe1CV6H 0W0i7QVVC24HasVRR/josLQ1g2D55Ix0qB2pYT3p3aHEMnGUE5lRKsuHa/YbExGah441 M0DjLfraPJ04dwzCNBF+4fBcHvEM0/Zn3O3olvFzzBv71kLsHii5norwPdig4D57Ufr0 2CLdzbpx+Hmhlj6sLVvE226cgdBeMRZu1FOW5k625oaVNXL74pF6iOGZ3jsN1ITOj0n+ 17BYtYC1nSapIR5UsOR3RlhtfvQtXxj5e203L2BOd2JxUtiUjdd79t8+XI9Y2JWYPUSg MGdw== X-Gm-Message-State: AOAM532cE7mSimDQOf5kVQD85ZBNgcq4JixMuWn9K9rSwIm0ztdal4h/ s8FpFIZ1d9bnPBLG7N4JADA= X-Google-Smtp-Source: ABdhPJy95IUvpCPt22VsFayKXAveCXg8EwxMR0uHdB0coyvn2RUYQvO3PylbuY6xgt0Xs0H4ilcndw== X-Received: by 2002:a5d:65ca:: with SMTP id e10mr4613978wrw.166.1612524091723; Fri, 05 Feb 2021 03:21:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y63sm8426430wmd.21.2021.02.05.03.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:31 -0800 (PST) From: luca.boccassi@gmail.com To: Samik Gupta Cc: Ajit Khaparde , Lance Richardson , Somnath Kotur , dpdk stable Date: Fri, 5 Feb 2021 11:15:26 +0000 Message-Id: <20210205111920.1272063-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix VNIC config on Rx queue stop' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/87fc956cc92072d5e52d644fda6e352c6478cf0c Thanks. Luca Boccassi --- >From 87fc956cc92072d5e52d644fda6e352c6478cf0c Mon Sep 17 00:00:00 2001 From: Samik Gupta Date: Fri, 6 Nov 2020 16:41:21 -0500 Subject: [PATCH] net/bnxt: fix VNIC config on Rx queue stop [ upstream commit e36b1cd6b8cd20dbb323be7a01b8152cbb07afd4 ] Reconfigure a vnic's default ring if the current default ring is stopped by the application. It picks the lowest numbered ring that is currently active to be the new default, and issues the hwrm_vnic_cfg command to update the configuration. Applies to adapters that are not Thor-based. Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop") Signed-off-by: Samik Gupta Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_rxq.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index e0ec342162..61196eba93 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -557,12 +557,12 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) rc = bnxt_vnic_rss_configure(bp, vnic); } - if (BNXT_CHIP_THOR(bp)) { - /* Compute current number of active receive queues. */ - for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) - if (bp->rx_queues[i]->rx_started) - active_queue_cnt++; + /* Compute current number of active receive queues. */ + for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) + if (bp->rx_queues[i]->rx_started) + active_queue_cnt++; + if (BNXT_CHIP_THOR(bp)) { /* * For Thor, we need to ensure that the VNIC default receive * ring corresponds to an active receive queue. When no queue @@ -582,6 +582,22 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) /* Reconfigure default receive ring. */ bnxt_hwrm_vnic_cfg(bp, vnic); } + } else if (active_queue_cnt) { + /* + * If the queue being stopped is the current default queue and + * there are other active queues, pick one of them as the + * default and reconfigure the vnic. + */ + if (vnic->dflt_ring_grp == bp->grp_info[rx_queue_id].fw_grp_id) { + for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) { + if (bp->rx_queues[i]->rx_started) { + vnic->dflt_ring_grp = + bp->grp_info[i].fw_grp_id; + bnxt_hwrm_vnic_cfg(bp, vnic); + break; + } + } + } } if (rc == 0) -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.095283209 +0000 +++ 0040-net-bnxt-fix-VNIC-config-on-Rx-queue-stop.patch 2021-02-05 11:18:28.706689208 +0000 @@ -1 +1 @@ -From e36b1cd6b8cd20dbb323be7a01b8152cbb07afd4 Mon Sep 17 00:00:00 2001 +From 87fc956cc92072d5e52d644fda6e352c6478cf0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e36b1cd6b8cd20dbb323be7a01b8152cbb07afd4 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org