X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-dpctl.c;h=658f6ba106b3f6c0da6b7790edea15acc20e5037;hb=25608d9720000ba2f4b4a881ca2a8cf519404f96;hp=ee545a61ac5273e611929ffe4a47f1682afbde27;hpb=149f577a25508779b756515be1f1bdcefa3710fa;p=sliver-openvswitch.git diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index ee545a61a..658f6ba10 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -36,12 +37,13 @@ #include "dynamic-string.h" #include "netdev.h" #include "odp-util.h" +#include "shash.h" #include "svec.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_dpctl + +VLOG_DEFINE_THIS_MODULE(dpctl); static const struct command all_commands[]; @@ -52,8 +54,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - time_init(); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); @@ -63,11 +63,15 @@ main(int argc, char *argv[]) static void parse_options(int argc, char *argv[]) { + enum { + OPT_DUMMY = UCHAR_MAX + 1, + VLOG_OPTION_ENUMS + }; static struct option long_options[] = { {"timeout", required_argument, 0, 't'}, - {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + VLOG_LONG_OPTIONS, {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -99,9 +103,7 @@ parse_options(int argc, char *argv[]) OVS_PRINT_VERSION(0, 0); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); - break; + VLOG_OPTION_HANDLERS case '?': exit(EXIT_FAILURE); @@ -126,8 +128,7 @@ usage(void) " show show basic info on all datapaths\n" " show DP... show basic info on each DP\n" " dump-flows DP display flows in DP\n" - " del-flows DP delete all flows from DP\n" - " dump-groups DP display port groups in DP\n", + " del-flows DP delete all flows from DP\n", program_name, program_name); vlog_usage(); printf("\nOther options:\n" @@ -174,11 +175,30 @@ static int if_up(const char *netdev_name) return retval; } +static int +parsed_dpif_open(const char *arg_, bool create, struct dpif **dpifp) +{ + int result; + char *name, *type; + + dp_parse_name(arg_, &name, &type); + + if (create) { + result = dpif_create(name, type, dpifp); + } else { + result = dpif_open(name, type, dpifp); + } + + free(name); + free(type); + return result; +} + static void -do_add_dp(int argc UNUSED, char *argv[]) +do_add_dp(int argc OVS_UNUSED, char *argv[]) { struct dpif *dpif; - run(dpif_create(argv[1], &dpif), "add_dp"); + run(parsed_dpif_open(argv[1], true, &dpif), "add_dp"); dpif_close(dpif); if (argc > 2) { do_add_if(argc, argv); @@ -186,78 +206,73 @@ do_add_dp(int argc UNUSED, char *argv[]) } static void -do_del_dp(int argc UNUSED, char *argv[]) +do_del_dp(int argc OVS_UNUSED, char *argv[]) { struct dpif *dpif; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); run(dpif_delete(dpif), "del_dp"); dpif_close(dpif); } -static int -compare_ports(const void *a_, const void *b_) -{ - const struct odp_port *a = a_; - const struct odp_port *b = b_; - return a->port < b->port ? -1 : a->port > b->port; -} - static void -query_ports(struct dpif *dpif, struct odp_port **ports, size_t *n_ports) -{ - run(dpif_port_list(dpif, ports, n_ports), "listing ports"); - qsort(*ports, *n_ports, sizeof **ports, compare_ports); -} - -static void -do_add_if(int argc UNUSED, char *argv[]) +do_add_if(int argc OVS_UNUSED, char *argv[]) { bool failure = false; struct dpif *dpif; int i; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); for (i = 2; i < argc; i++) { char *save_ptr = NULL; - char *devname, *suboptions; - int flags = 0; + struct netdev_options options; + struct netdev *netdev; + struct shash args; + char *option; int error; - devname = strtok_r(argv[i], ",", &save_ptr); - if (!devname) { + options.name = strtok_r(argv[i], ",", &save_ptr); + options.type = "system"; + options.args = &args; + options.ethertype = NETDEV_ETH_TYPE_NONE; + + if (!options.name) { ovs_error(0, "%s is not a valid network device name", argv[i]); continue; } - suboptions = strtok_r(NULL, "", &save_ptr); - if (suboptions) { - enum { - AP_INTERNAL - }; - static char *options[] = { - "internal" - }; - - while (*suboptions != '\0') { - char *value; - - switch (getsubopt(&suboptions, options, &value)) { - case AP_INTERNAL: - flags |= ODP_PORT_INTERNAL; - break; - - default: - ovs_error(0, "unknown suboption '%s'", value); - break; - } + shash_init(&args); + while ((option = strtok_r(NULL, ",", &save_ptr)) != NULL) { + char *save_ptr_2 = NULL; + char *key, *value; + + key = strtok_r(option, "=", &save_ptr_2); + value = strtok_r(NULL, "", &save_ptr_2); + if (!value) { + value = ""; + } + + if (!strcmp(key, "type")) { + options.type = value; + } else if (!shash_add_once(&args, key, value)) { + ovs_error(0, "duplicate \"%s\" option", key); } } - error = dpif_port_add(dpif, devname, flags, NULL); + error = netdev_open(&options, &netdev); + if (error) { + ovs_error(error, "%s: failed to open network device", + options.name); + } else { + error = dpif_port_add(dpif, netdev, NULL); + if (error) { + ovs_error(error, "adding %s to %s failed", + options.name, argv[1]); + } else { + error = if_up(options.name); + } + netdev_close(netdev); + } if (error) { - ovs_error(error, "adding %s to %s failed", devname, argv[1]); - failure = true; - } else if (if_up(devname)) { failure = true; } } @@ -270,31 +285,26 @@ do_add_if(int argc UNUSED, char *argv[]) static bool get_port_number(struct dpif *dpif, const char *name, uint16_t *port) { - struct odp_port *ports; - size_t n_ports; - size_t i; - - query_ports(dpif, &ports, &n_ports); - for (i = 0; i < n_ports; i++) { - if (!strcmp(name, ports[i].devname)) { - *port = ports[i].port; - free(ports); - return true; - } + struct dpif_port dpif_port; + + if (!dpif_port_query_by_name(dpif, name, &dpif_port)) { + *port = dpif_port.port_no; + dpif_port_destroy(&dpif_port); + return true; + } else { + ovs_error(0, "no port named %s", name); + return false; } - free(ports); - ovs_error(0, "no port named %s", name); - return false; } static void -do_del_if(int argc UNUSED, char *argv[]) +do_del_if(int argc OVS_UNUSED, char *argv[]) { bool failure = false; struct dpif *dpif; int i; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); for (i = 2; i < argc; i++) { const char *name = argv[i]; uint16_t port; @@ -322,36 +332,55 @@ do_del_if(int argc UNUSED, char *argv[]) static void show_dpif(struct dpif *dpif) { - struct odp_port *ports; + struct dpif_port_dump dump; + struct dpif_port dpif_port; struct odp_stats stats; - size_t n_ports; - size_t i; printf("%s:\n", dpif_name(dpif)); if (!dpif_get_dp_stats(dpif, &stats)) { - printf("\tflows: cur:%"PRIu32", soft-max:%"PRIu32", " - "hard-max:%"PRIu32"\n", - stats.n_flows, stats.cur_capacity, stats.max_capacity); - printf("\tports: cur:%"PRIu32", max:%"PRIu32"\n", - stats.n_ports, stats.max_ports); - printf("\tgroups: max:%"PRIu16"\n", stats.max_groups); printf("\tlookups: frags:%llu, hit:%llu, missed:%llu, lost:%llu\n", (unsigned long long int) stats.n_frags, (unsigned long long int) stats.n_hit, (unsigned long long int) stats.n_missed, (unsigned long long int) stats.n_lost); - printf("\tqueues: max-miss:%"PRIu16", max-action:%"PRIu16"\n", - stats.max_miss_queue, stats.max_action_queue); } - query_ports(dpif, &ports, &n_ports); - for (i = 0; i < n_ports; i++) { - printf("\tport %u: %s", ports[i].port, ports[i].devname); - if (ports[i].flags & ODP_PORT_INTERNAL) { - printf(" (internal)"); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, dpif) { + printf("\tport %u: %s", dpif_port.port_no, dpif_port.name); + + if (strcmp(dpif_port.type, "system")) { + struct netdev_options netdev_options; + struct netdev *netdev; + int error; + + printf (" (%s", dpif_port.type); + + netdev_options.name = dpif_port.name; + netdev_options.type = dpif_port.type; + netdev_options.args = NULL; + netdev_options.ethertype = NETDEV_ETH_TYPE_NONE; + error = netdev_open(&netdev_options, &netdev); + if (!error) { + const struct shash_node **nodes; + const struct shash *config; + size_t i; + + config = netdev_get_config(netdev); + nodes = shash_sort(config); + for (i = 0; i < shash_count(config); i++) { + const struct shash_node *node = nodes[i]; + printf("%c %s=%s", i ? ',' : ':', + node->name, (char *) node->data); + } + free(nodes); + + netdev_close(netdev); + } else { + printf(": open failed (%s)", strerror(error)); + } + putchar(')'); } - printf("\n"); + putchar('\n'); } - free(ports); dpif_close(dpif); } @@ -366,7 +395,7 @@ do_show(int argc, char *argv[]) struct dpif *dpif; int error; - error = dpif_open(name, &dpif); + error = parsed_dpif_open(name, false, &dpif); if (!error) { show_dpif(dpif); } else { @@ -375,21 +404,37 @@ do_show(int argc, char *argv[]) } } } else { - unsigned int i; - for (i = 0; i < ODP_MAX; i++) { - char name[128]; - struct dpif *dpif; - int error; + struct svec types; + const char *type; + size_t i; + + svec_init(&types); + dp_enumerate_types(&types); + SVEC_FOR_EACH (i, type, &types) { + struct svec names; + const char *name; + size_t j; - sprintf(name, "dp%u", i); - error = dpif_open(name, &dpif); - if (!error) { - show_dpif(dpif); - } else if (error != ENODEV) { - ovs_error(error, "opening datapath %s failed", name); + svec_init(&names); + if (dp_enumerate_names(type, &names)) { failure = true; + continue; + } + SVEC_FOR_EACH (j, name, &names) { + struct dpif *dpif; + int error; + + error = dpif_open(name, type, &dpif); + if (!error) { + show_dpif(dpif); + } else { + ovs_error(error, "opening datapath %s failed", name); + failure = true; + } } + svec_destroy(&names); } + svec_destroy(&types); } if (failure) { exit(EXIT_FAILURE); @@ -397,98 +442,84 @@ do_show(int argc, char *argv[]) } static void -do_dump_dps(int argc UNUSED, char *argv[] UNUSED) +do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - struct svec all_dps; + struct svec dpif_names, dpif_types; unsigned int i; - int error; + int error = 0; - svec_init(&all_dps); - error = dp_enumerate(&all_dps); + svec_init(&dpif_names); + svec_init(&dpif_types); + dp_enumerate_types(&dpif_types); - for (i = 0; i < all_dps.n; i++) { - struct dpif *dpif; - if (!dpif_open(all_dps.names[i], &dpif)) { - printf("%s\n", dpif_name(dpif)); - dpif_close(dpif); + for (i = 0; i < dpif_types.n; i++) { + unsigned int j; + int retval; + + retval = dp_enumerate_names(dpif_types.names[i], &dpif_names); + if (retval) { + error = retval; + } + + for (j = 0; j < dpif_names.n; j++) { + struct dpif *dpif; + if (!dpif_open(dpif_names.names[j], dpif_types.names[i], &dpif)) { + printf("%s\n", dpif_name(dpif)); + dpif_close(dpif); + } } } - svec_destroy(&all_dps); + svec_destroy(&dpif_names); + svec_destroy(&dpif_types); if (error) { exit(EXIT_FAILURE); } } static void -do_dump_flows(int argc UNUSED, char *argv[]) +do_dump_flows(int argc OVS_UNUSED, char *argv[]) { - struct odp_flow *flows; + const struct dpif_flow_stats *stats; + const struct nlattr *actions; + struct dpif_flow_dump dump; + const struct nlattr *key; + size_t actions_len; struct dpif *dpif; - size_t n_flows; + size_t key_len; struct ds ds; - size_t i; - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_flow_list_all(dpif, &flows, &n_flows), "listing all flows"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); ds_init(&ds); - for (i = 0; i < n_flows; i++) { - struct odp_flow *f = &flows[i]; - enum { MAX_ACTIONS = 4096 / sizeof(union odp_action) }; - union odp_action actions[MAX_ACTIONS]; - - f->actions = actions; - f->n_actions = MAX_ACTIONS; - dpif_flow_get(dpif, f); - + dpif_flow_dump_start(&dump, dpif); + while (dpif_flow_dump_next(&dump, &key, &key_len, + &actions, &actions_len, &stats)) { ds_clear(&ds); - format_odp_flow(&ds, f); + odp_flow_key_format(key, key_len, &ds); + ds_put_cstr(&ds, ", "); + dpif_flow_stats_format(stats, &ds); + ds_put_cstr(&ds, ", actions:"); + format_odp_actions(&ds, actions, actions_len); printf("%s\n", ds_cstr(&ds)); } + dpif_flow_dump_done(&dump); ds_destroy(&ds); dpif_close(dpif); } static void -do_del_flows(int argc UNUSED, char *argv[]) +do_del_flows(int argc OVS_UNUSED, char *argv[]) { struct dpif *dpif; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); run(dpif_flow_flush(dpif), "deleting all flows"); dpif_close(dpif); } static void -do_dump_groups(int argc UNUSED, char *argv[]) -{ - struct odp_stats stats; - struct dpif *dpif; - unsigned int i; - - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_get_dp_stats(dpif, &stats), "get datapath stats"); - for (i = 0; i < stats.max_groups; i++) { - uint16_t *ports; - size_t n_ports; - - if (!dpif_port_group_get(dpif, i, &ports, &n_ports) && n_ports) { - size_t j; - - printf("group %u:", i); - for (j = 0; j < n_ports; j++) { - printf(" %"PRIu16, ports[j]); - } - printf("\n"); - } - free(ports); - } - dpif_close(dpif); -} - -static void -do_help(int argc UNUSED, char *argv[] UNUSED) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } @@ -502,7 +533,6 @@ static const struct command all_commands[] = { { "show", 0, INT_MAX, do_show }, { "dump-flows", 1, 1, do_dump_flows }, { "del-flows", 1, 1, do_del_flows }, - { "dump-groups", 1, 1, do_dump_groups }, { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, };