openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

octeontx2-pf: Use NL_SET_ERR_MSG_MOD for TC 

This patch modifies all netdev_err messages in
tc code to NL_SET_ERR_MSG_MOD. NL_SET_ERR_MSG_MOD
does not support format specifiers yet hence
netdev_err messages with only strings are modified.

Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Subbaraya Sundeep 2021-06-15 17:04:30 +05:30 committed by David S. Miller
parent 2ca89a2c37
commit 5d2fdd86d5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
View File

@ -223,15 +223,17 @@ static int otx2_tc_egress_matchall_delete(struct otx2_nic *nic,
static int otx2_tc_parse_actions(struct otx2_nic *nic, static int otx2_tc_parse_actions(struct otx2_nic *nic,
struct flow_action *flow_action, struct flow_action *flow_action,
struct npc_install_flow_req *req) struct npc_install_flow_req *req,
struct flow_cls_offload *f)
{ {
struct netlink_ext_ack *extack = f->common.extack;
struct flow_action_entry *act; struct flow_action_entry *act;
struct net_device *target; struct net_device *target;
struct otx2_nic *priv; struct otx2_nic *priv;
int i; int i;
if (!flow_action_has_entries(flow_action)) { if (!flow_action_has_entries(flow_action)) {
netdev_info(nic->netdev, "no tc actions specified"); NL_SET_ERR_MSG_MOD(extack, "no tc actions specified");
return -EINVAL; return -EINVAL;
} }
@ -248,8 +250,8 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic,
priv = netdev_priv(target); priv = netdev_priv(target);
/* npc_install_flow_req doesn't support passing a target pcifunc */ /* npc_install_flow_req doesn't support passing a target pcifunc */
if (rvu_get_pf(nic->pcifunc) != rvu_get_pf(priv->pcifunc)) { if (rvu_get_pf(nic->pcifunc) != rvu_get_pf(priv->pcifunc)) {
netdev_info(nic->netdev, NL_SET_ERR_MSG_MOD(extack,
"can't redirect to other pf/vf\n"); "can't redirect to other pf/vf");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
req->vf = priv->pcifunc & RVU_PFVF_FUNC_MASK; req->vf = priv->pcifunc & RVU_PFVF_FUNC_MASK;
@ -272,6 +274,7 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
struct flow_cls_offload *f, struct flow_cls_offload *f,
struct npc_install_flow_req *req) struct npc_install_flow_req *req)
{ {
struct netlink_ext_ack *extack = f->common.extack;
struct flow_msg *flow_spec = &req->packet; struct flow_msg *flow_spec = &req->packet;
struct flow_msg *flow_mask = &req->mask; struct flow_msg *flow_mask = &req->mask;
struct flow_dissector *dissector; struct flow_dissector *dissector;
@ -336,7 +339,7 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
flow_rule_match_eth_addrs(rule, &match); flow_rule_match_eth_addrs(rule, &match);
if (!is_zero_ether_addr(match.mask->src)) { if (!is_zero_ether_addr(match.mask->src)) {
netdev_err(nic->netdev, "src mac match not supported\n"); NL_SET_ERR_MSG_MOD(extack, "src mac match not supported");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -354,11 +357,11 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
flow_rule_match_ip(rule, &match); flow_rule_match_ip(rule, &match);
if ((ntohs(flow_spec->etype) != ETH_P_IP) && if ((ntohs(flow_spec->etype) != ETH_P_IP) &&
match.mask->tos) { match.mask->tos) {
netdev_err(nic->netdev, "tos not supported\n"); NL_SET_ERR_MSG_MOD(extack, "tos not supported");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (match.mask->ttl) { if (match.mask->ttl) {
netdev_err(nic->netdev, "ttl not supported\n"); NL_SET_ERR_MSG_MOD(extack, "ttl not supported");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
flow_spec->tos = match.key->tos; flow_spec->tos = match.key->tos;
@ -414,8 +417,8 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
if (ipv6_addr_loopback(&match.key->dst) || if (ipv6_addr_loopback(&match.key->dst) ||
ipv6_addr_loopback(&match.key->src)) { ipv6_addr_loopback(&match.key->src)) {
netdev_err(nic->netdev, NL_SET_ERR_MSG_MOD(extack,
"Flow matching on IPv6 loopback addr is not supported\n"); "Flow matching IPv6 loopback addr not supported");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -464,7 +467,7 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
req->features |= BIT_ULL(NPC_SPORT_SCTP); req->features |= BIT_ULL(NPC_SPORT_SCTP);
} }
return otx2_tc_parse_actions(nic, &rule->action, req); return otx2_tc_parse_actions(nic, &rule->action, req, f);
} }
static int otx2_del_mcam_flow_entry(struct otx2_nic *nic, u16 entry) static int otx2_del_mcam_flow_entry(struct otx2_nic *nic, u16 entry)
@ -525,6 +528,7 @@ static int otx2_tc_del_flow(struct otx2_nic *nic,
static int otx2_tc_add_flow(struct otx2_nic *nic, static int otx2_tc_add_flow(struct otx2_nic *nic,
struct flow_cls_offload *tc_flow_cmd) struct flow_cls_offload *tc_flow_cmd)
{ {
struct netlink_ext_ack *extack = tc_flow_cmd->common.extack;
struct otx2_tc_info *tc_info = &nic->tc_info; struct otx2_tc_info *tc_info = &nic->tc_info;
struct otx2_tc_flow *new_node, *old_node; struct otx2_tc_flow *new_node, *old_node;
struct npc_install_flow_req *req; struct npc_install_flow_req *req;
@ -562,7 +566,8 @@ static int otx2_tc_add_flow(struct otx2_nic *nic,
otx2_tc_del_flow(nic, tc_flow_cmd); otx2_tc_del_flow(nic, tc_flow_cmd);
if (bitmap_full(tc_info->tc_entries_bitmap, nic->flow_cfg->tc_max_flows)) { if (bitmap_full(tc_info->tc_entries_bitmap, nic->flow_cfg->tc_max_flows)) {
netdev_err(nic->netdev, "Not enough MCAM space to add the flow\n"); NL_SET_ERR_MSG_MOD(extack,
"Not enough MCAM space to add the flow");
otx2_mbox_reset(&nic->mbox.mbox, 0); otx2_mbox_reset(&nic->mbox.mbox, 0);
mutex_unlock(&nic->mbox.lock); mutex_unlock(&nic->mbox.lock);
return -ENOMEM; return -ENOMEM;
@ -580,7 +585,7 @@ static int otx2_tc_add_flow(struct otx2_nic *nic,
/* Send message to AF */ /* Send message to AF */
rc = otx2_sync_mbox_msg(&nic->mbox); rc = otx2_sync_mbox_msg(&nic->mbox);
if (rc) { if (rc) {
netdev_err(nic->netdev, "Failed to install MCAM flow entry\n"); NL_SET_ERR_MSG_MOD(extack, "Failed to install MCAM flow entry");
mutex_unlock(&nic->mbox.lock); mutex_unlock(&nic->mbox.lock);
goto out; goto out;
} }