net/failsafe: fix reported device info

The failsafe driver device info had several issues in the
info it reported in dev_info_get:
  - it cleared dev_info->device set in rte_eth_dev_info_get
  - many fields (for example max_rx_queue) should be the minimum
    of all sub devices
  - it reported tx capa for the active transmit device, but
    the device may change.

There was enough messed up that ended up reworking the info_get
handler. There is no need to save current values or have a
template for defaults.

Fixes: 4e31ee26ed51 ("net/failsafe: report actual device capabilities")
Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index c900ecc..96e05d4 100644 (file)
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -17,81 +17,6 @@
 
 #include "failsafe_private.h"
 
-static struct rte_eth_dev_info default_infos = {
-       /* Max possible number of elements */
-       .max_rx_pktlen = UINT32_MAX,
-       .max_rx_queues = RTE_MAX_QUEUES_PER_PORT,
-       .max_tx_queues = RTE_MAX_QUEUES_PER_PORT,
-       .max_mac_addrs = FAILSAFE_MAX_ETHADDR,
-       .max_hash_mac_addrs = UINT32_MAX,
-       .max_vfs = UINT16_MAX,
-       .max_vmdq_pools = UINT16_MAX,
-       .rx_desc_lim = {
-               .nb_max = UINT16_MAX,
-               .nb_min = 0,
-               .nb_align = 1,
-               .nb_seg_max = UINT16_MAX,
-               .nb_mtu_seg_max = UINT16_MAX,
-       },
-       .tx_desc_lim = {
-               .nb_max = UINT16_MAX,
-               .nb_min = 0,
-               .nb_align = 1,
-               .nb_seg_max = UINT16_MAX,
-               .nb_mtu_seg_max = UINT16_MAX,
-       },
-       /*
-        * Set of capabilities that can be verified upon
-        * configuring a sub-device.
-        */
-       .rx_offload_capa =
-               DEV_RX_OFFLOAD_VLAN_STRIP |
-               DEV_RX_OFFLOAD_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_LRO |
-               DEV_RX_OFFLOAD_QINQ_STRIP |
-               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_MACSEC_STRIP |
-               DEV_RX_OFFLOAD_HEADER_SPLIT |
-               DEV_RX_OFFLOAD_VLAN_FILTER |
-               DEV_RX_OFFLOAD_VLAN_EXTEND |
-               DEV_RX_OFFLOAD_JUMBO_FRAME |
-               DEV_RX_OFFLOAD_SCATTER |
-               DEV_RX_OFFLOAD_TIMESTAMP |
-               DEV_RX_OFFLOAD_SECURITY,
-       .rx_queue_offload_capa =
-               DEV_RX_OFFLOAD_VLAN_STRIP |
-               DEV_RX_OFFLOAD_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_LRO |
-               DEV_RX_OFFLOAD_QINQ_STRIP |
-               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_MACSEC_STRIP |
-               DEV_RX_OFFLOAD_HEADER_SPLIT |
-               DEV_RX_OFFLOAD_VLAN_FILTER |
-               DEV_RX_OFFLOAD_VLAN_EXTEND |
-               DEV_RX_OFFLOAD_JUMBO_FRAME |
-               DEV_RX_OFFLOAD_SCATTER |
-               DEV_RX_OFFLOAD_TIMESTAMP |
-               DEV_RX_OFFLOAD_SECURITY,
-       .tx_offload_capa =
-               DEV_TX_OFFLOAD_MULTI_SEGS |
-               DEV_TX_OFFLOAD_MBUF_FAST_FREE |
-               DEV_TX_OFFLOAD_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_UDP_CKSUM |
-               DEV_TX_OFFLOAD_TCP_CKSUM |
-               DEV_TX_OFFLOAD_TCP_TSO,
-       .flow_type_rss_offloads =
-                       ETH_RSS_IP |
-                       ETH_RSS_UDP |
-                       ETH_RSS_TCP,
-       .dev_capa =
-               RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
-               RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP,
-};
-
 static int
 fs_dev_configure(struct rte_eth_dev *dev)
 {
@@ -864,6 +789,46 @@ fs_stats_reset(struct rte_eth_dev *dev)
        fs_unlock(dev, 0);
 }
 
+static void
+fs_dev_merge_desc_lim(struct rte_eth_desc_lim *to,
+                     const struct rte_eth_desc_lim *from)
+{
+       to->nb_max = RTE_MIN(to->nb_max, from->nb_max);
+       to->nb_min = RTE_MAX(to->nb_min, from->nb_min);
+       to->nb_align = RTE_MAX(to->nb_align, from->nb_align);
+
+       to->nb_seg_max = RTE_MIN(to->nb_seg_max, from->nb_seg_max);
+       to->nb_mtu_seg_max = RTE_MIN(to->nb_mtu_seg_max, from->nb_mtu_seg_max);
+}
+
+/*
+ * Merge the information from sub-devices.
+ *
+ * The reported values must be the common subset of all sub devices
+ */
+static void
+fs_dev_merge_info(struct rte_eth_dev_info *info,
+                 const struct rte_eth_dev_info *sinfo)
+{
+       info->max_rx_pktlen = RTE_MIN(info->max_rx_pktlen, sinfo->max_rx_pktlen);
+       info->max_rx_queues = RTE_MIN(info->max_rx_queues, sinfo->max_rx_queues);
+       info->max_tx_queues = RTE_MIN(info->max_tx_queues, sinfo->max_tx_queues);
+       info->max_mac_addrs = RTE_MIN(info->max_mac_addrs, sinfo->max_mac_addrs);
+       info->max_hash_mac_addrs = RTE_MIN(info->max_hash_mac_addrs,
+                                       sinfo->max_hash_mac_addrs);
+       info->max_vmdq_pools = RTE_MIN(info->max_vmdq_pools, sinfo->max_vmdq_pools);
+       info->max_vfs = RTE_MIN(info->max_vfs, sinfo->max_vfs);
+
+       fs_dev_merge_desc_lim(&info->rx_desc_lim, &sinfo->rx_desc_lim);
+       fs_dev_merge_desc_lim(&info->tx_desc_lim, &sinfo->tx_desc_lim);
+
+       info->rx_offload_capa &= sinfo->rx_offload_capa;
+       info->tx_offload_capa &= sinfo->tx_offload_capa;
+       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;
+}
+
 /**
  * Fail-safe dev_infos_get rules:
  *
@@ -902,43 +867,76 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
        struct sub_device *sdev;
        uint8_t i;
 
-       sdev = TX_SUBDEV(dev);
-       if (sdev == NULL) {
-               DEBUG("No probed device, using default infos");
-               rte_memcpy(&PRIV(dev)->infos, &default_infos,
-                          sizeof(default_infos));
-       } else {
-               uint64_t rx_offload_capa;
-               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),
-                                       &PRIV(dev)->infos);
-                       rx_offload_capa &= PRIV(dev)->infos.rx_offload_capa;
-                       rxq_offload_capa &=
-                                       PRIV(dev)->infos.rx_queue_offload_capa;
-                       rss_hf_offload_capa &=
-                                       PRIV(dev)->infos.flow_type_rss_offloads;
-                       dev_capa &= PRIV(dev)->infos.dev_capa;
-               }
-               sdev = TX_SUBDEV(dev);
-               rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
-               PRIV(dev)->infos.rx_offload_capa = rx_offload_capa;
-               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;
-               PRIV(dev)->infos.tx_queue_offload_capa &=
-                                       default_infos.tx_queue_offload_capa;
+       /* Use maximum upper bounds by default */
+       infos->max_rx_pktlen = UINT32_MAX;
+       infos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT;
+       infos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT;
+       infos->max_mac_addrs = FAILSAFE_MAX_ETHADDR;
+       infos->max_hash_mac_addrs = UINT32_MAX;
+       infos->max_vfs = UINT16_MAX;
+       infos->max_vmdq_pools = UINT16_MAX;
+
+       /*
+        * Set of capabilities that can be verified upon
+        * configuring a sub-device.
+        */
+       infos->rx_offload_capa =
+               DEV_RX_OFFLOAD_VLAN_STRIP |
+               DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_LRO |
+               DEV_RX_OFFLOAD_QINQ_STRIP |
+               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_MACSEC_STRIP |
+               DEV_RX_OFFLOAD_HEADER_SPLIT |
+               DEV_RX_OFFLOAD_VLAN_FILTER |
+               DEV_RX_OFFLOAD_VLAN_EXTEND |
+               DEV_RX_OFFLOAD_JUMBO_FRAME |
+               DEV_RX_OFFLOAD_SCATTER |
+               DEV_RX_OFFLOAD_TIMESTAMP |
+               DEV_RX_OFFLOAD_SECURITY;
+
+       infos->rx_queue_offload_capa =
+               DEV_RX_OFFLOAD_VLAN_STRIP |
+               DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_LRO |
+               DEV_RX_OFFLOAD_QINQ_STRIP |
+               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_MACSEC_STRIP |
+               DEV_RX_OFFLOAD_HEADER_SPLIT |
+               DEV_RX_OFFLOAD_VLAN_FILTER |
+               DEV_RX_OFFLOAD_VLAN_EXTEND |
+               DEV_RX_OFFLOAD_JUMBO_FRAME |
+               DEV_RX_OFFLOAD_SCATTER |
+               DEV_RX_OFFLOAD_TIMESTAMP |
+               DEV_RX_OFFLOAD_SECURITY;
+
+       infos->tx_offload_capa =
+               DEV_TX_OFFLOAD_MULTI_SEGS |
+               DEV_TX_OFFLOAD_MBUF_FAST_FREE |
+               DEV_TX_OFFLOAD_IPV4_CKSUM |
+               DEV_TX_OFFLOAD_UDP_CKSUM |
+               DEV_TX_OFFLOAD_TCP_CKSUM |
+               DEV_TX_OFFLOAD_TCP_TSO;
+
+       infos->flow_type_rss_offloads =
+               ETH_RSS_IP |
+               ETH_RSS_UDP |
+               ETH_RSS_TCP;
+       infos->dev_capa =
+               RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
+               RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
+
+       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
+               struct rte_eth_dev_info sub_info;
+
+               rte_eth_dev_info_get(PORT_ID(sdev), &sub_info);
+
+               fs_dev_merge_info(infos, &sub_info);
        }
-       rte_memcpy(infos, &PRIV(dev)->infos, sizeof(*infos));
 }
 
 static const uint32_t *

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 231b89e..e376b35 100644 (file)
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -157,7 +157,6 @@ struct fs_priv {
        uint32_t nb_mcast_addr;
        struct rte_ether_addr *mcast_addrs;
        /* current capabilities */
-       struct rte_eth_dev_info infos;
        struct rte_eth_dev_owner my_owner; /* Unique owner. */
        struct rte_intr_handle intr_handle; /* Port interrupt handle. */
        /*