Commit 9c9edf68 authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Zheng Zengkai
Browse files

RDMA/hns: Remove redundant DFX file and DFX ops structure 

mainline inclusion
from mainline-for-next
commit 40b4b79c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5TAQ5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=40b4b79c866f

----------------------------------------------------------------------

There is no need to use a dedicated DXF file and DFX structure to manage
the interface of the query queue context.

Link: https://lore.kernel.org/r/20220822104455.2311053-2-liangwenpeng@huawei.com


Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarZhengfeng Luo <luozhengfeng@h-partners.com>
Reviewed-by: default avatarYangyang Li <liyangyang20@huawei.com>
Reviewed-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 85778f7b

drivers/infiniband/hw/hns/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \ 
	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o



ifdef CONFIG_INFINIBAND_HNS_HIP08

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

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

obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v2.o

endif

drivers/infiniband/hw/hns/hns_roce_device.h

+2 −8
Original line number Diff line number Diff line
@@ -849,11 +849,6 @@ struct hns_roce_caps { 
	enum cong_type	cong_type;

};



struct hns_roce_dfx_hw {

	int (*query_cqc_info)(struct hns_roce_dev *hr_dev, u32 cqn,

			      int *buffer);

};



enum hns_roce_device_state {

	HNS_ROCE_DEVICE_STATE_INITED,

	HNS_ROCE_DEVICE_STATE_RST_DOWN,
@@ -899,6 +894,7 @@ struct hns_roce_hw { 
	int (*init_eq)(struct hns_roce_dev *hr_dev);

	void (*cleanup_eq)(struct hns_roce_dev *hr_dev);

	int (*write_srqc)(struct hns_roce_srq *srq, void *mb_buf);

	int (*query_cqc)(struct hns_roce_dev *hr_dev, u32 cqn, void *buffer);

	const struct ib_device_ops *hns_roce_dev_ops;

	const struct ib_device_ops *hns_roce_dev_srq_ops;

};
@@ -960,7 +956,6 @@ struct hns_roce_dev { 
	void			*priv;

	struct workqueue_struct *irq_workq;

	struct work_struct ecc_work;

	const struct hns_roce_dfx_hw *dfx;

	u32 func_num;

	u32 is_vf;

	u32 cong_algo_tmpl_id;
@@ -1223,8 +1218,7 @@ u8 hns_get_gid_index(struct hns_roce_dev *hr_dev, u8 port, int gid_index); 
void hns_roce_handle_device_err(struct hns_roce_dev *hr_dev);

int hns_roce_init(struct hns_roce_dev *hr_dev);

void hns_roce_exit(struct hns_roce_dev *hr_dev);

int hns_roce_fill_res_cq_entry(struct sk_buff *msg,

			       struct ib_cq *ib_cq);

int hns_roce_fill_res_cq_entry(struct sk_buff *msg, struct ib_cq *ib_cq);

struct hns_user_mmap_entry *

hns_roce_user_mmap_entry_insert(struct ib_ucontext *ucontext, u64 address,

				size_t length,

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+30 −5
Original line number Diff line number Diff line
@@ -5801,6 +5801,35 @@ static int hns_roce_v2_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period) 
	return ret;

}



static int hns_roce_v2_query_cqc(struct hns_roce_dev *hr_dev, u32 cqn,

				 void *buffer)

{

	struct hns_roce_v2_cq_context *context;

	struct hns_roce_cmd_mailbox *mailbox;

	int ret;



	mailbox = hns_roce_alloc_cmd_mailbox(hr_dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	context = mailbox->buf;

	ret = hns_roce_cmd_mbox(hr_dev, 0, mailbox->dma,

				HNS_ROCE_CMD_QUERY_CQC, cqn);

	if (ret) {

		ibdev_err(&hr_dev->ib_dev,

			  "failed to process cmd when querying CQ, ret = %d.\n",

			  ret);

		goto err_mailbox;

	}



	memcpy(buffer, context, sizeof(*context));



err_mailbox:

	hns_roce_free_cmd_mailbox(hr_dev, mailbox);



	return ret;

}



static void hns_roce_irq_work_handle(struct work_struct *work)

{

	struct hns_roce_work *irq_work =
@@ -6593,10 +6622,6 @@ static void hns_roce_v2_cleanup_eq_table(struct hns_roce_dev *hr_dev) 
	kfree(eq_table->eq);

}



static const struct hns_roce_dfx_hw hns_roce_dfx_hw_v2 = {

	.query_cqc_info = hns_roce_v2_query_cqc_info,

};



static const struct ib_device_ops hns_roce_v2_dev_ops = {

	.destroy_qp = hns_roce_v2_destroy_qp,

	.modify_cq = hns_roce_v2_modify_cq,
@@ -6637,6 +6662,7 @@ static const struct hns_roce_hw hns_roce_hw_v2 = { 
	.init_eq = hns_roce_v2_init_eq_table,

	.cleanup_eq = hns_roce_v2_cleanup_eq_table,

	.write_srqc = hns_roce_v2_write_srqc,

	.query_cqc = hns_roce_v2_query_cqc,

	.hns_roce_dev_ops = &hns_roce_v2_dev_ops,

	.hns_roce_dev_srq_ops = &hns_roce_v2_dev_srq_ops,

};
@@ -6668,7 +6694,6 @@ static void hns_roce_hw_v2_get_cfg(struct hns_roce_dev *hr_dev, 
	hr_dev->is_vf = id->driver_data;

	hr_dev->dev = &handle->pdev->dev;

	hr_dev->hw = &hns_roce_hw_v2;

	hr_dev->dfx = &hns_roce_dfx_hw_v2;

	hr_dev->sdb_offset = ROCEE_DB_SQ_L_0_REG;

	hr_dev->odb_offset = hr_dev->sdb_offset;

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+0 −3
Original line number Diff line number Diff line
@@ -1455,9 +1455,6 @@ struct hns_roce_sccc_clr_done { 
	__le32 rsv[5];

};



int hns_roce_v2_query_cqc_info(struct hns_roce_dev *hr_dev, u32 cqn,

			       int *buffer);



int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata);



int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_main.c

+5 −1
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ static const struct ib_device_ops hns_roce_dev_ops = { 
	.destroy_ah = hns_roce_destroy_ah,

	.destroy_cq = hns_roce_destroy_cq,

	.disassociate_ucontext = hns_roce_disassociate_ucontext,

	.fill_res_cq_entry = hns_roce_fill_res_cq_entry,

	.get_dma_mr = hns_roce_get_dma_mr,

	.get_link_layer = hns_roce_get_link_layer,

	.get_port_immutable = hns_roce_port_immutable,
@@ -564,6 +563,10 @@ static const struct ib_device_ops hns_roce_dev_xrcd_ops = { 
	INIT_RDMA_OBJ_SIZE(ib_xrcd, hns_roce_xrcd, ibxrcd),

};



static const struct ib_device_ops hns_roce_dev_restrack_ops = {

	.fill_res_cq_entry = hns_roce_fill_res_cq_entry,

};



static int hns_roce_register_device(struct hns_roce_dev *hr_dev)

{

	int ret;
@@ -642,6 +645,7 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev) 


	ib_set_device_ops(ib_dev, hr_dev->hw->hns_roce_dev_ops);

	ib_set_device_ops(ib_dev, &hns_roce_dev_ops);

	ib_set_device_ops(ib_dev, &hns_roce_dev_restrack_ops);

	for (i = 0; i < hr_dev->caps.num_ports; i++) {

		if (!hr_dev->iboe.netdevs[i])

			continue;