Merge branch 'iproute2-master' into next

[mirror_iproute2.git] / rdma / res-qp.c

diff --git a/rdma/res-qp.c b/rdma/res-qp.c
index 5d5ef27b46c38a2ae586545e0ff811269bbafa43..954e465de6fd6a5343c06698e093a38c51213e8d 100644 (file)
--- a/rdma/res-qp.c
+++ b/rdma/res-qp.c
@@ -79,19 +79,13 @@ static void print_pathmig(struct rd *rd, uint32_t val, struct nlattr **nla_line)
 }
 
 static int res_qp_line(struct rd *rd, const char *name, int idx,
-                      struct nlattr *nla_entry)
+                      struct nlattr **nla_line)
 {
-       struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
        uint32_t lqpn, rqpn = 0, rq_psn = 0, sq_psn;
        uint8_t type, state, path_mig_state = 0;
        uint32_t port = 0, pid = 0;
        uint32_t pdn = 0;
        char *comm = NULL;
-       int err;
-
-       err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
-       if (err != MNL_CB_OK)
-               return MNL_CB_ERROR;
 
        if (!nla_line[RDMA_NLDEV_ATTR_RES_LQPN] ||
            !nla_line[RDMA_NLDEV_ATTR_RES_SQ_PSN] ||
@@ -109,53 +103,49 @@ static int res_qp_line(struct rd *rd, const char *name, int idx,
                goto out;
 
        lqpn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
-       if (rd_check_is_filtered(rd, "lqpn", lqpn))
+       if (rd_is_filtered_attr(rd, "lqpn", lqpn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_LQPN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
                pdn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       if (rd_check_is_filtered(rd, "pdn", pdn))
+       if (rd_is_filtered_attr(rd, "pdn", pdn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PDN]))
                goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_RQPN]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_RQPN])
                rqpn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_RQPN]);
-               if (rd_check_is_filtered(rd, "rqpn", rqpn))
-                       goto out;
-       } else {
-               if (rd_check_is_key_exist(rd, "rqpn"))
-                       goto out;
-       }
+       if (rd_is_filtered_attr(rd, "rqpn", rqpn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_RQPN]))
+               goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_RQ_PSN]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_RQ_PSN])
                rq_psn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_RQ_PSN]);
-               if (rd_check_is_filtered(rd, "rq-psn", rq_psn))
-                       goto out;
-       } else {
-               if (rd_check_is_key_exist(rd, "rq-psn"))
-                       goto out;
-       }
+       if (rd_is_filtered_attr(rd, "rq-psn", rq_psn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_RQ_PSN]))
+               goto out;
 
        sq_psn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_SQ_PSN]);
-       if (rd_check_is_filtered(rd, "sq-psn", sq_psn))
+       if (rd_is_filtered_attr(rd, "sq-psn", sq_psn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_SQ_PSN]))
                goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_PATH_MIG_STATE]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_PATH_MIG_STATE])
                path_mig_state = mnl_attr_get_u8(
                        nla_line[RDMA_NLDEV_ATTR_RES_PATH_MIG_STATE]);
-               if (rd_check_is_string_filtered(rd, "path-mig-state",
-                                               path_mig_to_str(path_mig_state)))
-                       goto out;
-       } else {
-               if (rd_check_is_key_exist(rd, "path-mig-state"))
-                       goto out;
-       }
+       if (rd_is_string_filtered_attr(
+                   rd, "path-mig-state", path_mig_to_str(path_mig_state),
+                   nla_line[RDMA_NLDEV_ATTR_RES_PATH_MIG_STATE]))
+               goto out;
 
        type = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_TYPE]);
-       if (rd_check_is_string_filtered(rd, "type", qp_types_to_str(type)))
+       if (rd_is_string_filtered_attr(rd, "type", qp_types_to_str(type),
+                                      nla_line[RDMA_NLDEV_ATTR_RES_TYPE]))
                goto out;
 
        state = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_STATE]);
-       if (rd_check_is_string_filtered(rd, "state", qp_states_to_str(state)))
+       if (rd_is_string_filtered_attr(rd, "state", qp_states_to_str(state),
+                                      nla_line[RDMA_NLDEV_ATTR_RES_STATE]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
@@ -163,7 +153,8 @@ static int res_qp_line(struct rd *rd, const char *name, int idx,
                comm = get_task_name(pid);
        }
 
-       if (rd_check_is_filtered(rd, "pid", pid))
+       if (rd_is_filtered_attr(rd, "pid", pid,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])
@@ -199,6 +190,23 @@ out:
        return MNL_CB_OK;
 }
 
+int res_qp_idx_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
+       struct rd *rd = data;
+       const char *name;
+       uint32_t idx;
+
+       mnl_attr_parse(nlh, 0, rd_attr_cb, tb);
+       if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !tb[RDMA_NLDEV_ATTR_DEV_NAME])
+               return MNL_CB_ERROR;
+
+       name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]);
+       idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]);
+
+       return res_qp_line(rd, name, idx, tb);
+}
+
 int res_qp_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -218,8 +226,13 @@ int res_qp_parse_cb(const struct nlmsghdr *nlh, void *data)
        nla_table = tb[RDMA_NLDEV_ATTR_RES_QP];
 
        mnl_attr_for_each_nested(nla_entry, nla_table) {
-               ret = res_qp_line(rd, name, idx, nla_entry);
+               struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
+
+               ret = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
+               if (ret != MNL_CB_OK)
+                       break;
 
+               ret = res_qp_line(rd, name, idx, nla_line);
                if (ret != MNL_CB_OK)
                        break;
        }