| Message ID | 20200318124329.52111-5-leon@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce dynamic UAR allocation mode | expand |
On Wed, 2020-03-18 at 14:43 +0200, Leon Romanovsky wrote: > From: Yishai Hadas <yishaih@mellanox.com> > > Move to fully dynamic UAR mode once user space supports it. > In this case we prevent any legacy mode of UARs on the allocated > context > and prevent redundant allocation of the static ones. > > Signed-off-by: Yishai Hadas <yishaih@mellanox.com> > Reviewed-by: Michael Guralnik <michaelgur@mellanox.com> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > --- > drivers/infiniband/hw/mlx5/cq.c | 8 ++++++-- > drivers/infiniband/hw/mlx5/main.c | 13 ++++++++++++- > drivers/infiniband/hw/mlx5/qp.c | 6 ++++++ > include/linux/mlx5/driver.h | 1 + > include/uapi/rdma/mlx5-abi.h | 1 + > 5 files changed, 26 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/hw/mlx5/cq.c > b/drivers/infiniband/hw/mlx5/cq.c > index eafedc2f697b..146ba2966744 100644 > --- a/drivers/infiniband/hw/mlx5/cq.c > +++ b/drivers/infiniband/hw/mlx5/cq.c > @@ -764,10 +764,14 @@ static int create_cq_user(struct mlx5_ib_dev > *dev, struct ib_udata *udata, > MLX5_SET(cqc, cqc, log_page_size, > page_shift - MLX5_ADAPTER_PAGE_SHIFT); > > - if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) > + if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) { > *index = ucmd.uar_page_index; > - else > + } else if (context->bfregi.lib_uar_dyn) { > + err = -EINVAL; > + goto err_cqb; > + } else { > *index = context->bfregi.sys_pages[0]; > + } > > if (ucmd.cqe_comp_en == 1) { > int mini_cqe_format; > diff --git a/drivers/infiniband/hw/mlx5/main.c > b/drivers/infiniband/hw/mlx5/main.c > index e8787af2d74d..e355e06bf3ac 100644 > --- a/drivers/infiniband/hw/mlx5/main.c > +++ b/drivers/infiniband/hw/mlx5/main.c > @@ -1787,6 +1787,7 @@ static int mlx5_ib_alloc_ucontext(struct > ib_ucontext *uctx, > max_cqe_version); > u32 dump_fill_mkey; > bool lib_uar_4k; > + bool lib_uar_dyn; > > if (!dev->ib_active) > return -EAGAIN; > @@ -1845,8 +1846,14 @@ static int mlx5_ib_alloc_ucontext(struct > ib_ucontext *uctx, > } > > lib_uar_4k = req.lib_caps & MLX5_LIB_CAP_4K_UAR; > + lib_uar_dyn = req.lib_caps & MLX5_LIB_CAP_DYN_UAR; > bfregi = &context->bfregi; > > + if (lib_uar_dyn) { > + bfregi->lib_uar_dyn = lib_uar_dyn; > + goto uar_done; > + } > + > /* updates req->total_num_bfregs */ > err = calc_total_bfregs(dev, lib_uar_4k, &req, bfregi); > if (err) > @@ -1873,6 +1880,7 @@ static int mlx5_ib_alloc_ucontext(struct > ib_ucontext *uctx, > if (err) > goto out_sys_pages; > > +uar_done: > if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX) { > err = mlx5_ib_devx_create(dev, true); > if (err < 0) > @@ -1894,7 +1902,7 @@ static int mlx5_ib_alloc_ucontext(struct > ib_ucontext *uctx, > INIT_LIST_HEAD(&context->db_page_list); > mutex_init(&context->db_page_mutex); > > - resp.tot_bfregs = req.total_num_bfregs; > + resp.tot_bfregs = lib_uar_dyn ? 0 : req.total_num_bfregs; > resp.num_ports = dev->num_ports; > > if (offsetofend(typeof(resp), cqe_version) <= udata->outlen) > @@ -2142,6 +2150,9 @@ static int uar_mmap(struct mlx5_ib_dev *dev, > enum mlx5_ib_mmap_cmd cmd, > int max_valid_idx = dyn_uar ? bfregi->num_sys_pages : > bfregi->num_static_sys_pages; > > + if (bfregi->lib_uar_dyn) > + return -EINVAL; > + > if (vma->vm_end - vma->vm_start != PAGE_SIZE) > return -EINVAL; > > diff --git a/drivers/infiniband/hw/mlx5/qp.c > b/drivers/infiniband/hw/mlx5/qp.c > index 380ba3321851..319d514a2223 100644 > --- a/drivers/infiniband/hw/mlx5/qp.c > +++ b/drivers/infiniband/hw/mlx5/qp.c > @@ -697,6 +697,9 @@ static int alloc_bfreg(struct mlx5_ib_dev *dev, > { > int bfregn = -ENOMEM; > > + if (bfregi->lib_uar_dyn) > + return -EINVAL; > + > mutex_lock(&bfregi->lock); > if (bfregi->ver >= 2) { > bfregn = alloc_high_class_bfreg(dev, bfregi); > @@ -768,6 +771,9 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev, > u32 index_of_sys_page; > u32 offset; > > + if (bfregi->lib_uar_dyn) > + return -EINVAL; > + > bfregs_per_sys_page = get_uars_per_sys_page(dev, bfregi- > >lib_uar_4k) * > MLX5_NON_FP_BFREGS_PER_UAR; > index_of_sys_page = bfregn / bfregs_per_sys_page; > diff --git a/include/linux/mlx5/driver.h > b/include/linux/mlx5/driver.h > index 3f10a9633012..e4ab0eb9d202 100644 > --- a/include/linux/mlx5/driver.h > +++ b/include/linux/mlx5/driver.h > @@ -224,6 +224,7 @@ struct mlx5_bfreg_info { > struct mutex lock; > u32 ver; > bool lib_uar_4k; > + u8 lib_uar_dyn : 1; > u32 num_sys_pages; > u32 num_static_sys_pages > u32 total_num_bfregs; this struct is not used in mlx5_core, shall we move it to mlx5_ib as part of this patch? so next time you need to update it you don't need to bother netdev busy people about it ;-) > diff --git a/include/uapi/rdma/mlx5-abi.h b/include/uapi/rdma/mlx5- > abi.h > index a65d60b44829..df1cc3641bda 100644 > --- a/include/uapi/rdma/mlx5-abi.h > +++ b/include/uapi/rdma/mlx5-abi.h > @@ -79,6 +79,7 @@ struct mlx5_ib_alloc_ucontext_req { > > enum mlx5_lib_caps { > MLX5_LIB_CAP_4K_UAR = (__u64)1 << 0, > + MLX5_LIB_CAP_DYN_UAR = (__u64)1 << 1, > }; > > enum mlx5_ib_alloc_uctx_v2_flags {
On Wed, Mar 18, 2020 at 11:38:32PM +0000, Saeed Mahameed wrote: > On Wed, 2020-03-18 at 14:43 +0200, Leon Romanovsky wrote: > > From: Yishai Hadas <yishaih@mellanox.com> > > > > Move to fully dynamic UAR mode once user space supports it. > > In this case we prevent any legacy mode of UARs on the allocated > > context > > and prevent redundant allocation of the static ones. > > > > Signed-off-by: Yishai Hadas <yishaih@mellanox.com> > > Reviewed-by: Michael Guralnik <michaelgur@mellanox.com> > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > > --- > > drivers/infiniband/hw/mlx5/cq.c | 8 ++++++-- > > drivers/infiniband/hw/mlx5/main.c | 13 ++++++++++++- > > drivers/infiniband/hw/mlx5/qp.c | 6 ++++++ > > include/linux/mlx5/driver.h | 1 + > > include/uapi/rdma/mlx5-abi.h | 1 + > > 5 files changed, 26 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/infiniband/hw/mlx5/cq.c > > b/drivers/infiniband/hw/mlx5/cq.c > > index eafedc2f697b..146ba2966744 100644 > > --- a/drivers/infiniband/hw/mlx5/cq.c > > +++ b/drivers/infiniband/hw/mlx5/cq.c > > @@ -764,10 +764,14 @@ static int create_cq_user(struct mlx5_ib_dev > > *dev, struct ib_udata *udata, > > MLX5_SET(cqc, cqc, log_page_size, > > page_shift - MLX5_ADAPTER_PAGE_SHIFT); > > > > - if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) > > + if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) { > > *index = ucmd.uar_page_index; > > - else > > + } else if (context->bfregi.lib_uar_dyn) { > > + err = -EINVAL; > > + goto err_cqb; > > + } else { > > *index = context->bfregi.sys_pages[0]; > > + } > > > > if (ucmd.cqe_comp_en == 1) { > > int mini_cqe_format; > > diff --git a/drivers/infiniband/hw/mlx5/main.c > > b/drivers/infiniband/hw/mlx5/main.c > > index e8787af2d74d..e355e06bf3ac 100644 > > --- a/drivers/infiniband/hw/mlx5/main.c > > +++ b/drivers/infiniband/hw/mlx5/main.c > > @@ -1787,6 +1787,7 @@ static int mlx5_ib_alloc_ucontext(struct > > ib_ucontext *uctx, > > max_cqe_version); > > u32 dump_fill_mkey; > > bool lib_uar_4k; > > + bool lib_uar_dyn; > > > > if (!dev->ib_active) > > return -EAGAIN; > > @@ -1845,8 +1846,14 @@ static int mlx5_ib_alloc_ucontext(struct > > ib_ucontext *uctx, > > } > > > > lib_uar_4k = req.lib_caps & MLX5_LIB_CAP_4K_UAR; > > + lib_uar_dyn = req.lib_caps & MLX5_LIB_CAP_DYN_UAR; > > bfregi = &context->bfregi; > > > > + if (lib_uar_dyn) { > > + bfregi->lib_uar_dyn = lib_uar_dyn; > > + goto uar_done; > > + } > > + > > /* updates req->total_num_bfregs */ > > err = calc_total_bfregs(dev, lib_uar_4k, &req, bfregi); > > if (err) > > @@ -1873,6 +1880,7 @@ static int mlx5_ib_alloc_ucontext(struct > > ib_ucontext *uctx, > > if (err) > > goto out_sys_pages; > > > > +uar_done: > > if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX) { > > err = mlx5_ib_devx_create(dev, true); > > if (err < 0) > > @@ -1894,7 +1902,7 @@ static int mlx5_ib_alloc_ucontext(struct > > ib_ucontext *uctx, > > INIT_LIST_HEAD(&context->db_page_list); > > mutex_init(&context->db_page_mutex); > > > > - resp.tot_bfregs = req.total_num_bfregs; > > + resp.tot_bfregs = lib_uar_dyn ? 0 : req.total_num_bfregs; > > resp.num_ports = dev->num_ports; > > > > if (offsetofend(typeof(resp), cqe_version) <= udata->outlen) > > @@ -2142,6 +2150,9 @@ static int uar_mmap(struct mlx5_ib_dev *dev, > > enum mlx5_ib_mmap_cmd cmd, > > int max_valid_idx = dyn_uar ? bfregi->num_sys_pages : > > bfregi->num_static_sys_pages; > > > > + if (bfregi->lib_uar_dyn) > > + return -EINVAL; > > + > > if (vma->vm_end - vma->vm_start != PAGE_SIZE) > > return -EINVAL; > > > > diff --git a/drivers/infiniband/hw/mlx5/qp.c > > b/drivers/infiniband/hw/mlx5/qp.c > > index 380ba3321851..319d514a2223 100644 > > --- a/drivers/infiniband/hw/mlx5/qp.c > > +++ b/drivers/infiniband/hw/mlx5/qp.c > > @@ -697,6 +697,9 @@ static int alloc_bfreg(struct mlx5_ib_dev *dev, > > { > > int bfregn = -ENOMEM; > > > > + if (bfregi->lib_uar_dyn) > > + return -EINVAL; > > + > > mutex_lock(&bfregi->lock); > > if (bfregi->ver >= 2) { > > bfregn = alloc_high_class_bfreg(dev, bfregi); > > @@ -768,6 +771,9 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev, > > u32 index_of_sys_page; > > u32 offset; > > > > + if (bfregi->lib_uar_dyn) > > + return -EINVAL; > > + > > bfregs_per_sys_page = get_uars_per_sys_page(dev, bfregi- > > >lib_uar_4k) * > > MLX5_NON_FP_BFREGS_PER_UAR; > > index_of_sys_page = bfregn / bfregs_per_sys_page; > > diff --git a/include/linux/mlx5/driver.h > > b/include/linux/mlx5/driver.h > > index 3f10a9633012..e4ab0eb9d202 100644 > > --- a/include/linux/mlx5/driver.h > > +++ b/include/linux/mlx5/driver.h > > @@ -224,6 +224,7 @@ struct mlx5_bfreg_info { > > struct mutex lock; > > u32 ver; > > bool lib_uar_4k; > > + u8 lib_uar_dyn : 1; > > u32 num_sys_pages; > > u32 num_static_sys_pages > > u32 total_num_bfregs; > > this struct is not used in mlx5_core, shall we move it to mlx5_ib as > part of this patch? > so next time you need to update it you don't need to bother netdev busy > people about it ;-) Thanks, completely agree. I'll do it now.
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c index eafedc2f697b..146ba2966744 100644 --- a/drivers/infiniband/hw/mlx5/cq.c +++ b/drivers/infiniband/hw/mlx5/cq.c @@ -764,10 +764,14 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata, MLX5_SET(cqc, cqc, log_page_size, page_shift - MLX5_ADAPTER_PAGE_SHIFT); - if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) + if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX) { *index = ucmd.uar_page_index; - else + } else if (context->bfregi.lib_uar_dyn) { + err = -EINVAL; + goto err_cqb; + } else { *index = context->bfregi.sys_pages[0]; + } if (ucmd.cqe_comp_en == 1) { int mini_cqe_format; diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index e8787af2d74d..e355e06bf3ac 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1787,6 +1787,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx, max_cqe_version); u32 dump_fill_mkey; bool lib_uar_4k; + bool lib_uar_dyn; if (!dev->ib_active) return -EAGAIN; @@ -1845,8 +1846,14 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx, } lib_uar_4k = req.lib_caps & MLX5_LIB_CAP_4K_UAR; + lib_uar_dyn = req.lib_caps & MLX5_LIB_CAP_DYN_UAR; bfregi = &context->bfregi; + if (lib_uar_dyn) { + bfregi->lib_uar_dyn = lib_uar_dyn; + goto uar_done; + } + /* updates req->total_num_bfregs */ err = calc_total_bfregs(dev, lib_uar_4k, &req, bfregi); if (err) @@ -1873,6 +1880,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx, if (err) goto out_sys_pages; +uar_done: if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX) { err = mlx5_ib_devx_create(dev, true); if (err < 0) @@ -1894,7 +1902,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx, INIT_LIST_HEAD(&context->db_page_list); mutex_init(&context->db_page_mutex); - resp.tot_bfregs = req.total_num_bfregs; + resp.tot_bfregs = lib_uar_dyn ? 0 : req.total_num_bfregs; resp.num_ports = dev->num_ports; if (offsetofend(typeof(resp), cqe_version) <= udata->outlen) @@ -2142,6 +2150,9 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd, int max_valid_idx = dyn_uar ? bfregi->num_sys_pages : bfregi->num_static_sys_pages; + if (bfregi->lib_uar_dyn) + return -EINVAL; + if (vma->vm_end - vma->vm_start != PAGE_SIZE) return -EINVAL; diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 380ba3321851..319d514a2223 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -697,6 +697,9 @@ static int alloc_bfreg(struct mlx5_ib_dev *dev, { int bfregn = -ENOMEM; + if (bfregi->lib_uar_dyn) + return -EINVAL; + mutex_lock(&bfregi->lock); if (bfregi->ver >= 2) { bfregn = alloc_high_class_bfreg(dev, bfregi); @@ -768,6 +771,9 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev, u32 index_of_sys_page; u32 offset; + if (bfregi->lib_uar_dyn) + return -EINVAL; + bfregs_per_sys_page = get_uars_per_sys_page(dev, bfregi->lib_uar_4k) * MLX5_NON_FP_BFREGS_PER_UAR; index_of_sys_page = bfregn / bfregs_per_sys_page; diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 3f10a9633012..e4ab0eb9d202 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -224,6 +224,7 @@ struct mlx5_bfreg_info { struct mutex lock; u32 ver; bool lib_uar_4k; + u8 lib_uar_dyn : 1; u32 num_sys_pages; u32 num_static_sys_pages; u32 total_num_bfregs; diff --git a/include/uapi/rdma/mlx5-abi.h b/include/uapi/rdma/mlx5-abi.h index a65d60b44829..df1cc3641bda 100644 --- a/include/uapi/rdma/mlx5-abi.h +++ b/include/uapi/rdma/mlx5-abi.h @@ -79,6 +79,7 @@ struct mlx5_ib_alloc_ucontext_req { enum mlx5_lib_caps { MLX5_LIB_CAP_4K_UAR = (__u64)1 << 0, + MLX5_LIB_CAP_DYN_UAR = (__u64)1 << 1, }; enum mlx5_ib_alloc_uctx_v2_flags {