X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdpdkevents.c;h=4cdf01dfb778a83626b99e07d67403c865906835;hb=6378ec288f34ff250b2971a1452338a2b34c240a;hp=e9f01078492d9c5f9faf80e526032048f01b5685;hpb=400c086b0ab8fab8f5248d3b2893144767e60aa7;p=collectd.git diff --git a/src/dpdkevents.c b/src/dpdkevents.c index e9f01078..4cdf01df 100644 --- a/src/dpdkevents.c +++ b/src/dpdkevents.c @@ -32,12 +32,12 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #include "semaphore.h" #include "sys/mman.h" -#include "utils_dpdk.h" +#include "utils/dpdk/dpdk.h" #include "utils_time.h" #include @@ -66,19 +66,19 @@ typedef struct dpdk_ka_monitor_s { typedef struct dpdk_link_status_config_s { int enabled; - int send_updated; + bool send_updated; uint32_t enabled_port_mask; char port_name[RTE_MAX_ETHPORTS][DATA_MAX_NAME_LEN]; - int notify; + bool notify; } dpdk_link_status_config_t; typedef struct dpdk_keep_alive_config_s { int enabled; - int send_updated; + bool send_updated; uint128_t lcore_mask; dpdk_keepalive_shm_t *shm; char shm_name[DATA_MAX_NAME_LEN]; - int notify; + bool notify; int fd; } dpdk_keep_alive_config_t; @@ -101,12 +101,20 @@ typedef struct dpdk_events_ctx_s { dpdk_ka_monitor_t core_info[RTE_KEEPALIVE_MAXCORES]; } dpdk_events_ctx_t; +typedef enum { + DPDK_EVENTS_STATE_CFG_ERR = 1 << 0, + DPDK_EVENTS_STATE_KA_CFG_ERR = 1 << 1, + DPDK_EVENTS_STATE_LS_CFG_ERR = 1 << 2, + +} dpdk_events_cfg_status; + #define DPDK_EVENTS_CTX_GET(a) ((dpdk_events_ctx_t *)dpdk_helper_priv_get(a)) #define DPDK_EVENTS_TRACE() \ DEBUG("%s:%s:%d pid=%u", DPDK_EVENTS_PLUGIN, __FUNCTION__, __LINE__, getpid()) static dpdk_helper_ctx_t *g_hc; +static dpdk_events_cfg_status g_state; static int dpdk_event_keep_alive_shm_open(void) { dpdk_events_ctx_t *ec = DPDK_EVENTS_CTX_GET(g_hc); @@ -121,12 +129,11 @@ static int dpdk_event_keep_alive_shm_open(void) { shm_name); } - char errbuf[ERR_BUF_SIZE]; int fd = shm_open(shm_name, O_RDONLY, 0); if (fd < 0) { ERROR(DPDK_EVENTS_PLUGIN ": Failed to open %s as SHM:%s. Is DPDK KA " "primary application running?", - shm_name, sstrerror(errno, errbuf, sizeof(errbuf))); + shm_name, STRERRNO); return errno; } @@ -158,8 +165,7 @@ static int dpdk_event_keep_alive_shm_open(void) { ec->config.keep_alive.shm = (dpdk_keepalive_shm_t *)mmap( 0, sizeof(*(ec->config.keep_alive.shm)), PROT_READ, MAP_SHARED, fd, 0); if (ec->config.keep_alive.shm == MAP_FAILED) { - ERROR(DPDK_EVENTS_PLUGIN ": Failed to mmap KA SHM:%s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR(DPDK_EVENTS_PLUGIN ": Failed to mmap KA SHM:%s", STRERRNO); close(fd); return errno; } @@ -179,8 +185,8 @@ static void dpdk_events_default_config(void) { /* Link Status */ ec->config.link_status.enabled = 1; ec->config.link_status.enabled_port_mask = ~0; - ec->config.link_status.send_updated = 1; - ec->config.link_status.notify = 0; + ec->config.link_status.send_updated = true; + ec->config.link_status.notify = false; for (int i = 0; i < RTE_MAX_ETHPORTS; i++) { ec->config.link_status.port_name[i][0] = 0; @@ -188,8 +194,8 @@ static void dpdk_events_default_config(void) { /* Keep Alive */ ec->config.keep_alive.enabled = 1; - ec->config.keep_alive.send_updated = 1; - ec->config.keep_alive.notify = 0; + ec->config.keep_alive.send_updated = true; + ec->config.keep_alive.notify = false; /* by default enable 128 cores */ memset(&ec->config.keep_alive.lcore_mask, 1, sizeof(ec->config.keep_alive.lcore_mask)); @@ -240,18 +246,26 @@ static int dpdk_events_link_status_config(dpdk_events_ctx_t *ec, oconfig_item_t *child = ci->children + i; if (strcasecmp("EnabledPortMask", child->key) == 0) { - ec->config.link_status.enabled_port_mask = - (uint32_t)child->values[0].value.number; + if (cf_util_get_int(child, + (int *)&ec->config.link_status.enabled_port_mask)) + return -1; DEBUG(DPDK_EVENTS_PLUGIN ": LinkStatus:Enabled Port Mask 0x%X", ec->config.link_status.enabled_port_mask); } else if (strcasecmp("SendEventsOnUpdate", child->key) == 0) { - ec->config.link_status.send_updated = child->values[0].value.boolean; + if (cf_util_get_boolean(child, &ec->config.link_status.send_updated)) + return -1; DEBUG(DPDK_EVENTS_PLUGIN ": LinkStatus:SendEventsOnUpdate %d", - (int)child->values[0].value.boolean); + ec->config.link_status.send_updated); } else if (strcasecmp("SendNotification", child->key) == 0) { - ec->config.link_status.notify = child->values[0].value.boolean; + if (cf_util_get_boolean(child, &ec->config.link_status.notify)) + return -1; + DEBUG(DPDK_EVENTS_PLUGIN ": LinkStatus:SendNotification %d", - (int)child->values[0].value.boolean); + ec->config.link_status.notify); + } else if (strcasecmp("PortName", child->key) != 0) { + ERROR(DPDK_EVENTS_PLUGIN ": unrecognized configuration option %s.", + child->key); + return -1; } } @@ -263,8 +277,12 @@ static int dpdk_events_link_status_config(dpdk_events_ctx_t *ec, if (strcasecmp("PortName", child->key) == 0) { while (!(ec->config.link_status.enabled_port_mask & (1 << port_num))) port_num++; - ssnprintf(ec->config.link_status.port_name[port_num], DATA_MAX_NAME_LEN, - "%s", child->values[0].value.string); + + if (cf_util_get_string_buffer( + child, ec->config.link_status.port_name[port_num], + sizeof(ec->config.link_status.port_name[port_num]))) { + return -1; + } DEBUG(DPDK_EVENTS_PLUGIN ": LinkStatus:Port %d Name: %s", port_num, ec->config.link_status.port_name[port_num]); port_num++; @@ -283,28 +301,38 @@ static int dpdk_events_keep_alive_config(dpdk_events_ctx_t *ec, oconfig_item_t *child = ci->children + i; if (strcasecmp("SendEventsOnUpdate", child->key) == 0) { - ec->config.keep_alive.send_updated = child->values[0].value.boolean; + if (cf_util_get_boolean(child, &ec->config.keep_alive.send_updated)) + return -1; + DEBUG(DPDK_EVENTS_PLUGIN ": KeepAlive:SendEventsOnUpdate %d", - (int)child->values[0].value.boolean); + ec->config.keep_alive.send_updated); } else if (strcasecmp("LCoreMask", child->key) == 0) { char lcore_mask[DATA_MAX_NAME_LEN]; - ssnprintf(lcore_mask, sizeof(lcore_mask), "%s", - child->values[0].value.string); + + if (cf_util_get_string_buffer(child, lcore_mask, sizeof(lcore_mask))) + return -1; ec->config.keep_alive.lcore_mask = str_to_uint128(lcore_mask, strlen(lcore_mask)); DEBUG(DPDK_EVENTS_PLUGIN ": KeepAlive:LCoreMask 0x%" PRIX64 "%" PRIX64 "", ec->config.keep_alive.lcore_mask.high, ec->config.keep_alive.lcore_mask.low); } else if (strcasecmp("KeepAliveShmName", child->key) == 0) { - ssnprintf(ec->config.keep_alive.shm_name, - sizeof(ec->config.keep_alive.shm_name), "%s", - child->values[0].value.string); + if (cf_util_get_string_buffer(child, ec->config.keep_alive.shm_name, + sizeof(ec->config.keep_alive.shm_name))) + return -1; + DEBUG(DPDK_EVENTS_PLUGIN ": KeepAlive:KeepAliveShmName %s", ec->config.keep_alive.shm_name); } else if (strcasecmp("SendNotification", child->key) == 0) { - ec->config.keep_alive.notify = child->values[0].value.boolean; + if (cf_util_get_boolean(child, &ec->config.keep_alive.notify)) + return -1; + DEBUG(DPDK_EVENTS_PLUGIN ": KeepAlive:SendNotification %d", - (int)child->values[0].value.boolean); + ec->config.keep_alive.notify); + } else { + ERROR(DPDK_EVENTS_PLUGIN ": unrecognized configuration option %s.", + child->key); + return -1; } } @@ -314,8 +342,10 @@ static int dpdk_events_keep_alive_config(dpdk_events_ctx_t *ec, static int dpdk_events_config(oconfig_item_t *ci) { DPDK_EVENTS_TRACE(); int ret = dpdk_events_preinit(); - if (ret) - return ret; + if (ret) { + g_state |= DPDK_EVENTS_STATE_CFG_ERR; + return 0; + } dpdk_events_ctx_t *ec = DPDK_EVENTS_CTX_GET(g_hc); @@ -327,34 +357,74 @@ static int dpdk_events_config(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp("EAL", child->key) == 0) { - dpdk_helper_eal_config_parse(g_hc, child); - } else if (strcasecmp("Event", child->key) == 0) { - if (strcasecmp(child->values[0].value.string, "link_status") == 0) { - dpdk_events_link_status_config(ec, child); - } else if (strcasecmp(child->values[0].value.string, "keep_alive") == 0) { - dpdk_events_keep_alive_config(ec, child); + + if (strcasecmp("EAL", child->key) == 0) + ret = dpdk_helper_eal_config_parse(g_hc, child); + else if (strcasecmp("Event", child->key) == 0) { + char event_type[DATA_MAX_NAME_LEN]; + + if (cf_util_get_string_buffer(child, event_type, sizeof(event_type))) + ret = -1; + else if (strcasecmp(event_type, "link_status") == 0) { + ret = dpdk_events_link_status_config(ec, child); + if (ret) { + g_state |= DPDK_EVENTS_STATE_LS_CFG_ERR; + continue; + } + } else if (strcasecmp(event_type, "keep_alive") == 0) { + ret = dpdk_events_keep_alive_config(ec, child); + if (ret) { + g_state |= DPDK_EVENTS_STATE_KA_CFG_ERR; + continue; + } } else { ERROR(DPDK_EVENTS_PLUGIN ": The selected event \"%s\" is unknown.", - child->values[0].value.string); + event_type); + ret = -1; } + } else { + ERROR(DPDK_EVENTS_PLUGIN ": unrecognized configuration option %s.", + child->key); + ret = -1; + } + + if (ret != 0) { + g_state |= DPDK_EVENTS_STATE_CFG_ERR; + return 0; } } + if (g_state & DPDK_EVENTS_STATE_KA_CFG_ERR) { + ERROR(DPDK_EVENTS_PLUGIN + ": Invalid keep alive configuration. Event disabled."); + ec->config.keep_alive.enabled = 0; + } + + if (g_state & DPDK_EVENTS_STATE_LS_CFG_ERR) { + ERROR(DPDK_EVENTS_PLUGIN + ": Invalid link status configuration. Event disabled."); + ec->config.link_status.enabled = 0; + } + if (!ec->config.keep_alive.enabled && !ec->config.link_status.enabled) { ERROR(DPDK_EVENTS_PLUGIN ": At least one type of events should be " "configured for collecting. Plugin misconfigured"); - return -1; + g_state |= DPDK_EVENTS_STATE_CFG_ERR; + return 0; } - return ret; + return 0; } static int dpdk_helper_link_status_get(dpdk_helper_ctx_t *phc) { dpdk_events_ctx_t *ec = DPDK_EVENTS_CTX_GET(phc); - /* get Link Status values from DPDK */ +/* get Link Status values from DPDK */ +#if RTE_VERSION < RTE_VERSION_NUM(18, 05, 0, 0) uint8_t nb_ports = rte_eth_dev_count(); +#else + uint8_t nb_ports = rte_eth_dev_count_avail(); +#endif if (nb_ports == 0) { DPDK_CHILD_LOG("dpdkevent-helper: No DPDK ports available. " "Check bound devices to DPDK driver.\n"); @@ -362,7 +432,7 @@ static int dpdk_helper_link_status_get(dpdk_helper_ctx_t *phc) { } ec->nb_ports = nb_ports > RTE_MAX_ETHPORTS ? RTE_MAX_ETHPORTS : nb_ports; - for (int i = 0; i < ec->nb_ports; i++) { + for (unsigned int i = 0; i < ec->nb_ports; i++) { if (ec->config.link_status.enabled_port_mask & (1 << i)) { struct rte_eth_link link; ec->link_info[i].read_time = cdtime(); @@ -420,7 +490,6 @@ static void dpdk_events_gauge_submit(const char *plugin_instance, .plugin = DPDK_EVENTS_PLUGIN, .type = "gauge", .meta = NULL}; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance)); sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); plugin_dispatch_values(&vl); @@ -432,7 +501,7 @@ static int dpdk_events_link_status_dispatch(dpdk_helper_ctx_t *phc) { ec->nb_ports); /* dispatch Link Status values to collectd */ - for (int i = 0; i < ec->nb_ports; i++) { + for (unsigned int i = 0; i < ec->nb_ports; i++) { if (ec->config.link_status.enabled_port_mask & (1 << i)) { if (!ec->config.link_status.send_updated || ec->link_info[i].status_updated) { @@ -442,17 +511,17 @@ static int dpdk_events_link_status_dispatch(dpdk_helper_ctx_t *phc) { char dev_name[DATA_MAX_NAME_LEN]; if (ec->config.link_status.port_name[i][0] != 0) { - ssnprintf(dev_name, sizeof(dev_name), "%s", - ec->config.link_status.port_name[i]); + snprintf(dev_name, sizeof(dev_name), "%s", + ec->config.link_status.port_name[i]); } else { - ssnprintf(dev_name, sizeof(dev_name), "port.%d", i); + snprintf(dev_name, sizeof(dev_name), "port.%d", i); } if (ec->config.link_status.notify) { int sev = ec->link_info[i].link_status ? NOTIF_OKAY : NOTIF_WARNING; char msg[DATA_MAX_NAME_LEN]; - ssnprintf(msg, sizeof(msg), "Link Status: %s", - ec->link_info[i].link_status ? "UP" : "DOWN"); + snprintf(msg, sizeof(msg), "Link Status: %s", + ec->link_info[i].link_status ? "UP" : "DOWN"); dpdk_events_notification_dispatch(sev, dev_name, ec->link_info[i].read_time, msg); } else { @@ -488,7 +557,7 @@ static void dpdk_events_keep_alive_dispatch(dpdk_helper_ctx_t *phc) { } char core_name[DATA_MAX_NAME_LEN]; - ssnprintf(core_name, sizeof(core_name), "lcore%u", i); + snprintf(core_name, sizeof(core_name), "lcore%u", i); if (!ec->config.keep_alive.send_updated || (ec->core_info[i].lcore_state != @@ -503,34 +572,34 @@ static void dpdk_events_keep_alive_dispatch(dpdk_helper_ctx_t *phc) { switch (ec->config.keep_alive.shm->core_state[i]) { case RTE_KA_STATE_ALIVE: sev = NOTIF_OKAY; - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: ALIVE", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: ALIVE", i); break; case RTE_KA_STATE_MISSING: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: MISSING", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: MISSING", i); sev = NOTIF_WARNING; break; case RTE_KA_STATE_DEAD: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: DEAD", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: DEAD", i); sev = NOTIF_FAILURE; break; case RTE_KA_STATE_UNUSED: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: UNUSED", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: UNUSED", i); sev = NOTIF_OKAY; break; case RTE_KA_STATE_GONE: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: GONE", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: GONE", i); sev = NOTIF_FAILURE; break; case RTE_KA_STATE_DOZING: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: DOZING", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: DOZING", i); sev = NOTIF_OKAY; break; case RTE_KA_STATE_SLEEP: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: SLEEP", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: SLEEP", i); sev = NOTIF_OKAY; break; default: - ssnprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: UNKNOWN", i); + snprintf(msg, sizeof(msg), "lcore %u Keep Alive Status: UNKNOWN", i); sev = NOTIF_FAILURE; } @@ -583,19 +652,11 @@ static int dpdk_events_read(user_data_t *ud) { return 0; } -static int dpdk_events_init(void) { - DPDK_EVENTS_TRACE(); - - int ret = dpdk_events_preinit(); - if (ret) - return ret; - - return 0; -} - static int dpdk_events_shutdown(void) { DPDK_EVENTS_TRACE(); - int ret; + + if (g_hc == NULL) + return 0; dpdk_events_ctx_t *ec = DPDK_EVENTS_CTX_GET(g_hc); if (ec->config.keep_alive.enabled) { @@ -613,12 +674,25 @@ static int dpdk_events_shutdown(void) { } } - ret = dpdk_helper_shutdown(g_hc); + dpdk_helper_shutdown(g_hc); g_hc = NULL; + + return 0; +} + +static int dpdk_events_init(void) { + DPDK_EVENTS_TRACE(); + + if (g_state & DPDK_EVENTS_STATE_CFG_ERR) { + dpdk_events_shutdown(); + return -1; + } + + int ret = dpdk_events_preinit(); if (ret) - ERROR(DPDK_EVENTS_PLUGIN ": failed to cleanup %s helper", DPDK_EVENTS_NAME); + return ret; - return ret; + return 0; } void module_register(void) {