Hi,
Le dimanche 08 février 2015 à 13:28 +0200, Haggai Eran a écrit :
> Add a on-demand capabilities reporting to the extended query device verb.
>
"Add on-demand paging (ODP) capabilities [...]"
Perhaps we could also add a mention such the following to get an idea
of the purpose of those flags:
see also commit 860f10a799c8 ("IB/core: Add flags for on demand paging
support")
> Yann Droneaud writes:
> > Note: as offsetof() is used to retrieve the size of the lower chunk
> > of the response, beware that it only works if the upper chunk
> > is right after, without any implicit padding. And, as the size of
> > the latter chunk is added to the base size, implicit padding at the
> > end of the structure is not taken in account. Both point must be
> > taken in account when extending the uverbs functionalities.
>
> Cc: Yann Droneaud <[email protected]>
> Cc: Ira Weiny <[email protected]>
> Cc: Jason Gunthorpe <[email protected]>
> Cc: Eli Cohen <[email protected]>
> Signed-off-by: Haggai Eran <[email protected]>
> ---
> drivers/infiniband/core/uverbs_cmd.c | 20 +++++++++++++++++++-
> include/uapi/rdma/ib_user_verbs.h | 11 +++++++++++
> 2 files changed, 30 insertions(+), 1 deletion(-)
>
> 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 {
Reviewed-by: Yann Droneaud <[email protected]>
Thanks a lot for this updated patch.
Regards.
--
Yann Droneaud
OPTEYA
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
