Commit 9eae6b30 authored by Jijie Shao's avatar Jijie Shao Committed by Jiantao Xiao
Browse files

net: hns3: fix wrong bw weight of disabled tc issue 

mainline inclusion
from mainline-v6.5-rc2
commit 882481b1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7OL9R
CVE: NA

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



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

In dwrr mode, the default bandwidth weight of disabled tc is set to 0.
If the bandwidth weight is 0, the mode will change to sp.
Therefore, disabled tc default bandwidth weight need changed to 1,
and 0 is returned when query the bandwidth weight of disabled tc.
In addition, driver need stop configure bandwidth weight if tc is disabled.

Fixes: 84844054 ("net: hns3: Add support of TX Scheduler & Shaper to HNS3 driver")
Signed-off-by: default avatarJie Wang <wangjie125@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 635623b4

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

+14 −3
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ static void hclge_tm_info_to_ieee_ets(struct hclge_dev *hdev, 


	for (i = 0; i < HNAE3_MAX_TC; i++) {

		ets->prio_tc[i] = hdev->tm_info.prio_tc[i];

		if (i < hdev->tm_info.num_tc)

			ets->tc_tx_bw[i] = hdev->tm_info.pg_info[0].tc_dwrr[i];

		else

			ets->tc_tx_bw[i] = 0;



		if (hdev->tm_info.tc_info[i].tc_sch_mode ==

		    HCLGE_SCH_MODE_SP)
@@ -123,7 +126,8 @@ static u8 hclge_ets_tc_changed(struct hclge_dev *hdev, struct ieee_ets *ets, 
}



static int hclge_ets_sch_mode_validate(struct hclge_dev *hdev,

				       struct ieee_ets *ets, bool *changed)

				       struct ieee_ets *ets, bool *changed,

				       u8 tc_num)

{

	bool has_ets_tc = false;

	u32 total_ets_bw = 0;
@@ -137,6 +141,13 @@ static int hclge_ets_sch_mode_validate(struct hclge_dev *hdev, 
				*changed = true;

			break;

		case IEEE_8021QAZ_TSA_ETS:

			if (i >= tc_num) {

				dev_err(&hdev->pdev->dev,

					"tc%u is disabled, cannot set ets bw\n",

					i);

				return -EINVAL;

			}



			/* The hardware will switch to sp mode if bandwidth is

			 * 0, so limit ets bandwidth must be greater than 0.

			 */
@@ -176,7 +187,7 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets, 
	if (ret)

		return ret;



	ret = hclge_ets_sch_mode_validate(hdev, ets, changed);

	ret = hclge_ets_sch_mode_validate(hdev, ets, changed, tc_num);

	if (ret)

		return ret;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c

+2 −1
Original line number Diff line number Diff line
@@ -785,6 +785,7 @@ static void hclge_tm_tc_info_init(struct hclge_dev *hdev) 
static void hclge_tm_pg_info_init(struct hclge_dev *hdev)

{

#define BW_PERCENT	100

#define DEFAULT_BW_WEIGHT	1



	u8 i;
@@ -806,7 +807,7 @@ static void hclge_tm_pg_info_init(struct hclge_dev *hdev) 
		for (k = 0; k < hdev->tm_info.num_tc; k++)

			hdev->tm_info.pg_info[i].tc_dwrr[k] = BW_PERCENT;

		for (; k < HNAE3_MAX_TC; k++)

			hdev->tm_info.pg_info[i].tc_dwrr[k] = 0;

			hdev->tm_info.pg_info[i].tc_dwrr[k] = DEFAULT_BW_WEIGHT;

	}

}