X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Fproc-info%2Fmain.c;h=bfe5ce825b70c04f385bbd5d899ad9d34608bc9e;hb=80da61198b6be66ab16964eb0944c79c0325c40e;hp=44249dd2cb47889484ebab7b5bb3692f7c33f267;hpb=ff1047ba5b3128bfd710fc05d2f5adaa259bf88c;p=dpdk.git diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 44249dd2cb..bfe5ce825b 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -93,6 +94,9 @@ static char *mempool_name; /**< Enable iter mempool. */ static uint32_t enable_iter_mempool; static char *mempool_iter_name; +/**< Enable dump regs. */ +static uint32_t enable_dump_regs; +static char *dump_regs_file_prefix; /**< display usage */ static void @@ -118,7 +122,8 @@ proc_info_usage(const char *prgname) " --show-crypto: to display crypto information\n" " --show-ring[=name]: to display ring information\n" " --show-mempool[=name]: to display mempool information\n" - " --iter-mempool=name: iterate mempool elements to display content\n", + " --iter-mempool=name: iterate mempool elements to display content\n" + " --dump-regs=file-prefix: dump registers to file with the file-prefix\n", prgname); } @@ -225,6 +230,7 @@ proc_info_parse_args(int argc, char **argv) {"show-ring", optional_argument, NULL, 0}, {"show-mempool", optional_argument, NULL, 0}, {"iter-mempool", required_argument, NULL, 0}, + {"dump-regs", required_argument, NULL, 0}, {NULL, 0, 0, 0} }; @@ -287,6 +293,10 @@ proc_info_parse_args(int argc, char **argv) "iter-mempool", MAX_LONG_OPT_SZ)) { enable_iter_mempool = 1; mempool_iter_name = optarg; + } else if (!strncmp(long_option[option_index].name, + "dump-regs", MAX_LONG_OPT_SZ)) { + enable_dump_regs = 1; + dump_regs_file_prefix = optarg; } break; case 1: @@ -645,11 +655,16 @@ metrics_display(int port_id) } static void -show_security_context(uint16_t portid) +show_security_context(uint16_t portid, bool inline_offload) { - void *p_ctx = rte_eth_dev_get_sec_ctx(portid); + void *p_ctx; const struct rte_security_capability *s_cap; + if (inline_offload) + p_ctx = rte_eth_dev_get_sec_ctx(portid); + else + p_ctx = rte_cryptodev_get_sec_ctx(portid); + if (p_ctx == NULL) return; @@ -856,7 +871,7 @@ show_port(void) } #ifdef RTE_LIB_SECURITY - show_security_context(i); + show_security_context(i, true); #endif } } @@ -1220,7 +1235,7 @@ show_crypto(void) } #ifdef RTE_LIB_SECURITY - show_security_context(i); + show_security_context(i, false); #endif } } @@ -1280,15 +1295,17 @@ show_mempool(char *name) "\t -- No cache align (%c)\n" "\t -- SP put (%c), SC get (%c)\n" "\t -- Pool created (%c)\n" - "\t -- No IOVA config (%c)\n", + "\t -- No IOVA config (%c)\n" + "\t -- Not used for IO (%c)\n", ptr->name, ptr->socket_id, - (flags & MEMPOOL_F_NO_SPREAD) ? 'y' : 'n', - (flags & MEMPOOL_F_NO_CACHE_ALIGN) ? 'y' : 'n', - (flags & MEMPOOL_F_SP_PUT) ? 'y' : 'n', - (flags & MEMPOOL_F_SC_GET) ? 'y' : 'n', - (flags & MEMPOOL_F_POOL_CREATED) ? 'y' : 'n', - (flags & MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n'); + (flags & RTE_MEMPOOL_F_NO_SPREAD) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_NO_CACHE_ALIGN) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_SP_PUT) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_SC_GET) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_POOL_CREATED) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n', + (flags & RTE_MEMPOOL_F_NON_IO) ? 'y' : 'n'); printf(" - Size %u Cache %u element %u\n" " - header %u trailer %u\n" " - private data size %u\n", @@ -1343,6 +1360,85 @@ iter_mempool(char *name) } } +static void +dump_regs(char *file_prefix) +{ +#define MAX_FILE_NAME_SZ (MAX_LONG_OPT_SZ + 10) + char file_name[MAX_FILE_NAME_SZ]; + struct rte_dev_reg_info reg_info; + struct rte_eth_dev_info dev_info; + unsigned char *buf_data; + size_t buf_size; + FILE *fp_regs; + uint16_t i; + int ret; + + snprintf(bdr_str, MAX_STRING_LEN, " dump - Port REG"); + STATS_BDR_STR(10, bdr_str); + + RTE_ETH_FOREACH_DEV(i) { + /* Skip if port is not in mask */ + if ((enabled_port_mask & (1ul << i)) == 0) + continue; + + snprintf(bdr_str, MAX_STRING_LEN, " Port (%u)", i); + STATS_BDR_STR(5, bdr_str); + + ret = rte_eth_dev_info_get(i, &dev_info); + if (ret) { + printf("Error getting device info: %d\n", ret); + continue; + } + + memset(®_info, 0, sizeof(reg_info)); + ret = rte_eth_dev_get_reg_info(i, ®_info); + if (ret) { + printf("Error getting device reg info: %d\n", ret); + continue; + } + + buf_size = reg_info.length * reg_info.width; + buf_data = malloc(buf_size); + if (buf_data == NULL) { + printf("Error allocating %zu bytes buffer\n", buf_size); + continue; + } + + reg_info.data = buf_data; + reg_info.length = 0; + ret = rte_eth_dev_get_reg_info(i, ®_info); + if (ret) { + printf("Error getting regs from device: %d\n", ret); + free(buf_data); + continue; + } + + snprintf(file_name, MAX_FILE_NAME_SZ, "%s-port%u", + file_prefix, i); + fp_regs = fopen(file_name, "wb"); + if (fp_regs == NULL) { + printf("Error during opening '%s' for writing: %s\n", + file_name, strerror(errno)); + } else { + size_t nr_written; + + nr_written = fwrite(buf_data, 1, buf_size, fp_regs); + if (nr_written != buf_size) + printf("Error during writing %s: %s\n", + file_prefix, strerror(errno)); + else + printf("Device (%s) regs dumped successfully, " + "driver:%s version:0X%08X\n", + dev_info.device->name, + dev_info.driver_name, reg_info.version); + + fclose(fp_regs); + } + + free(buf_data); + } +} + int main(int argc, char **argv) { @@ -1448,6 +1544,8 @@ main(int argc, char **argv) show_mempool(mempool_name); if (enable_iter_mempool) iter_mempool(mempool_iter_name); + if (enable_dump_regs) + dump_regs(dump_regs_file_prefix); RTE_ETH_FOREACH_DEV(i) rte_eth_dev_close(i);