[v2,7/7] IB/verbs: destroy_qp verb need ib_udata

Message ID	20181014061118.14889-8-shamir.rabinovitch@oracle.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-rdma-owner@kernel.org> From: Shamir Rabinovitch <shamir.rabinovitch@oracle.com> To: linux-rdma@vger.kernel.org Cc: dledford@redhat.com, jgg@ziepe.ca, leon@kernel.org, santosh.shilimkar@oracle.com, shamir.rabinovitch@oracle.com Subject: [PATCH v2 7/7] IB/verbs: destroy_qp verb need ib_udata Date: Sun, 14 Oct 2018 09:11:18 +0300 Message-Id: <20181014061118.14889-8-shamir.rabinovitch@oracle.com> In-Reply-To: <20181014061118.14889-1-shamir.rabinovitch@oracle.com> References: <20181014061118.14889-1-shamir.rabinovitch@oracle.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk
Series	convey ib_ucontext via ib_udata \| expand [v2,0/7] convey ib_ucontext via ib_udata [v2,1/7] IB/verbs: add ib_ucontext to ib_udata [v2,2/7] IB/uverbs: initialize context field in ib_udata [v2,3/7] IB/verbs: dealloc_pd verb need ib_udata [v2,4/7] IB/verbs: alloc_mr verb need ib_udata [v2,5/7] IB/verbs: dereg_mr verb need ib_udata [v2,6/7] IB/verbs: destroy_wq verb need ib_udata [v2,7/7] IB/verbs: destroy_qp verb need ib_udata

Hi Shamir, Thank you for the patch! Yet something to improve: [auto build test ERROR on rdma/for-next] [also build test ERROR on v4.19-rc7 next-20181012] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Shamir-Rabinovitch/convey-ib_ucontext-via-ib_udata/20181015-013324 base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next config: ia64-allmodconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 8.1.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree GCC_VERSION=8.1.0 make.cross ARCH=ia64 All errors (new ones prefixed by >>): drivers/infiniband/hw/hns/hns_roce_main.c: In function 'hns_roce_register_device': drivers/infiniband/hw/hns/hns_roce_main.c:498:22: error: assignment to 'int (*)(struct ib_pd *, struct ib_udata *)' from incompatible pointer type 'int (*)(struct ib_pd *)' [-Werror=incompatible-pointer-types] ib_dev->dealloc_pd = hns_roce_dealloc_pd; ^ >> drivers/infiniband/hw/hns/hns_roce_main.c:509:22: error: assignment to 'int (*)(struct ib_qp *, struct ib_udata *)' from incompatible pointer type 'int (* const)(struct ib_qp *)' [-Werror=incompatible-pointer-types] ib_dev->destroy_qp = hr_dev->hw->destroy_qp; ^ drivers/infiniband/hw/hns/hns_roce_main.c:523:20: error: assignment to 'int (*)(struct ib_mr *, struct ib_udata *)' from incompatible pointer type 'int (*)(struct ib_mr *)' [-Werror=incompatible-pointer-types] ib_dev->dereg_mr = hns_roce_dereg_mr; ^ cc1: some warnings being treated as errors vim +509 drivers/infiniband/hw/hns/hns_roce_main.c 9a4435375 oulijun 2016-07-21 442 9a4435375 oulijun 2016-07-21 443 static int hns_roce_register_device(struct hns_roce_dev *hr_dev) 9a4435375 oulijun 2016-07-21 444 { 9a4435375 oulijun 2016-07-21 445 int ret; 9a4435375 oulijun 2016-07-21 446 struct hns_roce_ib_iboe *iboe = NULL; 9a4435375 oulijun 2016-07-21 447 struct ib_device *ib_dev = NULL; 13ca970e3 Wei Hu(Xavier 2017-08-30 448) struct device *dev = hr_dev->dev; 9a4435375 oulijun 2016-07-21 449 9a4435375 oulijun 2016-07-21 450 iboe = &hr_dev->iboe; 49fdf6bb0 Lijun Ou 2016-09-20 451 spin_lock_init(&iboe->lock); 9a4435375 oulijun 2016-07-21 452 9a4435375 oulijun 2016-07-21 453 ib_dev = &hr_dev->ib_dev; 9a4435375 oulijun 2016-07-21 454 9a4435375 oulijun 2016-07-21 455 ib_dev->owner = THIS_MODULE; 9a4435375 oulijun 2016-07-21 456 ib_dev->node_type = RDMA_NODE_IB_CA; fecd02eb2 Bart Van Assche 2017-01-20 457 ib_dev->dev.parent = dev; 9a4435375 oulijun 2016-07-21 458 9a4435375 oulijun 2016-07-21 459 ib_dev->phys_port_cnt = hr_dev->caps.num_ports; 9a4435375 oulijun 2016-07-21 460 ib_dev->local_dma_lkey = hr_dev->caps.reserved_lkey; 9a4435375 oulijun 2016-07-21 461 ib_dev->num_comp_vectors = hr_dev->caps.num_comp_vectors; 9a4435375 oulijun 2016-07-21 462 ib_dev->uverbs_abi_ver = 1; 9a4435375 oulijun 2016-07-21 463 ib_dev->uverbs_cmd_mask = 9a4435375 oulijun 2016-07-21 464 (1ULL << IB_USER_VERBS_CMD_GET_CONTEXT) | 9a4435375 oulijun 2016-07-21 465 (1ULL << IB_USER_VERBS_CMD_QUERY_DEVICE) | 9a4435375 oulijun 2016-07-21 466 (1ULL << IB_USER_VERBS_CMD_QUERY_PORT) | 9a4435375 oulijun 2016-07-21 467 (1ULL << IB_USER_VERBS_CMD_ALLOC_PD) | 9a4435375 oulijun 2016-07-21 468 (1ULL << IB_USER_VERBS_CMD_DEALLOC_PD) | 9a4435375 oulijun 2016-07-21 469 (1ULL << IB_USER_VERBS_CMD_REG_MR) | 9a4435375 oulijun 2016-07-21 470 (1ULL << IB_USER_VERBS_CMD_DEREG_MR) | 9a4435375 oulijun 2016-07-21 471 (1ULL << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) | 9a4435375 oulijun 2016-07-21 472 (1ULL << IB_USER_VERBS_CMD_CREATE_CQ) | 9a4435375 oulijun 2016-07-21 473 (1ULL << IB_USER_VERBS_CMD_DESTROY_CQ) | 9a4435375 oulijun 2016-07-21 474 (1ULL << IB_USER_VERBS_CMD_CREATE_QP) | 9a4435375 oulijun 2016-07-21 475 (1ULL << IB_USER_VERBS_CMD_MODIFY_QP) | 9a4435375 oulijun 2016-07-21 476 (1ULL << IB_USER_VERBS_CMD_QUERY_QP) | 9a4435375 oulijun 2016-07-21 477 (1ULL << IB_USER_VERBS_CMD_DESTROY_QP); 9a4435375 oulijun 2016-07-21 478 df0651079 Lijun Ou 2018-07-25 479 ib_dev->uverbs_ex_cmd_mask |= df0651079 Lijun Ou 2018-07-25 480 (1ULL << IB_USER_VERBS_EX_CMD_MODIFY_CQ); df0651079 Lijun Ou 2018-07-25 481 9a4435375 oulijun 2016-07-21 482 /* HCA||device||port */ 9a4435375 oulijun 2016-07-21 483 ib_dev->modify_device = hns_roce_modify_device; 9a4435375 oulijun 2016-07-21 484 ib_dev->query_device = hns_roce_query_device; 9a4435375 oulijun 2016-07-21 485 ib_dev->query_port = hns_roce_query_port; 9a4435375 oulijun 2016-07-21 486 ib_dev->modify_port = hns_roce_modify_port; 9a4435375 oulijun 2016-07-21 487 ib_dev->get_link_layer = hns_roce_get_link_layer; 2eefca272 Lijun Ou 2016-09-15 488 ib_dev->get_netdev = hns_roce_get_netdev; 825474697 Shaobo Xu 2016-11-23 489 ib_dev->add_gid = hns_roce_add_gid; 825474697 Shaobo Xu 2016-11-23 490 ib_dev->del_gid = hns_roce_del_gid; 9a4435375 oulijun 2016-07-21 491 ib_dev->query_pkey = hns_roce_query_pkey; 9a4435375 oulijun 2016-07-21 492 ib_dev->alloc_ucontext = hns_roce_alloc_ucontext; 9a4435375 oulijun 2016-07-21 493 ib_dev->dealloc_ucontext = hns_roce_dealloc_ucontext; 9a4435375 oulijun 2016-07-21 494 ib_dev->mmap = hns_roce_mmap; 9a4435375 oulijun 2016-07-21 495 9a4435375 oulijun 2016-07-21 496 /* PD */ 9a4435375 oulijun 2016-07-21 497 ib_dev->alloc_pd = hns_roce_alloc_pd; 9a4435375 oulijun 2016-07-21 @498 ib_dev->dealloc_pd = hns_roce_dealloc_pd; 9a4435375 oulijun 2016-07-21 499 9a4435375 oulijun 2016-07-21 500 /* AH */ 9a4435375 oulijun 2016-07-21 501 ib_dev->create_ah = hns_roce_create_ah; 9a4435375 oulijun 2016-07-21 502 ib_dev->query_ah = hns_roce_query_ah; 9a4435375 oulijun 2016-07-21 503 ib_dev->destroy_ah = hns_roce_destroy_ah; 9a4435375 oulijun 2016-07-21 504 9a4435375 oulijun 2016-07-21 505 /* QP */ 9a4435375 oulijun 2016-07-21 506 ib_dev->create_qp = hns_roce_create_qp; 9a4435375 oulijun 2016-07-21 507 ib_dev->modify_qp = hns_roce_modify_qp; 9a4435375 oulijun 2016-07-21 508 ib_dev->query_qp = hr_dev->hw->query_qp; 9a4435375 oulijun 2016-07-21 @509 ib_dev->destroy_qp = hr_dev->hw->destroy_qp; 9a4435375 oulijun 2016-07-21 510 ib_dev->post_send = hr_dev->hw->post_send; 9a4435375 oulijun 2016-07-21 511 ib_dev->post_recv = hr_dev->hw->post_recv; 9a4435375 oulijun 2016-07-21 512 9a4435375 oulijun 2016-07-21 513 /* CQ */ 9a4435375 oulijun 2016-07-21 514 ib_dev->create_cq = hns_roce_ib_create_cq; b156269d8 oulijun 2017-10-19 515 ib_dev->modify_cq = hr_dev->hw->modify_cq; 9a4435375 oulijun 2016-07-21 516 ib_dev->destroy_cq = hns_roce_ib_destroy_cq; 9a4435375 oulijun 2016-07-21 517 ib_dev->req_notify_cq = hr_dev->hw->req_notify_cq; 9a4435375 oulijun 2016-07-21 518 ib_dev->poll_cq = hr_dev->hw->poll_cq; 9a4435375 oulijun 2016-07-21 519 9a4435375 oulijun 2016-07-21 520 /* MR */ 9a4435375 oulijun 2016-07-21 521 ib_dev->get_dma_mr = hns_roce_get_dma_mr; 9a4435375 oulijun 2016-07-21 522 ib_dev->reg_user_mr = hns_roce_reg_user_mr; 9a4435375 oulijun 2016-07-21 523 ib_dev->dereg_mr = hns_roce_dereg_mr; a2c80b7b4 Wei Hu(Xavier 2017-10-26 524) if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_REREG_MR) { a2c80b7b4 Wei Hu(Xavier 2017-10-26 525) ib_dev->rereg_user_mr = hns_roce_rereg_user_mr; a2c80b7b4 Wei Hu(Xavier 2017-10-26 526) ib_dev->uverbs_cmd_mask |= (1ULL << IB_USER_VERBS_CMD_REREG_MR); a2c80b7b4 Wei Hu(Xavier 2017-10-26 527) } 9a4435375 oulijun 2016-07-21 528 c7c281914 Yixian Liu 2018-09-23 529 /* MW */ c7c281914 Yixian Liu 2018-09-23 530 if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_MW) { c7c281914 Yixian Liu 2018-09-23 531 ib_dev->alloc_mw = hns_roce_alloc_mw; c7c281914 Yixian Liu 2018-09-23 532 ib_dev->dealloc_mw = hns_roce_dealloc_mw; c7c281914 Yixian Liu 2018-09-23 533 ib_dev->uverbs_cmd_mask |= c7c281914 Yixian Liu 2018-09-23 534 (1ULL << IB_USER_VERBS_CMD_ALLOC_MW) | c7c281914 Yixian Liu 2018-09-23 535 (1ULL << IB_USER_VERBS_CMD_DEALLOC_MW); c7c281914 Yixian Liu 2018-09-23 536 } c7c281914 Yixian Liu 2018-09-23 537 9a4435375 oulijun 2016-07-21 538 /* OTHERS */ 9a4435375 oulijun 2016-07-21 539 ib_dev->get_port_immutable = hns_roce_port_immutable; fedc3abe7 Wei Hu(Xavier 2018-05-28 540) ib_dev->disassociate_ucontext = hns_roce_disassociate_ucontext; 9a4435375 oulijun 2016-07-21 541 0ede73bc0 Matan Barak 2018-03-19 542 ib_dev->driver_id = RDMA_DRIVER_HNS; e349f858d Jason Gunthorpe 2018-09-25 543 ret = ib_register_device(ib_dev, "hns_%d", NULL); 9a4435375 oulijun 2016-07-21 544 if (ret) { 9a4435375 oulijun 2016-07-21 545 dev_err(dev, "ib_register_device failed!\n"); 9a4435375 oulijun 2016-07-21 546 return ret; 9a4435375 oulijun 2016-07-21 547 } 9a4435375 oulijun 2016-07-21 548 825474697 Shaobo Xu 2016-11-23 549 ret = hns_roce_setup_mtu_mac(hr_dev); 9a4435375 oulijun 2016-07-21 550 if (ret) { 825474697 Shaobo Xu 2016-11-23 551 dev_err(dev, "setup_mtu_mac failed!\n"); 825474697 Shaobo Xu 2016-11-23 552 goto error_failed_setup_mtu_mac; 9a4435375 oulijun 2016-07-21 553 } 9a4435375 oulijun 2016-07-21 554 9a4435375 oulijun 2016-07-21 555 iboe->nb.notifier_call = hns_roce_netdev_event; 9a4435375 oulijun 2016-07-21 556 ret = register_netdevice_notifier(&iboe->nb); 9a4435375 oulijun 2016-07-21 557 if (ret) { 9a4435375 oulijun 2016-07-21 558 dev_err(dev, "register_netdevice_notifier failed!\n"); 825474697 Shaobo Xu 2016-11-23 559 goto error_failed_setup_mtu_mac; 9a4435375 oulijun 2016-07-21 560 } 9a4435375 oulijun 2016-07-21 561 cb7a94c9c Wei Hu(Xavier 2018-05-28 562) hr_dev->active = true; 9a4435375 oulijun 2016-07-21 563 return 0; 9a4435375 oulijun 2016-07-21 564 825474697 Shaobo Xu 2016-11-23 565 error_failed_setup_mtu_mac: 9a4435375 oulijun 2016-07-21 566 ib_unregister_device(ib_dev); 9a4435375 oulijun 2016-07-21 567 9a4435375 oulijun 2016-07-21 568 return ret; 9a4435375 oulijun 2016-07-21 569 } 9a4435375 oulijun 2016-07-21 570 :::::: The code at line 509 was first introduced by commit :::::: 9a4435375cd151e07c0c38fa601b00115986091b IB/hns: Add driver files for hns RoCE driver :::::: TO: oulijun <oulijun@huawei.com> :::::: CC: Doug Ledford <dledford@redhat.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index afa3a6ebb4e0..f2bb0ebbad69 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -1789,7 +1789,7 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file, return uobj_alloc_commit(&obj->uevent.uobject, in_len); err_destroy: - ib_destroy_qp(qp); + ib_destroy_qp_user(qp, &udata); err_xrcd: uobj_put_read(xrcd_uobj); err_put: diff --git a/drivers/infiniband/core/uverbs_std_types.c b/drivers/infiniband/core/uverbs_std_types.c index 302aa5261cda..59e527a6ffc1 100644 --- a/drivers/infiniband/core/uverbs_std_types.c +++ b/drivers/infiniband/core/uverbs_std_types.c @@ -76,6 +76,7 @@ static int uverbs_free_qp(struct ib_uobject *uobject, struct ib_qp *qp = uobject->object; struct ib_uqp_object *uqp = container_of(uobject, struct ib_uqp_object, uevent.uobject); + struct ib_udata udata = {0}; int ret; /* @@ -92,7 +93,10 @@ static int uverbs_free_qp(struct ib_uobject *uobject, ib_uverbs_detach_umcast(qp, uqp); } - ret = ib_destroy_qp(qp); + ib_uverbs_init_udata_buf_or_null(&udata, NULL, NULL, 0, 0, + uobject->context); + + ret = ib_destroy_qp_user(qp, &udata); if (ib_is_destroy_retryable(ret, why, uobject)) return ret; diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index e59372af72ac..d972f1dbf8fd 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -1106,7 +1106,8 @@ struct ib_qp *ib_open_qp(struct ib_xrcd *xrcd, EXPORT_SYMBOL(ib_open_qp); static struct ib_qp *ib_create_xrc_qp(struct ib_qp *qp, - struct ib_qp_init_attr *qp_init_attr) + struct ib_qp_init_attr *qp_init_attr, + struct ib_udata *udata) { struct ib_qp *real_qp = qp; @@ -1124,12 +1125,13 @@ static struct ib_qp *ib_create_xrc_qp(struct ib_qp *qp, if (!IS_ERR(qp)) __ib_insert_xrcd_qp(qp_init_attr->xrcd, real_qp); else - real_qp->device->destroy_qp(real_qp); + real_qp->device->destroy_qp(real_qp, udata); return qp; } -struct ib_qp *ib_create_qp(struct ib_pd *pd, - struct ib_qp_init_attr *qp_init_attr) +struct ib_qp *ib_create_qp_user(struct ib_pd *pd, + struct ib_qp_init_attr *qp_init_attr, + struct ib_udata *udata) { struct ib_device *device = pd ? pd->device : qp_init_attr->xrcd->device; struct ib_qp *qp; @@ -1172,7 +1174,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, qp->port = 0; if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) - return ib_create_xrc_qp(qp, qp_init_attr); + return ib_create_xrc_qp(qp, qp_init_attr, udata); qp->event_handler = qp_init_attr->event_handler; qp->qp_context = qp_init_attr->qp_context; @@ -1217,6 +1219,17 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, return qp; } +EXPORT_SYMBOL(ib_create_qp_user); + +/* NOTE: Never call this function from uverbs! */ +struct ib_qp *ib_create_qp(struct ib_pd *pd, + struct ib_qp_init_attr *qp_init_attr) +{ + if (WARN_ON(rdma_is_user_pd(pd))) + return ERR_PTR(-EINVAL); + + return ib_create_qp_user(pd, qp_init_attr, NULL); +} EXPORT_SYMBOL(ib_create_qp); static const struct { @@ -1827,7 +1840,7 @@ static int __ib_destroy_shared_qp(struct ib_qp *qp) return 0; } -int ib_destroy_qp(struct ib_qp *qp) +int ib_destroy_qp_user(struct ib_qp *qp, struct ib_udata *udata) { const struct ib_gid_attr *alt_path_sgid_attr = qp->alt_path_sgid_attr; const struct ib_gid_attr *av_sgid_attr = qp->av_sgid_attr; @@ -1859,7 +1872,7 @@ int ib_destroy_qp(struct ib_qp *qp) rdma_rw_cleanup_mrs(qp); rdma_restrack_del(&qp->res); - ret = qp->device->destroy_qp(qp); + ret = qp->device->destroy_qp(qp, udata); if (!ret) { if (alt_path_sgid_attr) rdma_put_gid_attr(alt_path_sgid_attr); @@ -1884,6 +1897,16 @@ int ib_destroy_qp(struct ib_qp *qp) return ret; } +EXPORT_SYMBOL(ib_destroy_qp_user); + +/* NOTE: Never call this function from uverbs! */ +int ib_destroy_qp(struct ib_qp *qp) +{ + if (WARN_ON(rdma_is_user_pd(qp->pd))) + return -EINVAL; + + return ib_destroy_qp_user(qp, NULL); +} EXPORT_SYMBOL(ib_destroy_qp); /* Completion queues */ diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index a2982a160123..cceaa6133903 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -797,7 +797,7 @@ void bnxt_re_unlock_cqs(struct bnxt_re_qp *qp, } /* Queue Pairs */ -int bnxt_re_destroy_qp(struct ib_qp *ib_qp) +int bnxt_re_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata) { struct bnxt_re_qp *qp = container_of(ib_qp, struct bnxt_re_qp, ib_qp); struct bnxt_re_dev *rdev = qp->rdev; diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.h b/drivers/infiniband/hw/bnxt_re/ib_verbs.h index d73a5c74c85d..14b853249d59 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.h +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.h @@ -190,7 +190,7 @@ int bnxt_re_modify_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_udata *udata); int bnxt_re_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr); -int bnxt_re_destroy_qp(struct ib_qp *qp); +int bnxt_re_destroy_qp(struct ib_qp *qp, struct ib_udata *udata); int bnxt_re_post_send(struct ib_qp *qp, const struct ib_send_wr *send_wr, const struct ib_send_wr **bad_send_wr); int bnxt_re_post_recv(struct ib_qp *qp, const struct ib_recv_wr *recv_wr, diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c index 059280fc1eab..4d1a86999a2a 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c @@ -757,7 +757,7 @@ static int iwch_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, iwch_set_page); } -static int iwch_destroy_qp(struct ib_qp *ib_qp) +static int iwch_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata) { struct iwch_dev *rhp; struct iwch_qp *qhp; @@ -899,14 +899,14 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd, mm1 = kmalloc(sizeof *mm1, GFP_KERNEL); if (!mm1) { - iwch_destroy_qp(&qhp->ibqp); + iwch_destroy_qp(&qhp->ibqp, udata); return ERR_PTR(-ENOMEM); } mm2 = kmalloc(sizeof *mm2, GFP_KERNEL); if (!mm2) { kfree(mm1); - iwch_destroy_qp(&qhp->ibqp); + iwch_destroy_qp(&qhp->ibqp, udata); return ERR_PTR(-ENOMEM); } @@ -923,7 +923,7 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd, if (ib_copy_to_udata(udata, &uresp, sizeof (uresp))) { kfree(mm1); kfree(mm2); - iwch_destroy_qp(&qhp->ibqp); + iwch_destroy_qp(&qhp->ibqp, udata); return ERR_PTR(-EFAULT); } mm1->key = uresp.key; diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 79016715720b..0d64e72b2303 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -1076,7 +1076,7 @@ int c4iw_destroy_srq(struct ib_srq *ib_srq); struct ib_srq *c4iw_create_srq(struct ib_pd *pd, struct ib_srq_init_attr *attrs, struct ib_udata *udata); -int c4iw_destroy_qp(struct ib_qp *ib_qp); +int c4iw_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata); struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, struct ib_udata *udata); diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index 74eb70300fdf..6103c1a6caec 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -2089,7 +2089,7 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp, return ret; } -int c4iw_destroy_qp(struct ib_qp *ib_qp) +int c4iw_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata) { struct c4iw_dev *rhp; struct c4iw_qp *qhp; diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c index 201c030acd50..408a65fc00b3 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c @@ -443,8 +443,9 @@ static void i40iw_clean_cqes(struct i40iw_qp *iwqp, struct i40iw_cq *iwcq) /** * i40iw_destroy_qp - destroy qp * @ibqp: qp's ib pointer also to get to device's qp address + * @udata: user data (if any) */ -static int i40iw_destroy_qp(struct ib_qp *ibqp) +static int i40iw_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct i40iw_qp *iwqp = to_iwqp(ibqp); @@ -775,7 +776,7 @@ static struct ib_qp *i40iw_create_qp(struct ib_pd *ibpd, err_code = ib_copy_to_udata(udata, &uresp, sizeof(uresp)); if (err_code) { i40iw_pr_err("copy_to_udata failed\n"); - i40iw_destroy_qp(&iwqp->ibqp); + i40iw_destroy_qp(&iwqp->ibqp, udata); /* let the completion of the qp destroy free the qp */ return ERR_PTR(err_code); } diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h index d4c45fdfd0c9..4662e39caecd 100644 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h @@ -776,7 +776,7 @@ int mlx4_ib_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *init_attr, struct ib_udata *udata); -int mlx4_ib_destroy_qp(struct ib_qp *qp); +int mlx4_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata); void mlx4_ib_drain_sq(struct ib_qp *qp); void mlx4_ib_drain_rq(struct ib_qp *qp); int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index 227f419df222..78e0a430e6be 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c @@ -1572,7 +1572,8 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd, if (is_eth && dev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ROCE_V1_V2) { init_attr->create_flags |= MLX4_IB_QP_CREATE_ROCE_V2_GSI; - sqp->roce_v2_gsi = ib_create_qp(pd, init_attr); + sqp->roce_v2_gsi = ib_create_qp_user(pd, init_attr, + udata); if (IS_ERR(sqp->roce_v2_gsi)) { pr_err("Failed to create GSI QP for RoCEv2 (%ld)\n", PTR_ERR(sqp->roce_v2_gsi)); @@ -1624,7 +1625,7 @@ static int _mlx4_ib_destroy_qp(struct ib_qp *qp) return 0; } -int mlx4_ib_destroy_qp(struct ib_qp *qp) +int mlx4_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata) { struct mlx4_ib_qp *mqp = to_mqp(qp); diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c index 4950df3f71b6..8bdd35286ead 100644 --- a/drivers/infiniband/hw/mlx5/gsi.c +++ b/drivers/infiniband/hw/mlx5/gsi.c @@ -113,7 +113,8 @@ static void handle_single_completion(struct ib_cq *cq, struct ib_wc *wc) } struct ib_qp *mlx5_ib_gsi_create_qp(struct ib_pd *pd, - struct ib_qp_init_attr *init_attr) + struct ib_qp_init_attr *init_attr, + struct ib_udata *udata) { struct mlx5_ib_dev *dev = to_mdev(pd->device); struct mlx5_ib_gsi_qp *gsi; @@ -184,7 +185,7 @@ struct ib_qp *mlx5_ib_gsi_create_qp(struct ib_pd *pd, hw_init_attr.cap.max_send_sge = 0; hw_init_attr.cap.max_inline_data = 0; } - gsi->rx_qp = ib_create_qp(pd, &hw_init_attr); + gsi->rx_qp = ib_create_qp_user(pd, &hw_init_attr, udata); if (IS_ERR(gsi->rx_qp)) { mlx5_ib_warn(dev, "unable to create hardware GSI QP. error %ld\n", PTR_ERR(gsi->rx_qp)); diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 09a298a5043f..885129678837 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -4415,7 +4415,7 @@ static void destroy_umrc_res(struct mlx5_ib_dev *dev) mlx5_ib_warn(dev, "mr cache cleanup failed\n"); if (dev->umrc.qp) - mlx5_ib_destroy_qp(dev->umrc.qp); + mlx5_ib_destroy_qp(dev->umrc.qp, NULL); if (dev->umrc.cq) ib_free_cq(dev->umrc.cq); if (dev->umrc.pd) @@ -4520,7 +4520,7 @@ static int create_umr_res(struct mlx5_ib_dev *dev) return 0; error_4: - mlx5_ib_destroy_qp(qp); + mlx5_ib_destroy_qp(qp, NULL); dev->umrc.qp = NULL; error_3: diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 2561594df671..fe1032ced752 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -1045,7 +1045,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, struct ib_udata *udata); int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr); -int mlx5_ib_destroy_qp(struct ib_qp *qp); +int mlx5_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata); void mlx5_ib_drain_sq(struct ib_qp *qp); void mlx5_ib_drain_rq(struct ib_qp *qp); int mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, @@ -1226,7 +1226,8 @@ int mlx5_ib_init_cong_debugfs(struct mlx5_ib_dev *dev, u8 port_num); /* GSI QP helper functions */ struct ib_qp *mlx5_ib_gsi_create_qp(struct ib_pd *pd, - struct ib_qp_init_attr *init_attr); + struct ib_qp_init_attr *init_attr, + struct ib_udata *udata); int mlx5_ib_gsi_destroy_qp(struct ib_qp *qp); int mlx5_ib_gsi_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr, int attr_mask); diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index f13447cfba12..edfbcfa90555 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -2452,7 +2452,7 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd, break; case IB_QPT_GSI: - return mlx5_ib_gsi_create_qp(pd, init_attr); + return mlx5_ib_gsi_create_qp(pd, init_attr, udata); case IB_QPT_RAW_IPV6: case IB_QPT_RAW_ETHERTYPE: @@ -2489,7 +2489,7 @@ static int mlx5_ib_destroy_dct(struct mlx5_ib_qp *mqp) return 0; } -int mlx5_ib_destroy_qp(struct ib_qp *qp) +int mlx5_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata) { struct mlx5_ib_dev *dev = to_mdev(qp->device); struct mlx5_ib_qp *mqp = to_mqp(qp); diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index 303de9955ad6..e0536325de81 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c @@ -632,7 +632,7 @@ static struct ib_qp *mthca_create_qp(struct ib_pd *pd, return &qp->ibqp; } -static int mthca_destroy_qp(struct ib_qp *qp) +static int mthca_destroy_qp(struct ib_qp *qp, struct ib_udata *udata) { if (qp->uobject) { mthca_unmap_user_db(to_mdev(qp->device), diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 5f69d076b742..185ad94b0daf 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -1334,7 +1334,7 @@ static void nes_clean_cq(struct nes_qp *nesqp, struct nes_cq *nescq) /** * nes_destroy_qp */ -static int nes_destroy_qp(struct ib_qp *ibqp) +static int nes_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct nes_qp *nesqp = to_nesqp(ibqp); struct nes_ucontext *nes_ucontext; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 84a815277788..b04b42bf9a24 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -1741,7 +1741,7 @@ void ocrdma_del_flush_qp(struct ocrdma_qp *qp) spin_unlock_irqrestore(&dev->flush_q_lock, flags); } -int ocrdma_destroy_qp(struct ib_qp *ibqp) +int ocrdma_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct ocrdma_pd *pd; struct ocrdma_qp *qp; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h index 8bc96aaf0972..176dabd22714 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h @@ -91,7 +91,7 @@ int ocrdma_modify_qp(struct ib_qp *, struct ib_qp_attr *attr, int ocrdma_query_qp(struct ib_qp *, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *); -int ocrdma_destroy_qp(struct ib_qp *); +int ocrdma_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata); void ocrdma_del_flush_qp(struct ocrdma_qp *qp); struct ib_srq *ocrdma_create_srq(struct ib_pd *, struct ib_srq_init_attr *, diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c index 6e364b801f33..b9c5ca03fbe9 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -2571,7 +2571,7 @@ static int qedr_free_qp_resources(struct qedr_dev *dev, struct qedr_qp *qp) return 0; } -int qedr_destroy_qp(struct ib_qp *ibqp) +int qedr_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct qedr_qp *qp = get_qedr_qp(ibqp); struct qedr_dev *dev = qp->dev; diff --git a/drivers/infiniband/hw/qedr/verbs.h b/drivers/infiniband/hw/qedr/verbs.h index 16a8c7494447..3aca0c0164d1 100644 --- a/drivers/infiniband/hw/qedr/verbs.h +++ b/drivers/infiniband/hw/qedr/verbs.h @@ -64,7 +64,7 @@ int qedr_modify_qp(struct ib_qp *, struct ib_qp_attr *attr, int attr_mask, struct ib_udata *udata); int qedr_query_qp(struct ib_qp *, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *); -int qedr_destroy_qp(struct ib_qp *ibqp); +int qedr_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata); struct ib_srq *qedr_create_srq(struct ib_pd *ibpd, struct ib_srq_init_attr *attr, diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c index 120cfd522aba..11945372fee0 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c @@ -559,7 +559,7 @@ struct ib_qp *usnic_ib_create_qp(struct ib_pd *pd, return ERR_PTR(err); } -int usnic_ib_destroy_qp(struct ib_qp *qp) +int usnic_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata) { struct usnic_ib_qp_grp *qp_grp; struct usnic_ib_vf *vf; diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h index 32cd4363b190..a6feb1d975a9 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h @@ -58,7 +58,7 @@ int usnic_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata); struct ib_qp *usnic_ib_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *init_attr, struct ib_udata *udata); -int usnic_ib_destroy_qp(struct ib_qp *qp); +int usnic_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata); int usnic_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, struct ib_udata *udata); struct ib_cq *usnic_ib_create_cq(struct ib_device *ibdev, diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c index 1a013e2d7399..36d9ce00527d 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c @@ -451,7 +451,7 @@ static void pvrdma_free_qp(struct pvrdma_qp *qp) * * @return: 0 on success. */ -int pvrdma_destroy_qp(struct ib_qp *qp) +int pvrdma_destroy_qp(struct ib_qp *qp, struct ib_udata *udata) { struct pvrdma_qp *vqp = to_vqp(qp); union pvrdma_cmd_req req; diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h index 64c8f778c53a..8a3c25ce6d41 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h @@ -438,7 +438,7 @@ int pvrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, struct ib_udata *udata); int pvrdma_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr); -int pvrdma_destroy_qp(struct ib_qp *qp); +int pvrdma_destroy_qp(struct ib_qp *qp, struct ib_udata *udata); int pvrdma_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, const struct ib_send_wr **bad_wr); int pvrdma_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr, diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index d396f889eb10..581e6261b9d0 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -544,7 +544,7 @@ static int rxe_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, return 0; } -static int rxe_destroy_qp(struct ib_qp *ibqp) +static int rxe_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct rxe_qp *qp = to_rqp(ibqp); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 1886b50e630a..f88838988f4d 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2427,7 +2427,8 @@ struct ib_device { struct ib_qp_attr *qp_attr, int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr); - int (*destroy_qp)(struct ib_qp *qp); + int (*destroy_qp)(struct ib_qp *qp, + struct ib_udata *udata); int (*post_send)(struct ib_qp *qp, const struct ib_send_wr *send_wr, const struct ib_send_wr **bad_send_wr); @@ -3357,6 +3358,18 @@ static inline int ib_post_srq_recv(struct ib_srq *srq, return srq->device->post_srq_recv(srq, recv_wr, bad_recv_wr ? : &dummy); } +/** + * ib_create_qp_user - Creates a QP associated with the specified protection + * domain. + * @pd: The protection domain associated with the QP. + * @qp_init_attr: A list of initial attributes required to create the + * QP. If QP creation succeeds, then the attributes are updated to + * the actual capabilities of the created QP. + * @udata: User data (if any) + */ +struct ib_qp *ib_create_qp_user(struct ib_pd *pd, + struct ib_qp_init_attr *qp_init_attr, + struct ib_udata *udata); /** * ib_create_qp - Creates a QP associated with the specified protection * domain. @@ -3364,6 +3377,8 @@ static inline int ib_post_srq_recv(struct ib_srq *srq, * @qp_init_attr: A list of initial attributes required to create the * QP. If QP creation succeeds, then the attributes are updated to * the actual capabilities of the created QP. + * + * NOTE: Never call this function from uverbs! */ struct ib_qp *ib_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *qp_init_attr); @@ -3413,9 +3428,19 @@ int ib_query_qp(struct ib_qp *qp, int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr); +/** + * ib_destroy_qp_user - Destroys the specified QP. + * @qp: The QP to destroy. + * @udata: User data (if any) + */ +int ib_destroy_qp_user(struct ib_qp *qp, + struct ib_udata *udata); + /** * ib_destroy_qp - Destroys the specified QP. * @qp: The QP to destroy. + * + * NOTE: Never call this function from uverbs! */ int ib_destroy_qp(struct ib_qp *qp);

[v2,7/7] IB/verbs: destroy_qp verb need ib_udata

Commit Message

Comments

Patch