mirror of
https://github.com/torvalds/linux
synced 2024-10-07 20:05:15 +00:00
RDMA/hns: Optimize qp context create and destroy flow
Rename the qp context related functions and adjusts the code location to distinguish between the qp context and the entire qp. Link: https://lore.kernel.org/r/1582526258-13825-3-git-send-email-liweihang@huawei.com Signed-off-by: Xi Wang <wangxi11@huawei.com> Signed-off-by: Weihang Li <liweihang@huawei.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Xi Wang
Jason Gunthorpe
parent
e365b26c6b
commit
b71961d1da
|
|
@ -5019,10 +5019,6 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,
|
|||
spin_lock_irqsave(&hr_dev->qp_list_lock, flags);
|
||||
hns_roce_lock_cqs(send_cq, recv_cq);
|
||||
|
||||
list_del(&hr_qp->node);
|
||||
list_del(&hr_qp->sq_node);
|
||||
list_del(&hr_qp->rq_node);
|
||||
|
||||
if (!udata) {
|
||||
if (recv_cq)
|
||||
__hns_roce_v2_cq_clean(recv_cq, hr_qp->qpn,
|
||||
|
|
|
|||
|
|
@ -187,50 +187,75 @@ enum hns_roce_qp_state to_hns_roce_state(enum ib_qp_state state)
|
|||
}
|
||||
}
|
||||
|
||||
static int hns_roce_gsi_qp_alloc(struct hns_roce_dev *hr_dev, unsigned long qpn,
|
||||
struct hns_roce_qp *hr_qp)
|
||||
static void add_qp_to_list(struct hns_roce_dev *hr_dev,
|
||||
struct hns_roce_qp *hr_qp,
|
||||
struct ib_cq *send_cq, struct ib_cq *recv_cq)
|
||||
{
|
||||
struct hns_roce_cq *hr_send_cq, *hr_recv_cq;
|
||||
unsigned long flags;
|
||||
|
||||
hr_send_cq = send_cq ? to_hr_cq(send_cq) : NULL;
|
||||
hr_recv_cq = recv_cq ? to_hr_cq(recv_cq) : NULL;
|
||||
|
||||
spin_lock_irqsave(&hr_dev->qp_list_lock, flags);
|
||||
hns_roce_lock_cqs(hr_send_cq, hr_recv_cq);
|
||||
|
||||
list_add_tail(&hr_qp->node, &hr_dev->qp_list);
|
||||
if (hr_send_cq)
|
||||
list_add_tail(&hr_qp->sq_node, &hr_send_cq->sq_list);
|
||||
if (hr_recv_cq)
|
||||
list_add_tail(&hr_qp->rq_node, &hr_recv_cq->rq_list);
|
||||
|
||||
hns_roce_unlock_cqs(hr_send_cq, hr_recv_cq);
|
||||
spin_unlock_irqrestore(&hr_dev->qp_list_lock, flags);
|
||||
}
|
||||
|
||||
static int hns_roce_qp_store(struct hns_roce_dev *hr_dev,
|
||||
struct hns_roce_qp *hr_qp,
|
||||
struct ib_qp_init_attr *init_attr)
|
||||
{
|
||||
struct xarray *xa = &hr_dev->qp_table_xa;
|
||||
int ret;
|
||||
|
||||
if (!qpn)
|
||||
if (!hr_qp->qpn)
|
||||
return -EINVAL;
|
||||
|
||||
hr_qp->qpn = qpn;
|
||||
atomic_set(&hr_qp->refcount, 1);
|
||||
init_completion(&hr_qp->free);
|
||||
|
||||
ret = xa_err(xa_store_irq(xa, hr_qp->qpn & (hr_dev->caps.num_qps - 1),
|
||||
hr_qp, GFP_KERNEL));
|
||||
ret = xa_err(xa_store_irq(xa, hr_qp->qpn, hr_qp, GFP_KERNEL));
|
||||
if (ret)
|
||||
dev_err(hr_dev->dev, "QPC xa_store failed\n");
|
||||
dev_err(hr_dev->dev, "Failed to xa store for QPC\n");
|
||||
else
|
||||
/* add QP to device's QP list for softwc */
|
||||
add_qp_to_list(hr_dev, hr_qp, init_attr->send_cq,
|
||||
init_attr->recv_cq);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int hns_roce_qp_alloc(struct hns_roce_dev *hr_dev, unsigned long qpn,
|
||||
struct hns_roce_qp *hr_qp)
|
||||
static int alloc_qpc(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)
|
||||
{
|
||||
struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;
|
||||
struct device *dev = hr_dev->dev;
|
||||
int ret;
|
||||
|
||||
if (!qpn)
|
||||
if (!hr_qp->qpn)
|
||||
return -EINVAL;
|
||||
|
||||
hr_qp->qpn = qpn;
|
||||
/* In v1 engine, GSI QP context is saved in the RoCE hw's register */
|
||||
if (hr_qp->ibqp.qp_type == IB_QPT_GSI &&
|
||||
hr_dev->hw_rev == HNS_ROCE_HW_VER1)
|
||||
return 0;
|
||||
|
||||
/* Alloc memory for QPC */
|
||||
ret = hns_roce_table_get(hr_dev, &qp_table->qp_table, hr_qp->qpn);
|
||||
if (ret) {
|
||||
dev_err(dev, "QPC table get failed\n");
|
||||
dev_err(dev, "Failed to get QPC table\n");
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
/* Alloc memory for IRRL */
|
||||
ret = hns_roce_table_get(hr_dev, &qp_table->irrl_table, hr_qp->qpn);
|
||||
if (ret) {
|
||||
dev_err(dev, "IRRL table get failed\n");
|
||||
dev_err(dev, "Failed to get IRRL table\n");
|
||||
goto err_put_qp;
|
||||
}
|
||||
|
||||
|
|
@ -239,7 +264,7 @@ static int hns_roce_qp_alloc(struct hns_roce_dev *hr_dev, unsigned long qpn,
|
|||
ret = hns_roce_table_get(hr_dev, &qp_table->trrl_table,
|
||||
hr_qp->qpn);
|
||||
if (ret) {
|
||||
dev_err(dev, "TRRL table get failed\n");
|
||||
dev_err(dev, "Failed to get TRRL table\n");
|
||||
goto err_put_irrl;
|
||||
}
|
||||
}
|
||||
|
|
@ -249,22 +274,13 @@ static int hns_roce_qp_alloc(struct hns_roce_dev *hr_dev, unsigned long qpn,
|
|||
ret = hns_roce_table_get(hr_dev, &qp_table->sccc_table,
|
||||
hr_qp->qpn);
|
||||
if (ret) {
|
||||
dev_err(dev, "SCC CTX table get failed\n");
|
||||
dev_err(dev, "Failed to get SCC CTX table\n");
|
||||
goto err_put_trrl;
|
||||
}
|
||||
}
|
||||
|
||||
ret = hns_roce_gsi_qp_alloc(hr_dev, qpn, hr_qp);
|
||||
if (ret)
|
||||
goto err_put_sccc;
|
||||
|
||||
return 0;
|
||||
|
||||
err_put_sccc:
|
||||
if (hr_dev->caps.sccc_entry_sz)
|
||||
hns_roce_table_put(hr_dev, &qp_table->sccc_table,
|
||||
hr_qp->qpn);
|
||||
|
||||
err_put_trrl:
|
||||
if (hr_dev->caps.trrl_entry_sz)
|
||||
hns_roce_table_put(hr_dev, &qp_table->trrl_table, hr_qp->qpn);
|
||||
|
|
@ -284,25 +300,27 @@ void hns_roce_qp_remove(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)
|
|||
struct xarray *xa = &hr_dev->qp_table_xa;
|
||||
unsigned long flags;
|
||||
|
||||
list_del(&hr_qp->node);
|
||||
list_del(&hr_qp->sq_node);
|
||||
list_del(&hr_qp->rq_node);
|
||||
|
||||
xa_lock_irqsave(xa, flags);
|
||||
__xa_erase(xa, hr_qp->qpn & (hr_dev->caps.num_qps - 1));
|
||||
xa_unlock_irqrestore(xa, flags);
|
||||
}
|
||||
|
||||
void hns_roce_qp_free(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)
|
||||
static void free_qpc(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)
|
||||
{
|
||||
struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;
|
||||
|
||||
if (atomic_dec_and_test(&hr_qp->refcount))
|
||||
complete(&hr_qp->free);
|
||||
wait_for_completion(&hr_qp->free);
|
||||
/* In v1 engine, GSI QP context is saved in the RoCE hw's register */
|
||||
if (hr_qp->ibqp.qp_type == IB_QPT_GSI &&
|
||||
hr_dev->hw_rev == HNS_ROCE_HW_VER1)
|
||||
return;
|
||||
|
||||
if ((hr_qp->ibqp.qp_type) != IB_QPT_GSI) {
|
||||
if (hr_dev->caps.trrl_entry_sz)
|
||||
hns_roce_table_put(hr_dev, &qp_table->trrl_table,
|
||||
hr_qp->qpn);
|
||||
hns_roce_table_put(hr_dev, &qp_table->irrl_table, hr_qp->qpn);
|
||||
}
|
||||
if (hr_dev->caps.trrl_entry_sz)
|
||||
hns_roce_table_put(hr_dev, &qp_table->trrl_table, hr_qp->qpn);
|
||||
hns_roce_table_put(hr_dev, &qp_table->irrl_table, hr_qp->qpn);
|
||||
}
|
||||
|
||||
void hns_roce_release_range_qp(struct hns_roce_dev *hr_dev, int base_qpn,
|
||||
|
|
@ -728,29 +746,6 @@ static void free_rq_inline_buf(struct hns_roce_qp *hr_qp)
|
|||
kfree(hr_qp->rq_inl_buf.wqe_list);
|
||||
}
|
||||
|
||||
static void add_qp_to_list(struct hns_roce_dev *hr_dev,
|
||||
struct hns_roce_qp *hr_qp,
|
||||
struct ib_cq *send_cq, struct ib_cq *recv_cq)
|
||||
{
|
||||
struct hns_roce_cq *hr_send_cq, *hr_recv_cq;
|
||||
unsigned long flags;
|
||||
|
||||
hr_send_cq = send_cq ? to_hr_cq(send_cq) : NULL;
|
||||
hr_recv_cq = recv_cq ? to_hr_cq(recv_cq) : NULL;
|
||||
|
||||
spin_lock_irqsave(&hr_dev->qp_list_lock, flags);
|
||||
hns_roce_lock_cqs(hr_send_cq, hr_recv_cq);
|
||||
|
||||
list_add_tail(&hr_qp->node, &hr_dev->qp_list);
|
||||
if (hr_send_cq)
|
||||
list_add_tail(&hr_qp->sq_node, &hr_send_cq->sq_list);
|
||||
if (hr_recv_cq)
|
||||
list_add_tail(&hr_qp->rq_node, &hr_recv_cq->rq_list);
|
||||
|
||||
hns_roce_unlock_cqs(hr_send_cq, hr_recv_cq);
|
||||
spin_unlock_irqrestore(&hr_dev->qp_list_lock, flags);
|
||||
}
|
||||
|
||||
static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
|
||||
struct ib_pd *ib_pd,
|
||||
struct ib_qp_init_attr *init_attr,
|
||||
|
|
@ -975,6 +970,8 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
|
|||
}
|
||||
}
|
||||
|
||||
hr_qp->qpn = qpn;
|
||||
|
||||
hr_qp->wqe_bt_pg_shift = calc_wqe_bt_page_shift(hr_dev, hr_qp->regions,
|
||||
hr_qp->region_cnt);
|
||||
hns_roce_mtr_init(&hr_qp->mtr, PAGE_SHIFT + hr_qp->wqe_bt_pg_shift,
|
||||
|
|
@ -986,20 +983,16 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
|
|||
goto err_mtr;
|
||||
}
|
||||
|
||||
if (init_attr->qp_type == IB_QPT_GSI &&
|
||||
hr_dev->hw_rev == HNS_ROCE_HW_VER1) {
|
||||
/* In v1 engine, GSI QP context in RoCE engine's register */
|
||||
ret = hns_roce_gsi_qp_alloc(hr_dev, qpn, hr_qp);
|
||||
if (ret) {
|
||||
dev_err(dev, "hns_roce_qp_alloc failed!\n");
|
||||
goto err_qpn;
|
||||
}
|
||||
} else {
|
||||
ret = hns_roce_qp_alloc(hr_dev, qpn, hr_qp);
|
||||
if (ret) {
|
||||
dev_err(dev, "hns_roce_qp_alloc failed!\n");
|
||||
goto err_qpn;
|
||||
}
|
||||
ret = alloc_qpc(hr_dev, hr_qp);
|
||||
if (ret) {
|
||||
ibdev_err(&hr_dev->ib_dev, "Failed to alloc QP context\n");
|
||||
goto err_qpn;
|
||||
}
|
||||
|
||||
ret = hns_roce_qp_store(hr_dev, hr_qp, init_attr);
|
||||
if (ret) {
|
||||
ibdev_err(&hr_dev->ib_dev, "Failed to store QP\n");
|
||||
goto err_qpc;
|
||||
}
|
||||
|
||||
if (sqpn)
|
||||
|
|
@ -1011,29 +1004,28 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
|
|||
ret = ib_copy_to_udata(udata, &resp,
|
||||
min(udata->outlen, sizeof(resp)));
|
||||
if (ret)
|
||||
goto err_qp;
|
||||
goto err_store;
|
||||
}
|
||||
|
||||
if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL) {
|
||||
ret = hr_dev->hw->qp_flow_control_init(hr_dev, hr_qp);
|
||||
if (ret)
|
||||
goto err_qp;
|
||||
goto err_store;
|
||||
}
|
||||
|
||||
hr_qp->event = hns_roce_ib_qp_event;
|
||||
|
||||
add_qp_to_list(hr_dev, hr_qp, init_attr->send_cq, init_attr->recv_cq);
|
||||
atomic_set(&hr_qp->refcount, 1);
|
||||
init_completion(&hr_qp->free);
|
||||
|
||||
hns_roce_free_buf_list(buf_list, hr_qp->region_cnt);
|
||||
|
||||
return 0;
|
||||
|
||||
err_qp:
|
||||
if (init_attr->qp_type == IB_QPT_GSI &&
|
||||
hr_dev->hw_rev == HNS_ROCE_HW_VER1)
|
||||
hns_roce_qp_remove(hr_dev, hr_qp);
|
||||
else
|
||||
hns_roce_qp_free(hr_dev, hr_qp);
|
||||
err_store:
|
||||
hns_roce_qp_remove(hr_dev, hr_qp);
|
||||
|
||||
err_qpc:
|
||||
free_qpc(hr_dev, hr_qp);
|
||||
|
||||
err_qpn:
|
||||
if (!sqpn)
|
||||
|
|
@ -1090,7 +1082,11 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
|
|||
void hns_roce_qp_destroy(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
|
||||
struct ib_udata *udata)
|
||||
{
|
||||
hns_roce_qp_free(hr_dev, hr_qp);
|
||||
if (atomic_dec_and_test(&hr_qp->refcount))
|
||||
complete(&hr_qp->free);
|
||||
wait_for_completion(&hr_qp->free);
|
||||
|
||||
free_qpc(hr_dev, hr_qp);
|
||||
|
||||
/* Not special_QP, free their QPN */
|
||||
if (hr_qp->ibqp.qp_type != IB_QPT_GSI)
|
||||
|
|
|
|||
Loading…
Reference in a new issue