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 3CD8CA0524 for ; Fri, 5 Feb 2021 12:22:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 345A81606C3; Fri, 5 Feb 2021 12:22:02 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id A77A14067B for ; Fri, 5 Feb 2021 12:22:00 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id 7so7339875wrz.0 for ; Fri, 05 Feb 2021 03:22:00 -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=mmiaLsjmU+FRBZwP5gXeD8VWUvetzMct/o0YELnJpG0=; b=OvRSIBkgx0aMGubmKuhQIgQM6pz1HeNidLpXMDz7pfiyVmayM6xT++bdsjPd4GCBf5 3k7S/J0yj/IZ0i945VruHlxfGAR7KrTFaqvApW+jdwe97SrDBNdQjaqkNXFEJUGxmHcZ lWRyrhTQaX19X7Biq+8GGQ7IUfhMkc1twX+gwNtcRpgA/E1romQ0OKkOaTJ7plganKkt bN7XQneUPcb8RAw07WVk4ZO0buBkAMxhYuKs5PeJZVijn2gq1Ut4P6hTdph9vWuqr0rD /vCkq9hIK/x2TsmboI2oaymO5VgzVLGWrsvaZ2BA5FzanpnQPZSjPaVUnOB32H0TyWmc Medw== 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=mmiaLsjmU+FRBZwP5gXeD8VWUvetzMct/o0YELnJpG0=; b=nyzuMN9E0F6I0wJqZ8dA30loMYPT3mPpwdY6jlYYEF1QikEstoZu5RnHZsybYlB2WG JYs7iVV0n/dGaTxdR0e3PY8ZsdN5M45gSY83YSkERK5AZ4YjbmAIWNr1mPohbHbPVjDI ldpmKWwZVoPsB2JJKM8gmbOnEHOfjQDaIOFqUwh9W7h2Fs7f/QlkD5FNJ0ZxJrIdK7FD r+vZThc4VXkRGE5gKqyNJ5E7xdnZL6FsCaYE2Z9+XNCbe27X7snZn7szVbfPcKz+HSdZ dfY5tqHUZhxGDVEbOPEgpKXyiiS9WfA/Ydl5YyNoWoAGjAGl/mWUXJYS3yDRB5APmXex B5+A== X-Gm-Message-State: AOAM532OKKSzb737CY9linpsZPO40A6Tt8GbS+bYVhS70iNvNOsEy4BE XPODdd2JNN7SRLZFcUluQTQ= X-Google-Smtp-Source: ABdhPJwyAAR2VctvoEVn/PPYSHnoE39BtBi15/eNCANu7ULR57T7LyKNXDpQDI8EDIJr9XdjmWOG+Q== X-Received: by 2002:adf:e381:: with SMTP id e1mr4428205wrm.22.1612524120498; Fri, 05 Feb 2021 03:22:00 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z18sm12205828wro.91.2021.02.05.03.21.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:59 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Fri, 5 Feb 2021 11:15:33 +0000 Message-Id: <20210205111920.1272063-47-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 RSS configure function' 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/0012f36035029ab055b6e70dab184611c0c838a2 Thanks. Luca Boccassi --- >From 0012f36035029ab055b6e70dab184611c0c838a2 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 7 Oct 2020 09:11:50 +0530 Subject: [PATCH] net/bnxt: fix VNIC RSS configure function [ upstream commit 5f0f9a45aca26d8462eb2dfce34c6d3561610915 ] 1. Moved invalid VNIC id check to the beginning of the function. 2. Removed a duplicate check which avoids unnecessary code indentation. Fixes: 49d0709b257f ("net/bnxt: delete and flush L2 filters cleanly") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 42 +++++++++++++++++------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 784e9778a3..f64df1892e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4896,37 +4896,35 @@ int bnxt_vnic_rss_configure(struct bnxt *bp, struct bnxt_vnic_info *vnic) { unsigned int rss_idx, fw_idx, i; + if (vnic->fw_vnic_id == INVALID_HW_RING_ID) + return 0; + if (!(vnic->rss_table && vnic->hash_type)) return 0; if (BNXT_CHIP_THOR(bp)) return bnxt_vnic_rss_configure_thor(bp, vnic); - if (vnic->fw_vnic_id == INVALID_HW_RING_ID) - return 0; - - if (vnic->rss_table && vnic->hash_type) { - /* - * Fill the RSS hash & redirection table with - * ring group ids for all VNICs - */ - for (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE; - rss_idx++, fw_idx++) { - for (i = 0; i < bp->rx_cp_nr_rings; i++) { - fw_idx %= bp->rx_cp_nr_rings; - if (vnic->fw_grp_ids[fw_idx] != - INVALID_HW_RING_ID) - break; - fw_idx++; - } - if (i == bp->rx_cp_nr_rings) - return 0; - vnic->rss_table[rss_idx] = vnic->fw_grp_ids[fw_idx]; + /* + * Fill the RSS hash & redirection table with + * ring group ids for all VNICs + */ + for (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE; + rss_idx++, fw_idx++) { + for (i = 0; i < bp->rx_cp_nr_rings; i++) { + fw_idx %= bp->rx_cp_nr_rings; + if (vnic->fw_grp_ids[fw_idx] != INVALID_HW_RING_ID) + break; + fw_idx++; } - return bnxt_hwrm_vnic_rss_cfg(bp, vnic); + + if (i == bp->rx_cp_nr_rings) + return 0; + + vnic->rss_table[rss_idx] = vnic->fw_grp_ids[fw_idx]; } - return 0; + return bnxt_hwrm_vnic_rss_cfg(bp, vnic); } static void bnxt_hwrm_set_coal_params(struct bnxt_coal *hw_coal, -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.387704380 +0000 +++ 0047-net-bnxt-fix-VNIC-RSS-configure-function.patch 2021-02-05 11:18:28.730689665 +0000 @@ -1 +1 @@ -From 5f0f9a45aca26d8462eb2dfce34c6d3561610915 Mon Sep 17 00:00:00 2001 +From 0012f36035029ab055b6e70dab184611c0c838a2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f0f9a45aca26d8462eb2dfce34c6d3561610915 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 6f5402070f..cee2656c14 100644 +index 784e9778a3..f64df1892e 100644 @@ -33,2 +34,2 @@ - if (BNXT_CHIP_P5(bp)) - return bnxt_vnic_rss_configure_p5(bp, vnic); + if (BNXT_CHIP_THOR(bp)) + return bnxt_vnic_rss_configure_thor(bp, vnic);