bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: hns3: optimize converting dscp to priority process of hns3_nic_select_queue()

Browse source 
Currently, when function hns3_nic_select_queue() converts dscp to priority,
it calls an indirect callback ae_algo->ops->get_dscp_prio to get priority.

However as function hns3_nic_select_queue() is in fast path, the indirect
call may cause degradation of performance. For optimization, this patch
moves dscp_app_cnt and dscp_prio from struct hclge_tm_info to struct
hnae3_knic_private_info, so they can be used in both hclge and hns3 layers.

Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Guangbin Huang 2022-09-16 10:38:01 +08:00 • committed by Jakub Kicinski
parent 04b6ba1435
commit dfea275e06
7 changed files with 45 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/hisilicon/hns3/hnae3.h
View file

@ -798,6 +798,8 @@ struct hnae3_tc_info {
bool mqprio_active; bool mqprio_active;
}; };
#define HNAE3_MAX_DSCP 64
#define HNAE3_PRIO_ID_INVALID 0xff
struct hnae3_knic_private_info { struct hnae3_knic_private_info {
struct net_device *netdev; /* Set by KNIC client when init instance */ struct net_device *netdev; /* Set by KNIC client when init instance */
u16 rss_size; /* Allocated RSS queues */ u16 rss_size; /* Allocated RSS queues */
@ -809,6 +811,8 @@ struct hnae3_knic_private_info {
struct hnae3_tc_info tc_info; struct hnae3_tc_info tc_info;
u8 tc_map_mode; u8 tc_map_mode;
u8 dscp_app_cnt;
u8 dscp_prio[HNAE3_MAX_DSCP];
u16 num_tqps; /* total number of TQPs in this handle */ u16 num_tqps; /* total number of TQPs in this handle */
struct hnae3_queue **tqp; /* array base of all TQPs in this instance */ struct hnae3_queue **tqp; /* array base of all TQPs in this instance */

13
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View file

@ -2987,22 +2987,19 @@ static u16 hns3_nic_select_queue(struct net_device *netdev,
struct net_device *sb_dev) struct net_device *sb_dev)
{ {
struct hnae3_handle *h = hns3_get_handle(netdev); struct hnae3_handle *h = hns3_get_handle(netdev);
u8 dscp, priority; u8 dscp;
int ret;
if (h->kinfo.tc_map_mode != HNAE3_TC_MAP_MODE_DSCP || if (h->kinfo.tc_map_mode != HNAE3_TC_MAP_MODE_DSCP ||
!h->ae_algo->ops->get_dscp_prio) !h->ae_algo->ops->get_dscp_prio)
goto out; goto out;
dscp = hns3_get_skb_dscp(skb); dscp = hns3_get_skb_dscp(skb);
if (unlikely(dscp == HNS3_INVALID_DSCP)) if (unlikely(dscp >= HNAE3_MAX_DSCP))
goto out; goto out;
ret = h->ae_algo->ops->get_dscp_prio(h, dscp, NULL, &priority); skb->priority = h->kinfo.dscp_prio[dscp];
if (ret) if (skb->priority == HNAE3_PRIO_ID_INVALID)
goto out; skb->priority = 0;
skb->priority = priority;
out: out:
return netdev_pick_tx(netdev, skb, sb_dev); return netdev_pick_tx(netdev, skb, sb_dev);

28
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
View file

@ -368,14 +368,14 @@ static int hclge_ieee_setapp(struct hnae3_handle *h, struct dcb_app *app)
int ret; int ret;
if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP || if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP ||
app->protocol >= HCLGE_MAX_DSCP || app->protocol >= HNAE3_MAX_DSCP ||
app->priority >= HNAE3_MAX_USER_PRIO) app->priority >= HNAE3_MAX_USER_PRIO)
return -EINVAL; return -EINVAL;
dev_info(&hdev->pdev->dev, "setapp dscp=%u priority=%u\n", dev_info(&hdev->pdev->dev, "setapp dscp=%u priority=%u\n",
app->protocol, app->priority); app->protocol, app->priority);
if (app->priority == hdev->tm_info.dscp_prio[app->protocol]) if (app->priority == h->kinfo.dscp_prio[app->protocol])
return 0; return 0;
ret = dcb_ieee_setapp(netdev, app); ret = dcb_ieee_setapp(netdev, app);
@ -384,21 +384,21 @@ static int hclge_ieee_setapp(struct hnae3_handle *h, struct dcb_app *app)
old_app.selector = IEEE_8021QAZ_APP_SEL_DSCP; old_app.selector = IEEE_8021QAZ_APP_SEL_DSCP;
old_app.protocol = app->protocol; old_app.protocol = app->protocol;
old_app.priority = hdev->tm_info.dscp_prio[app->protocol]; old_app.priority = h->kinfo.dscp_prio[app->protocol];
hdev->tm_info.dscp_prio[app->protocol] = app->priority; h->kinfo.dscp_prio[app->protocol] = app->priority;
ret = hclge_dscp_to_tc_map(hdev); ret = hclge_dscp_to_tc_map(hdev);
if (ret) { if (ret) {
dev_err(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"failed to set dscp to tc map, ret = %d\n", ret); "failed to set dscp to tc map, ret = %d\n", ret);
hdev->tm_info.dscp_prio[app->protocol] = old_app.priority; h->kinfo.dscp_prio[app->protocol] = old_app.priority;
(void)dcb_ieee_delapp(netdev, app); (void)dcb_ieee_delapp(netdev, app);
return ret; return ret;
} }
vport->nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_DSCP; vport->nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_DSCP;
if (old_app.priority == HCLGE_PRIO_ID_INVALID) if (old_app.priority == HNAE3_PRIO_ID_INVALID)
hdev->tm_info.dscp_app_cnt++; h->kinfo.dscp_app_cnt++;
else else
ret = dcb_ieee_delapp(netdev, &old_app); ret = dcb_ieee_delapp(netdev, &old_app);
@ -413,9 +413,9 @@ static int hclge_ieee_delapp(struct hnae3_handle *h, struct dcb_app *app)
int ret; int ret;
if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP || if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP ||
app->protocol >= HCLGE_MAX_DSCP || app->protocol >= HNAE3_MAX_DSCP ||
app->priority >= HNAE3_MAX_USER_PRIO || app->priority >= HNAE3_MAX_USER_PRIO ||
app->priority != hdev->tm_info.dscp_prio[app->protocol]) app->priority != h->kinfo.dscp_prio[app->protocol])
return -EINVAL; return -EINVAL;
dev_info(&hdev->pdev->dev, "delapp dscp=%u priority=%u\n", dev_info(&hdev->pdev->dev, "delapp dscp=%u priority=%u\n",
@ -425,20 +425,20 @@ static int hclge_ieee_delapp(struct hnae3_handle *h, struct dcb_app *app)
if (ret) if (ret)
return ret; return ret;
hdev->tm_info.dscp_prio[app->protocol] = HCLGE_PRIO_ID_INVALID; h->kinfo.dscp_prio[app->protocol] = HNAE3_PRIO_ID_INVALID;
ret = hclge_dscp_to_tc_map(hdev); ret = hclge_dscp_to_tc_map(hdev);
if (ret) { if (ret) {
dev_err(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"failed to del dscp to tc map, ret = %d\n", ret); "failed to del dscp to tc map, ret = %d\n", ret);
hdev->tm_info.dscp_prio[app->protocol] = app->priority; h->kinfo.dscp_prio[app->protocol] = app->priority;
(void)dcb_ieee_setapp(netdev, app); (void)dcb_ieee_setapp(netdev, app);
return ret; return ret;
} }
if (hdev->tm_info.dscp_app_cnt) if (h->kinfo.dscp_app_cnt)
hdev->tm_info.dscp_app_cnt--; h->kinfo.dscp_app_cnt--;
if (!hdev->tm_info.dscp_app_cnt) { if (!h->kinfo.dscp_app_cnt) {
vport->nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_PRIO; vport->nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_PRIO;
ret = hclge_up_to_tc_map(hdev); ret = hclge_up_to_tc_map(hdev);
} }

17
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
View file

@ -1158,17 +1158,18 @@ static int hclge_dbg_dump_qos_pri_map(struct hclge_dev *hdev, char *buf,
static int hclge_dbg_dump_qos_dscp_map(struct hclge_dev *hdev, char *buf, static int hclge_dbg_dump_qos_dscp_map(struct hclge_dev *hdev, char *buf,
int len) int len)
{ {
struct hnae3_knic_private_info *kinfo = &hdev->vport[0].nic.kinfo;
struct hclge_desc desc[HCLGE_DSCP_MAP_TC_BD_NUM]; struct hclge_desc desc[HCLGE_DSCP_MAP_TC_BD_NUM];
u8 *req0 = (u8 *)desc[0].data; u8 *req0 = (u8 *)desc[0].data;
u8 *req1 = (u8 *)desc[1].data; u8 *req1 = (u8 *)desc[1].data;
u8 dscp_tc[HCLGE_MAX_DSCP]; u8 dscp_tc[HNAE3_MAX_DSCP];
int pos, ret; int pos, ret;
u8 i, j; u8 i, j;
pos = scnprintf(buf, len, "tc map mode: %s\n", pos = scnprintf(buf, len, "tc map mode: %s\n",
tc_map_mode_str[hdev->vport[0].nic.kinfo.tc_map_mode]); tc_map_mode_str[kinfo->tc_map_mode]);
if (hdev->vport[0].nic.kinfo.tc_map_mode != HNAE3_TC_MAP_MODE_DSCP) if (kinfo->tc_map_mode != HNAE3_TC_MAP_MODE_DSCP)
return 0; return 0;
hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_QOS_MAP, true); hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_QOS_MAP, true);
@ -1184,8 +1185,8 @@ static int hclge_dbg_dump_qos_dscp_map(struct hclge_dev *hdev, char *buf,
pos += scnprintf(buf + pos, len - pos, "\nDSCP PRIO TC\n"); pos += scnprintf(buf + pos, len - pos, "\nDSCP PRIO TC\n");
/* The low 32 dscp setting use bd0, high 32 dscp setting use bd1 */ /* The low 32 dscp setting use bd0, high 32 dscp setting use bd1 */
for (i = 0; i < HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; i++) { for (i = 0; i < HNAE3_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; i++) {
j = i + HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; j = i + HNAE3_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM;
/* Each dscp setting has 4 bits, so each byte saves two dscp /* Each dscp setting has 4 bits, so each byte saves two dscp
* setting * setting
*/ */
@ -1195,12 +1196,12 @@ static int hclge_dbg_dump_qos_dscp_map(struct hclge_dev *hdev, char *buf,
dscp_tc[j] &= HCLGE_DBG_TC_MASK; dscp_tc[j] &= HCLGE_DBG_TC_MASK;
} }
for (i = 0; i < HCLGE_MAX_DSCP; i++) { for (i = 0; i < HNAE3_MAX_DSCP; i++) {
if (hdev->tm_info.dscp_prio[i] == HCLGE_PRIO_ID_INVALID) if (kinfo->dscp_prio[i] == HNAE3_PRIO_ID_INVALID)
continue; continue;
pos += scnprintf(buf + pos, len - pos, " %2u %u %u\n", pos += scnprintf(buf + pos, len - pos, " %2u %u %u\n",
i, hdev->tm_info.dscp_prio[i], dscp_tc[i]); i, kinfo->dscp_prio[i], dscp_tc[i]);
} }
return 0; return 0;

11
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
View file

@ -12981,17 +12981,14 @@ static void hclge_clean_vport_config(struct hnae3_ae_dev *ae_dev, int num_vfs)
static int hclge_get_dscp_prio(struct hnae3_handle *h, u8 dscp, u8 *tc_mode, static int hclge_get_dscp_prio(struct hnae3_handle *h, u8 dscp, u8 *tc_mode,
u8 *priority) u8 *priority)
{ {
struct hclge_vport *vport = hclge_get_vport(h); if (dscp >= HNAE3_MAX_DSCP)
struct hclge_dev *hdev = vport->back;
if (dscp >= HCLGE_MAX_DSCP)
return -EINVAL; return -EINVAL;
if (tc_mode) if (tc_mode)
*tc_mode = vport->nic.kinfo.tc_map_mode; *tc_mode = h->kinfo.tc_map_mode;
if (priority) if (priority)
*priority = hdev->tm_info.dscp_prio[dscp] == HCLGE_PRIO_ID_INVALID ? 0 : *priority = h->kinfo.dscp_prio[dscp] == HNAE3_PRIO_ID_INVALID ? 0 :
hdev->tm_info.dscp_prio[dscp]; h->kinfo.dscp_prio[dscp];
return 0; return 0;
} }

4
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
View file

@ -351,15 +351,11 @@ struct hclge_cfg {
u16 umv_space; u16 umv_space;
}; };
#define HCLGE_MAX_DSCP 64
#define HCLGE_PRIO_ID_INVALID 0xff
struct hclge_tm_info { struct hclge_tm_info {
u8 num_tc; u8 num_tc;
u8 num_pg; /* It must be 1 if vNET-Base schd */ u8 num_pg; /* It must be 1 if vNET-Base schd */
u8 dscp_app_cnt;
u8 pg_dwrr[HCLGE_PG_NUM]; u8 pg_dwrr[HCLGE_PG_NUM];
u8 prio_tc[HNAE3_MAX_USER_PRIO]; u8 prio_tc[HNAE3_MAX_USER_PRIO];
u8 dscp_prio[HCLGE_MAX_DSCP];
struct hclge_pg_info pg_info[HCLGE_PG_NUM]; struct hclge_pg_info pg_info[HCLGE_PG_NUM];
struct hclge_tc_info tc_info[HNAE3_MAX_TC]; struct hclge_tc_info tc_info[HNAE3_MAX_TC];
enum hclge_fc_mode fc_mode; enum hclge_fc_mode fc_mode;

18
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
View file

@ -271,9 +271,9 @@ static void hclge_dscp_to_prio_map_init(struct hclge_dev *hdev)
u8 i; u8 i;
hdev->vport[0].nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_PRIO; hdev->vport[0].nic.kinfo.tc_map_mode = HNAE3_TC_MAP_MODE_PRIO;
hdev->tm_info.dscp_app_cnt = 0; hdev->vport[0].nic.kinfo.dscp_app_cnt = 0;
for (i = 0; i < HCLGE_MAX_DSCP; i++) for (i = 0; i < HNAE3_MAX_DSCP; i++)
hdev->tm_info.dscp_prio[i] = HCLGE_PRIO_ID_INVALID; hdev->vport[0].nic.kinfo.dscp_prio[i] = HNAE3_PRIO_ID_INVALID;
} }
int hclge_dscp_to_tc_map(struct hclge_dev *hdev) int hclge_dscp_to_tc_map(struct hclge_dev *hdev)
@ -288,18 +288,18 @@ int hclge_dscp_to_tc_map(struct hclge_dev *hdev)
hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_QOS_MAP, false); hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_QOS_MAP, false);
/* The low 32 dscp setting use bd0, high 32 dscp setting use bd1 */ /* The low 32 dscp setting use bd0, high 32 dscp setting use bd1 */
for (i = 0; i < HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; i++) { for (i = 0; i < HNAE3_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; i++) {
pri_id = hdev->tm_info.dscp_prio[i]; pri_id = hdev->vport[0].nic.kinfo.dscp_prio[i];
pri_id = pri_id == HCLGE_PRIO_ID_INVALID ? 0 : pri_id; pri_id = pri_id == HNAE3_PRIO_ID_INVALID ? 0 : pri_id;
tc_id = hdev->tm_info.prio_tc[pri_id]; tc_id = hdev->tm_info.prio_tc[pri_id];
/* Each dscp setting has 4 bits, so each byte saves two dscp /* Each dscp setting has 4 bits, so each byte saves two dscp
* setting * setting
*/ */
req0[i >> 1] |= tc_id << HCLGE_DSCP_TC_SHIFT(i); req0[i >> 1] |= tc_id << HCLGE_DSCP_TC_SHIFT(i);
j = i + HCLGE_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM; j = i + HNAE3_MAX_DSCP / HCLGE_DSCP_MAP_TC_BD_NUM;
pri_id = hdev->tm_info.dscp_prio[j]; pri_id = hdev->vport[0].nic.kinfo.dscp_prio[j];
pri_id = pri_id == HCLGE_PRIO_ID_INVALID ? 0 : pri_id; pri_id = pri_id == HNAE3_PRIO_ID_INVALID ? 0 : pri_id;
tc_id = hdev->tm_info.prio_tc[pri_id]; tc_id = hdev->tm_info.prio_tc[pri_id];
req1[i >> 1] |= tc_id << HCLGE_DSCP_TC_SHIFT(i); req1[i >> 1] |= tc_id << HCLGE_DSCP_TC_SHIFT(i);
} }