ethdev: store numa_node per device

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 64d7855..2d18212 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -31,6 +31,36 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
+/*   BSD LICENSE
+ *
+ *   Copyright(c) 2013 6WIND.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of 6WIND S.A. nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <stdarg.h>
 #include <errno.h>
@@ -207,6 +237,8 @@ port_infos_display(portid_t port_id)
        struct rte_port *port;
        struct rte_eth_link link;
        int vlan_offload;
+       int socket_id;
+       struct rte_mempool * mp;
        static const char *info_border = "*********************";
 
        if (port_id >= nb_ports) {
@@ -215,9 +247,20 @@ port_infos_display(portid_t port_id)
        }
        port = &ports[port_id];
        rte_eth_link_get_nowait(port_id, &link);
+       socket_id = rte_eth_dev_socket_id(port_id);
        printf("\n%s Infos for port %-2d %s\n",
               info_border, port_id, info_border);
        print_ethaddr("MAC address: ", &port->eth_addr);
+       printf("\nConnect to socket: %d",socket_id);
+
+       if (port_numa[port_id] != NUMA_NO_CONFIG) {
+               mp = mbuf_pool_find(port_numa[port_id]);
+               if (mp)
+                       printf("\nmemory allocation on the socket: %d",
+                                                       port_numa[port_id]);
+       } else
+               printf("\nmemory allocation on the socket: %d",socket_id);
+
        printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down"));
        printf("Link speed: %u Mbps\n", (unsigned) link.link_speed);
        printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
@@ -278,7 +321,7 @@ port_reg_off_is_invalid(portid_t port_id, uint32_t reg_off)
                       (unsigned)reg_off);
                return 1;
        }
-       pci_len = ports[port_id].dev_info.pci_dev->mem_resource.len;
+       pci_len = ports[port_id].dev_info.pci_dev->mem_resource[0].len;
        if (reg_off >= pci_len) {
                printf("Port %d: register offset %u (0x%X) out of port PCI "
                       "resource (length=%"PRIu64")\n",
@@ -620,7 +663,6 @@ setup_fwd_config_of_each_lcore(struct fwd_config *cfg)
                nb_fs_per_lcore = (streamid_t) (nb_fs / nb_fc);
                nb_extra = (lcoreid_t) (nb_fs % nb_fc);
        }
-       nb_extra = (lcoreid_t) (nb_fs % nb_fc);
 
        nb_lc = (lcoreid_t) (nb_fc - nb_extra);
        sm_id = 0;
@@ -648,17 +690,14 @@ simple_fwd_config_setup(void)
        portid_t j;
        portid_t inc = 2;
 
-       if (nb_fwd_ports % 2) {
-               if (port_topology == PORT_TOPOLOGY_CHAINED) {
-                       inc = 1;
-               }
-               else {
-                       printf("\nWarning! Cannot handle an odd number of ports "
-                              "with the current port topology. Configuration "
-                              "must be changed to have an even number of ports, "
-                              "or relaunch application with "
-                              "--port-topology=chained\n\n");
-               }
+       if (port_topology == PORT_TOPOLOGY_CHAINED) {
+               inc = 1;
+       } else if (nb_fwd_ports % 2) {
+               printf("\nWarning! Cannot handle an odd number of ports "
+                      "with the current port topology. Configuration "
+                      "must be changed to have an even number of ports, "
+                      "or relaunch application with "
+                      "--port-topology=chained\n\n");
        }
 
        cur_fwd_config.nb_fwd_ports = (portid_t) nb_fwd_ports;