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

!11940 【OLK 5.10】RDMA/hns backport some bugfix from mainline linux 

Merge Pull Request from: @huwentao0417 
 
|commitID|commit message|冲突|
|--|--|--|
|fe51f6254d81|RDMA/hns: Optimize hem allocation performance|否|
|f4ccc0a2a0c5|RDMA/hns: Fix restricted __le16 degrades to integer issue|否|
 
 
Link:https://gitee.com/openeuler/kernel/pulls/11940

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 9bb70673 ad570071

drivers/infiniband/hw/hns/hns_roce_hem.c

+6 −4
Original line number Diff line number Diff line
@@ -1193,11 +1193,13 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev, 


	/* config L1 bt to last bt and link them to corresponding parent */

	for (level = 1; level < hopnum; level++) {

		if (!hem_list_is_bottom_bt(hopnum, level)) {

			cur = hem_list_search_item(&mid_bt[level], offset);

			if (cur) {

				hem_ptrs[level] = cur;

				continue;

			}

		}



		step = hem_list_calc_ba_range(hopnum, level, unit);

		if (step < 1) {

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -1883,8 +1883,8 @@ static int hns_roce_hw_v2_query_counter(struct hns_roce_dev *hr_dev, 


	for (i = 0; i < HNS_ROCE_HW_CNT_TOTAL && i < *num_counters; i++) {

		bd_idx = i / CNT_PER_DESC;

		if (!(desc[bd_idx].flag & HNS_ROCE_CMD_FLAG_NEXT) &&

		    bd_idx != HNS_ROCE_HW_CNT_TOTAL / CNT_PER_DESC)

		if (bd_idx != HNS_ROCE_HW_CNT_TOTAL / CNT_PER_DESC &&

		    !(desc[bd_idx].flag & cpu_to_le16(HNS_ROCE_CMD_FLAG_NEXT)))

			break;



		cnt_data = (__le64 *)&desc[bd_idx].data[0];