Commit 141f2ce8 authored by Junxian Huang's avatar Junxian Huang Committed by Juan Zhou
Browse files

RDMA/hns: Response dmac to userspace 

mainline inclusion
from mainline-v6.8-rc1
commit d3f4020a213e1cb125eed2363fca372a23f7de7a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I90X3R
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d3f4020a213e1cb125eed2363fca372a23f7de7a



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

While creating AH, dmac is already resolved in kernel. Response dmac
to userspace so that userspace doesn't need to resolve dmac repeatedly.

Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20231207114231.2872104-3-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent a19bcbc3

drivers/infiniband/hw/hns/hns_roce_ah.c

+7 −0
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;
@@ -97,6 +98,12 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
		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]);

include/uapi/rdma/hns-abi.h

+5 −0
Original line number Diff line number Diff line
@@ -125,4 +125,9 @@ struct hns_roce_ib_alloc_pd_resp { 
	__u32 pdn;

};



struct hns_roce_ib_create_ah_resp {

	__u8 dmac[6];

	__u8 reserved[2];

};



#endif /* HNS_ABI_USER_H */