Message ID | 1702438411-23530-2-git-send-email-selvin.xavier@broadcom.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | RDMA/bnxt_re: Share the CQ pages for GenP7 adapters | expand |
On Tue, Dec 12, 2023 at 07:33:30PM -0800, Selvin Xavier wrote: > Gen P7 adapters require to share a toggle value for CQ > and SRQ. This is received by the driver as part of > interrupt notifications and needs to be shared with the > user space. Add a new UAPI infrastructure to get the > shared page for CQ and SRQ. > > Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com> > --- > drivers/infiniband/hw/bnxt_re/ib_verbs.c | 106 +++++++++++++++++++++++++++++++ > drivers/infiniband/hw/bnxt_re/ib_verbs.h | 1 + > include/uapi/rdma/bnxt_re-abi.h | 26 ++++++++ > 3 files changed, 133 insertions(+) > > diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c > index e7ef099..76cea30 100644 > --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c > +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c > @@ -567,6 +567,7 @@ bnxt_re_mmap_entry_insert(struct bnxt_re_ucontext *uctx, u64 mem_offset, > case BNXT_RE_MMAP_WC_DB: > case BNXT_RE_MMAP_DBR_BAR: > case BNXT_RE_MMAP_DBR_PAGE: > + case BNXT_RE_MMAP_TOGGLE_PAGE: > ret = rdma_user_mmap_entry_insert(&uctx->ib_uctx, > &entry->rdma_entry, PAGE_SIZE); > break; > @@ -4254,6 +4255,7 @@ int bnxt_re_mmap(struct ib_ucontext *ib_uctx, struct vm_area_struct *vma) > rdma_entry); > break; > case BNXT_RE_MMAP_DBR_PAGE: > + case BNXT_RE_MMAP_TOGGLE_PAGE: > /* Driver doesn't expect write access for user space */ > if (vma->vm_flags & VM_WRITE) > return -EFAULT; > @@ -4430,8 +4432,112 @@ DECLARE_UVERBS_NAMED_METHOD(BNXT_RE_METHOD_NOTIFY_DRV); > DECLARE_UVERBS_GLOBAL_METHODS(BNXT_RE_OBJECT_NOTIFY_DRV, > &UVERBS_METHOD(BNXT_RE_METHOD_NOTIFY_DRV)); > > +/* Toggle MEM */ > +static int UVERBS_HANDLER(BNXT_RE_METHOD_GET_TOGGLE_MEM)(struct uverbs_attr_bundle *attrs) > +{ > + struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); > + enum bnxt_re_get_toggle_mem_type res_type; > + struct bnxt_re_user_mmap_entry *entry; > + enum bnxt_re_mmap_flag mmap_flag; > + struct bnxt_qplib_chip_ctx *cctx; > + struct bnxt_re_ucontext *uctx; > + struct bnxt_re_dev *rdev; > + u64 mem_offset; > + u32 length; > + u32 offset; > + u64 addr; > + int err; > + > + uctx = container_of(ib_uverbs_get_ucontext(attrs), struct bnxt_re_ucontext, ib_uctx); > + if (IS_ERR(uctx)) How is it possible? You should check return value from ib_uverbs_get_ucontext() and not container_of. > + return PTR_ERR(uctx); > + > + err = uverbs_get_const(&res_type, attrs, BNXT_RE_TOGGLE_MEM_TYPE); > + if (err) > + return err; > + > + rdev = uctx->rdev; > + cctx = rdev->chip_ctx; > + > + switch (res_type) { > + case BNXT_RE_CQ_TOGGLE_MEM: > + break; No need in this break here. > + case BNXT_RE_SRQ_TOGGLE_MEM: > + break; > + > + default: > + return -EOPNOTSUPP; > + } Thanks
On Wed, Dec 13, 2023 at 1:40 PM Leon Romanovsky <leon@kernel.org> wrote: > > On Tue, Dec 12, 2023 at 07:33:30PM -0800, Selvin Xavier wrote: > > Gen P7 adapters require to share a toggle value for CQ > > and SRQ. This is received by the driver as part of > > interrupt notifications and needs to be shared with the > > user space. Add a new UAPI infrastructure to get the > > shared page for CQ and SRQ. > > > > Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com> > > --- > > drivers/infiniband/hw/bnxt_re/ib_verbs.c | 106 +++++++++++++++++++++++++++++++ > > drivers/infiniband/hw/bnxt_re/ib_verbs.h | 1 + > > include/uapi/rdma/bnxt_re-abi.h | 26 ++++++++ > > 3 files changed, 133 insertions(+) > > > > diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c > > index e7ef099..76cea30 100644 > > --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c > > +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c > > @@ -567,6 +567,7 @@ bnxt_re_mmap_entry_insert(struct bnxt_re_ucontext *uctx, u64 mem_offset, > > case BNXT_RE_MMAP_WC_DB: > > case BNXT_RE_MMAP_DBR_BAR: > > case BNXT_RE_MMAP_DBR_PAGE: > > + case BNXT_RE_MMAP_TOGGLE_PAGE: > > ret = rdma_user_mmap_entry_insert(&uctx->ib_uctx, > > &entry->rdma_entry, PAGE_SIZE); > > break; > > @@ -4254,6 +4255,7 @@ int bnxt_re_mmap(struct ib_ucontext *ib_uctx, struct vm_area_struct *vma) > > rdma_entry); > > break; > > case BNXT_RE_MMAP_DBR_PAGE: > > + case BNXT_RE_MMAP_TOGGLE_PAGE: > > /* Driver doesn't expect write access for user space */ > > if (vma->vm_flags & VM_WRITE) > > return -EFAULT; > > @@ -4430,8 +4432,112 @@ DECLARE_UVERBS_NAMED_METHOD(BNXT_RE_METHOD_NOTIFY_DRV); > > DECLARE_UVERBS_GLOBAL_METHODS(BNXT_RE_OBJECT_NOTIFY_DRV, > > &UVERBS_METHOD(BNXT_RE_METHOD_NOTIFY_DRV)); > > > > +/* Toggle MEM */ > > +static int UVERBS_HANDLER(BNXT_RE_METHOD_GET_TOGGLE_MEM)(struct uverbs_attr_bundle *attrs) > > +{ > > + struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); > > + enum bnxt_re_get_toggle_mem_type res_type; > > + struct bnxt_re_user_mmap_entry *entry; > > + enum bnxt_re_mmap_flag mmap_flag; > > + struct bnxt_qplib_chip_ctx *cctx; > > + struct bnxt_re_ucontext *uctx; > > + struct bnxt_re_dev *rdev; > > + u64 mem_offset; > > + u32 length; > > + u32 offset; > > + u64 addr; > > + int err; > > + > > + uctx = container_of(ib_uverbs_get_ucontext(attrs), struct bnxt_re_ucontext, ib_uctx); > > + if (IS_ERR(uctx)) > > How is it possible? You should check return value from ib_uverbs_get_ucontext() and not container_of. ok. will include in the next revision. > > > + return PTR_ERR(uctx); > > + > > + err = uverbs_get_const(&res_type, attrs, BNXT_RE_TOGGLE_MEM_TYPE); > > + if (err) > > + return err; > > + > > + rdev = uctx->rdev; > > + cctx = rdev->chip_ctx; > > + > > + switch (res_type) { > > + case BNXT_RE_CQ_TOGGLE_MEM: > > + break; > > No need in this break here. ok. thanks > > > + case BNXT_RE_SRQ_TOGGLE_MEM: > > + break; > > + > > + default: > > + return -EOPNOTSUPP; > > + } > > Thanks
Hi Selvin, kernel test robot noticed the following build warnings: [auto build test WARNING on rdma/for-next] [also build test WARNING on linus/master v6.7-rc5 next-20231213] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Selvin-Xavier/RDMA-bnxt_re-Add-UAPI-to-share-a-page-with-user-space/20231213-115222 base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next patch link: https://lore.kernel.org/r/1702438411-23530-2-git-send-email-selvin.xavier%40broadcom.com patch subject: [PATCH for-next 1/2] RDMA/bnxt_re: Add UAPI to share a page with user space config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20231213/202312132318.8DO4UiPT-lkp@intel.com/config) compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231213/202312132318.8DO4UiPT-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202312132318.8DO4UiPT-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/infiniband/hw/bnxt_re/ib_verbs.c:4442:30: warning: variable 'cctx' set but not used [-Wunused-but-set-variable] struct bnxt_qplib_chip_ctx *cctx; ^ drivers/infiniband/hw/bnxt_re/ib_verbs.c:4472:42: warning: variable 'addr' is uninitialized when used here [-Wuninitialized] entry = bnxt_re_mmap_entry_insert(uctx, addr, mmap_flag, &mem_offset); ^~~~ drivers/infiniband/hw/bnxt_re/ib_verbs.c:4448:10: note: initialize the variable 'addr' to silence this warning u64 addr; ^ = 0 drivers/infiniband/hw/bnxt_re/ib_verbs.c:4472:48: warning: variable 'mmap_flag' is uninitialized when used here [-Wuninitialized] entry = bnxt_re_mmap_entry_insert(uctx, addr, mmap_flag, &mem_offset); ^~~~~~~~~ drivers/infiniband/hw/bnxt_re/ib_verbs.c:4441:2: note: variable 'mmap_flag' is declared here enum bnxt_re_mmap_flag mmap_flag; ^ 3 warnings generated. vim +/cctx +4442 drivers/infiniband/hw/bnxt_re/ib_verbs.c 4431 4432 DECLARE_UVERBS_GLOBAL_METHODS(BNXT_RE_OBJECT_NOTIFY_DRV, 4433 &UVERBS_METHOD(BNXT_RE_METHOD_NOTIFY_DRV)); 4434 4435 /* Toggle MEM */ 4436 static int UVERBS_HANDLER(BNXT_RE_METHOD_GET_TOGGLE_MEM)(struct uverbs_attr_bundle *attrs) 4437 { 4438 struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); 4439 enum bnxt_re_get_toggle_mem_type res_type; 4440 struct bnxt_re_user_mmap_entry *entry; 4441 enum bnxt_re_mmap_flag mmap_flag; > 4442 struct bnxt_qplib_chip_ctx *cctx; 4443 struct bnxt_re_ucontext *uctx; 4444 struct bnxt_re_dev *rdev; 4445 u64 mem_offset; 4446 u32 length; 4447 u32 offset; 4448 u64 addr; 4449 int err; 4450 4451 uctx = container_of(ib_uverbs_get_ucontext(attrs), struct bnxt_re_ucontext, ib_uctx); 4452 if (IS_ERR(uctx)) 4453 return PTR_ERR(uctx); 4454 4455 err = uverbs_get_const(&res_type, attrs, BNXT_RE_TOGGLE_MEM_TYPE); 4456 if (err) 4457 return err; 4458 4459 rdev = uctx->rdev; 4460 cctx = rdev->chip_ctx; 4461 4462 switch (res_type) { 4463 case BNXT_RE_CQ_TOGGLE_MEM: 4464 break; 4465 case BNXT_RE_SRQ_TOGGLE_MEM: 4466 break; 4467 4468 default: 4469 return -EOPNOTSUPP; 4470 } 4471 4472 entry = bnxt_re_mmap_entry_insert(uctx, addr, mmap_flag, &mem_offset); 4473 if (!entry) 4474 return -ENOMEM; 4475 4476 uobj->object = entry; 4477 uverbs_finalize_uobj_create(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); 4478 err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_PAGE, 4479 &mem_offset, sizeof(mem_offset)); 4480 if (err) 4481 return err; 4482 4483 err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_LENGTH, 4484 &length, sizeof(length)); 4485 if (err) 4486 return err; 4487 4488 err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_OFFSET, 4489 &offset, sizeof(length)); 4490 if (err) 4491 return err; 4492 4493 return 0; 4494 } 4495
diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index e7ef099..76cea30 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -567,6 +567,7 @@ bnxt_re_mmap_entry_insert(struct bnxt_re_ucontext *uctx, u64 mem_offset, case BNXT_RE_MMAP_WC_DB: case BNXT_RE_MMAP_DBR_BAR: case BNXT_RE_MMAP_DBR_PAGE: + case BNXT_RE_MMAP_TOGGLE_PAGE: ret = rdma_user_mmap_entry_insert(&uctx->ib_uctx, &entry->rdma_entry, PAGE_SIZE); break; @@ -4254,6 +4255,7 @@ int bnxt_re_mmap(struct ib_ucontext *ib_uctx, struct vm_area_struct *vma) rdma_entry); break; case BNXT_RE_MMAP_DBR_PAGE: + case BNXT_RE_MMAP_TOGGLE_PAGE: /* Driver doesn't expect write access for user space */ if (vma->vm_flags & VM_WRITE) return -EFAULT; @@ -4430,8 +4432,112 @@ DECLARE_UVERBS_NAMED_METHOD(BNXT_RE_METHOD_NOTIFY_DRV); DECLARE_UVERBS_GLOBAL_METHODS(BNXT_RE_OBJECT_NOTIFY_DRV, &UVERBS_METHOD(BNXT_RE_METHOD_NOTIFY_DRV)); +/* Toggle MEM */ +static int UVERBS_HANDLER(BNXT_RE_METHOD_GET_TOGGLE_MEM)(struct uverbs_attr_bundle *attrs) +{ + struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); + enum bnxt_re_get_toggle_mem_type res_type; + struct bnxt_re_user_mmap_entry *entry; + enum bnxt_re_mmap_flag mmap_flag; + struct bnxt_qplib_chip_ctx *cctx; + struct bnxt_re_ucontext *uctx; + struct bnxt_re_dev *rdev; + u64 mem_offset; + u32 length; + u32 offset; + u64 addr; + int err; + + uctx = container_of(ib_uverbs_get_ucontext(attrs), struct bnxt_re_ucontext, ib_uctx); + if (IS_ERR(uctx)) + return PTR_ERR(uctx); + + err = uverbs_get_const(&res_type, attrs, BNXT_RE_TOGGLE_MEM_TYPE); + if (err) + return err; + + rdev = uctx->rdev; + cctx = rdev->chip_ctx; + + switch (res_type) { + case BNXT_RE_CQ_TOGGLE_MEM: + break; + case BNXT_RE_SRQ_TOGGLE_MEM: + break; + + default: + return -EOPNOTSUPP; + } + + entry = bnxt_re_mmap_entry_insert(uctx, addr, mmap_flag, &mem_offset); + if (!entry) + return -ENOMEM; + + uobj->object = entry; + uverbs_finalize_uobj_create(attrs, BNXT_RE_TOGGLE_MEM_HANDLE); + err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_PAGE, + &mem_offset, sizeof(mem_offset)); + if (err) + return err; + + err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_LENGTH, + &length, sizeof(length)); + if (err) + return err; + + err = uverbs_copy_to(attrs, BNXT_RE_TOGGLE_MEM_MMAP_OFFSET, + &offset, sizeof(length)); + if (err) + return err; + + return 0; +} + +static int get_toggle_mem_obj_cleanup(struct ib_uobject *uobject, + enum rdma_remove_reason why, + struct uverbs_attr_bundle *attrs) +{ + struct bnxt_re_user_mmap_entry *entry = uobject->object; + + rdma_user_mmap_entry_remove(&entry->rdma_entry); + return 0; +} + +DECLARE_UVERBS_NAMED_METHOD(BNXT_RE_METHOD_GET_TOGGLE_MEM, + UVERBS_ATTR_IDR(BNXT_RE_TOGGLE_MEM_HANDLE, + BNXT_RE_OBJECT_GET_TOGGLE_MEM, + UVERBS_ACCESS_NEW, + UA_MANDATORY), + UVERBS_ATTR_CONST_IN(BNXT_RE_TOGGLE_MEM_TYPE, + enum bnxt_re_get_toggle_mem_type, + UA_MANDATORY), + UVERBS_ATTR_PTR_IN(BNXT_RE_TOGGLE_MEM_RES_ID, + UVERBS_ATTR_TYPE(u32), + UA_MANDATORY), + UVERBS_ATTR_PTR_OUT(BNXT_RE_TOGGLE_MEM_MMAP_PAGE, + UVERBS_ATTR_TYPE(u64), + UA_MANDATORY), + UVERBS_ATTR_PTR_OUT(BNXT_RE_TOGGLE_MEM_MMAP_OFFSET, + UVERBS_ATTR_TYPE(u32), + UA_MANDATORY), + UVERBS_ATTR_PTR_OUT(BNXT_RE_TOGGLE_MEM_MMAP_LENGTH, + UVERBS_ATTR_TYPE(u32), + UA_MANDATORY)); + +DECLARE_UVERBS_NAMED_METHOD_DESTROY(BNXT_RE_METHOD_RELEASE_TOGGLE_MEM, + UVERBS_ATTR_IDR(BNXT_RE_RELEASE_TOGGLE_MEM_HANDLE, + BNXT_RE_OBJECT_GET_TOGGLE_MEM, + UVERBS_ACCESS_DESTROY, + UA_MANDATORY)); + +DECLARE_UVERBS_NAMED_OBJECT(BNXT_RE_OBJECT_GET_TOGGLE_MEM, + UVERBS_TYPE_ALLOC_IDR(get_toggle_mem_obj_cleanup), + &UVERBS_METHOD(BNXT_RE_METHOD_GET_TOGGLE_MEM), + &UVERBS_METHOD(BNXT_RE_METHOD_RELEASE_TOGGLE_MEM)); + const struct uapi_definition bnxt_re_uapi_defs[] = { UAPI_DEF_CHAIN_OBJ_TREE_NAMED(BNXT_RE_OBJECT_ALLOC_PAGE), UAPI_DEF_CHAIN_OBJ_TREE_NAMED(BNXT_RE_OBJECT_NOTIFY_DRV), + UAPI_DEF_CHAIN_OBJ_TREE_NAMED(BNXT_RE_OBJECT_GET_TOGGLE_MEM), {} }; diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.h b/drivers/infiniband/hw/bnxt_re/ib_verbs.h index 98baea9..da3fe01 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.h +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.h @@ -149,6 +149,7 @@ enum bnxt_re_mmap_flag { BNXT_RE_MMAP_WC_DB, BNXT_RE_MMAP_DBR_PAGE, BNXT_RE_MMAP_DBR_BAR, + BNXT_RE_MMAP_TOGGLE_PAGE, }; struct bnxt_re_user_mmap_entry { diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index 3342276..9b9eb10 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -143,6 +143,7 @@ enum bnxt_re_shpg_offt { enum bnxt_re_objects { BNXT_RE_OBJECT_ALLOC_PAGE = (1U << UVERBS_ID_NS_SHIFT), BNXT_RE_OBJECT_NOTIFY_DRV, + BNXT_RE_OBJECT_GET_TOGGLE_MEM, }; enum bnxt_re_alloc_page_type { @@ -171,4 +172,29 @@ enum bnxt_re_alloc_page_methods { enum bnxt_re_notify_drv_methods { BNXT_RE_METHOD_NOTIFY_DRV = (1U << UVERBS_ID_NS_SHIFT), }; + +/* Toggle mem */ + +enum bnxt_re_get_toggle_mem_type { + BNXT_RE_CQ_TOGGLE_MEM = 0, + BNXT_RE_SRQ_TOGGLE_MEM, +}; + +enum bnxt_re_var_toggle_mem_attrs { + BNXT_RE_TOGGLE_MEM_HANDLE = (1U << UVERBS_ID_NS_SHIFT), + BNXT_RE_TOGGLE_MEM_TYPE, + BNXT_RE_TOGGLE_MEM_RES_ID, + BNXT_RE_TOGGLE_MEM_MMAP_PAGE, + BNXT_RE_TOGGLE_MEM_MMAP_OFFSET, + BNXT_RE_TOGGLE_MEM_MMAP_LENGTH, +}; + +enum bnxt_re_toggle_mem_attrs { + BNXT_RE_RELEASE_TOGGLE_MEM_HANDLE = (1U << UVERBS_ID_NS_SHIFT), +}; + +enum bnxt_re_toggle_mem_methods { + BNXT_RE_METHOD_GET_TOGGLE_MEM = (1U << UVERBS_ID_NS_SHIFT), + BNXT_RE_METHOD_RELEASE_TOGGLE_MEM, +}; #endif /* __BNXT_RE_UVERBS_ABI_H__*/
Gen P7 adapters require to share a toggle value for CQ and SRQ. This is received by the driver as part of interrupt notifications and needs to be shared with the user space. Add a new UAPI infrastructure to get the shared page for CQ and SRQ. Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com> --- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 106 +++++++++++++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 26 ++++++++ 3 files changed, 133 insertions(+)