Commit 71e80a47 authored by Jason Gunthorpe's avatar Jason Gunthorpe

RDMA/qedr: Fix uABI structure layouts for 32/64 compat

struct qedr_alloc_ucontext_resp is a different length in 32 and 64
bit compiles due to implicit compiler padding.

The structs alloc_pd_uresp, create_cq_uresp and create_qp_uresp are
not padded by the compiler, but in user space the compiler pads them
due to the way the core and driver structs are concatenated. Make
this padding explicit and consistent for future sanity.

The kernel driver can already handle the user buffer being smaller
than required and copies correctly, so no compat or ABI break happens
from introducing the explicit padding.
Acked-by: default avatarMichal Kalderon <michal.kalderon@cavium.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 611cb92b
...@@ -53,6 +53,7 @@ struct qedr_alloc_ucontext_resp { ...@@ -53,6 +53,7 @@ struct qedr_alloc_ucontext_resp {
__u8 dpm_enabled; __u8 dpm_enabled;
__u8 wids_enabled; __u8 wids_enabled;
__u16 wid_count; __u16 wid_count;
__u32 reserved;
}; };
struct qedr_alloc_pd_ureq { struct qedr_alloc_pd_ureq {
...@@ -61,6 +62,7 @@ struct qedr_alloc_pd_ureq { ...@@ -61,6 +62,7 @@ struct qedr_alloc_pd_ureq {
struct qedr_alloc_pd_uresp { struct qedr_alloc_pd_uresp {
__u32 pd_id; __u32 pd_id;
__u32 reserved;
}; };
struct qedr_create_cq_ureq { struct qedr_create_cq_ureq {
...@@ -71,6 +73,7 @@ struct qedr_create_cq_ureq { ...@@ -71,6 +73,7 @@ struct qedr_create_cq_ureq {
struct qedr_create_cq_uresp { struct qedr_create_cq_uresp {
__u32 db_offset; __u32 db_offset;
__u16 icid; __u16 icid;
__u16 reserved;
}; };
struct qedr_create_qp_ureq { struct qedr_create_qp_ureq {
...@@ -105,6 +108,7 @@ struct qedr_create_qp_uresp { ...@@ -105,6 +108,7 @@ struct qedr_create_qp_uresp {
__u16 rq_icid; __u16 rq_icid;
__u32 rq_db2_offset; __u32 rq_db2_offset;
__u32 reserved;
}; };
#endif /* __QEDR_USER_H__ */ #endif /* __QEDR_USER_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment