ethdev: RSS RETA configuration

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index f85540c..aaf8b9e 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 
@@ -237,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) {
@@ -245,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) ?
@@ -308,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",
@@ -627,6 +640,40 @@ rxtx_config_display(void)
               tx_rs_thresh, txq_flags);
 }
 
+void
+port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
+{
+       uint8_t i,j;
+       int ret;
+
+       if (port_id_is_invalid(port_id)) 
+               return;
+
+       ret = rte_eth_dev_rss_reta_query(port_id, reta_conf);
+       if (ret != 0) {
+               printf("Failed to get RSS RETA info, return code = %d\n", ret);
+               return;
+       }
+
+       if (reta_conf->mask_lo != 0) {
+               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
+                       if (reta_conf->mask_lo & (uint64_t)(1ULL << i))
+                               printf("RSS RETA configuration: hash index=%d,"
+                                       "queue=%d\n",i,reta_conf->reta[i]);     
+               }
+       }
+       
+       if (reta_conf->mask_hi != 0) {
+               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
+                       if(reta_conf->mask_hi & (uint64_t)(1ULL << i)) {
+                               j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);          
+                               printf("RSS RETA configuration: hash index=%d,"
+                                       "queue=%d\n",j,reta_conf->reta[j]);
+                       }
+               }
+       }
+}
+
 /*
  * Setup forwarding configuration for each logical core.
  */
@@ -650,7 +697,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;