Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6ff78a authored by Wei Hu (Xavier)'s avatar Wei Hu (Xavier) Committed by Doug Ledford
Browse files

IB/hns: Change qpn allocation to round-robin mode. 



When using CM to establish connections, qp number that was freed
just now will be rejected by ib core. To fix these problem, We
change qpn allocation to round-robin mode. We added the round-robin
mode for allocating resources using bitmap. We use round-robin mode
for qp number and non round-robing mode for other resources like
cq number, pd number etc.

Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent dd783a21

drivers/infiniband/hw/hns/hns_roce_alloc.c

+7 −4
Original line number Diff line number Diff line
@@ -61,9 +61,10 @@ int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj) 
	return ret;

}



void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj)

void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj,

			  int rr)

{

	hns_roce_bitmap_free_range(bitmap, obj, 1);

	hns_roce_bitmap_free_range(bitmap, obj, 1, rr);

}



int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt,
@@ -106,7 +107,8 @@ int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt, 
}



void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap,

				unsigned long obj, int cnt)

				unsigned long obj, int cnt,

				int rr)

{

	int i;
@@ -116,6 +118,7 @@ void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap, 
	for (i = 0; i < cnt; i++)

		clear_bit(obj + i, bitmap->table);



	if (!rr)

		bitmap->last = min(bitmap->last, obj);

	bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)

		       & bitmap->mask;

drivers/infiniband/hw/hns/hns_roce_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int hns_roce_cq_alloc(struct hns_roce_dev *hr_dev, int nent, 
	hns_roce_table_put(hr_dev, &cq_table->table, hr_cq->cqn);



err_out:

	hns_roce_bitmap_free(&cq_table->bitmap, hr_cq->cqn);

	hns_roce_bitmap_free(&cq_table->bitmap, hr_cq->cqn, BITMAP_NO_RR);

	return ret;

}
@@ -204,7 +204,7 @@ static void hns_roce_free_cq(struct hns_roce_dev *hr_dev, 
	spin_unlock_irq(&cq_table->lock);



	hns_roce_table_put(hr_dev, &cq_table->table, hr_cq->cqn);

	hns_roce_bitmap_free(&cq_table->bitmap, hr_cq->cqn);

	hns_roce_bitmap_free(&cq_table->bitmap, hr_cq->cqn, BITMAP_NO_RR);

}



static int hns_roce_ib_get_cq_umem(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_device.h

+7 −2
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ 
#define HNS_ROCE_MAX_GID_NUM			16

#define HNS_ROCE_GID_SIZE			16



#define BITMAP_NO_RR				0

#define BITMAP_RR				1



#define MR_TYPE_MR				0x00

#define MR_TYPE_DMA				0x03
@@ -661,7 +664,8 @@ void hns_roce_cleanup_cq_table(struct hns_roce_dev *hr_dev); 
void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev);



int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj);

void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj);

void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj,

			 int rr);

int hns_roce_bitmap_init(struct hns_roce_bitmap *bitmap, u32 num, u32 mask,

			 u32 reserved_bot, u32 resetrved_top);

void hns_roce_bitmap_cleanup(struct hns_roce_bitmap *bitmap);
@@ -669,7 +673,8 @@ void hns_roce_cleanup_bitmap(struct hns_roce_dev *hr_dev); 
int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt,

				int align, unsigned long *obj);

void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap,

				unsigned long obj, int cnt);

				unsigned long obj, int cnt,

				int rr);



struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);

int hns_roce_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);

drivers/infiniband/hw/hns/hns_roce_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static void hns_roce_mr_free(struct hns_roce_dev *hr_dev, 
	}



	hns_roce_bitmap_free(&hr_dev->mr_table.mtpt_bitmap,

			     key_to_hw_index(mr->key));

			     key_to_hw_index(mr->key), BITMAP_NO_RR);

}



static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_pd.c

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int hns_roce_pd_alloc(struct hns_roce_dev *hr_dev, unsigned long *pdn) 


static void hns_roce_pd_free(struct hns_roce_dev *hr_dev, unsigned long pdn)

{

	hns_roce_bitmap_free(&hr_dev->pd_bitmap, pdn);

	hns_roce_bitmap_free(&hr_dev->pd_bitmap, pdn, BITMAP_NO_RR);

}



int hns_roce_init_pd_table(struct hns_roce_dev *hr_dev)
@@ -121,7 +121,8 @@ 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)

{

	hns_roce_bitmap_free(&hr_dev->uar_table.bitmap, uar->index);

	hns_roce_bitmap_free(&hr_dev->uar_table.bitmap, uar->index,

			     BITMAP_NO_RR);

}



int hns_roce_init_uar_table(struct hns_roce_dev *hr_dev)