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 EF0D8A04DD for ; Wed, 28 Oct 2020 11:48:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E1CBCC9C0; Wed, 28 Oct 2020 11:48:06 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 6B9FE2C2A for ; Wed, 28 Oct 2020 11:48:06 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id c194so4079442wme.2 for ; Wed, 28 Oct 2020 03:48: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=TchcDd+/BejsVYAKs60XG11o2Yr8+5iehrhrjrpMYvQ=; b=CmDbomgZQm4L2swgavSzZVgm5NX3v28fNColbOt/y+Njxp4UrxRJ0m6fFX1g3bRRsO jvGblW0AIDrqd0Tp7VIWCedhM6bbZP1W3DZf9t17UIIQQhYaSbnSIvZiSIk/KxUFYIRk QRxqSJMM3vN/VZqZBrLBPVoh8Cs00R8tGwtpd6lxE45EMPP33o0bJpGG10I1ROUOGugn LDYIcWV+AcSsFark3S5fQf3dvFe3jtV8i/luv/XWnn/vj7A1N+2qAaIIbrIsh4JPgNFF +hMwcrrBBd3HuWY35KFAkikHpgLe+wXRP/Oq8w5HZajpspZwVEPCJN3pMA7tG2kDfyij jrLg== 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=TchcDd+/BejsVYAKs60XG11o2Yr8+5iehrhrjrpMYvQ=; b=H80bNRUGe/pqNYdzzMHOqLk6UZ6+mu4kUcpFh/9bJc7lYeSTOgm7Cg3oMg8wOn3GOL E53w7nAA22p41/wWE5mYJLjVzQRxKD4zrbGdNRHvQhvK5u1/ws366Gy1K+3oAGh8RRWA G3fPy1HRG+nYcXOZ5djRjdCL8ivVESlUSVR3AxMXbi2cvGsAoZgG9KYqQo2/Uue3nYvv 1LuSMW/l3/puhnkSDHohrBC2sjeblIh8d6rA0d+FYflXcy96xNIi7OjgpnuKbCNP2OAK J+R9/IoehbbKrO3qOnma//tJvDo8Qc9c1IAsRii+a6MlkPYjF4IG+vctTGJ3DIcOJeXY q2xw== X-Gm-Message-State: AOAM53022LtViITAv6YdqNSv4Ai5Bd+zt3A6r9z+DJR9eCFAD6MOgprR HqkgXHbthu0ANvBCFOkt9BM= X-Google-Smtp-Source: ABdhPJzBYVQJ6jUs318KZN2hZyjVjE4CPx5+rUHeW1FMb5b16SbbKrEvXETvJkADR0gb43J+ZWDBtQ== X-Received: by 2002:a05:600c:20c:: with SMTP id 12mr7877009wmi.144.1603882085187; Wed, 28 Oct 2020 03:48:05 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b136sm5542207wmb.21.2020.10.28.03.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Maxime Leroy Cc: Ori Kam , dpdk stable Date: Wed, 28 Oct 2020 10:43:15 +0000 Message-Id: <20201028104606.3504127-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix RSS RETA reset on start' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 ae09dbd15a26d99f607627bb3e0595efefcb642c Mon Sep 17 00:00:00 2001 From: Maxime Leroy Date: Thu, 16 Jul 2020 12:43:20 +0200 Subject: [PATCH] net/mlx5: fix RSS RETA reset on start [ upstream commit e0d449513bcab58d9ab40bfeeb113b0db3093cad ] The following sequences was working fine on mlx5: rte_eth_dev_configure(portid, ...); for (queueid = 0; queueid < nb_txq; queueid++) rte_eth_tx_queue_setup(portid, queueid, ...); for (queueid = 0; queueid < nb_rxq; queueid++) rte_eth_rx_queue_setup(portid, queueid, ...); // use a custom reta configuration rte_eth_dev_rss_reta_update(portid, reta_conf, reta_size); rte_eth_dev_start(portid); We were able to configure a custom reta before starting the port. The commit "net/mlx5: support RSS on hairpin" breaks this logic by moving the code initializing the RSS reta from rte_eth_dev_configure into rte_eth_dev_start. To fix the issue, the skip_default_rss_reta is always set to 1 in rte_eth_dev_rss_reta to avoid reconfigure the rss reta when the device is started. Fixes: 63bd16292c3a ("net/mlx5: support RSS on hairpin") Signed-off-by: Maxime Leroy Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_rss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index 102826452d..170005a7af 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -221,9 +221,11 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, assert(reta_conf[idx].reta[pos] < priv->rxqs_n); (*priv->reta_idx)[i] = reta_conf[idx].reta[pos]; } + + priv->skip_default_rss_reta = 1; + if (dev->data->dev_started) { mlx5_dev_stop(dev); - priv->skip_default_rss_reta = 1; return mlx5_dev_start(dev); } return 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.912757146 +0000 +++ 0036-net-mlx5-fix-RSS-RETA-reset-on-start.patch 2020-10-28 10:35:11.480829671 +0000 @@ -1,8 +1,10 @@ -From e0d449513bcab58d9ab40bfeeb113b0db3093cad Mon Sep 17 00:00:00 2001 +From ae09dbd15a26d99f607627bb3e0595efefcb642c Mon Sep 17 00:00:00 2001 From: Maxime Leroy Date: Thu, 16 Jul 2020 12:43:20 +0200 Subject: [PATCH] net/mlx5: fix RSS RETA reset on start +[ upstream commit e0d449513bcab58d9ab40bfeeb113b0db3093cad ] + The following sequences was working fine on mlx5: rte_eth_dev_configure(portid, ...); @@ -27,7 +29,6 @@ is started. Fixes: 63bd16292c3a ("net/mlx5: support RSS on hairpin") -Cc: stable@dpdk.org Signed-off-by: Maxime Leroy Acked-by: Ori Kam @@ -36,11 +37,11 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c -index a63cc8df9a..845cebe2e8 100644 +index 102826452d..170005a7af 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c -@@ -215,9 +215,11 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, - MLX5_ASSERT(reta_conf[idx].reta[pos] < priv->rxqs_n); +@@ -221,9 +221,11 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, + assert(reta_conf[idx].reta[pos] < priv->rxqs_n); (*priv->reta_idx)[i] = reta_conf[idx].reta[pos]; } +