From: Suresh Rupanagudi This patch adds below verbs. - bng_re_alloc_pd - bng_re_dealloc_pd Signed-off-by: Suresh Rupanagudi Signed-off-by: Siva Reddy Kallam --- drivers/infiniband/hw/bng_re/bng_dev.c | 3 ++ drivers/infiniband/hw/bng_re/bng_res.c | 38 +++++++++++++++++++++++- drivers/infiniband/hw/bng_re/bng_res.h | 9 ++++++ drivers/infiniband/hw/bng_re/bng_sp.c | 36 ++++++++++++++++++++++ drivers/infiniband/hw/bng_re/bng_sp.h | 11 +++++++ drivers/infiniband/hw/bng_re/bng_verbs.c | 34 +++++++++++++++++++++ drivers/infiniband/hw/bng_re/bng_verbs.h | 8 +++++ 7 files changed, 138 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/bng_re/bng_dev.c b/drivers/infiniband/hw/bng_re/bng_dev.c index 9ce8e1bb420a..b8a50c8cd299 100644 --- a/drivers/infiniband/hw/bng_re/bng_dev.c +++ b/drivers/infiniband/hw/bng_re/bng_dev.c @@ -44,6 +44,9 @@ static const struct ib_device_ops bng_re_dev_ops = { .query_gid = bng_re_query_gid, .add_gid = bng_re_add_gid, .del_gid = bng_re_del_gid, + .alloc_pd = bng_re_alloc_pd, + .dealloc_pd = bng_re_dealloc_pd, + INIT_RDMA_OBJ_SIZE(ib_pd, bng_re_pd, ib_pd), INIT_RDMA_OBJ_SIZE(ib_ucontext, bng_re_ucontext, ib_uctx), }; diff --git a/drivers/infiniband/hw/bng_re/bng_res.c b/drivers/infiniband/hw/bng_re/bng_res.c index a169ed2bb16b..8bf6e8efa182 100644 --- a/drivers/infiniband/hw/bng_re/bng_res.c +++ b/drivers/infiniband/hw/bng_re/bng_res.c @@ -365,8 +365,38 @@ static int bng_res_alloc_dpi_tbl(struct bng_re_res *res, return 0; } +static void bng_res_free_pd_tbl(struct bng_re_pd_tbl *pdt) +{ + kfree(pdt->tbl); + pdt->tbl = NULL; + pdt->max = 0; +} + +static int bng_res_alloc_pd_tbl(struct bng_re_res *res, + struct bng_re_dev_attr *dev_attr) +{ + struct bng_re_pd_tbl *pdt = &res->pd_tbl; + u32 max = dev_attr->max_pd; + u32 bytes; + + max++; /* one extra slot, reserved so it's never allocated */ + bytes = BITS_TO_LONGS(max) * sizeof(unsigned long); + + pdt->tbl = kmalloc(bytes, GFP_KERNEL); + if (!pdt->tbl) + return -ENOMEM; + + pdt->max = max; + memset(pdt->tbl, 0xFF, bytes); /* mark every pd id as available */ + clear_bit(pdt->max - 1, pdt->tbl); /* reserve the last pd id */ + mutex_init(&res->pd_tbl_lock); + + return 0; +} + void bng_res_free_tbls(struct bng_re_res *res) { + bng_res_free_pd_tbl(&res->pd_tbl); bng_res_free_dpi_tbl(&res->dpi_tbl); bng_sp_free_sgid_tbl(&res->sgid_tbl); } @@ -375,10 +405,14 @@ int bng_res_alloc_init_tbls(struct bng_re_res *res) { int rc; - rc = bng_res_alloc_dpi_tbl(res, res->dattr); + rc = bng_res_alloc_pd_tbl(res, res->dattr); if (rc) return rc; + rc = bng_res_alloc_dpi_tbl(res, res->dattr); + if (rc) + goto free_pd_tbl; + rc = bng_sp_alloc_sgid_tbl(&res->sgid_tbl, res->dattr->max_sgid); if (rc) @@ -388,6 +422,8 @@ int bng_res_alloc_init_tbls(struct bng_re_res *res) free_dpi_tbl: bng_res_free_dpi_tbl(&res->dpi_tbl); +free_pd_tbl: + bng_res_free_pd_tbl(&res->pd_tbl); return rc; } diff --git a/drivers/infiniband/hw/bng_re/bng_res.h b/drivers/infiniband/hw/bng_re/bng_res.h index 58a6012998c1..72afe51c6bfa 100644 --- a/drivers/infiniband/hw/bng_re/bng_res.h +++ b/drivers/infiniband/hw/bng_re/bng_res.h @@ -196,6 +196,12 @@ struct bng_re_dpi_tbl { void __iomem *priv_db; }; +/* PD table */ +struct bng_re_pd_tbl { + unsigned long *tbl; + u32 max; +}; + struct bng_re_res { struct pci_dev *pdev; struct bng_re_chip_ctx *cctx; @@ -207,6 +213,9 @@ struct bng_re_res { struct xid_manager *ah_xids; struct bng_re_sgid_tbl sgid_tbl; bool prio; + struct bng_re_pd_tbl pd_tbl; + /* Serialize access to PD table */ + struct mutex pd_tbl_lock; }; #define to_bng_re_res(ptr, member) container_of(ptr, struct bng_re_res, member) diff --git a/drivers/infiniband/hw/bng_re/bng_sp.c b/drivers/infiniband/hw/bng_re/bng_sp.c index 8401d1a7ff28..97768a25c0e4 100644 --- a/drivers/infiniband/hw/bng_re/bng_sp.c +++ b/drivers/infiniband/hw/bng_re/bng_sp.c @@ -335,3 +335,39 @@ int bng_sp_del_sgid(struct bng_re_sgid_tbl *sgid_tbl, u32 index, bool update) return 0; } +/* PD allocation/de-allocation functions from Gerrit */ +int bng_sp_alloc_pd(struct bng_re_res *res, struct bng_sp_pd *pd) +{ + struct bng_re_pd_tbl *pdt = &res->pd_tbl; + u32 bit_num; + + mutex_lock(&res->pd_tbl_lock); + bit_num = find_first_bit(pdt->tbl, pdt->max); + if (bit_num >= pdt->max - 1) { + mutex_unlock(&res->pd_tbl_lock); + return -ENOMEM; + } + + /* Found unused PD - mark it as allocated */ + clear_bit(bit_num, pdt->tbl); + pd->id = bit_num; + + mutex_unlock(&res->pd_tbl_lock); + return 0; +} + +int bng_sp_dealloc_pd(struct bng_re_res *res, + struct bng_re_pd_tbl *pdt, + struct bng_sp_pd *pd) +{ + mutex_lock(&res->pd_tbl_lock); + if (pd->id >= pdt->max - 1 || test_and_set_bit(pd->id, pdt->tbl)) { + dev_warn(&res->pdev->dev, "Freeing an unused PD? pdn = %d\n", + pd->id); + mutex_unlock(&res->pd_tbl_lock); + return -EINVAL; + } + pd->id = pdt->max - 1; + mutex_unlock(&res->pd_tbl_lock); + return 0; +} diff --git a/drivers/infiniband/hw/bng_re/bng_sp.h b/drivers/infiniband/hw/bng_re/bng_sp.h index 05c2749419d8..136703942e1f 100644 --- a/drivers/infiniband/hw/bng_re/bng_sp.h +++ b/drivers/infiniband/hw/bng_re/bng_sp.h @@ -53,6 +53,10 @@ struct bng_re_gid_info { u16 vlan_id; }; +struct bng_sp_pd { + u32 id; +}; + int bng_re_get_dev_attr(struct bng_re_rcfw *rcfw); int bng_sp_alloc_sgid_tbl(struct bng_re_sgid_tbl *sgid_tbl, u16 size); @@ -65,4 +69,11 @@ int bng_sp_add_sgid(struct bng_re_sgid_tbl *sgid_tbl, bool update, u32 *index, bool is_ugid, u32 stats_ctx_id); int bng_sp_del_sgid(struct bng_re_sgid_tbl *sgid_tbl, u32 index, bool update); + +int bng_sp_alloc_pd(struct bng_re_res *res, struct bng_sp_pd *pd); + +int bng_sp_dealloc_pd(struct bng_re_res *res, + struct bng_re_pd_tbl *pdt, + struct bng_sp_pd *pd); + #endif diff --git a/drivers/infiniband/hw/bng_re/bng_verbs.c b/drivers/infiniband/hw/bng_re/bng_verbs.c index 59c7d95830f4..140a972a0316 100644 --- a/drivers/infiniband/hw/bng_re/bng_verbs.c +++ b/drivers/infiniband/hw/bng_re/bng_verbs.c @@ -526,3 +526,37 @@ int bng_re_del_gid(const struct ib_gid_attr *attr, void **context) return rc; } +int bng_re_alloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata) +{ + struct bng_re_pd *pd = container_of(ib_pd, struct bng_re_pd, ib_pd); + struct ib_device *ibdev = ib_pd->device; + struct bng_re_dev *rdev = container_of(ibdev, struct bng_re_dev, ibdev); + int rc; + + pd->rdev = rdev; + + rc = bng_sp_alloc_pd(&rdev->bng_res, &pd->sp_pd); + if (rc) { + ibdev_err(&rdev->ibdev, + "Failed to allocate HW PD\n"); + return -ENOMEM; + } + + return 0; +} + +int bng_re_dealloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata) +{ + struct bng_re_pd *pd = container_of(ib_pd, struct bng_re_pd, ib_pd); + struct bng_re_dev *rdev = pd->rdev; + int rc; + + rc = bng_sp_dealloc_pd(&rdev->bng_res, &rdev->bng_res.pd_tbl, + &pd->sp_pd); + if (rc) { + ibdev_err(&rdev->ibdev, + "Dealloc PD failed: pdid=%u, rc=%d\n", + pd->sp_pd.id, rc); + } + return 0; +} diff --git a/drivers/infiniband/hw/bng_re/bng_verbs.h b/drivers/infiniband/hw/bng_re/bng_verbs.h index eba56cf42672..ea017f70142e 100644 --- a/drivers/infiniband/hw/bng_re/bng_verbs.h +++ b/drivers/infiniband/hw/bng_re/bng_verbs.h @@ -31,6 +31,12 @@ struct bng_re_gid_ctx { u32 refcnt; }; +struct bng_re_pd { + struct ib_pd ib_pd; + struct bng_re_dev *rdev; + struct bng_sp_pd sp_pd; +}; + int bng_re_query_device(struct ib_device *ibdev, struct ib_device_attr *ib_attr, struct ib_udata *udata); int bng_re_modify_device(struct ib_device *ibdev, int device_modify_mask, @@ -56,5 +62,7 @@ int bng_re_query_gid(struct ib_device *ibdev, u32 port_num, int index, union ib_gid *gid); int bng_re_add_gid(const struct ib_gid_attr *attr, void **context); int bng_re_del_gid(const struct ib_gid_attr *attr, void **context); +int bng_re_alloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata); +int bng_re_dealloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata); #endif /* __BNG_RE_VERBS_H__ */ -- 2.43.5