Unverified Commit bc52626b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2929 RDMA/hns: A set of bugfixes for openEuler 

Merge Pull Request from: @stinft 
 
Upload eight patches to fix six issues.
 Junxian Huang (5):
   RDMA/hns: Fix incorrect congest type configuration
   RDMA/hns: Fix a missing default value for invalid congest type
   RDMA/hns: Cleanup of RoCE Bonding driver
   RDMA/hns: Add a max length of gid table
   RDMA/hns: Response dmac to userspace
 Luoyouming (2):
   RDMA/hns: Fix congestions control algorithm type for UD
   RDMA/hns: Fix a missing validation check for sl
 wenglianfa (1):
   RDMA/hns: Fix simultaneous reset and resource deregistration
bugzilla: 
1、https://gitee.com/openeuler/kernel/issues/I87LFL
2、https://gitee.com/openeuler/kernel/issues/I87LV8
3、https://gitee.com/openeuler/kernel/issues/I8HYSU
4、https://gitee.com/openeuler/kernel/issues/I8HYV0
5、https://gitee.com/openeuler/kernel/issues/I8HZ73
6、https://gitee.com/openeuler/kernel/issues/I8HZ7W

 
 
Link:https://gitee.com/openeuler/kernel/pulls/2929

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 8d0be1f9 5c0a1aea

drivers/infiniband/hw/hns/hns_roce_ah.c

+10 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	struct hns_roce_ah *ah = to_hr_ah(ibah);

	u8 priority = 0;

	u8 tc_mode = 0;

	u32 sl_num;

	int ret;



	if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08 && udata)
@@ -92,6 +93,14 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	else

		ah->av.sl = rdma_ah_get_sl(ah_attr);



	sl_num = min_t(u32, MAX_SERVICE_LEVEL, hr_dev->caps.sl_num - 1);

	if (unlikely(ah->av.sl > sl_num)) {

		ibdev_err_ratelimited(&hr_dev->ib_dev,

			  "failed to set sl, sl (%u) shouldn't be larger than %u.\n",

			  ah->av.sl, sl_num);

		return -EINVAL;

	}



	memcpy(ah->av.dgid, grh->dgid.raw, HNS_ROCE_GID_SIZE);

	memcpy(ah->av.mac, ah_attr->roce.dmac, ETH_ALEN);
@@ -108,6 +117,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	if (udata) {

		resp.priority = ah->av.sl;

		resp.tc_mode = tc_mode;

		memcpy(resp.dmac, ah_attr->roce.dmac, ETH_ALEN);

		ret = ib_copy_to_udata(udata, &resp,

				       min(udata->outlen, sizeof(resp)));

	}

drivers/infiniband/hw/hns/hns_roce_bond.c

+5 −5
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static void hns_roce_set_bond(struct hns_roce_bond_group *bond_grp) 
static void hns_roce_clear_bond(struct hns_roce_bond_group *bond_grp)

{

	u8 main_func_idx = PCI_FUNC(bond_grp->main_hr_dev->pci_dev->devfn);

	struct hns_roce_dev *hr_dev;

	struct hns_roce_dev *hr_dev = NULL;

	struct net_device *net_dev;

	int i, ret;
@@ -676,8 +676,8 @@ static void hns_roce_bond_info_update(struct hns_roce_bond_group *bond_grp, 
			net_dev = bond_grp->bond_func_info[i].net_dev;

			if (net_dev && upper_dev !=

				get_upper_dev_from_ndev(net_dev)) {

				bond_grp->slave_map_diff |= (1 << i);

				bond_grp->slave_map &= ~(1 << i);

				bond_grp->slave_map_diff |= (1U << i);

				bond_grp->slave_map &= ~(1U << i);

			}

		}

		return;
@@ -689,8 +689,8 @@ static void hns_roce_bond_info_update(struct hns_roce_bond_group *bond_grp, 
		if (hr_dev) {

			func_idx = PCI_FUNC(hr_dev->pci_dev->devfn);

			if (!bond_grp->bond_func_info[func_idx].net_dev) {

				bond_grp->slave_map_diff |= (1 << func_idx);

				bond_grp->slave_map |= (1 << func_idx);

				bond_grp->slave_map_diff |= (1U << func_idx);

				bond_grp->slave_map |= (1U << func_idx);

				priv = hr_dev->priv;



				bond_grp->bond_func_info[func_idx].net_dev =

drivers/infiniband/hw/hns/hns_roce_cq.c

+22 −4
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ static void free_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
	if (ret)

		dev_err(dev, "DESTROY_CQ failed (%d) for CQN %06lx\n", ret,

			hr_cq->cqn);

	if (ret == -EBUSY)

		hr_cq->delayed_destroy_flag = true;



	xa_erase(&cq_table->array, hr_cq->cqn);
@@ -193,6 +195,10 @@ static void free_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
		complete(&hr_cq->free);

	wait_for_completion(&hr_cq->free);



	/* this resource will be freed when the driver is uninstalled, so

	 * no memory leak will occur.

	 */

	if (!hr_cq->delayed_destroy_flag)

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

}
@@ -203,6 +209,10 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
	struct hns_roce_buf_attr buf_attr = {};

	int ret;



	hr_cq->mtr_node = kvmalloc(sizeof(*hr_cq->mtr_node), GFP_KERNEL);

	if (!hr_cq->mtr_node)

		return -ENOMEM;



	buf_attr.page_shift = hr_dev->caps.cqe_buf_pg_sz + PAGE_SHIFT;

	buf_attr.region[0].size = hr_cq->cq_depth * hr_cq->cqe_size;

	buf_attr.region[0].hopnum = hr_dev->caps.cqe_hop_num;
@@ -211,15 +221,22 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
	ret = hns_roce_mtr_create(hr_dev, &hr_cq->mtr, &buf_attr,

				  hr_dev->caps.cqe_ba_pg_sz + PAGE_SHIFT,

				  udata, addr);

	if (ret)

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc CQ mtr, ret = %d\n", ret);

		kvfree(hr_cq->mtr_node);

	}



	return ret;

}



static void free_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)

{

	if (hr_cq->delayed_destroy_flag) {

		hns_roce_add_unfree_mtr(hr_cq->mtr_node, hr_dev, &hr_cq->mtr);

	} else {

		hns_roce_mtr_destroy(hr_dev, &hr_cq->mtr);

		kvfree(hr_cq->mtr_node);

	}

}



static int alloc_cq_db(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq,
@@ -270,7 +287,8 @@ static void free_cq_db(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
		uctx = rdma_udata_to_drv_context(udata,

						 struct hns_roce_ucontext,

						 ibucontext);

		hns_roce_db_unmap_user(uctx, &hr_cq->db);

		hns_roce_db_unmap_user(uctx, &hr_cq->db,

				       hr_cq->delayed_destroy_flag);

	} else {

		hns_roce_free_db(hr_dev, &hr_cq->db);

	}

drivers/infiniband/hw/hns/hns_roce_db.c

+24 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt, 
	page = kmalloc(sizeof(*page), GFP_KERNEL);

	if (!page) {

		ret = -ENOMEM;

		goto out;

		goto err_out;

	}



	refcount_set(&page->refcount, 1);
@@ -33,8 +33,12 @@ int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt, 
				 PAGE_SIZE, 0);

	if (IS_ERR(page->umem)) {

		ret = PTR_ERR(page->umem);

		kfree(page);

		goto out;

		goto err_page;

	}

	page->umem_node = kvmalloc(sizeof(*page->umem_node), GFP_KERNEL);

	if (!page->umem_node) {

		ret = -ENOMEM;

		goto err_umem;

	}



	list_add(&page->list, &context->page_list);
@@ -45,22 +49,36 @@ int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt, 
	db->virt_addr = sg_virt(page->umem->sg_head.sgl) + offset;

	db->u.user_page = page;

	refcount_inc(&page->refcount);

	mutex_unlock(&context->page_mutex);

	return 0;



out:

err_umem:

	ib_umem_release(page->umem);

err_page:

	kvfree(page);

err_out:

	mutex_unlock(&context->page_mutex);



	return ret;

}



void hns_roce_db_unmap_user(struct hns_roce_ucontext *context,

			    struct hns_roce_db *db)

			    struct hns_roce_db *db,

			    bool delayed_unmap_flag)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(context->ibucontext.device);



	mutex_lock(&context->page_mutex);



	refcount_dec(&db->u.user_page->refcount);

	if (refcount_dec_if_one(&db->u.user_page->refcount)) {

		list_del(&db->u.user_page->list);

		if (delayed_unmap_flag) {

			hns_roce_add_unfree_umem(db->u.user_page, hr_dev);

		} else {

			ib_umem_release(db->u.user_page->umem);

			kvfree(db->u.user_page->umem_node);

		}

		kfree(db->u.user_page);

	}

drivers/infiniband/hw/hns/hns_roce_device.h

+33 −1
Original line number Diff line number Diff line
@@ -409,6 +409,8 @@ struct hns_roce_mr { 
	struct hns_roce_mtr	pbl_mtr;

	u32			npages;

	dma_addr_t		*page_list;

	bool			delayed_destroy_flag;

	struct hns_roce_mtr_node *mtr_node;

};



struct hns_roce_mr_table {
@@ -475,11 +477,17 @@ struct hns_roce_db_pgdir { 
	dma_addr_t		db_dma;

};



struct hns_roce_umem_node {

	struct ib_umem *umem;

	struct list_head list;

};



struct hns_roce_user_db_page {

	struct list_head	list;

	struct ib_umem		*umem;

	unsigned long		user_virt;

	refcount_t		refcount;

	struct hns_roce_umem_node *umem_node;

};



struct hns_roce_db {
@@ -531,7 +539,9 @@ struct hns_roce_cq { 
	int				is_armed; /* cq is armed */

	struct list_head		node; /* all armed cqs are on a list */

	u8				poe_channel;

	bool				delayed_destroy_flag;

	struct hns_roce_notify_conf	write_notify;

	struct hns_roce_mtr_node *mtr_node;

};



struct hns_roce_idx_que {
@@ -540,6 +550,7 @@ struct hns_roce_idx_que { 
	unsigned long			*bitmap;

	u32				head;

	u32				tail;

	struct hns_roce_mtr_node *mtr_node;

};



struct hns_roce_srq {
@@ -565,6 +576,8 @@ struct hns_roce_srq { 
	void (*event)(struct hns_roce_srq *srq, enum hns_roce_event event);

	struct hns_roce_db	rdb;

	u32			cap_flags;

	bool			delayed_destroy_flag;

	struct hns_roce_mtr_node *mtr_node;

};



struct hns_roce_uar_table {
@@ -740,6 +753,8 @@ struct hns_roce_qp { 
	u32			config;

	u8			tc_mode;

	u8			priority;

	bool			delayed_destroy_flag;

	struct hns_roce_mtr_node *mtr_node;

};



struct hns_roce_ib_iboe {
@@ -1100,6 +1115,11 @@ struct hns_roce_port { 
	struct hns_roce_scc_param *scc_param;

};



struct hns_roce_mtr_node {

	struct hns_roce_mtr mtr;

	struct list_head list;

};



struct hns_roce_dev {

	struct ib_device	ib_dev;

	struct pci_dev		*pci_dev;
@@ -1183,6 +1203,10 @@ struct hns_roce_dev { 


	struct rdma_notify_mem *notify_tbl;

	size_t notify_num;

	struct list_head mtr_unfree_list; /* list of unfree mtr on this dev */

	spinlock_t mtr_unfree_list_lock; /* protect mtr_unfree_list */

	struct list_head umem_unfree_list; /* list of unfree umem on this dev */

	spinlock_t umem_unfree_list_lock; /* protect umem_unfree_list */

};



static inline struct hns_roce_dev *to_hr_dev(struct ib_device *ib_dev)
@@ -1464,7 +1488,8 @@ int hns_roce_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata); 
int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,

			 struct hns_roce_db *db);

void hns_roce_db_unmap_user(struct hns_roce_ucontext *context,

			    struct hns_roce_db *db);

			    struct hns_roce_db *db,

			    bool delayed_unmap_flag);

int hns_roce_alloc_db(struct hns_roce_dev *hr_dev, struct hns_roce_db *db,

		      int order);

void hns_roce_free_db(struct hns_roce_dev *hr_dev, struct hns_roce_db *db);
@@ -1484,6 +1509,13 @@ int hns_roce_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ib_qp); 
int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp);

int hns_roce_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);

int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr);

void hns_roce_add_unfree_umem(struct hns_roce_user_db_page *user_page,

			      struct hns_roce_dev *hr_dev);

void hns_roce_free_unfree_umem(struct hns_roce_dev *hr_dev);

void hns_roce_add_unfree_mtr(struct hns_roce_mtr_node *pos,

			     struct hns_roce_dev *hr_dev,

			     struct hns_roce_mtr *mtr);

void hns_roce_free_unfree_mtr(struct hns_roce_dev *hr_dev);

struct hns_user_mmap_entry *

hns_roce_user_mmap_entry_insert(struct ib_ucontext *ucontext, u64 address,

				size_t length,