Merge branch 'master' into next

[mirror_iproute2.git] / rdma / utils.c

diff --git a/rdma/utils.c b/rdma/utils.c
index cff5297db93805ec7880c1e3c29684b88f9c9958..37659011d167c77ea540c52c5243ac90f8767652 100644 (file)
--- a/rdma/utils.c
+++ b/rdma/utils.c
@@ -56,7 +56,7 @@ bool rd_no_arg(struct rd *rd)
  * mlx5_1/1    | 1          | false
  * mlx5_1/-    | 0          | false
  *
- * In strict mode, /- will return error.
+ * In strict port mode, a non-0 port must be provided
  */
 static int get_port_from_argv(struct rd *rd, uint32_t *port,
                              bool *is_dump_all, bool strict_port)
@@ -64,7 +64,7 @@ static int get_port_from_argv(struct rd *rd, uint32_t *port,
        char *slash;
 
        *port = 0;
-       *is_dump_all = true;
+       *is_dump_all = strict_port ? false : true;
 
        slash = strchr(rd_argv(rd), '/');
        /* if no port found, return 0 */
@@ -83,6 +83,9 @@ static int get_port_from_argv(struct rd *rd, uint32_t *port,
                if (!*port && strlen(slash))
                        return -EINVAL;
        }
+       if (strict_port && (*port == 0))
+               return -EINVAL;
+
        return 0;
 }
 
@@ -233,7 +236,7 @@ out:
        return ret;
 }
 
-bool rd_check_is_key_exist(struct rd *rd, const char *key)
+static bool rd_check_is_key_exist(struct rd *rd, const char *key)
 {
        struct filter_entry *fe;
 
@@ -249,8 +252,8 @@ bool rd_check_is_key_exist(struct rd *rd, const char *key)
  * Check if string entry is filtered:
  *  * key doesn't exist -> user didn't request -> not filtered
  */
-bool rd_check_is_string_filtered(struct rd *rd,
-                                const char *key, const char *val)
+static bool rd_check_is_string_filtered(struct rd *rd, const char *key,
+                                       const char *val)
 {
        bool key_is_filtered = false;
        struct filter_entry *fe;
@@ -300,7 +303,7 @@ out:
  * Check if key is filtered:
  * key doesn't exist -> user didn't request -> not filtered
  */
-bool rd_check_is_filtered(struct rd *rd, const char *key, uint32_t val)
+static bool rd_check_is_filtered(struct rd *rd, const char *key, uint32_t val)
 {
        bool key_is_filtered = false;
        struct filter_entry *fe;
@@ -349,6 +352,24 @@ out:
        return key_is_filtered;
 }
 
+bool rd_is_filtered_attr(struct rd *rd, const char *key, uint32_t val,
+                        struct nlattr *attr)
+{
+       if (!attr)
+               return rd_check_is_key_exist(rd, key);
+
+       return rd_check_is_filtered(rd, key, val);
+}
+
+bool rd_is_string_filtered_attr(struct rd *rd, const char *key, const char *val,
+                               struct nlattr *attr)
+{
+       if (!attr)
+               rd_check_is_key_exist(rd, key);
+
+       return rd_check_is_string_filtered(rd, key, val);
+}
+
 static void filters_cleanup(struct rd *rd)
 {
        struct filter_entry *fe, *tmp;
@@ -417,6 +438,18 @@ static const enum mnl_attr_data_type nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
        [RDMA_NLDEV_ATTR_DRIVER_U32] = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_DRIVER_S64] = MNL_TYPE_U64,
        [RDMA_NLDEV_ATTR_DRIVER_U64] = MNL_TYPE_U64,
+       [RDMA_NLDEV_SYS_ATTR_NETNS_MODE] = MNL_TYPE_U8,
+       [RDMA_NLDEV_ATTR_STAT_COUNTER] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_STAT_COUNTER_ENTRY] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_STAT_COUNTER_ID] = MNL_TYPE_U32,
+       [RDMA_NLDEV_ATTR_STAT_HWCOUNTERS] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME] = MNL_TYPE_NUL_STRING,
+       [RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_VALUE] = MNL_TYPE_U64,
+       [RDMA_NLDEV_ATTR_STAT_MODE] = MNL_TYPE_U32,
+       [RDMA_NLDEV_ATTR_STAT_RES] = MNL_TYPE_U32,
+       [RDMA_NLDEV_ATTR_STAT_AUTO_MODE_MASK] = MNL_TYPE_U32,
+       [RDMA_NLDEV_ATTR_DEV_DIM] = MNL_TYPE_U8,
 };
 
 int rd_attr_check(const struct nlattr *attr, int *typep)
@@ -675,10 +708,28 @@ int rd_recv_msg(struct rd *rd, mnl_cb_t callback, void *data, unsigned int seq)
                ret = mnl_cb_run(buf, ret, seq, portid, callback, data);
        } while (ret > 0);
 
+       if (ret < 0 && !rd->suppress_errors)
+               perror("error");
+
        mnl_socket_close(rd->nl);
        return ret;
 }
 
+static int null_cb(const struct nlmsghdr *nlh, void *data)
+{
+       return MNL_CB_OK;
+}
+
+int rd_sendrecv_msg(struct rd *rd, unsigned int seq)
+{
+       int ret;
+
+       ret = rd_send_msg(rd);
+       if (!ret)
+               ret = rd_recv_msg(rd, null_cb, rd, seq);
+       return ret;
+}
+
 static struct dev_map *_dev_map_lookup(struct rd *rd, const char *dev_name)
 {
        struct dev_map *dev_map;
@@ -739,6 +790,11 @@ static int print_driver_string(struct rd *rd, const char *key_str,
        }
 }
 
+void print_on_off(struct rd *rd, const char *key_str, bool on)
+{
+       print_driver_string(rd, key_str, (on) ? "on":"off");
+}
+
 static int print_driver_s32(struct rd *rd, const char *key_str, int32_t val,
                              enum rdma_nldev_print_type print_type)
 {
@@ -811,27 +867,37 @@ static int print_driver_entry(struct rd *rd, struct nlattr *key_attr,
                                struct nlattr *val_attr,
                                enum rdma_nldev_print_type print_type)
 {
-       const char *key_str = mnl_attr_get_str(key_attr);
        int attr_type = nla_type(val_attr);
+       int ret = -EINVAL;
+       char *key_str;
+
+       if (asprintf(&key_str, "drv_%s", mnl_attr_get_str(key_attr)) == -1)
+               return -ENOMEM;
 
        switch (attr_type) {
        case RDMA_NLDEV_ATTR_DRIVER_STRING:
-               return print_driver_string(rd, key_str,
-                               mnl_attr_get_str(val_attr));
+               ret = print_driver_string(rd, key_str,
+                                         mnl_attr_get_str(val_attr));
+               break;
        case RDMA_NLDEV_ATTR_DRIVER_S32:
-               return print_driver_s32(rd, key_str,
-                               mnl_attr_get_u32(val_attr), print_type);
+               ret = print_driver_s32(rd, key_str, mnl_attr_get_u32(val_attr),
+                                      print_type);
+               break;
        case RDMA_NLDEV_ATTR_DRIVER_U32:
-               return print_driver_u32(rd, key_str,
-                               mnl_attr_get_u32(val_attr), print_type);
+               ret = print_driver_u32(rd, key_str, mnl_attr_get_u32(val_attr),
+                                      print_type);
+               break;
        case RDMA_NLDEV_ATTR_DRIVER_S64:
-               return print_driver_s64(rd, key_str,
-                               mnl_attr_get_u64(val_attr), print_type);
+               ret = print_driver_s64(rd, key_str, mnl_attr_get_u64(val_attr),
+                                      print_type);
+               break;
        case RDMA_NLDEV_ATTR_DRIVER_U64:
-               return print_driver_u64(rd, key_str,
-                               mnl_attr_get_u64(val_attr), print_type);
+               ret = print_driver_u64(rd, key_str, mnl_attr_get_u64(val_attr),
+                                      print_type);
+               break;
        }
-       return -EINVAL;
+       free(key_str);
+       return ret;
 }
 
 void print_driver_table(struct rd *rd, struct nlattr *tb)