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

!4463 RDMA/hns: Backport bugfix 

Merge Pull Request from: @stinft 
 
Chengchang Tang (3):
   RDMA/hns: Rename the interrupts
   RDMA/hns: Remove unnecessary checks for NULL in mtr_alloc_bufs()
   RDMA/hns: Fix memory leak in free_mr_init()
Junxian Huang (5):
   RDMA/hns: Fix inappropriate err code for unsupported operations
   RDMA/hns: Add debugfs to hns RoCE
   RDMA/hns: Support SW stats with debugfs
   RDMA/hns: Response dmac to userspace
   RDMA/hns: Add a max length of gid table

https://gitee.com/openeuler/kernel/issues/I90X3R 
 
Link:https://gitee.com/openeuler/kernel/pulls/4463

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 98f33cd8 3cbb7be5

drivers/infiniband/hw/hns/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 


hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \

	hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o \

	hns_roce_debugfs.o



ifdef CONFIG_INFINIBAND_HNS_HIP08

hns-roce-hw-v2-objs := hns_roce_hw_v2.o $(hns-roce-objs)

drivers/infiniband/hw/hns/hns_roce_ah.c

+12 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;

	const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);

	struct hns_roce_dev *hr_dev = to_hr_dev(ibah->device);

	struct hns_roce_ib_create_ah_resp resp = {};

	struct hns_roce_ah *ah = to_hr_ah(ibah);

	int ret = 0;

	u32 max_sl;
@@ -92,11 +93,21 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
		ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,

					      &ah->av.vlan_id, NULL);

		if (ret)

			return ret;

			goto err_out;



		ah->av.vlan_en = ah->av.vlan_id < VLAN_N_VID;

	}



	if (udata) {

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

		ret = ib_copy_to_udata(udata, &resp,

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

	}



err_out:

	if (ret)

		atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_AH_CREATE_ERR_CNT]);



	return ret;

}

drivers/infiniband/hw/hns/hns_roce_cmd.c

+17 −2
Original line number Diff line number Diff line
@@ -41,7 +41,15 @@ 
static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev,

				     struct hns_roce_mbox_msg *mbox_msg)

{

	return hr_dev->hw->post_mbox(hr_dev, mbox_msg);

	int ret;



	ret = hr_dev->hw->post_mbox(hr_dev, mbox_msg);

	if (ret)

		return ret;



	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_POSTED_CNT]);



	return 0;

}



/* this should be called with "poll_sem" */
@@ -58,7 +66,13 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, 
		return ret;

	}



	return hr_dev->hw->poll_mbox_done(hr_dev);

	ret = hr_dev->hw->poll_mbox_done(hr_dev);

	if (ret)

		return ret;



	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_POLLED_CNT]);



	return 0;

}



static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev,
@@ -89,6 +103,7 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, 
	context->result = (status == HNS_ROCE_CMD_SUCCESS) ? 0 : (-EIO);

	context->out_param = out_param;

	complete(&context->done);

	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_EVENT_CNT]);

}



static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_cq.c

+11 −6
Original line number Diff line number Diff line
@@ -363,29 +363,31 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	struct hns_roce_ib_create_cq ucmd = {};

	int ret;



	if (attr->flags)

		return -EOPNOTSUPP;

	if (attr->flags) {

		ret = -EOPNOTSUPP;

		goto err_out;

	}



	ret = verify_cq_create_attr(hr_dev, attr);

	if (ret)

		return ret;

		goto err_out;



	if (udata) {

		ret = get_cq_ucmd(hr_cq, udata, &ucmd);

		if (ret)

			return ret;

			goto err_out;

	}



	set_cq_param(hr_cq, attr->cqe, attr->comp_vector, &ucmd);



	ret = set_cqe_size(hr_cq, udata, &ucmd);

	if (ret)

		return ret;

		goto err_out;



	ret = alloc_cq_buf(hr_dev, hr_cq, udata, ucmd.buf_addr);

	if (ret) {

		ibdev_err(ibdev, "failed to alloc CQ buf, ret = %d.\n", ret);

		return ret;

		goto err_out;

	}



	ret = alloc_cq_db(hr_dev, hr_cq, udata, ucmd.db_addr, &resp);
@@ -430,6 +432,9 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	free_cq_db(hr_dev, hr_cq, udata);

err_cq_buf:

	free_cq_buf(hr_dev, hr_cq);

err_out:

	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_CQ_CREATE_ERR_CNT]);



	return ret;

}

drivers/infiniband/hw/hns/hns_roce_debugfs.c

0 → 100644
+110 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (c) 2023 Hisilicon Limited.

 */



#include <linux/debugfs.h>

#include <linux/device.h>



#include "hns_roce_device.h"



static struct dentry *hns_roce_dbgfs_root;



static int hns_debugfs_seqfile_open(struct inode *inode, struct file *f)

{

	struct hns_debugfs_seqfile *seqfile = inode->i_private;



	return single_open(f, seqfile->read, seqfile->data);

}



static const struct file_operations hns_debugfs_seqfile_fops = {

	.owner = THIS_MODULE,

	.open = hns_debugfs_seqfile_open,

	.release = single_release,

	.read = seq_read,

	.llseek = seq_lseek

};



static void init_debugfs_seqfile(struct hns_debugfs_seqfile *seq,

				 const char *name, struct dentry *parent,

				 int (*read_fn)(struct seq_file *, void *),

				 void *data)

{

	debugfs_create_file(name, 0400, parent, seq, &hns_debugfs_seqfile_fops);



	seq->read = read_fn;

	seq->data = data;

}



static const char * const sw_stat_info[] = {

	[HNS_ROCE_DFX_AEQE_CNT] = "aeqe",

	[HNS_ROCE_DFX_CEQE_CNT] = "ceqe",

	[HNS_ROCE_DFX_CMDS_CNT] = "cmds",

	[HNS_ROCE_DFX_CMDS_ERR_CNT] = "cmds_err",

	[HNS_ROCE_DFX_MBX_POSTED_CNT] = "posted_mbx",

	[HNS_ROCE_DFX_MBX_POLLED_CNT] = "polled_mbx",

	[HNS_ROCE_DFX_MBX_EVENT_CNT] = "mbx_event",

	[HNS_ROCE_DFX_QP_CREATE_ERR_CNT] = "qp_create_err",

	[HNS_ROCE_DFX_QP_MODIFY_ERR_CNT] = "qp_modify_err",

	[HNS_ROCE_DFX_CQ_CREATE_ERR_CNT] = "cq_create_err",

	[HNS_ROCE_DFX_CQ_MODIFY_ERR_CNT] = "cq_modify_err",

	[HNS_ROCE_DFX_SRQ_CREATE_ERR_CNT] = "srq_create_err",

	[HNS_ROCE_DFX_SRQ_MODIFY_ERR_CNT] = "srq_modify_err",

	[HNS_ROCE_DFX_XRCD_ALLOC_ERR_CNT] = "xrcd_alloc_err",

	[HNS_ROCE_DFX_MR_REG_ERR_CNT] = "mr_reg_err",

	[HNS_ROCE_DFX_MR_REREG_ERR_CNT] = "mr_rereg_err",

	[HNS_ROCE_DFX_AH_CREATE_ERR_CNT] = "ah_create_err",

	[HNS_ROCE_DFX_MMAP_ERR_CNT] = "mmap_err",

	[HNS_ROCE_DFX_UCTX_ALLOC_ERR_CNT] = "uctx_alloc_err",

};



static int sw_stat_debugfs_show(struct seq_file *file, void *offset)

{

	struct hns_roce_dev *hr_dev = file->private;

	int i;



	for (i = 0; i < HNS_ROCE_DFX_CNT_TOTAL; i++)

		seq_printf(file, "%-20s --- %lld\n", sw_stat_info[i],

			   atomic64_read(&hr_dev->dfx_cnt[i]));



	return 0;

}



static void create_sw_stat_debugfs(struct hns_roce_dev *hr_dev,

				   struct dentry *parent)

{

	struct hns_sw_stat_debugfs *dbgfs = &hr_dev->dbgfs.sw_stat_root;



	dbgfs->root = debugfs_create_dir("sw_stat", parent);



	init_debugfs_seqfile(&dbgfs->sw_stat, "sw_stat", dbgfs->root,

			     sw_stat_debugfs_show, hr_dev);

}



/* debugfs for device */

void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev)

{

	struct hns_roce_dev_debugfs *dbgfs = &hr_dev->dbgfs;



	dbgfs->root = debugfs_create_dir(dev_name(&hr_dev->ib_dev.dev),

					 hns_roce_dbgfs_root);



	create_sw_stat_debugfs(hr_dev, dbgfs->root);

}



void hns_roce_unregister_debugfs(struct hns_roce_dev *hr_dev)

{

	debugfs_remove_recursive(hr_dev->dbgfs.root);

}



/* debugfs for hns module */

void hns_roce_init_debugfs(void)

{

	hns_roce_dbgfs_root = debugfs_create_dir("hns_roce", NULL);

}



void hns_roce_cleanup_debugfs(void)

{

	debugfs_remove_recursive(hns_roce_dbgfs_root);

	hns_roce_dbgfs_root = NULL;

}