Skip to content

L
linux
Commit 545d95e5 authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Jakub Kicinski
Browse files
Options

cxgb4: flower: use NL_SET_ERR_MSG_MOD for validation errors 

Replace netdev_{warn,err} with NL_SET_ERR_MSG_{FMT_,}MOD
to better inform the user about the problem.

Only compile-tested, no access to HW.
Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Link: https://lore.kernel.org/r/20240408165506.94483-1-ast@fiberby.netSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9ef9ecfa
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 34 deletions
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
View file @ 545d95e5
...@@ -305,7 +305,7 @@ static void cxgb4_process_flow_match(struct net_device *dev, ...@@ -305,7 +305,7 @@ static void cxgb4_process_flow_match(struct net_device *dev,
fs->mask.iport = ~0; fs->mask.iport = ~0;
} }
static int cxgb4_validate_flow_match(struct net_device *dev, static int cxgb4_validate_flow_match(struct netlink_ext_ack *extack,
struct flow_rule *rule) struct flow_rule *rule)
{ {
struct flow_dissector *dissector = rule->match.dissector; struct flow_dissector *dissector = rule->match.dissector;
...@@ -321,8 +321,9 @@ static int cxgb4_validate_flow_match(struct net_device *dev, ...@@ -321,8 +321,9 @@ static int cxgb4_validate_flow_match(struct net_device *dev,
BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) | BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |
BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) | BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |
BIT_ULL(FLOW_DISSECTOR_KEY_IP))) { BIT_ULL(FLOW_DISSECTOR_KEY_IP))) {
netdev_warn(dev, "Unsupported key used: 0x%llx\n", NL_SET_ERR_MSG_FMT_MOD(extack,
dissector->used_keys); "Unsupported key used: 0x%llx",
dissector->used_keys);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
...@@ -339,13 +340,15 @@ static int cxgb4_validate_flow_match(struct net_device *dev, ...@@ -339,13 +340,15 @@ static int cxgb4_validate_flow_match(struct net_device *dev,
struct flow_match_ip match; struct flow_match_ip match;
if (eth_ip_type != ETH_P_IP && eth_ip_type != ETH_P_IPV6) { if (eth_ip_type != ETH_P_IP && eth_ip_type != ETH_P_IPV6) {
netdev_err(dev, "IP Key supported only with IPv4/v6"); NL_SET_ERR_MSG_MOD(extack,
"IP Key supported only with IPv4/v6");
return -EINVAL; return -EINVAL;
} }
flow_rule_match_ip(rule, &match); flow_rule_match_ip(rule, &match);
if (match.mask->ttl) { if (match.mask->ttl) {
netdev_warn(dev, "ttl match unsupported for offload"); NL_SET_ERR_MSG_MOD(extack,
"ttl match unsupported for offload");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
} }
...@@ -576,7 +579,7 @@ static bool valid_l4_mask(u32 mask) ...@@ -576,7 +579,7 @@ static bool valid_l4_mask(u32 mask)
return hi && lo ? false : true; return hi && lo ? false : true;
} }
static bool valid_pedit_action(struct net_device *dev, static bool valid_pedit_action(struct netlink_ext_ack *extack,
const struct flow_action_entry *act, const struct flow_action_entry *act,
u8 *natmode_flags) u8 *natmode_flags)
{ {
...@@ -595,8 +598,7 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -595,8 +598,7 @@ static bool valid_pedit_action(struct net_device *dev,
case PEDIT_ETH_SMAC_47_16: case PEDIT_ETH_SMAC_47_16:
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");
__func__);
return false; return false;
} }
break; break;
...@@ -609,8 +611,7 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -609,8 +611,7 @@ static bool valid_pedit_action(struct net_device *dev,
*natmode_flags |= CXGB4_ACTION_NATMODE_DIP; *natmode_flags |= CXGB4_ACTION_NATMODE_DIP;
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");
__func__);
return false; return false;
} }
break; break;
...@@ -629,8 +630,7 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -629,8 +630,7 @@ static bool valid_pedit_action(struct net_device *dev,
*natmode_flags |= CXGB4_ACTION_NATMODE_DIP; *natmode_flags |= CXGB4_ACTION_NATMODE_DIP;
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");
__func__);
return false; return false;
} }
break; break;
...@@ -638,8 +638,8 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -638,8 +638,8 @@ static bool valid_pedit_action(struct net_device *dev,
switch (offset) { switch (offset) {
case PEDIT_TCP_SPORT_DPORT: case PEDIT_TCP_SPORT_DPORT:
if (!valid_l4_mask(~mask)) { if (!valid_l4_mask(~mask)) {
netdev_err(dev, "%s: Unsupported mask for TCP L4 ports\n", NL_SET_ERR_MSG_MOD(extack,
__func__); "Unsupported mask for TCP L4 ports");
return false; return false;
} }
if (~mask & PEDIT_TCP_UDP_SPORT_MASK) if (~mask & PEDIT_TCP_UDP_SPORT_MASK)
...@@ -648,8 +648,7 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -648,8 +648,7 @@ static bool valid_pedit_action(struct net_device *dev,
*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");
__func__);
return false; return false;
} }
break; break;
...@@ -657,8 +656,8 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -657,8 +656,8 @@ static bool valid_pedit_action(struct net_device *dev,
switch (offset) { switch (offset) {
case PEDIT_UDP_SPORT_DPORT: case PEDIT_UDP_SPORT_DPORT:
if (!valid_l4_mask(~mask)) { if (!valid_l4_mask(~mask)) {
netdev_err(dev, "%s: Unsupported mask for UDP L4 ports\n", NL_SET_ERR_MSG_MOD(extack,
__func__); "Unsupported mask for UDP L4 ports");
return false; return false;
} }
if (~mask & PEDIT_TCP_UDP_SPORT_MASK) if (~mask & PEDIT_TCP_UDP_SPORT_MASK)
...@@ -667,13 +666,12 @@ static bool valid_pedit_action(struct net_device *dev, ...@@ -667,13 +666,12 @@ static bool valid_pedit_action(struct net_device *dev,
*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");
__func__);
return false; return false;
} }
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit type\n", __func__); NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit type");
return false; return false;
} }
return true; return true;
...@@ -727,8 +725,7 @@ int cxgb4_validate_flow_actions(struct net_device *dev, ...@@ -727,8 +725,7 @@ int cxgb4_validate_flow_actions(struct net_device *dev,
* the provided output port is not valid * the provided output port is not valid
*/ */
if (!found) { if (!found) {
netdev_err(dev, "%s: Out port invalid\n", NL_SET_ERR_MSG_MOD(extack, "Out port invalid");
__func__);
return -EINVAL; return -EINVAL;
} }
act_redir = true; act_redir = true;
...@@ -745,21 +742,21 @@ int cxgb4_validate_flow_actions(struct net_device *dev, ...@@ -745,21 +742,21 @@ int cxgb4_validate_flow_actions(struct net_device *dev,
case FLOW_ACTION_VLAN_PUSH: case FLOW_ACTION_VLAN_PUSH:
case FLOW_ACTION_VLAN_MANGLE: case FLOW_ACTION_VLAN_MANGLE:
if (proto != ETH_P_8021Q) { if (proto != ETH_P_8021Q) {
netdev_err(dev, "%s: Unsupported vlan proto\n", NL_SET_ERR_MSG_MOD(extack,
__func__); "Unsupported vlan proto");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
break; break;
default: default:
netdev_err(dev, "%s: Unsupported vlan action\n", NL_SET_ERR_MSG_MOD(extack,
__func__); "Unsupported vlan action");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
act_vlan = true; act_vlan = true;
} }
break; break;
case FLOW_ACTION_MANGLE: { case FLOW_ACTION_MANGLE: {
bool pedit_valid = valid_pedit_action(dev, act, bool pedit_valid = valid_pedit_action(extack, act,
&natmode_flags); &natmode_flags);
if (!pedit_valid) if (!pedit_valid)
...@@ -771,14 +768,14 @@ int cxgb4_validate_flow_actions(struct net_device *dev, ...@@ -771,14 +768,14 @@ int cxgb4_validate_flow_actions(struct net_device *dev,
/* Do nothing. cxgb4_set_filter will validate */ /* Do nothing. cxgb4_set_filter will validate */
break; break;
default: default:
netdev_err(dev, "%s: Unsupported action\n", __func__); NL_SET_ERR_MSG_MOD(extack, "Unsupported action");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
} }
if ((act_pedit || act_vlan) && !act_redir) { if ((act_pedit || act_vlan) && !act_redir) {
netdev_err(dev, "%s: pedit/vlan rewrite invalid without egress redirect\n", NL_SET_ERR_MSG_MOD(extack,
__func__); "pedit/vlan rewrite invalid without egress redirect");
return -EINVAL; return -EINVAL;
} }
...@@ -864,7 +861,7 @@ int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule, ...@@ -864,7 +861,7 @@ int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule,
if (cxgb4_validate_flow_actions(dev, &rule->action, extack, 0)) if (cxgb4_validate_flow_actions(dev, &rule->action, extack, 0))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (cxgb4_validate_flow_match(dev, rule)) if (cxgb4_validate_flow_match(extack, rule))
return -EOPNOTSUPP; return -EOPNOTSUPP;
cxgb4_process_flow_match(dev, rule, fs); cxgb4_process_flow_match(dev, rule, fs);
...@@ -901,8 +898,7 @@ int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule, ...@@ -901,8 +898,7 @@ int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule,
init_completion(&ctx.completion); init_completion(&ctx.completion);
ret = __cxgb4_set_filter(dev, fidx, fs, &ctx); ret = __cxgb4_set_filter(dev, fidx, fs, &ctx);
if (ret) { if (ret) {
netdev_err(dev, "%s: filter creation err %d\n", NL_SET_ERR_MSG_FMT_MOD(extack, "filter creation err %d", ret);
__func__, ret);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7