netlink plugin: additional chck for older netlink (kernel) versions

Add a safe check if VF statistics are supported by netlink.

Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>

diff --git a/configure.ac b/configure.ac
index 81a3feb231b3d82f3b6350305259f962cfb4d705..dd81e7c22b172940b2a5cab336883f38cfc84a6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3730,6 +3730,12 @@ if test "x$with_libmnl" = "xyes"; then
     [[#include <linux/if_link.h>]]
   )
 
+  AC_CHECK_DECLS([IFLA_VF_STATS],
+    [AC_DEFINE(HAVE_IFLA_VF_STATS, 1, [Define if IFLA_VF_STATS exists.])],
+    [],
+    [[#include <linux/if_link.h>]]
+  )
+
   AC_CHECK_LIB([mnl], [mnl_nlmsg_get_payload],
     [with_libmnl="yes"],
     [with_libmnl="no (symbol 'mnl_nlmsg_get_payload' not found)"],

diff --git a/src/netlink.c b/src/netlink.c
index 5e7ccd140b47dcc1df3113d17ae41380960bf432..7a5da762c73980013d90e4203590d07cb1193347 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -88,6 +88,7 @@ union ir_link_stats_u {
 #endif
 };
 
+#ifdef HAVE_IFLA_VF_STATS
 typedef struct vf_stats_s {
   struct ifla_vf_mac *vf_mac;
   uint32_t vlan;
@@ -113,6 +114,7 @@ typedef struct vf_stats_s {
   uint64_t tx_dropped;
 #endif
 } vf_stats_t;
+#endif
 
 typedef struct ir_ignorelist_s {
   char *device;
@@ -274,6 +276,7 @@ static int check_ignorelist(const char *dev, const char *type,
   return ir_ignorelist_invert;
 } /* int check_ignorelist */
 
+#ifdef HAVE_IFLA_VF_STATS
 static void submit_one_gauge(const char *dev, const char *type,
                              const char *type_instance, gauge_t value) {
   value_list_t vl = VALUE_LIST_INIT;
@@ -289,6 +292,7 @@ static void submit_one_gauge(const char *dev, const char *type,
 
   plugin_dispatch_values(&vl);
 } /* void submit_one_gauge */
+#endif
 
 static void submit_one(const char *dev, const char *type,
                        const char *type_instance, derive_t value) {
@@ -442,6 +446,7 @@ static void check_ignorelist_and_submit32(const char *dev,
   check_ignorelist_and_submit(dev, &s);
 }
 
+#ifdef HAVE_IFLA_VF_STATS
 static void vf_info_submit(const char *dev, vf_stats_t *vf_stats) {
   if (vf_stats->vf_mac == NULL) {
     ERROR("netlink plugin: vf_info_submit: failed to get VF macaddress, "
@@ -647,6 +652,7 @@ static int vf_info_attr_cb(const struct nlattr *attr, void *args) {
 
   return MNL_CB_OK;
 } /* int vf_info_attr_cb */
+#endif /* HAVE_IFLA_VF_STATS */
 
 static int link_filter_cb(const struct nlmsghdr *nlh,
                           void *args __attribute__((unused))) {
@@ -654,7 +660,9 @@ static int link_filter_cb(const struct nlmsghdr *nlh,
   struct nlattr *attr;
   const char *dev = NULL;
   union ir_link_stats_u stats;
+#ifdef HAVE_IFLA_VF_STATS
   uint32_t num_vfs = 0;
+#endif
   bool stats_done = false;
 
   if (nlh->nlmsg_type != RTM_NEWLINK) {
@@ -692,6 +700,7 @@ static int link_filter_cb(const struct nlmsghdr *nlh,
     return MNL_CB_OK;
   }
 
+#ifdef HAVE_IFLA_VF_STATS
   if (collect_vf_stats) {
     mnl_attr_for_each(attr, nlh, sizeof(*ifm)) {
       if (mnl_attr_get_type(attr) != IFLA_NUM_VF)
@@ -707,6 +716,8 @@ static int link_filter_cb(const struct nlmsghdr *nlh,
       break;
     }
   }
+#endif
+
 #ifdef HAVE_RTNL_LINK_STATS64
   mnl_attr_for_each(attr, nlh, sizeof(*ifm)) {
     if (mnl_attr_get_type(attr) != IFLA_STATS64)
@@ -750,6 +761,8 @@ static int link_filter_cb(const struct nlmsghdr *nlh,
   if (stats_done == false)
     DEBUG("netlink plugin: link_filter: No statistics for interface %s.", dev);
 #endif
+
+#ifdef HAVE_IFLA_VF_STATS
   if (num_vfs == 0)
     return MNL_CB_OK;
 
@@ -785,6 +798,7 @@ static int link_filter_cb(const struct nlmsghdr *nlh,
     }
     break;
   }
+#endif
 
   return MNL_CB_OK;
 } /* int link_filter_cb */
@@ -1107,10 +1121,14 @@ static int ir_config(const char *key, const char *value) {
             key, fields_num);
       status = -1;
     } else {
+#ifdef HAVE_IFLA_VF_STATS
       if (IS_TRUE(fields[0]))
         collect_vf_stats = true;
       else
         collect_vf_stats = false;
+#else
+      WARNING("netlink plugin: VF statistics not supported on this system.");
+#endif
       status = 0;
     }
   }
@@ -1157,12 +1175,14 @@ static int ir_read(void) {
   rt = mnl_nlmsg_put_extra_header(nlh, sizeof(*rt));
   rt->rtgen_family = AF_PACKET;
 
+#ifdef HAVE_IFLA_VF_STATS
   if (collect_vf_stats &&
       mnl_attr_put_u32_check(nlh, sizeof(buf), IFLA_EXT_MASK,
                              RTEXT_FILTER_VF) == 0) {
     ERROR("netlink plugin: FAILED to set RTEXT_FILTER_VF");
     return -1;
   }
+#endif
 
   if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
     ERROR("netlink plugin: ir_read: rtnl_wilddump_request failed.");

diff --git a/src/netlink_test.c b/src/netlink_test.c
index 447ddb818b522be286805f1ba4f6bfa5214d9176..fba123604ac053ed7b3c7f10171a6090e0e84f1a 100644 (file)
--- a/src/netlink_test.c
+++ b/src/netlink_test.c
@@ -30,6 +30,7 @@
 #include "netlink.c" /* sic */
 #include "testing.h"
 
+#ifdef HAVE_IFLA_VF_STATS
 static vf_stats_t g_test_res;
 static char g_instance[512];
 static int g_type_valid;
@@ -93,8 +94,15 @@ int mnl_attr_validate2(const struct nlattr *attr, enum mnl_attr_data_type type,
 void *mnl_attr_get_payload(__attribute__((unused)) const struct nlattr *attr) {
   return g_test_payload;
 }
+#else /* HAVE_IFLA_VF_STATS */
+int plugin_dispatch_values_nl_test(__attribute__((unused))
+                                   value_list_t const *vl) {
+  return 0;
+}
+#endif
 /* end mock functions */
 
+#ifdef HAVE_IFLA_VF_STATS
 DEF_TEST(plugin_nl_config) {
   EXPECT_EQ_INT(0, collect_vf_stats);
   int ret = ir_config("CollectVFStats", "true");
@@ -115,6 +123,7 @@ DEF_TEST(plugin_nl_config) {
 
   return 0;
 }
+#endif
 
 DEF_TEST(ignorelist_test) {
   ir_ignorelist_invert = 1;
@@ -201,6 +210,7 @@ DEF_TEST(ignorelist_test) {
   return 0;
 }
 
+#ifdef HAVE_IFLA_VF_STATS
 DEF_TEST(vf_submit_test) {
   const char *test_dev = "eth0";
   vf_stats_t test_stats;
@@ -353,12 +363,17 @@ DEF_TEST(vf_info_attr_cb_test) {
 
   return 0;
 }
+#endif /* HAVE_IFLA_VF_STATS */
 
 int main(void) {
+#ifdef HAVE_IFLA_VF_STATS
   RUN_TEST(plugin_nl_config);
+#endif
   RUN_TEST(ignorelist_test);
 
+#ifdef HAVE_IFLA_VF_STATS
   RUN_TEST(vf_submit_test);
   RUN_TEST(vf_info_attr_cb_test);
+#endif
   END_TEST;
 }