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 A966DA0093 for ; Fri, 22 May 2020 11:41:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C3E21D96F; Fri, 22 May 2020 11:41:37 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 44B881D96A for ; Fri, 22 May 2020 11:41:35 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id e1so9511393wrt.5 for ; Fri, 22 May 2020 02:41:35 -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=2JKVIuBYnDvfRfqN9vAOdUMrCl8dVfBqKaX+xljwecQ=; b=QZlVmDmWgTXMnCrukncVyon5hNWMBnpIGXQZfRTTupAb7euZq9YZ0bSpmOwH//d0Ux FX2HqG3qofbNjRjDOIYyuOqTDdw9hy6vdtuZ8HcCj/gaoxjI4iP0BZdwN9uygm+kN9w+ vMQjuqulR4f/G2v19K6bgwrMGi5a7iruDDjsIp76ir1MS6Go2I257LtXNadSJGAeO/Ns b1XWfrOJL1+/iUe6pgrzeMmwptJG3amleD+n3vNYoCbzc6Q19JxoArqZxbCnggLcGMce prFY3/TL8mXl0ufXdItjaO/qKbMek2Gezslh0SwjkdK75FtU6by+CbNSS+hU9UWgQIw9 BgHQ== 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=2JKVIuBYnDvfRfqN9vAOdUMrCl8dVfBqKaX+xljwecQ=; b=n/FbgYqQFdwFZdFIZv5Avz7ikUVnIpN0N6FwIzxS1ibWkY9azzIoKdnSqO+qVcNeCI zgZWpyL0AUaxgZTEjq86sP7MkaMjSWa5vXhoKGnRmEr+2nSH6fhRrTUTbcJ8OHCaNHoQ WYdgsCuKx+hM+Gpvt3SEJ5LzUuaAFVgQr0+zrpL9j6XxnJe5MYOAipf1p7+rp4ElUKOi ntk8WCj44MFbMYVHZZqFJcg1tDuxDNAhb2T+JjOriWA7dveAxEAdKg8uu+eNnQ4eMQR2 yIRE9CEqrshPKj6yMJMqJLAR8mHFu3m7vivss+BEoeMe9Opf6HlVUWqUCHu/16YW5B6s f9gw== X-Gm-Message-State: AOAM533cN0mKfUkzNB/tj8JmxOj7cKZyt/juyTKHrlceMqUKVboGqN8m a9kZvg+T8EUz5RtTKd24rD0= X-Google-Smtp-Source: ABdhPJwX+W8Fg55xg4EWrr3T4CeXx4+MRl1+Xv8Fn+8h9UYtJo2SiGpCpceXHlIwEkwrVPJq3vUigw== X-Received: by 2002:adf:eb08:: with SMTP id s8mr2668036wrn.361.1590140494974; Fri, 22 May 2020 02:41:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 190sm2095381wmb.23.2020.05.22.02.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Ajit Khaparde Cc: Kalesh AP , dpdk stable Date: Fri, 22 May 2020 10:40:02 +0100 Message-Id: <20200522094022.1025696-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' 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/24/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 ba15f6288ea1180bed75bf9bc5d40ad0b19e472b Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 15 May 2020 04:25:11 -0700 Subject: [PATCH] net/bnxt: fix using RSS config struct [ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ] There is no need to maintain local copy. This helps reduce the size of the bnxt structure. Fixes: fcc0aa1edc10 ("net/bnxt: add RSS hash configuration") Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt.h | 1 - drivers/net/bnxt/bnxt_ethdev.c | 4 +++- drivers/net/bnxt/bnxt_rxq.c | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 0ef0282d2a..995e5980a6 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -499,7 +499,6 @@ struct bnxt { void *bar0; struct rte_eth_dev *eth_dev; - struct rte_eth_rss_conf rss_conf; struct rte_pci_device *pdev; void *doorbell_base; diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 4547dd1420..aa6ceff13c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1440,7 +1440,9 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, } bp->flags |= BNXT_FLAG_UPDATE_HASH; - memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf)); + memcpy(ð_dev->data->dev_conf.rx_adv_conf.rss_conf, + rss_conf, + sizeof(*rss_conf)); /* Update the default RSS VNIC(s) */ vnic = &bp->vnic_info[0]; diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 457ebede0e..e42308a97f 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -168,10 +168,8 @@ out: if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf; - if (bp->flags & BNXT_FLAG_UPDATE_HASH) { - rss = &bp->rss_conf; + if (bp->flags & BNXT_FLAG_UPDATE_HASH) bp->flags &= ~BNXT_FLAG_UPDATE_HASH; - } for (i = 0; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:40.101096555 +0100 +++ 0023-net-bnxt-fix-using-RSS-config-struct.patch 2020-05-22 10:37:39.124412642 +0100 @@ -1,13 +1,14 @@ -From 39395b9d41aff5488db4924df94098abbe4d4e8c Mon Sep 17 00:00:00 2001 +From ba15f6288ea1180bed75bf9bc5d40ad0b19e472b Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 15 May 2020 04:25:11 -0700 Subject: [PATCH] net/bnxt: fix using RSS config struct +[ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ] + There is no need to maintain local copy. This helps reduce the size of the bnxt structure. Fixes: fcc0aa1edc10 ("net/bnxt: add RSS hash configuration") -Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP @@ -18,10 +19,10 @@ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index 7410db5e42..4093a2f01e 100644 +index 0ef0282d2a..995e5980a6 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h -@@ -530,7 +530,6 @@ struct bnxt { +@@ -499,7 +499,6 @@ struct bnxt { void *bar0; struct rte_eth_dev *eth_dev; @@ -30,10 +31,10 @@ void *doorbell_base; diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index b647450031..4d64a98351 100644 +index 4547dd1420..aa6ceff13c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -1796,7 +1796,9 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, +@@ -1440,7 +1440,9 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, } bp->flags |= BNXT_FLAG_UPDATE_HASH; @@ -43,7 +44,7 @@ + sizeof(*rss_conf)); /* Update the default RSS VNIC(s) */ - vnic = BNXT_GET_DEFAULT_VNIC(bp); + vnic = &bp->vnic_info[0]; diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 457ebede0e..e42308a97f 100644 --- a/drivers/net/bnxt/bnxt_rxq.c