Commit 644f55e6 authored by Jijie Shao's avatar Jijie Shao Committed by Jiantao Xiao
Browse files

net: hns3: fix delete tc fail issue 

mainline inclusion
from mainline-v6.9-rc1
commit 03f92287b251de318f3b93f5c1e0cb6ccc87b011
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I98TUP
CVE: NA

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



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

When the tc is removed during reset, hns3 driver will return a errcode.
But kernel ignores this errcode, As a result,
the driver status is inconsistent with the kernel status.

This patch retains the deletion status when the deletion fails
and continues to delete after the reset to ensure that
the status of the driver is consistent with that of kernel.

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 1f5ac3ff

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ struct hnae3_tc_info { 
	u8 max_tc; /* Total number of TCs */

	u8 num_tc; /* Total number of enabled TCs */

	bool mqprio_active;

	bool mqprio_destroy;

	bool dcb_ets_active;

};

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

+2 −0
Original line number Diff line number Diff line
@@ -619,6 +619,8 @@ static int hclge_setup_tc(struct hnae3_handle *h, 
		return ret;

	}



	kinfo->tc_info.mqprio_destroy = !tc;



	ret = hclge_notify_down_uinit(hdev);

	if (ret)

		return ret;

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

+2 −0
Original line number Diff line number Diff line
@@ -12124,6 +12124,8 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev) 
		return ret;

	}



	hclge_reset_tc_config(hdev);



	ret = hclge_tm_init_hw(hdev, true);

	if (ret) {

		dev_err(&pdev->dev, "tm init hw fail, ret =%d\n", ret);

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

+16 −0
Original line number Diff line number Diff line
@@ -2144,3 +2144,19 @@ int hclge_tm_flush_cfg(struct hclge_dev *hdev, bool enable) 


	return ret;

}



void hclge_reset_tc_config(struct hclge_dev *hdev)

{

	struct hclge_vport *vport = &hdev->vport[0];

	struct hnae3_knic_private_info *kinfo;



	kinfo = &vport->nic.kinfo;



	if (!kinfo->tc_info.mqprio_destroy)

		return;



	/* clear tc info, including mqprio_destroy and mqprio_active */

	memset(&kinfo->tc_info, 0, sizeof(kinfo->tc_info));

	hclge_tm_schd_info_update(hdev, 0);

	hclge_comm_rss_indir_init_cfg(hdev->ae_dev, &hdev->rss_cfg);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -279,4 +279,5 @@ int hclge_tm_get_port_shaper(struct hclge_dev *hdev, 
int hclge_up_to_tc_map(struct hclge_dev *hdev);

int hclge_dscp_to_tc_map(struct hclge_dev *hdev);

int hclge_tm_flush_cfg(struct hclge_dev *hdev, bool enable);

void hclge_reset_tc_config(struct hclge_dev *hdev);

#endif