app/testpmd: force shared Rx queue polled on same core

Shared Rx queue must be polled on same core. This patch checks and stops
forwarding if shared RxQ being scheduled on multiple
cores.

It's suggested to use same number of Rx queues and polling cores.

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e4bbf457916d327d288bbe386983c134d9ca2c20..cad78350dcc9128b4809eea2af3ab037d00b48b5 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3067,6 +3067,111 @@ port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key,
        }
 }
 
+/*
+ * Check whether a shared rxq scheduled on other lcores.
+ */
+static bool
+fwd_stream_on_other_lcores(uint16_t domain_id, lcoreid_t src_lc,
+                          portid_t src_port, queueid_t src_rxq,
+                          uint32_t share_group, queueid_t share_rxq)
+{
+       streamid_t sm_id;
+       streamid_t nb_fs_per_lcore;
+       lcoreid_t  nb_fc;
+       lcoreid_t  lc_id;
+       struct fwd_stream *fs;
+       struct rte_port *port;
+       struct rte_eth_dev_info *dev_info;
+       struct rte_eth_rxconf *rxq_conf;
+
+       nb_fc = cur_fwd_config.nb_fwd_lcores;
+       /* Check remaining cores. */
+       for (lc_id = src_lc + 1; lc_id < nb_fc; lc_id++) {
+               sm_id = fwd_lcores[lc_id]->stream_idx;
+               nb_fs_per_lcore = fwd_lcores[lc_id]->stream_nb;
+               for (; sm_id < fwd_lcores[lc_id]->stream_idx + nb_fs_per_lcore;
+                    sm_id++) {
+                       fs = fwd_streams[sm_id];
+                       port = &ports[fs->rx_port];
+                       dev_info = &port->dev_info;
+                       rxq_conf = &port->rx_conf[fs->rx_queue];
+                       if ((dev_info->dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE)
+                           == 0 || rxq_conf->share_group == 0)
+                               /* Not shared rxq. */
+                               continue;
+                       if (domain_id != port->dev_info.switch_info.domain_id)
+                               continue;
+                       if (rxq_conf->share_group != share_group)
+                               continue;
+                       if (rxq_conf->share_qid != share_rxq)
+                               continue;
+                       printf("Shared Rx queue group %u queue %hu can't be scheduled on different cores:\n",
+                              share_group, share_rxq);
+                       printf("  lcore %hhu Port %hu queue %hu\n",
+                              src_lc, src_port, src_rxq);
+                       printf("  lcore %hhu Port %hu queue %hu\n",
+                              lc_id, fs->rx_port, fs->rx_queue);
+                       printf("Please use --nb-cores=%hu to limit number of forwarding cores\n",
+                              nb_rxq);
+                       return true;
+               }
+       }
+       return false;
+}
+
+/*
+ * Check shared rxq configuration.
+ *
+ * Shared group must not being scheduled on different core.
+ */
+bool
+pkt_fwd_shared_rxq_check(void)
+{
+       streamid_t sm_id;
+       streamid_t nb_fs_per_lcore;
+       lcoreid_t  nb_fc;
+       lcoreid_t  lc_id;
+       struct fwd_stream *fs;
+       uint16_t domain_id;
+       struct rte_port *port;
+       struct rte_eth_dev_info *dev_info;
+       struct rte_eth_rxconf *rxq_conf;
+
+       if (rxq_share == 0)
+               return true;
+       nb_fc = cur_fwd_config.nb_fwd_lcores;
+       /*
+        * Check streams on each core, make sure the same switch domain +
+        * group + queue doesn't get scheduled on other cores.
+        */
+       for (lc_id = 0; lc_id < nb_fc; lc_id++) {
+               sm_id = fwd_lcores[lc_id]->stream_idx;
+               nb_fs_per_lcore = fwd_lcores[lc_id]->stream_nb;
+               for (; sm_id < fwd_lcores[lc_id]->stream_idx + nb_fs_per_lcore;
+                    sm_id++) {
+                       fs = fwd_streams[sm_id];
+                       /* Update lcore info stream being scheduled. */
+                       fs->lcore = fwd_lcores[lc_id];
+                       port = &ports[fs->rx_port];
+                       dev_info = &port->dev_info;
+                       rxq_conf = &port->rx_conf[fs->rx_queue];
+                       if ((dev_info->dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE)
+                           == 0 || rxq_conf->share_group == 0)
+                               /* Not shared rxq. */
+                               continue;
+                       /* Check shared rxq not scheduled on remaining cores. */
+                       domain_id = port->dev_info.switch_info.domain_id;
+                       if (fwd_stream_on_other_lcores(domain_id, lc_id,
+                                                      fs->rx_port,
+                                                      fs->rx_queue,
+                                                      rxq_conf->share_group,
+                                                      rxq_conf->share_qid))
+                               return false;
+               }
+       }
+       return true;
+}
+
 /*
  * Setup forwarding configuration for each logical core.
  */

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 80337bad382e7cd54a419eab0328917ecfcd7180..d76d298a4b94fa2e4f28d91dc5e7d9fe0fefad89 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2309,6 +2309,10 @@ start_packet_forwarding(int with_tx_first)
 
        fwd_config_setup();
 
+       pkt_fwd_config_display(&cur_fwd_config);
+       if (!pkt_fwd_shared_rxq_check())
+               return;
+
        port_fwd_begin = cur_fwd_config.fwd_eng->port_fwd_begin;
        if (port_fwd_begin != NULL) {
                for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) {
@@ -2338,7 +2342,6 @@ start_packet_forwarding(int with_tx_first)
        if(!no_flush_rx)
                flush_fwd_rx_queues();
 
-       pkt_fwd_config_display(&cur_fwd_config);
        rxtx_config_display();
 
        fwd_stats_reset();

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 63f9913deb6c8f6af54130ce65e31293a2f4b8ed..9482dab3071ce38aa041c7f9eb0801747c452126 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -147,6 +147,7 @@ struct fwd_stream {
        uint64_t     core_cycles; /**< used for RX and TX processing */
        struct pkt_burst_stats rx_burst_stats;
        struct pkt_burst_stats tx_burst_stats;
+       struct fwd_lcore *lcore; /**< Lcore being scheduled. */
 };
 
 /**
@@ -842,6 +843,7 @@ void port_summary_header_display(void);
 void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id);
 void tx_queue_infos_display(portid_t port_idi, uint16_t queue_id);
 void fwd_lcores_config_display(void);
+bool pkt_fwd_shared_rxq_check(void);
 void pkt_fwd_config_display(struct fwd_config *cfg);
 void rxtx_config_display(void);
 void fwd_config_setup(void);