Skip to content

Commit

Permalink
RDMA/hns: Update the kernel header file of hns
Browse files Browse the repository at this point in the history
The hns_roce_ib_create_srq_resp is used to interact with the user for
data, this was open coded to use a u32 directly, instead use a properly
sized structure.

Fixes: c7bcb13 ("RDMA/hns: Add SRQ support for hip08 kernel mode")
Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
  • Loading branch information
Lijun Ou authored and Jason Gunthorpe committed Jan 25, 2019
1 parent 951d01b commit 9d9d4ff
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/infiniband/hw/hns/hns_roce_srq.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ struct ib_srq *hns_roce_create_srq(struct ib_pd *pd,
struct ib_udata *udata)
{
struct hns_roce_dev *hr_dev = to_hr_dev(pd->device);
struct hns_roce_ib_create_srq_resp resp = {};
struct hns_roce_srq *srq;
int srq_desc_size;
int srq_buf_size;
Expand Down Expand Up @@ -378,16 +379,21 @@ struct ib_srq *hns_roce_create_srq(struct ib_pd *pd,

srq->event = hns_roce_ib_srq_event;
srq->ibsrq.ext.xrc.srq_num = srq->srqn;
resp.srqn = srq->srqn;

if (udata) {
if (ib_copy_to_udata(udata, &srq->srqn, sizeof(__u32))) {
if (ib_copy_to_udata(udata, &resp,
min(udata->outlen, sizeof(resp)))) {
ret = -EFAULT;
goto err_wrid;
goto err_srqc_alloc;
}
}

return &srq->ibsrq;

err_srqc_alloc:
hns_roce_srq_free(hr_dev, srq);

err_wrid:
kvfree(srq->wrid);

Expand Down
5 changes: 5 additions & 0 deletions include/uapi/rdma/hns-abi.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ struct hns_roce_ib_create_srq {
__aligned_u64 que_addr;
};

struct hns_roce_ib_create_srq_resp {
__u32 srqn;
__u32 reserved;
};

struct hns_roce_ib_create_qp {
__aligned_u64 buf_addr;
__aligned_u64 db_addr;
Expand Down

0 comments on commit 9d9d4ff

Please sign in to comment.