git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net: add rte prefix to ether structures
[dpdk.git] / drivers / net / failsafe / failsafe_ops.c
diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 84f4b7a..c900ecc 100644 (file)
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -78,6 +78,7 @@ static struct rte_eth_dev_info default_infos = {
                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 |
@@ -86,6 +87,9 @@ static struct rte_eth_dev_info default_infos = {
                        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
@@ -177,13 +181,13 @@ fs_set_queues_state_start(struct rte_eth_dev *dev)
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                rxq = dev->data->rx_queues[i];
-               if (!rxq->info.conf.rx_deferred_start)
+               if (rxq != NULL && !rxq->info.conf.rx_deferred_start)
                        dev->data->rx_queue_state[i] =
                                                RTE_ETH_QUEUE_STATE_STARTED;
        }
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
                txq = dev->data->tx_queues[i];
-               if (!txq->info.conf.tx_deferred_start)
+               if (txq != NULL && !txq->info.conf.tx_deferred_start)
                        dev->data->tx_queue_state[i] =
                                                RTE_ETH_QUEUE_STATE_STARTED;
        }
@@ -238,9 +242,13 @@ fs_set_queues_state_stop(struct rte_eth_dev *dev)
        uint16_t i;
 
        for (i = 0; i < dev->data->nb_rx_queues; i++)
-               dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+               if (dev->data->rx_queues[i] != NULL)
+                       dev->data->rx_queue_state[i] =
+                                               RTE_ETH_QUEUE_STATE_STOPPED;
        for (i = 0; i < dev->data->nb_tx_queues; i++)
-               dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+               if (dev->data->tx_queues[i] != NULL)
+                       dev->data->tx_queue_state[i] =
+                                               RTE_ETH_QUEUE_STATE_STOPPED;
 }
 
 static void
@@ -444,7 +452,7 @@ fs_rx_queue_release(void *queue)
        if (queue == NULL)
                return;
        rxq = queue;
-       dev = rxq->priv->dev;
+       dev = &rte_eth_devices[rxq->priv->data->port_id];
        fs_lock(dev, 0);
        if (rxq->event_fd > 0)
                close(rxq->event_fd);
@@ -628,7 +636,7 @@ fs_tx_queue_release(void *queue)
        if (queue == NULL)
                return;
        txq = queue;
-       dev = txq->priv->dev;
+       dev = &rte_eth_devices[txq->priv->data->port_id];
        fs_lock(dev, 0);
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
                if (ETH(sdev)->data->tx_queues != NULL &&
@@ -883,6 +891,8 @@ fs_stats_reset(struct rte_eth_dev *dev)
  *      all sub_devices and the default capabilities.
  *      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.
  *
  */
 static void
@@ -901,10 +911,12 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
                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);
@@ -913,12 +925,14 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
                                        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 &=
@@ -1068,7 +1082,7 @@ fs_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 
 static int
 fs_mac_addr_add(struct rte_eth_dev *dev,
-               struct ether_addr *mac_addr,
+               struct rte_ether_addr *mac_addr,
                uint32_t index,
                uint32_t vmdq)
 {
@@ -1097,7 +1111,7 @@ fs_mac_addr_add(struct rte_eth_dev *dev,
 }
 
 static int
-fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+fs_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct sub_device *sdev;
        uint8_t i;
@@ -1119,6 +1133,55 @@ fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
        return 0;
 }
 
+static int
+fs_set_mc_addr_list(struct rte_eth_dev *dev,
+                   struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr)
+{
+       struct sub_device *sdev;
+       uint8_t i;
+       int ret;
+       void *mcast_addrs;
+
+       fs_lock(dev, 0);
+
+       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+               ret = rte_eth_dev_set_mc_addr_list(PORT_ID(sdev),
+                                                  mc_addr_set, nb_mc_addr);
+               if (ret != 0) {
+                       ERROR("Operation rte_eth_dev_set_mc_addr_list failed for sub_device %d with error %d",
+                             i, ret);
+                       goto rollback;
+               }
+       }
+
+       mcast_addrs = rte_realloc(PRIV(dev)->mcast_addrs,
+               nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]), 0);
+       if (mcast_addrs == NULL && nb_mc_addr > 0) {
+               ret = -ENOMEM;
+               goto rollback;
+       }
+       rte_memcpy(mcast_addrs, mc_addr_set,
+                  nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]));
+       PRIV(dev)->nb_mcast_addr = nb_mc_addr;
+       PRIV(dev)->mcast_addrs = mcast_addrs;
+
+       fs_unlock(dev, 0);
+       return 0;
+
+rollback:
+       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+               int rc = rte_eth_dev_set_mc_addr_list(PORT_ID(sdev),
+                       PRIV(dev)->mcast_addrs, PRIV(dev)->nb_mcast_addr);
+               if (rc != 0) {
+                       ERROR("Multicast MAC address list rollback for sub_device %d failed with error %d",
+                             i, rc);
+               }
+       }
+
+       fs_unlock(dev, 0);
+       return ret;
+}
+
 static int
 fs_rss_hash_update(struct rte_eth_dev *dev,
                        struct rte_eth_rss_conf *rss_conf)
@@ -1145,33 +1208,17 @@ fs_rss_hash_update(struct rte_eth_dev *dev,
 }
 
 static int
-fs_filter_ctrl(struct rte_eth_dev *dev,
+fs_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
                enum rte_filter_type type,
                enum rte_filter_op op,
                void *arg)
 {
-       struct sub_device *sdev;
-       uint8_t i;
-       int ret;
-
        if (type == RTE_ETH_FILTER_GENERIC &&
            op == RTE_ETH_FILTER_GET) {
                *(const void **)arg = &fs_flow_ops;
                return 0;
        }
-       fs_lock(dev, 0);
-       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
-               DEBUG("Calling rte_eth_dev_filter_ctrl on sub_device %d", i);
-               ret = rte_eth_dev_filter_ctrl(PORT_ID(sdev), type, op, arg);
-               if ((ret = fs_err(sdev, ret))) {
-                       ERROR("Operation rte_eth_dev_filter_ctrl failed for sub_device %d"
-                             " with error %d", i, ret);
-                       fs_unlock(dev, 0);
-                       return ret;
-               }
-       }
-       fs_unlock(dev, 0);
-       return 0;
+       return -ENOTSUP;
 }
 
 const struct eth_dev_ops failsafe_ops = {
@@ -1207,6 +1254,7 @@ const struct eth_dev_ops failsafe_ops = {
        .mac_addr_remove = fs_mac_addr_remove,
        .mac_addr_add = fs_mac_addr_add,
        .mac_addr_set = fs_mac_addr_set,
+       .set_mc_addr_list = fs_set_mc_addr_list,
        .rss_hash_update = fs_rss_hash_update,
        .filter_ctrl = fs_filter_ctrl,
 };
DPDK repo used for reviews