2 files changed, 30 insertions, 1 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 8f507538c42b..04ca04559ce5 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3318,7 +3318,7 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
        if (cmd.reserved)
                return -EINVAL;
-        resp.response_length = sizeof(resp);
+        resp.response_length = offsetof(typeof(resp), odp_caps);
        if (ucore->outlen < resp.response_length)
                return -ENOSPC;
@@ -3330,6 +3330,24 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
        copy_query_dev_fields(file, &resp.base, &attr);
        resp.comp_mask = 0;
+        if (ucore->outlen < resp.response_length + sizeof(resp.odp_caps))
+                goto end;
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+        resp.odp_caps.general_caps = attr.odp_caps.general_caps;
+        resp.odp_caps.per_transport_caps.rc_odp_caps =
+                attr.odp_caps.per_transport_caps.rc_odp_caps;
+        resp.odp_caps.per_transport_caps.uc_odp_caps =
+                attr.odp_caps.per_transport_caps.uc_odp_caps;
+        resp.odp_caps.per_transport_caps.ud_odp_caps =
+                attr.odp_caps.per_transport_caps.ud_odp_caps;
+        resp.odp_caps.reserved = 0;
+#else
+        memset(&resp.odp_caps, 0, sizeof(resp.odp_caps));
+#endif
+        resp.response_length += sizeof(resp.odp_caps);
+end:
        err = ib_copy_to_udata(ucore, &resp, resp.response_length);
        if (err)
                return err;
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index f0f799afd856..b513e662d8e4 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -207,10 +207,21 @@ struct ib_uverbs_ex_query_device {
        __u32 reserved;
 };
+struct ib_uverbs_odp_caps {
+        __u64 general_caps;
+        struct {
+                __u32 rc_odp_caps;
+                __u32 uc_odp_caps;
+                __u32 ud_odp_caps;
+        } per_transport_caps;
+        __u32 reserved;
+};
 struct ib_uverbs_ex_query_device_resp {
        struct ib_uverbs_query_device_resp base;
        __u32 comp_mask;
        __u32 response_length;
+        struct ib_uverbs_odp_caps odp_caps;
 };
 struct ib_uverbs_query_port {

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 8f507538c42b..04ca04559ce5 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3318,7 +3318,7 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
3318	if (cmd.reserved)	3318	if (cmd.reserved)
3319	return -EINVAL;	3319	return -EINVAL;
3320		3320
3321	resp.response_length = sizeof(resp);	3321	resp.response_length = offsetof(typeof(resp), odp_caps);
3322		3322
3323	if (ucore->outlen < resp.response_length)	3323	if (ucore->outlen < resp.response_length)
3324	return -ENOSPC;	3324	return -ENOSPC;
@@ -3330,6 +3330,24 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
3330	copy_query_dev_fields(file, &resp.base, &attr);	3330	copy_query_dev_fields(file, &resp.base, &attr);
3331	resp.comp_mask = 0;	3331	resp.comp_mask = 0;
3332		3332
		3333	if (ucore->outlen < resp.response_length + sizeof(resp.odp_caps))
		3334	goto end;
		3335
		3336	#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
		3337	resp.odp_caps.general_caps = attr.odp_caps.general_caps;
		3338	resp.odp_caps.per_transport_caps.rc_odp_caps =
		3339	attr.odp_caps.per_transport_caps.rc_odp_caps;
		3340	resp.odp_caps.per_transport_caps.uc_odp_caps =
		3341	attr.odp_caps.per_transport_caps.uc_odp_caps;
		3342	resp.odp_caps.per_transport_caps.ud_odp_caps =
		3343	attr.odp_caps.per_transport_caps.ud_odp_caps;
		3344	resp.odp_caps.reserved = 0;
		3345	#else
		3346	memset(&resp.odp_caps, 0, sizeof(resp.odp_caps));
		3347	#endif
		3348	resp.response_length += sizeof(resp.odp_caps);
		3349
		3350	end:
3333	err = ib_copy_to_udata(ucore, &resp, resp.response_length);	3351	err = ib_copy_to_udata(ucore, &resp, resp.response_length);
3334	if (err)	3352	if (err)
3335	return err;	3353	return err;


diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index f0f799afd856..b513e662d8e4 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h
@@ -207,10 +207,21 @@ struct ib_uverbs_ex_query_device {
207	__u32 reserved;	207	__u32 reserved;
208	};	208	};
209		209
		210	struct ib_uverbs_odp_caps {
		211	__u64 general_caps;
		212	struct {
		213	__u32 rc_odp_caps;
		214	__u32 uc_odp_caps;
		215	__u32 ud_odp_caps;
		216	} per_transport_caps;
		217	__u32 reserved;
		218	};
		219
210	struct ib_uverbs_ex_query_device_resp {	220	struct ib_uverbs_ex_query_device_resp {
211	struct ib_uverbs_query_device_resp base;	221	struct ib_uverbs_query_device_resp base;
212	__u32 comp_mask;	222	__u32 comp_mask;
213	__u32 response_length;	223	__u32 response_length;
		224	struct ib_uverbs_odp_caps odp_caps;
214	};	225	};
215		226
216	struct ib_uverbs_query_port {	227	struct ib_uverbs_query_port {