@@ -450,6 +450,29 @@ us_vhost_usage(const char *prgname)
prgname);
}
+enum {
+#define CMD_LINE_OPT_VM2VM "vm2vm"
+ CMD_LINE_OPT_VM2VM_NUM = 256,
+#define CMD_LINE_OPT_RX_RETRY "rx-retry"
+ CMD_LINE_OPT_RX_RETRY_NUM,
+#define CMD_LINE_OPT_RX_RETRY_DELAY "rx-retry-delay"
+ CMD_LINE_OPT_RX_RETRY_DELAY_NUM,
+#define CMD_LINE_OPT_RX_RETRY_NUMB "rx-retry-num"
+ CMD_LINE_OPT_RX_RETRY_NUMB_NUM,
+#define CMD_LINE_OPT_MERGEABLE "mergeable"
+ CMD_LINE_OPT_MERGEABLE_NUM,
+#define CMD_LINE_OPT_STATS "stats"
+ CMD_LINE_OPT_STATS_NUM,
+#define CMD_LINE_OPT_SOCKET_FILE "socket-file"
+ CMD_LINE_OPT_SOCKET_FILE_NUM,
+#define CMD_LINE_OPT_TX_CSUM "tx-csum"
+ CMD_LINE_OPT_TX_CSUM_NUM,
+#define CMD_LINE_OPT_TSO "tso"
+ CMD_LINE_OPT_TSO_NUM,
+#define CMD_LINE_OPT_CLIENT "client"
+#define CMD_LINE_OPT_BUILTIN_NET_DRIVER "builtin-net-driver"
+};
+
/*
* Parse the arguments given in the command line of the application.
*/
@@ -461,17 +484,27 @@ us_vhost_parse_args(int argc, char **argv)
unsigned i;
const char *prgname = argv[0];
static struct option long_option[] = {
- {"vm2vm", required_argument, NULL, 0},
- {"rx-retry", required_argument, NULL, 0},
- {"rx-retry-delay", required_argument, NULL, 0},
- {"rx-retry-num", required_argument, NULL, 0},
- {"mergeable", required_argument, NULL, 0},
- {"stats", required_argument, NULL, 0},
- {"socket-file", required_argument, NULL, 0},
- {"tx-csum", required_argument, NULL, 0},
- {"tso", required_argument, NULL, 0},
- {"client", no_argument, &client_mode, 1},
- {"builtin-net-driver", no_argument, &builtin_net_driver, 1},
+ {CMD_LINE_OPT_VM2VM, required_argument,
+ NULL, CMD_LINE_OPT_VM2VM_NUM},
+ {CMD_LINE_OPT_RX_RETRY, required_argument,
+ NULL, CMD_LINE_OPT_RX_RETRY_NUM},
+ {CMD_LINE_OPT_RX_RETRY_DELAY, required_argument,
+ NULL, CMD_LINE_OPT_RX_RETRY_DELAY_NUM},
+ {CMD_LINE_OPT_RX_RETRY_NUMB, required_argument,
+ NULL, CMD_LINE_OPT_RX_RETRY_NUMB_NUM},
+ {CMD_LINE_OPT_MERGEABLE, required_argument,
+ NULL, CMD_LINE_OPT_MERGEABLE_NUM},
+ {CMD_LINE_OPT_STATS, required_argument,
+ NULL, CMD_LINE_OPT_STATS_NUM},
+ {CMD_LINE_OPT_SOCKET_FILE, required_argument,
+ NULL, CMD_LINE_OPT_SOCKET_FILE_NUM},
+ {CMD_LINE_OPT_TX_CSUM, required_argument,
+ NULL, CMD_LINE_OPT_TX_CSUM_NUM},
+ {CMD_LINE_OPT_TSO, required_argument,
+ NULL, CMD_LINE_OPT_TSO_NUM},
+ {CMD_LINE_OPT_CLIENT, no_argument, &client_mode, 1},
+ {CMD_LINE_OPT_BUILTIN_NET_DRIVER, no_argument,
+ &builtin_net_driver, 1},
{NULL, 0, 0, 0},
};
@@ -497,126 +530,115 @@ us_vhost_parse_args(int argc, char **argv)
break;
- case 0:
- /* Enable/disable vm2vm comms. */
- if (!strncmp(long_option[option_index].name, "vm2vm",
- MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, (VM2VM_LAST - 1));
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for "
- "vm2vm [0|1|2]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- vm2vm_mode = (vm2vm_type)ret;
- }
+ case CMD_LINE_OPT_VM2VM_NUM:
+ {
+ ret = parse_num_opt(optarg, (VM2VM_LAST - 1));
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for "
+ "vm2vm [0|1|2]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable retries on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- enable_retry = ret;
- }
+ vm2vm_mode = (vm2vm_type)ret;
+ break;
+ }
+ case CMD_LINE_OPT_RX_RETRY_NUM:
+ {
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable TX checksum offload. */
- if (!strncmp(long_option[option_index].name, "tx-csum", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tx-csum [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else
- enable_tx_csum = ret;
+ enable_retry = ret;
+ break;
+ }
+ case CMD_LINE_OPT_TX_CSUM_NUM:
+ {
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tx-csum [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable TSO offload. */
- if (!strncmp(long_option[option_index].name, "tso", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tso [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else
- enable_tso = ret;
+ enable_tx_csum = ret;
+ break;
+ }
+ case CMD_LINE_OPT_TSO_NUM:
+ {
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tso [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Specify the retries delay time (in useconds) on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry-delay", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-delay [0-N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- burst_rx_delay_time = ret;
- }
+ enable_tso = ret;
+ break;
+ }
+ case CMD_LINE_OPT_RX_RETRY_DELAY_NUM:
+ {
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-delay [0-N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Specify the retries number on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry-num", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-num [0-N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- burst_rx_retry_num = ret;
- }
+ burst_rx_delay_time = ret;
+ break;
+ }
+ case CMD_LINE_OPT_RX_RETRY_NUMB_NUM:
+ {
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-num [0-N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable RX mergeable buffers. */
- if (!strncmp(long_option[option_index].name, "mergeable", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for mergeable [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- mergeable = !!ret;
- if (ret) {
- vmdq_conf_default.rxmode.offloads |=
- DEV_RX_OFFLOAD_JUMBO_FRAME;
- vmdq_conf_default.rxmode.max_rx_pkt_len
- = JUMBO_FRAME_MAX_SIZE;
- }
- }
+ burst_rx_retry_num = ret;
+ break;
+ }
+ case CMD_LINE_OPT_MERGEABLE_NUM:
+ {
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for mergeable [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable stats. */
- if (!strncmp(long_option[option_index].name, "stats", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for stats [0..N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- enable_stats = ret;
- }
+ mergeable = !!ret;
+ if (ret) {
+ vmdq_conf_default.rxmode.offloads |=
+ DEV_RX_OFFLOAD_JUMBO_FRAME;
+ vmdq_conf_default.rxmode.max_rx_pkt_len
+ = JUMBO_FRAME_MAX_SIZE;
}
-
- /* Set socket file path. */
- if (!strncmp(long_option[option_index].name,
- "socket-file", MAX_LONG_OPT_SZ)) {
- if (us_vhost_parse_socket_path(optarg) == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for socket name (Max %d characters)\n",
- PATH_MAX);
- us_vhost_usage(prgname);
- return -1;
- }
+ break;
+ }
+ case CMD_LINE_OPT_STATS_NUM:
+ {
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for stats [0..N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
+ enable_stats = ret;
break;
-
- /* Invalid option - print options. */
+ }
+ case CMD_LINE_OPT_SOCKET_FILE_NUM:
+ {
+ if (us_vhost_parse_socket_path(optarg) == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for socket name (Max %d characters)\n",
+ PATH_MAX);
+ us_vhost_usage(prgname);
+ return -1;
+ }
+ break;
+ }
+ /* Invalid option - print options. */
default:
us_vhost_usage(prgname);
return -1;