Commit 5b6eb54f authored by Wei Hu(Xavier)'s avatar Wei Hu(Xavier) Committed by Jason Gunthorpe

RDMA/hns: Modify uar allocation algorithm to avoid bitmap exhaust

This patch modified uar allocation algorithm in hns_roce_uar_alloc
function to avoid bitmap exhaust.
Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent c62091bc
...@@ -214,6 +214,7 @@ enum { ...@@ -214,6 +214,7 @@ enum {
struct hns_roce_uar { struct hns_roce_uar {
u64 pfn; u64 pfn;
unsigned long index; unsigned long index;
unsigned long logic_idx;
}; };
struct hns_roce_ucontext { struct hns_roce_ucontext {
......
...@@ -107,13 +107,15 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) ...@@ -107,13 +107,15 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar)
int ret = 0; int ret = 0;
/* Using bitmap to manager UAR index */ /* Using bitmap to manager UAR index */
ret = hns_roce_bitmap_alloc(&hr_dev->uar_table.bitmap, &uar->index); ret = hns_roce_bitmap_alloc(&hr_dev->uar_table.bitmap, &uar->logic_idx);
if (ret == -1) if (ret == -1)
return -ENOMEM; return -ENOMEM;
if (uar->index > 0) if (uar->logic_idx > 0 && hr_dev->caps.phy_num_uars > 1)
uar->index = (uar->index - 1) % uar->index = (uar->logic_idx - 1) %
(hr_dev->caps.phy_num_uars - 1) + 1; (hr_dev->caps.phy_num_uars - 1) + 1;
else
uar->index = 0;
if (!dev_is_pci(hr_dev->dev)) { if (!dev_is_pci(hr_dev->dev)) {
res = platform_get_resource(hr_dev->pdev, IORESOURCE_MEM, 0); res = platform_get_resource(hr_dev->pdev, IORESOURCE_MEM, 0);
...@@ -132,7 +134,7 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) ...@@ -132,7 +134,7 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar)
void hns_roce_uar_free(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) void hns_roce_uar_free(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar)
{ {
hns_roce_bitmap_free(&hr_dev->uar_table.bitmap, uar->index, hns_roce_bitmap_free(&hr_dev->uar_table.bitmap, uar->logic_idx,
BITMAP_NO_RR); BITMAP_NO_RR);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment