Merge branch 'master' into next

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

diff --git a/rdma/res-pd.c b/rdma/res-pd.c
index e8c042dc77293e784c6216ee310ee2e2efa96e6a..6e5e4e6b8fb87cc0a185ee9d33670d1cdb5ea3f6 100644 (file)
--- a/rdma/res-pd.c
+++ b/rdma/res-pd.c
@@ -8,33 +8,25 @@
 #include <inttypes.h>
 
 static int res_pd_line(struct rd *rd, const char *name, int idx,
-                      struct nlattr *nla_entry)
+                      struct nlattr **nla_line)
 {
        uint32_t local_dma_lkey = 0, unsafe_global_rkey = 0;
-       struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
        char *comm = NULL;
        uint32_t ctxn = 0;
        uint32_t pid = 0;
        uint32_t pdn = 0;
        uint64_t users;
-       int err;
 
-       err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
-       if (err != MNL_CB_OK)
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_USECNT])
                return MNL_CB_ERROR;
 
-       if (!nla_line[RDMA_NLDEV_ATTR_RES_USECNT] ||
-           (!nla_line[RDMA_NLDEV_ATTR_RES_PID] &&
-            !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) {
-               return MNL_CB_ERROR;
-       }
-
        if (nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY])
                local_dma_lkey = mnl_attr_get_u32(
                        nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]);
 
        users = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
-       if (rd_check_is_filtered(rd, "users", users))
+       if (rd_is_filtered_attr(rd, "users", users,
+                               nla_line[RDMA_NLDEV_ATTR_RES_USECNT]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY])
@@ -46,18 +38,21 @@ static int res_pd_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_CTXN])
                ctxn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
 
-       if (rd_check_is_filtered(rd, "ctxn", ctxn))
+       if (rd_is_filtered_attr(rd, "ctxn", ctxn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_CTXN]))
                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_KERN_NAME])
@@ -88,6 +83,23 @@ out: if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
        return MNL_CB_OK;
 }
 
+int res_pd_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_pd_line(rd, name, idx, tb);
+}
+
 int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -107,8 +119,13 @@ int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data)
        nla_table = tb[RDMA_NLDEV_ATTR_RES_PD];
 
        mnl_attr_for_each_nested(nla_entry, nla_table) {
-               ret = res_pd_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_pd_line(rd, name, idx, nla_line);
                if (ret != MNL_CB_OK)
                        break;
        }