net/mlx5: fix Tx stats error counter logic
[dpdk.git] / drivers / net / failsafe / failsafe_ether.c
index d205f61..0c0748f 100644 (file)
@@ -73,6 +73,28 @@ fs_flow_complain(struct rte_flow_error *error)
        return -err;
 }
 
+static int
+eth_dev_flow_isolate_set(struct rte_eth_dev *dev,
+                        struct sub_device *sdev)
+{
+       struct rte_flow_error ferror;
+       int ret;
+
+       if (!PRIV(dev)->flow_isolated) {
+               DEBUG("Flow isolation already disabled");
+       } else {
+               DEBUG("Enabling flow isolation");
+               ret = rte_flow_isolate(PORT_ID(sdev),
+                                      PRIV(dev)->flow_isolated,
+                                      &ferror);
+               if (ret) {
+                       fs_flow_complain(&ferror);
+                       return ret;
+               }
+       }
+       return 0;
+}
+
 static int
 fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
                struct sub_device *sdev)
@@ -181,6 +203,7 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
 
                        ether_format_addr(ea_fmt, ETHER_ADDR_FMT_SIZE, ea);
                        ERROR("Adding MAC address %s failed", ea_fmt);
+                       return ret;
                }
        }
        /* VLAN filter */
@@ -286,6 +309,14 @@ fs_dev_remove(struct sub_device *sdev)
        failsafe_hotplug_alarm_install(sdev->fs_dev);
 }
 
+static void
+fs_dev_stats_save(struct sub_device *sdev)
+{
+       failsafe_stats_increment(&PRIV(sdev->fs_dev)->stats_accumulator,
+                       &sdev->stats_snapshot);
+       memset(&sdev->stats_snapshot, 0, sizeof(struct rte_eth_stats));
+}
+
 static inline int
 fs_rxtx_clean(struct sub_device *sdev)
 {
@@ -307,8 +338,10 @@ failsafe_dev_remove(struct rte_eth_dev *dev)
        uint8_t i;
 
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
-               if (sdev->remove && fs_rxtx_clean(sdev))
+               if (sdev->remove && fs_rxtx_clean(sdev)) {
+                       fs_dev_stats_save(sdev);
                        fs_dev_remove(sdev);
+               }
 }
 
 int
@@ -334,9 +367,17 @@ failsafe_eth_dev_state_sync(struct rte_eth_dev *dev)
        if (PRIV(dev)->state < DEV_ACTIVE)
                return 0;
        inactive = 0;
-       FOREACH_SUBDEV(sdev, i, dev)
-               if (sdev->state == DEV_PROBED)
+       FOREACH_SUBDEV(sdev, i, dev) {
+               if (sdev->state == DEV_PROBED) {
                        inactive |= UINT32_C(1) << i;
+                       ret = eth_dev_flow_isolate_set(dev, sdev);
+                       if (ret) {
+                               ERROR("Could not apply configuration to sub_device %d",
+                                     i);
+                               goto err_remove;
+                       }
+               }
+       }
        ret = dev->dev_ops->dev_configure(dev);
        if (ret)
                goto err_remove;
@@ -369,6 +410,29 @@ err_remove:
        return ret;
 }
 
+void
+failsafe_stats_increment(struct rte_eth_stats *to, struct rte_eth_stats *from)
+{
+       uint32_t i;
+
+       RTE_ASSERT(to != NULL && from != NULL);
+       to->ipackets += from->ipackets;
+       to->opackets += from->opackets;
+       to->ibytes += from->ibytes;
+       to->obytes += from->obytes;
+       to->imissed += from->imissed;
+       to->ierrors += from->ierrors;
+       to->oerrors += from->oerrors;
+       to->rx_nombuf += from->rx_nombuf;
+       for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
+               to->q_ipackets[i] += from->q_ipackets[i];
+               to->q_opackets[i] += from->q_opackets[i];
+               to->q_ibytes[i] += from->q_ibytes[i];
+               to->q_obytes[i] += from->q_obytes[i];
+               to->q_errors[i] += from->q_errors[i];
+       }
+}
+
 int
 failsafe_eth_rmv_event_callback(uint8_t port_id __rte_unused,
                                enum rte_eth_event_type event __rte_unused,