Merge branch 'upstream-16.11-stable' into 16.11.x

[deb_dpdk.git] / app / test-pmd / config.c

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index c50b62e..69fa04b 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1155,6 +1155,36 @@ setup_fwd_config_of_each_lcore(struct fwd_config *cfg)
        }
 }
 
+static portid_t
+fwd_topology_tx_port_get(portid_t rxp)
+{
+       static int warning_once = 1;
+
+       RTE_ASSERT(rxp < cur_fwd_config.nb_fwd_ports);
+
+       switch (port_topology) {
+       default:
+       case PORT_TOPOLOGY_PAIRED:
+               if ((rxp & 0x1) == 0) {
+                       if (rxp + 1 < cur_fwd_config.nb_fwd_ports)
+                               return rxp + 1;
+                       if (warning_once) {
+                               printf("\nWarning! port-topology=paired"
+                                      " and odd forward ports number,"
+                                      " the last port will pair with"
+                                      " itself.\n\n");
+                               warning_once = 0;
+                       }
+                       return rxp;
+               }
+               return rxp - 1;
+       case PORT_TOPOLOGY_CHAINED:
+               return (rxp + 1) % cur_fwd_config.nb_fwd_ports;
+       case PORT_TOPOLOGY_LOOP:
+               return rxp;
+       }
+}
+
 static void
 simple_fwd_config_setup(void)
 {
@@ -1217,11 +1247,6 @@ simple_fwd_config_setup(void)
  * For the RSS forwarding test all streams distributed over lcores. Each stream
  * being composed of a RX queue to poll on a RX port for input messages,
  * associated with a TX queue of a TX port where to send forwarded packets.
- * All packets received on the RX queue of index "RxQj" of the RX port "RxPi"
- * are sent on the TX queue "TxQl" of the TX port "TxPk" according to the two
- * following rules:
- *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd
- *    - TxQl = RxQj
  */
 static void
 rss_fwd_config_setup(void)
@@ -1253,18 +1278,7 @@ rss_fwd_config_setup(void)
                struct fwd_stream *fs;
 
                fs = fwd_streams[sm_id];
-
-               if ((rxp & 0x1) == 0)
-                       txp = (portid_t) (rxp + 1);
-               else
-                       txp = (portid_t) (rxp - 1);
-               /*
-                * if we are in loopback, simply send stuff out through the
-                * ingress port
-                */
-               if (port_topology == PORT_TOPOLOGY_LOOP)
-                       txp = rxp;
-
+               txp = fwd_topology_tx_port_get(rxp);
                fs->rx_port = fwd_ports_ids[rxp];
                fs->rx_queue = rxq;
                fs->tx_port = fwd_ports_ids[txp];
@@ -1279,11 +1293,7 @@ rss_fwd_config_setup(void)
                 * Restart from RX queue 0 on next RX port
                 */
                rxq = 0;
-               if (numa_support && (nb_fwd_ports <= (nb_ports >> 1)))
-                       rxp = (portid_t)
-                               (rxp + ((nb_ports >> 1) / nb_fwd_ports));
-               else
-                       rxp = (portid_t) (rxp + 1);
+               rxp++;
        }
 }