[dpdk-stable] patch 'net/failsafe: report actual device capabilities' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 88c8ba39161e4ab8d7a0590e1b1a34f8e09101b2 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Wed, 26 Sep 2018 07:38:04 +0100
Subject: [PATCH] net/failsafe: report actual device capabilities

[ upstream commit 4e31ee26ed510442ddacb753a31c79327aeb0fec ]

Failsafe device capabilities depend on supported by the failsafe
itself plus capabilities supported by sub-devices.
Make fs_dev_infos_get() take failsafe device capabilities into account.

Fixes: cac923cfea47 ("ethdev: support runtime queue setup")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
 drivers/net/failsafe/failsafe_ops.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 1343f02a9..73d6fd365 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -735,4 +735,6 @@ fs_stats_reset(struct rte_eth_dev *dev)
  *      Uses a logical AND of TX capabilities among
  *      the active probed sub_device and the default capabilities.
+ *      Uses a logical AND of device capabilities among
+ *      all sub_devices and the default capabilities.
  *
  */
@@ -753,8 +755,10 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
 		uint64_t rxq_offload_capa;
 		uint64_t rss_hf_offload_capa;
+		uint64_t dev_capa;
 
 		rx_offload_capa = default_infos.rx_offload_capa;
 		rxq_offload_capa = default_infos.rx_queue_offload_capa;
 		rss_hf_offload_capa = default_infos.flow_type_rss_offloads;
+		dev_capa = default_infos.dev_capa;
 		FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
 			rte_eth_dev_info_get(PORT_ID(sdev),
@@ -765,4 +769,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
 			rss_hf_offload_capa &=
 					PRIV(dev)->infos.flow_type_rss_offloads;
+			dev_capa &= PRIV(dev)->infos.dev_capa;
 		}
 		sdev = TX_SUBDEV(dev);
@@ -771,4 +776,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
 		PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
 		PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
+		PRIV(dev)->infos.dev_capa = dev_capa;
 		PRIV(dev)->infos.tx_offload_capa &=
 					default_infos.tx_offload_capa;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:31.632613204 +0000
+++ 0026-net-failsafe-report-actual-device-capabilities.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,14 +1,15 @@
-From 4e31ee26ed510442ddacb753a31c79327aeb0fec Mon Sep 17 00:00:00 2001
+From 88c8ba39161e4ab8d7a0590e1b1a34f8e09101b2 Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov at oktetlabs.ru>
 Date: Wed, 26 Sep 2018 07:38:04 +0100
 Subject: [PATCH] net/failsafe: report actual device capabilities
 
+[ upstream commit 4e31ee26ed510442ddacb753a31c79327aeb0fec ]
+
 Failsafe device capabilities depend on supported by the failsafe
 itself plus capabilities supported by sub-devices.
 Make fs_dev_infos_get() take failsafe device capabilities into account.
 
 Fixes: cac923cfea47 ("ethdev: support runtime queue setup")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -18,17 +19,17 @@
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
-index 86d7fa2a0..7f8bcd4c6 100644
+index 1343f02a9..73d6fd365 100644
 --- a/drivers/net/failsafe/failsafe_ops.c
 +++ b/drivers/net/failsafe/failsafe_ops.c
-@@ -891,4 +891,6 @@ fs_stats_reset(struct rte_eth_dev *dev)
+@@ -735,4 +735,6 @@ fs_stats_reset(struct rte_eth_dev *dev)
   *      Uses a logical AND of TX capabilities among
   *      the active probed sub_device and the default capabilities.
 + *      Uses a logical AND of device capabilities among
 + *      all sub_devices and the default capabilities.
   *
   */
-@@ -909,8 +911,10 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
+@@ -753,8 +755,10 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
  		uint64_t rxq_offload_capa;
  		uint64_t rss_hf_offload_capa;
 +		uint64_t dev_capa;
@@ -39,13 +40,13 @@
 +		dev_capa = default_infos.dev_capa;
  		FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
  			rte_eth_dev_info_get(PORT_ID(sdev),
-@@ -921,4 +925,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
+@@ -765,4 +769,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
  			rss_hf_offload_capa &=
  					PRIV(dev)->infos.flow_type_rss_offloads;
 +			dev_capa &= PRIV(dev)->infos.dev_capa;
  		}
  		sdev = TX_SUBDEV(dev);
-@@ -927,4 +932,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
+@@ -771,4 +776,5 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
  		PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
  		PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
 +		PRIV(dev)->infos.dev_capa = dev_capa;