net/sfc: fix xstats query by unsorted list of IDs

[dpdk.git] / drivers / net / sfc / sfc_port.c

diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c
index 23313e1..bb9e01d 100644 (file)
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
@@ -10,6 +10,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_kvargs.h"
 
@@ -42,7 +43,7 @@ sfc_port_update_mac_stats(struct sfc_adapter *sa)
        unsigned int nb_attempts = 0;
        int rc;
 
-       SFC_ASSERT(rte_spinlock_is_locked(&port->mac_stats_lock));
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
 
        if (sa->state != SFC_ADAPTER_STARTED)
                return EINVAL;
@@ -102,14 +103,13 @@ sfc_port_reset_sw_stats(struct sfc_adapter *sa)
 int
 sfc_port_reset_mac_stats(struct sfc_adapter *sa)
 {
-       struct sfc_port *port = &sa->port;
        int rc;
 
-       rte_spinlock_lock(&port->mac_stats_lock);
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
+
        rc = efx_mac_stats_clear(sa->nic);
        if (rc == 0)
                sfc_port_reset_sw_stats(sa);
-       rte_spinlock_unlock(&port->mac_stats_lock);
 
        return rc;
 }
@@ -157,6 +157,27 @@ sfc_port_phy_caps_to_max_link_speed(uint32_t phy_caps)
 
 #endif
 
+static void
+sfc_port_fill_mac_stats_info(struct sfc_adapter *sa)
+{
+       unsigned int mac_stats_nb_supported = 0;
+       struct sfc_port *port = &sa->port;
+       unsigned int stat_idx;
+
+       efx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,
+                              sizeof(port->mac_stats_mask));
+
+       for (stat_idx = 0; stat_idx < EFX_MAC_NSTATS; ++stat_idx) {
+               if (!EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, stat_idx))
+                       continue;
+
+               port->mac_stats_by_id[mac_stats_nb_supported] = stat_idx;
+               mac_stats_nb_supported++;
+       }
+
+       port->mac_stats_nb_supported = mac_stats_nb_supported;
+}
+
 int
 sfc_port_start(struct sfc_adapter *sa)
 {
@@ -165,7 +186,6 @@ sfc_port_start(struct sfc_adapter *sa)
        uint32_t phy_adv_cap;
        const uint32_t phy_pause_caps =
                ((1u << EFX_PHY_CAP_PAUSE) | (1u << EFX_PHY_CAP_ASYM));
-       unsigned int i;
 
        sfc_log_init(sa, "entry");
 
@@ -239,7 +259,7 @@ sfc_port_start(struct sfc_adapter *sa)
                                B_TRUE : B_FALSE;
                port->allmulti = (sa->eth_dev->data->all_multicast != 0) ?
                                 B_TRUE : B_FALSE;
-               rc = sfc_set_rx_mode(sa);
+               rc = sfc_set_rx_mode_unchecked(sa);
                if (rc != 0)
                        goto fail_mac_filter_set;
 
@@ -259,12 +279,7 @@ sfc_port_start(struct sfc_adapter *sa)
                port->mac_stats_reset_pending = B_FALSE;
        }
 
-       efx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,
-                              sizeof(port->mac_stats_mask));
-
-       for (i = 0, port->mac_stats_nb_supported = 0; i < EFX_MAC_NSTATS; ++i)
-               if (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))
-                       port->mac_stats_nb_supported++;
+       sfc_port_fill_mac_stats_info(sa);
 
        port->mac_stats_update_generation = 0;
 
@@ -415,8 +430,6 @@ sfc_port_attach(struct sfc_adapter *sa)
                goto fail_mcast_addr_list_buf_alloc;
        }
 
-       rte_spinlock_init(&port->mac_stats_lock);
-
        rc = ENOMEM;
        port->mac_stats_buf = rte_calloc_socket("mac_stats_buf", EFX_MAC_NSTATS,
                                                sizeof(uint64_t), 0,
@@ -485,16 +498,70 @@ sfc_port_detach(struct sfc_adapter *sa)
        sfc_log_init(sa, "done");
 }
 
+static boolean_t
+sfc_get_requested_all_ucast(struct sfc_port *port)
+{
+       return port->promisc;
+}
+
+static boolean_t
+sfc_get_requested_all_mcast(struct sfc_port *port)
+{
+       return port->promisc || port->allmulti;
+}
+
+int
+sfc_set_rx_mode_unchecked(struct sfc_adapter *sa)
+{
+       struct sfc_port *port = &sa->port;
+       boolean_t requested_all_ucast = sfc_get_requested_all_ucast(port);
+       boolean_t requested_all_mcast = sfc_get_requested_all_mcast(port);
+       int rc;
+
+       rc = efx_mac_filter_set(sa->nic, requested_all_ucast, B_TRUE,
+                               requested_all_mcast, B_TRUE);
+       if (rc != 0)
+               return rc;
+
+       return 0;
+}
+
 int
 sfc_set_rx_mode(struct sfc_adapter *sa)
 {
        struct sfc_port *port = &sa->port;
+       boolean_t old_all_ucast;
+       boolean_t old_all_mcast;
+       boolean_t requested_all_ucast = sfc_get_requested_all_ucast(port);
+       boolean_t requested_all_mcast = sfc_get_requested_all_mcast(port);
+       boolean_t actual_all_ucast;
+       boolean_t actual_all_mcast;
        int rc;
 
-       rc = efx_mac_filter_set(sa->nic, port->promisc, B_TRUE,
-                               port->promisc || port->allmulti, B_TRUE);
+       efx_mac_filter_get_all_ucast_mcast(sa->nic, &old_all_ucast,
+                                          &old_all_mcast);
 
-       return rc;
+       rc = sfc_set_rx_mode_unchecked(sa);
+       if (rc != 0)
+               return rc;
+
+       efx_mac_filter_get_all_ucast_mcast(sa->nic, &actual_all_ucast,
+                                          &actual_all_mcast);
+
+       if (actual_all_ucast != requested_all_ucast ||
+           actual_all_mcast != requested_all_mcast) {
+               /*
+                * MAC filter set succeeded but not all requested modes
+                * were applied. The rollback is necessary to bring back the
+                * consistent old state.
+                */
+               (void)efx_mac_filter_set(sa->nic, old_all_ucast, B_TRUE,
+                                        old_all_mcast, B_TRUE);
+
+               return EPERM;
+       }
+
+       return 0;
 }
 
 void