net/sfc: add representor proxy port API

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

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 591b897..f79f4d5 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -26,7 +26,6 @@
 #include "sfc_tweak.h"
 #include "sfc_sw_stats.h"
 
-
 bool
 sfc_repr_supported(const struct sfc_adapter *sa)
 {
@@ -46,6 +45,12 @@ sfc_repr_supported(const struct sfc_adapter *sa)
        return true;
 }
 
+bool
+sfc_repr_available(const struct sfc_adapter_shared *sas)
+{
+       return sas->nb_repr_rxq > 0 && sas->nb_repr_txq > 0;
+}
+
 int
 sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
              size_t len, int socket_id, efsys_mem_t *esmp)
@@ -296,6 +301,41 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
                sas->counters_rxq_allocated = false;
        }
 
+       if (sfc_repr_supported(sa) &&
+           evq_allocated >= SFC_REPR_PROXY_NB_RXQ_MIN +
+           SFC_REPR_PROXY_NB_TXQ_MIN &&
+           rxq_allocated >= SFC_REPR_PROXY_NB_RXQ_MIN &&
+           txq_allocated >= SFC_REPR_PROXY_NB_TXQ_MIN) {
+               unsigned int extra;
+
+               txq_allocated -= SFC_REPR_PROXY_NB_TXQ_MIN;
+               rxq_allocated -= SFC_REPR_PROXY_NB_RXQ_MIN;
+               evq_allocated -= SFC_REPR_PROXY_NB_RXQ_MIN +
+                       SFC_REPR_PROXY_NB_TXQ_MIN;
+
+               sas->nb_repr_rxq = SFC_REPR_PROXY_NB_RXQ_MIN;
+               sas->nb_repr_txq = SFC_REPR_PROXY_NB_TXQ_MIN;
+
+               /* Allocate extra representor RxQs up to the maximum */
+               extra = MIN(evq_allocated, rxq_allocated);
+               extra = MIN(extra,
+                           SFC_REPR_PROXY_NB_RXQ_MAX - sas->nb_repr_rxq);
+               evq_allocated -= extra;
+               rxq_allocated -= extra;
+               sas->nb_repr_rxq += extra;
+
+               /* Allocate extra representor TxQs up to the maximum */
+               extra = MIN(evq_allocated, txq_allocated);
+               extra = MIN(extra,
+                           SFC_REPR_PROXY_NB_TXQ_MAX - sas->nb_repr_txq);
+               evq_allocated -= extra;
+               txq_allocated -= extra;
+               sas->nb_repr_txq += extra;
+       } else {
+               sas->nb_repr_rxq = 0;
+               sas->nb_repr_txq = 0;
+       }
+
        /* Add remaining allocated queues */
        sa->rxq_max += MIN(rxq_allocated, evq_allocated / 2);
        sa->txq_max += MIN(txq_allocated, evq_allocated - sa->rxq_max);
@@ -313,8 +353,10 @@ fail_nic_init:
 static int
 sfc_set_drv_limits(struct sfc_adapter *sa)
 {
+       struct sfc_adapter_shared *sas = sfc_sa2shared(sa);
        const struct rte_eth_dev_data *data = sa->eth_dev->data;
-       uint32_t rxq_reserved = sfc_nb_reserved_rxq(sfc_sa2shared(sa));
+       uint32_t rxq_reserved = sfc_nb_reserved_rxq(sas);
+       uint32_t txq_reserved = sfc_nb_txq_reserved(sas);
        efx_drv_limits_t lim;
 
        memset(&lim, 0, sizeof(lim));
@@ -325,10 +367,12 @@ sfc_set_drv_limits(struct sfc_adapter *sa)
         * sfc_estimate_resource_limits().
         */
        lim.edl_min_evq_count = lim.edl_max_evq_count =
-               1 + data->nb_rx_queues + data->nb_tx_queues + rxq_reserved;
+               1 + data->nb_rx_queues + data->nb_tx_queues +
+               rxq_reserved + txq_reserved;
        lim.edl_min_rxq_count = lim.edl_max_rxq_count =
                data->nb_rx_queues + rxq_reserved;
-       lim.edl_min_txq_count = lim.edl_max_txq_count = data->nb_tx_queues;
+       lim.edl_min_txq_count = lim.edl_max_txq_count =
+               data->nb_tx_queues + txq_reserved;
 
        return efx_nic_set_drv_limits(sa->nic, &lim);
 }
@@ -395,7 +439,7 @@ sfc_try_start(struct sfc_adapter *sa)
        sfc_log_init(sa, "entry");
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
-       SFC_ASSERT(sa->state == SFC_ADAPTER_STARTING);
+       SFC_ASSERT(sa->state == SFC_ETHDEV_STARTING);
 
        sfc_log_init(sa, "set FW subvariant");
        rc = sfc_set_fw_subvariant(sa);
@@ -500,9 +544,9 @@ sfc_start(struct sfc_adapter *sa)
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
        switch (sa->state) {
-       case SFC_ADAPTER_CONFIGURED:
+       case SFC_ETHDEV_CONFIGURED:
                break;
-       case SFC_ADAPTER_STARTED:
+       case SFC_ETHDEV_STARTED:
                sfc_notice(sa, "already started");
                return 0;
        default:
@@ -510,7 +554,7 @@ sfc_start(struct sfc_adapter *sa)
                goto fail_bad_state;
        }
 
-       sa->state = SFC_ADAPTER_STARTING;
+       sa->state = SFC_ETHDEV_STARTING;
 
        rc = 0;
        do {
@@ -533,13 +577,13 @@ sfc_start(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_try_start;
 
-       sa->state = SFC_ADAPTER_STARTED;
+       sa->state = SFC_ETHDEV_STARTED;
        sfc_log_init(sa, "done");
        return 0;
 
 fail_try_start:
 fail_sriov_vswitch_create:
-       sa->state = SFC_ADAPTER_CONFIGURED;
+       sa->state = SFC_ETHDEV_CONFIGURED;
 fail_bad_state:
        sfc_log_init(sa, "failed %d", rc);
        return rc;
@@ -553,9 +597,9 @@ sfc_stop(struct sfc_adapter *sa)
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
        switch (sa->state) {
-       case SFC_ADAPTER_STARTED:
+       case SFC_ETHDEV_STARTED:
                break;
-       case SFC_ADAPTER_CONFIGURED:
+       case SFC_ETHDEV_CONFIGURED:
                sfc_notice(sa, "already stopped");
                return;
        default:
@@ -564,7 +608,7 @@ sfc_stop(struct sfc_adapter *sa)
                return;
        }
 
-       sa->state = SFC_ADAPTER_STOPPING;
+       sa->state = SFC_ETHDEV_STOPPING;
 
        sfc_repr_proxy_stop(sa);
        sfc_flow_stop(sa);
@@ -575,7 +619,7 @@ sfc_stop(struct sfc_adapter *sa)
        sfc_intr_stop(sa);
        efx_nic_fini(sa->nic);
 
-       sa->state = SFC_ADAPTER_CONFIGURED;
+       sa->state = SFC_ETHDEV_CONFIGURED;
        sfc_log_init(sa, "done");
 }
 
@@ -586,7 +630,7 @@ sfc_restart(struct sfc_adapter *sa)
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
-       if (sa->state != SFC_ADAPTER_STARTED)
+       if (sa->state != SFC_ETHDEV_STARTED)
                return EINVAL;
 
        sfc_stop(sa);
@@ -607,7 +651,7 @@ sfc_restart_if_required(void *arg)
        if (rte_atomic32_cmpset((volatile uint32_t *)&sa->restart_required,
                                1, 0)) {
                sfc_adapter_lock(sa);
-               if (sa->state == SFC_ADAPTER_STARTED)
+               if (sa->state == SFC_ETHDEV_STARTED)
                        (void)sfc_restart(sa);
                sfc_adapter_unlock(sa);
        }
@@ -640,9 +684,9 @@ sfc_configure(struct sfc_adapter *sa)
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
-       SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED ||
-                  sa->state == SFC_ADAPTER_CONFIGURED);
-       sa->state = SFC_ADAPTER_CONFIGURING;
+       SFC_ASSERT(sa->state == SFC_ETHDEV_INITIALIZED ||
+                  sa->state == SFC_ETHDEV_CONFIGURED);
+       sa->state = SFC_ETHDEV_CONFIGURING;
 
        rc = sfc_check_conf(sa);
        if (rc != 0)
@@ -668,7 +712,7 @@ sfc_configure(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_sw_xstats_configure;
 
-       sa->state = SFC_ADAPTER_CONFIGURED;
+       sa->state = SFC_ETHDEV_CONFIGURED;
        sfc_log_init(sa, "done");
        return 0;
 
@@ -686,7 +730,7 @@ fail_port_configure:
 
 fail_intr_configure:
 fail_check_conf:
-       sa->state = SFC_ADAPTER_INITIALIZED;
+       sa->state = SFC_ETHDEV_INITIALIZED;
        sfc_log_init(sa, "failed %d", rc);
        return rc;
 }
@@ -698,8 +742,8 @@ sfc_close(struct sfc_adapter *sa)
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
-       SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
-       sa->state = SFC_ADAPTER_CLOSING;
+       SFC_ASSERT(sa->state == SFC_ETHDEV_CONFIGURED);
+       sa->state = SFC_ETHDEV_CLOSING;
 
        sfc_sw_xstats_close(sa);
        sfc_tx_close(sa);
@@ -707,7 +751,7 @@ sfc_close(struct sfc_adapter *sa)
        sfc_port_close(sa);
        sfc_intr_close(sa);
 
-       sa->state = SFC_ADAPTER_INITIALIZED;
+       sa->state = SFC_ETHDEV_INITIALIZED;
        sfc_log_init(sa, "done");
 }
 
@@ -948,7 +992,7 @@ sfc_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_sriov_vswitch_create;
 
-       sa->state = SFC_ADAPTER_INITIALIZED;
+       sa->state = SFC_ETHDEV_INITIALIZED;
 
        sfc_log_init(sa, "done");
        return 0;
@@ -999,6 +1043,18 @@ fail_nic_reset:
        return rc;
 }
 
+void
+sfc_pre_detach(struct sfc_adapter *sa)
+{
+       sfc_log_init(sa, "entry");
+
+       SFC_ASSERT(!sfc_adapter_is_locked(sa));
+
+       sfc_repr_proxy_pre_detach(sa);
+
+       sfc_log_init(sa, "done");
+}
+
 void
 sfc_detach(struct sfc_adapter *sa)
 {
@@ -1022,7 +1078,7 @@ sfc_detach(struct sfc_adapter *sa)
        efx_tunnel_fini(sa->nic);
        sfc_sriov_detach(sa);
 
-       sa->state = SFC_ADAPTER_UNINITIALIZED;
+       sa->state = SFC_ETHDEV_UNINITIALIZED;
 }
 
 static int
@@ -1280,7 +1336,7 @@ sfc_unprobe(struct sfc_adapter *sa)
        sfc_mem_bar_fini(sa);
 
        sfc_flow_fini(sa);
-       sa->state = SFC_ADAPTER_UNINITIALIZED;
+       sa->state = SFC_ETHDEV_UNINITIALIZED;
 }
 
 uint32_t