renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

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

Browse Source 
With 32 bit compilation several of the fields become misaligned here.
Fixing this is an ABI break for 32 bit rxe and it is in well used
portions of the rxe ABI.

To handle this we bump the ABI version, as expected. However the user
space driver doesn't handle it properly today, so all existing user
space continues to work.

Updated userspace will start to require the necessary kernel version.

We don't expect there to be any 32 bit users of rxe. Most likely cases,
such as ARM 32 already generally don't work because rxe does not handle
the CPU cache properly on its shared with userspace pages.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Jason Gunthorpe 2018-03-20 14:19:50 -06:00
parent 366380a0c8
commit f2e9bfac13
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/sw/rxe/rxe.h
View File

@ -59,7 +59,11 @@
#include "rxe_verbs.h" #include "rxe_verbs.h"
#include "rxe_loc.h" #include "rxe_loc.h"
#define RXE_UVERBS_ABI_VERSION (1) /*
* Version 1 and Version 2 are identical on 64 bit machines, but on 32 bit
* machines Version 2 has a different struct layout.
*/
#define RXE_UVERBS_ABI_VERSION 2
#define IB_PHYS_STATE_LINK_UP (5) #define IB_PHYS_STATE_LINK_UP (5)
#define IB_PHYS_STATE_LINK_DOWN (3) #define IB_PHYS_STATE_LINK_DOWN (3)

10
include/uapi/rdma/rdma_user_rxe.h
View File

@ -58,6 +58,8 @@ struct rxe_global_route {
struct rxe_av { struct rxe_av {
__u8 port_num; __u8 port_num;
__u8 network_type; __u8 network_type;
__u16 reserved1;
__u32 reserved2;
struct rxe_global_route grh; struct rxe_global_route grh;
union { union {
struct sockaddr_in _sockaddr_in; struct sockaddr_in _sockaddr_in;
@ -92,10 +94,14 @@ struct rxe_send_wr {
__u32 remote_qkey; __u32 remote_qkey;
__u16 pkey_index; __u16 pkey_index;
} ud; } ud;
/* reg is only used by the kernel and is not part of the uapi */
struct { struct {
union {
struct ib_mr *mr; struct ib_mr *mr;
__u64 reserved;
};
__u32 key; __u32 key;
int access; __u32 access;
} reg; } reg;
} wr; } wr;
}; };
@ -118,6 +124,7 @@ struct rxe_dma_info {
__u32 cur_sge; __u32 cur_sge;
__u32 num_sge; __u32 num_sge;
__u32 sge_offset; __u32 sge_offset;
__u32 reserved;
union { union {
__u8 inline_data[0]; __u8 inline_data[0];
struct rxe_sge sge[0]; struct rxe_sge sge[0];
@ -162,6 +169,7 @@ struct rxe_create_qp_resp {
struct rxe_create_srq_resp { struct rxe_create_srq_resp {
struct mminfo mi; struct mminfo mi;
__u32 srq_num; __u32 srq_num;
__u32 reserved;
}; };
struct rxe_modify_srq_cmd { struct rxe_modify_srq_cmd {