[dpdk-stable] patch 'net/failsafe: fix RSS RETA size info' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 d307ec9062a72b247154d657b041323b734264b7 Mon Sep 17 00:00:00 2001
From: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
Date: Wed, 27 May 2020 15:34:33 +0100
Subject: [PATCH] net/failsafe: fix RSS RETA size info

[ upstream commit 6e8bdf7266db71f43f47f40704ab1122f60c3f17 ]

Failsafe driver has been indicating zero for RSS redirection table size
after device info reporting had been reworked. Report proper value.

Fixes: 4586be3743d4 ("net/failsafe: fix reported device info")

Signed-off-by: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Gaetan Rivet <grive at u256.net>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/failsafe/failsafe_ops.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index e1d08e46c..96f7e456f 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -1068,6 +1068,13 @@ fs_dev_merge_info(struct rte_eth_dev_info *info,
 	info->rx_queue_offload_capa &= sinfo->rx_queue_offload_capa;
 	info->tx_queue_offload_capa &= sinfo->tx_queue_offload_capa;
 	info->flow_type_rss_offloads &= sinfo->flow_type_rss_offloads;
+
+	/*
+	 * RETA size is a GCD of RETA sizes indicated by sub-devices.
+	 * Each of these sizes is a power of 2, so use the lower one.
+	 */
+	info->reta_size = RTE_MIN(info->reta_size, sinfo->reta_size);
+
 	info->hash_key_size = RTE_MIN(info->hash_key_size,
 				      sinfo->hash_key_size);
 }
@@ -1119,6 +1126,7 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
 	infos->max_hash_mac_addrs = UINT32_MAX;
 	infos->max_vfs = UINT16_MAX;
 	infos->max_vmdq_pools = UINT16_MAX;
+	infos->reta_size = UINT16_MAX;
 	infos->hash_key_size = UINT8_MAX;
 
 	/*
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:49.225027465 +0100
+++ 0016-net-failsafe-fix-RSS-RETA-size-info.patch	2020-07-24 12:53:48.183004522 +0100
@@ -1,13 +1,14 @@
-From 6e8bdf7266db71f43f47f40704ab1122f60c3f17 Mon Sep 17 00:00:00 2001
+From d307ec9062a72b247154d657b041323b734264b7 Mon Sep 17 00:00:00 2001
 From: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
 Date: Wed, 27 May 2020 15:34:33 +0100
 Subject: [PATCH] net/failsafe: fix RSS RETA size info
 
+[ upstream commit 6e8bdf7266db71f43f47f40704ab1122f60c3f17 ]
+
 Failsafe driver has been indicating zero for RSS redirection table size
 after device info reporting had been reworked. Report proper value.
 
 Fixes: 4586be3743d4 ("net/failsafe: fix reported device info")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>