net/sfc: use zero RSS channels as disabled RSS indicator

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

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index d8cd228..664b38d 100644 (file)
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -122,10 +122,10 @@ sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq)
                        rxd = &rxq->sw_desc[id];
                        rxd->mbuf = m;
 
-                       rte_mbuf_refcnt_set(m, 1);
+                       SFC_ASSERT(rte_mbuf_refcnt_read(m) == 1);
                        m->data_off = RTE_PKTMBUF_HEADROOM;
-                       m->next = NULL;
-                       m->nb_segs = 1;
+                       SFC_ASSERT(m->next == NULL);
+                       SFC_ASSERT(m->nb_segs == 1);
                        m->port = port_id;
 
                        addr[i] = rte_pktmbuf_mtophys(m);
@@ -577,7 +577,7 @@ sfc_rx_qflush(struct sfc_adapter *sa, unsigned int sw_index)
 static int
 sfc_rx_default_rxq_set_filter(struct sfc_adapter *sa, struct sfc_rxq *rxq)
 {
-       boolean_t rss = (sa->rss_channels > 1) ? B_TRUE : B_FALSE;
+       boolean_t rss = (sa->rss_channels > 0) ? B_TRUE : B_FALSE;
        struct sfc_port *port = &sa->port;
        int rc;
 
@@ -1052,7 +1052,7 @@ sfc_rx_rss_config(struct sfc_adapter *sa)
        int rc = 0;
 
 #if EFSYS_OPT_RX_SCALE
-       if (sa->rss_channels > 1) {
+       if (sa->rss_channels > 0) {
                rc = efx_rx_scale_mode_set(sa->nic, EFX_RX_HASHALG_TOEPLITZ,
                                           sa->rss_hash_types, B_TRUE);
                if (rc != 0)
@@ -1206,58 +1206,105 @@ sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode)
        return rc;
 }
 
+/**
+ * Destroy excess queues that are no longer needed after reconfiguration
+ * or complete close.
+ */
+static void
+sfc_rx_fini_queues(struct sfc_adapter *sa, unsigned int nb_rx_queues)
+{
+       int sw_index;
+
+       SFC_ASSERT(nb_rx_queues <= sa->rxq_count);
+
+       sw_index = sa->rxq_count;
+       while (--sw_index >= (int)nb_rx_queues) {
+               if (sa->rxq_info[sw_index].rxq != NULL)
+                       sfc_rx_qfini(sa, sw_index);
+       }
+
+       sa->rxq_count = nb_rx_queues;
+}
+
 /**
  * Initialize Rx subsystem.
  *
- * Called at device configuration stage when number of receive queues is
+ * Called at device (re)configuration stage when number of receive queues is
  * specified together with other device level receive configuration.
  *
  * It should be used to allocate NUMA-unaware resources.
  */
 int
-sfc_rx_init(struct sfc_adapter *sa)
+sfc_rx_configure(struct sfc_adapter *sa)
 {
        struct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf;
+       const unsigned int nb_rx_queues = sa->eth_dev->data->nb_rx_queues;
        unsigned int sw_index;
        int rc;
 
+       sfc_log_init(sa, "nb_rx_queues=%u (old %u)",
+                    nb_rx_queues, sa->rxq_count);
+
        rc = sfc_rx_check_mode(sa, &dev_conf->rxmode);
        if (rc != 0)
                goto fail_check_mode;
 
-       sa->rxq_count = sa->eth_dev->data->nb_rx_queues;
+       if (nb_rx_queues == sa->rxq_count)
+               goto done;
 
-       rc = ENOMEM;
-       sa->rxq_info = rte_calloc_socket("sfc-rxqs", sa->rxq_count,
-                                        sizeof(struct sfc_rxq_info), 0,
-                                        sa->socket_id);
-       if (sa->rxq_info == NULL)
-               goto fail_rxqs_alloc;
+       if (sa->rxq_info == NULL) {
+               rc = ENOMEM;
+               sa->rxq_info = rte_calloc_socket("sfc-rxqs", nb_rx_queues,
+                                                sizeof(sa->rxq_info[0]), 0,
+                                                sa->socket_id);
+               if (sa->rxq_info == NULL)
+                       goto fail_rxqs_alloc;
+       } else {
+               struct sfc_rxq_info *new_rxq_info;
+
+               if (nb_rx_queues < sa->rxq_count)
+                       sfc_rx_fini_queues(sa, nb_rx_queues);
+
+               rc = ENOMEM;
+               new_rxq_info =
+                       rte_realloc(sa->rxq_info,
+                                   nb_rx_queues * sizeof(sa->rxq_info[0]), 0);
+               if (new_rxq_info == NULL && nb_rx_queues > 0)
+                       goto fail_rxqs_realloc;
+
+               sa->rxq_info = new_rxq_info;
+               if (nb_rx_queues > sa->rxq_count)
+                       memset(&sa->rxq_info[sa->rxq_count], 0,
+                              (nb_rx_queues - sa->rxq_count) *
+                              sizeof(sa->rxq_info[0]));
+       }
 
-       for (sw_index = 0; sw_index < sa->rxq_count; ++sw_index) {
-               rc = sfc_rx_qinit_info(sa, sw_index);
+       while (sa->rxq_count < nb_rx_queues) {
+               rc = sfc_rx_qinit_info(sa, sa->rxq_count);
                if (rc != 0)
                        goto fail_rx_qinit_info;
+
+               sa->rxq_count++;
        }
 
 #if EFSYS_OPT_RX_SCALE
        sa->rss_channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ?
-                          MIN(sa->rxq_count, EFX_MAXRSS) : 1;
+                          MIN(sa->rxq_count, EFX_MAXRSS) : 0;
 
-       if (sa->rss_channels > 1) {
+       if (sa->rss_channels > 0) {
                for (sw_index = 0; sw_index < EFX_RSS_TBL_SIZE; ++sw_index)
                        sa->rss_tbl[sw_index] = sw_index % sa->rss_channels;
        }
 #endif
 
+done:
        return 0;
 
 fail_rx_qinit_info:
-       rte_free(sa->rxq_info);
-       sa->rxq_info = NULL;
-
+fail_rxqs_realloc:
 fail_rxqs_alloc:
-       sa->rxq_count = 0;
+       sfc_rx_close(sa);
+
 fail_check_mode:
        sfc_log_init(sa, "failed %d", rc);
        return rc;
@@ -1266,21 +1313,15 @@ fail_check_mode:
 /**
  * Shutdown Rx subsystem.
  *
- * Called at device close stage, for example, before device
- * reconfiguration or shutdown.
+ * Called at device close stage, for example, before device shutdown.
  */
 void
-sfc_rx_fini(struct sfc_adapter *sa)
+sfc_rx_close(struct sfc_adapter *sa)
 {
-       unsigned int sw_index;
+       sfc_rx_fini_queues(sa, 0);
 
-       sw_index = sa->rxq_count;
-       while (sw_index-- > 0) {
-               if (sa->rxq_info[sw_index].rxq != NULL)
-                       sfc_rx_qfini(sa, sw_index);
-       }
+       sa->rss_channels = 0;
 
        rte_free(sa->rxq_info);
        sa->rxq_info = NULL;
-       sa->rxq_count = 0;
 }